assert2 0.5.3 → 0.5.5

data/lib/assert2/rjs.rb

@@ -63,12 +63,20 @@ module Test; module Unit; module Assertions
         matchers = matchers_backup.dup
         
         thang.value.each do |arg|
-          @text = eval(arg.value)
+#         p arg
           @matcher = matchers.first # or return @text
-          @matcher.to_s == @text or /#{ @matcher }/ =~ @text or break
+          
+          if @matcher.kind_of?(Hash) and
+             hash = props_to_hash(arg) 
+            hash_match(hash, @matcher) or break  #  TODO  rename to match_hash
+          else
+            @text = eval(arg.value)
+            @matcher.to_s == @text or /#{ @matcher }/ =~ @text or break
+          end
+          
           matchers.shift
         end
-        
+
         matchers.empty? and 
           matchers_backup.length == thang.value.length and 
           return @text 
@@ -80,6 +88,32 @@ module Test; module Unit; module Assertions
                         matchers } not found in #{ js }")
     end
 
+    def props_to_hash(props)
+      case props
+        when RKelly::Nodes::ObjectLiteralNode
+          hash = {}
+          
+          props.value.each do |thang|
+            hash[thang.name.to_sym] = eval(thang.value.value)
+          end
+
+          return hash
+
+        else
+          return nil
+      end
+    end
+
+    def hash_match(sample, reference)
+      reference.each do |key, value|
+        sample[key] == value or
+          value.kind_of?(Regexp) && sample[key] =~ value or 
+            return false
+      end
+      
+      return true
+    end
+
     class ALERT < AssertRjs
       def pwn *args, &block
         @command = :call
@@ -87,6 +121,12 @@ module Test; module Unit; module Assertions
       end
     end
 
+    class CALL < AssertRjs
+      def pwn *args, &block  #  TODO  use or reject the block
+        pwn_call *args, &block
+      end
+    end
+
     class REMOVE < AssertRjs
       def pwn *args, &block
         @command = :call
@@ -101,9 +141,11 @@ module Test; module Unit; module Assertions
       end
     end
 
-    class CALL < AssertRjs
-      def pwn *args, &block  #  TODO  use or reject the block
-        pwn_call *args, &block
+    class INSERT_HTML < AssertRjs
+      def pwn *args, &block
+        @command = :call
+        location, id, html = args
+        pwn_call 'Element.insert', id, { location.to_sym => html }, &block
       end
     end
 

data/lib/assert2/xhtml.rb

@@ -97,9 +97,16 @@ class BeHtmlWith
   end
 
   def elemental_children(element = @builder.doc)
-    element.children.grep(Nokogiri::XML::Element)
-  end
+    element_kids = element.children.grep(Nokogiri::XML::Node)
+
+    element_kids = element_kids.reject{|k| 
+                     k.class == Nokogiri::XML::Text ||
+                     k.class == Nokogiri::XML::DTD
+                     }  #  CONSIDER  rebuild to use not abuse the text nodage!
 
+    return element_kids
+  end
+  
   def build_deep_xpath(element)
     path = build_xpath(element)
     path.index('not(') == 0 and return '/*[ ' + path + ' ]'
@@ -149,9 +156,9 @@ class BeHtmlWith
 
   def match_xpath(path, &refer)
     nodes = @doc.root.xpath_with_callback path, :refer do |element, index|
-       collect_samples(element, index.to_i)
-     end
-
+      collect_samples(element, index.to_i)
+    end
+     
     @returnable ||= nodes.first  #  TODO  be_with_html must get on board too
     return nodes
   end
@@ -242,11 +249,12 @@ class BeHtmlWith
     ref_text.empty? and return true
     sam_text = get_texts(sam)
     (ref_text - sam_text).empty? and return true
-    ref_text.length == 1 and match_regexp(ref_text.first, sam_text.join)
+    got = (ref_text.length == 1 and match_regexp(ref_text.first, sam_text.join))
+    return got
   end
 
   def get_texts(element)
-    element.children.grep(Nokogiri::XML::Text).
+   element.children.grep(Nokogiri::XML::Text).
       map{|x|x.to_s.strip}.select{|x|x.any?}
   end
 
@@ -278,7 +286,7 @@ class BeHtmlWith
 
   def build_xpath_too(element)
     path = element.name.sub(/\!$/, '')
-    element_kids = element.children.grep(Nokogiri::XML::Element)
+    element_kids = element.children.grep(Nokogiri::XML::Node)
     path << '[ '
     count = @references.length
     @references << element
@@ -384,4 +392,4 @@ module Nokogiri
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: assert2
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors: 
 - Phlip
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-10 00:00:00 -07:00
+date: 2009-06-20 00:00:00 -07:00
 default_executable: 
 dependencies: []