Changeset 145

Timestamp:

05/31/2007 01:51:43 (18 months ago)

Author:

why

Message:

• lib/hpricot/: wrapped up the rest of wycats' patch. no [] syntax for now and changed everything to use get_attribute, set_attribute rather than raw_attributes.
  

Location:

trunk

Files:

• lib/hpricot.rb (modified) (1 diff)
• lib/hpricot/builder.rb (modified) (2 diffs)
• lib/hpricot/elements.rb (modified) (1 diff)
• lib/hpricot/traverse.rb (modified) (1 diff)
• lib/hpricot/xchar.rb (modified) (2 diffs)
• test/test_alter.rb (modified) (2 diffs)

trunk/lib/hpricot.rb

@@ -25 +25 @@
 require 'hpricot/parse'
 require 'hpricot/builder'
-require 'hpricot/hpricot_functions'

trunk/lib/hpricot/builder.rb

@@ -76 +76 @@
       childs = []
       attrs = args.grep(Hash)
-      childs.concat((args - attrs).map { |x| Text.new(Hpricot.xs(x)) if x })
+      childs.concat((args - attrs).map do |x|
+        if x.respond_to? :to_html
+          Hpricot.make(x.to_html)
+        elsif x
+          Text.new(Hpricot.xs(x))
+        end
+      end.flatten)
       attrs = attrs.inject({}) do |hsh, ath|
         ath.each do |k, v|
-          hsh[k] = Hpricot.xs(v)
+          hsh[k] = Hpricot.xs(v.to_s) if v
         end
         hsh
@@ -183 +189 @@
       end
 
-      unless args.empty?
-        if args.last.respond_to? :to_hash
-          @attrs.merge! args.pop.to_hash
-        end
-      end
-      
       if block or args.any?
         args.push(@attrs)

trunk/lib/hpricot/elements.rb

@@ -173 +173 @@
     end
 
-    # Access a property on the first matched element.
-    def attr(k)
-      node = first
-      node.get_attribute(k) if node
+    def attr key, value = nil
+      if value
+        each do |el|
+          el.set_attribute(key, value)
+        end
+        return self      
+      end    
+      if key.is_a? Hash
+        key.each { |k,v| self.attr(k,v) }
+        return self
+      else
+        return self[0].get_attribute(key)
+      end
+    end
+  
+    def add_class class_name
+      each do |el|
+        next unless el.respond_to? :get_attribute
+        classes = el.get_attribute('class').to_s.split(" ")
+        el.set_attribute('class', classes.push(class_name).uniq.join(" "))
+      end
+      self
     end
 

trunk/lib/hpricot/traverse.rb

@@ -811 +811 @@
     alias_method :[]=, :set_attribute
     def remove_attribute(name)
+      name = name.to_s
       if has_attribute? name
         altered!

trunk/lib/hpricot/xchar.rb

@@ -52 +52 @@
       34 => '"', # quotation mark
       38 => '&',  # ampersand
-      39 => ''', # apostrophe
       60 => '<',   # left angle bracket
       62 => '>'    # right angle bracket
@@ -80 +79 @@
     # XML escaped version of to_s
     def xs(str)
-      str.unpack('U*').map {|n| xchr(n)}.join # ASCII, UTF-8
+      str.to_s.unpack('U*').map {|n| xchr(n)}.join # ASCII, UTF-8
     rescue
-      str.unpack('C*').map {|n| xchr(n)}.join # ISO-8859-1, WIN-1252
+      str.to_s.unpack('C*').map {|n| xchr(n)}.join # ISO-8859-1, WIN-1252
     end
 

trunk/test/test_alter.rb

@@ -29 +29 @@
   
   def test_add_class
-    first_p = @basic["p:first"].add_class("testing123")
-    assert first_p[0].attributes["class"].split(" ").include?("testing123")
-    assert Hpricot(@basic.to_html)["p:first"][0].attributes["class"].split(" ").include?("testing123")
-    assert !Hpricot(@basic.to_html)["p:gt(0)"][0].attributes["class"].split(" ").include?("testing123")
+    first_p = (@basic/"p:first").add_class("testing123")
+    assert first_p[0].get_attribute("class").split(" ").include?("testing123")
+    assert (Hpricot(@basic.to_html)/"p:first")[0].attributes["class"].split(" ").include?("testing123")
+    assert !(Hpricot(@basic.to_html)/"p:gt(0)")[0].attributes["class"].split(" ").include?("testing123")
   end
   
   def test_change_attributes
-    all_ps = @basic["p"].attr("title", "Some Title")
-    all_as = @basic["a"].attr("href", "http://my_new_href.com")
+    all_ps = (@basic/"p").attr("title", "Some Title")
+    all_as = (@basic/"a").attr("href", "http://my_new_href.com")
     assert_changed(@basic, "p", all_ps) {|p| p.attributes["title"] == "Some Title"}
     assert_changed(@basic, "a", all_as) {|a| a.attributes["href"] == "http://my_new_href.com"}
@@ -43 +43 @@
   
   def assert_changed original, selector, set, &block
-    assert set.all? &block
-    assert Hpricot(original.to_html)[selector].all? &block
+    assert set.all?(&block)
+    assert Hpricot(original.to_html).search(selector).all?(&block)
   end
 end