assert2 0.4.9 → 0.5.0

data/lib/assert2/rjs.rb

@@ -13,7 +13,8 @@ module Test; module Unit; module Assertions
       @js, @command, @scope = js, command, scope
     end
 
-    attr_reader :command, :js, :scope
+    attr_reader :command, :js, :scope, :failure_message
+      #  TODO  rename js to sample
 
     def match(kode)
       RKelly.parse(js).pointcut(kode).
@@ -31,12 +32,28 @@ module Test; module Unit; module Assertions
     end
     
     def flunk(about)
-      scope.flunk(complain(about))
+      @failure_message ||= complain(about)
     end
-
+    
     def match_or_flunk(why)  
+      @text = @text.to_s
       @matcher = @matcher.to_s if @matcher.kind_of?(Symbol)
-      scope.assert_match @matcher, @text, complain(why)
+      return if Regexp.new(@matcher) =~ @text or @text.index(@matcher)
+      @failure_message = scope.build_message(complain(why),
+                                  "<?> expected to be =~\n<?>.", @text, @matcher)
+    end
+
+#  ERGO  blog about how bottom-up TDD decouples
+#  ERGO  assert_no_rjs_ ...without! ... oh the humanity!
+
+    def wrap_expectation whatever;  yield;  end unless defined? wrap_expectation
+
+    def assert_xhtml(why, &block)
+        #  scope.assert_xhtml @text, complain(why), &block      
+      matcher = BeHtmlWith.new(self, &block)
+      matcher.message = complain(why)
+      matcher.matches?(@text, &block)
+      @failure_message = matcher.failure_message
     end
 
     def pwn_call *args, &block  #  TODO  use or reject the block
@@ -59,7 +76,7 @@ module Test; module Unit; module Assertions
       
       matchers = matchers_backup.inspect
 
-      scope.flunk("#{ command } to #{ target } with arguments #{ 
+      flunk("#{ command } to #{ target } with arguments #{ 
                         matchers } not found in #{ js }")
     end
 
@@ -99,9 +116,10 @@ module Test; module Unit; module Assertions
 
             if div_id == target.to_s
               cornplaint = complain("for ID #{ target } has incorrect payload, in")
-              scope.assert_match @matcher, html, cornplaint if @matcher
-              scope.assert_xhtml html, cornplaint, &block if block
-              return html
+              @text = html
+              match_or_flunk cornplaint if @matcher
+              assert_xhtml cornplaint, &block if block
+              return html  #  TODO  match any html not just the first. Because!
             end
           end
         end
@@ -116,17 +134,67 @@ module Test; module Unit; module Assertions
     end
   end
 
-  def assert_rjs_(command, *args, &block)
+  def __interpret_rjs(command, *args, &block)
     klass = command.to_s.upcase
     klass = eval("AssertRjs::#{klass}") rescue
       flunk("#{command} not implemented!")
     asserter = klass.new(@response.body, command, self)
-    return asserter.pwn(*args, &block)
+    sample = asserter.pwn(*args, &block)
+    return sample, asserter
+  end
+
+  def assert_rjs_(command, *args, &block)
+    sample, asserter = __interpret_rjs(command, *args, &block)
+    asserter.failure_message and flunk(asserter.failure_message)
+    return sample
   end
     
+  def assert_no_rjs_(command, *args, &block)
+    sample, asserter = __interpret_rjs(command, *args, &block)
+    asserter.failure_message and return sample
+    flunk("should not find #{sample.inspect} in\n#{asserter.js}") #  TODO  complaint system
+  end
+
+#  TODO  wrappers for RSpec
+
 #     command == :replace_html or  #  TODO  put me inside the method_missing!
 #       flunk("assert_rjs's alpha version only respects :replace_html")
 #   TODO  also crack out the args correctly and gripe if they wrong
 #  TODO TDD the @matcher can be a string or regexp
 
 end; end; end
+
+module Spec; module Matchers
+
+  class SendJsTo
+    def initialize(scope, command, *args, &block)
+      @scope, @command, @args, @block = scope, command, args, block
+    end
+ 
+    def matches?(response, &block)
+      @block = block if block
+      sample, asserter = @scope.__interpret_rjs(response, @command, @args, &@block)
+      return !(@failure_message = asserter.failure_message) # or
+#         @negative_failure_message = "should not find #{sample.inspect} in\n#{asserter.js}" #  TODO  complaint system
+    end
+ 
+    attr_reader :failure_message, :negative_failure_message
+  end
+
+  def __interpret_rjs(response, command, *args, &block)
+    klass = command.to_s.upcase
+    klass = eval("Test::Unit::Assertions::AssertRjs::#{klass}") rescue
+      flunk("#{command} not implemented!")
+    asserter = klass.new(response, command, self)
+    sample = asserter.pwn(*args, &block)
+    return sample, asserter
+  end  #  ERGO  further merging!
+  
+  def send_js_to(*args, &block)
+    SendJsTo.new(self, *args, &block)
+  end
+  
+  def generate_js_to(*args, &block)
+    send_js_to(*args, &block)
+  end
+end; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: assert2
 version: !ruby/object:Gem::Version 
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors: 
 - Phlip
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-04-11 00:00:00 -07:00
 default_executable: 
 dependencies: []