remarkable 3.1.7 → 3.1.8

data/lib/remarkable.rb

@@ -8,7 +8,8 @@ require File.join(dir, 'remarkable', 'messages')
 
 require File.join(dir, 'remarkable', 'base')
 require File.join(dir, 'remarkable', 'macros')
-require File.join(dir, 'remarkable', 'pending')
+require File.join(dir, 'remarkable', 'pending')
+require File.join(dir, 'remarkable', 'negative')
 require File.join(dir, 'remarkable', 'core_ext', 'array')
 
 if defined?(Spec)

data/lib/remarkable/base.rb

@@ -10,6 +10,14 @@ module Remarkable
       @spec = binding
       self
     end
+
+    def positive?
+      !negative?
+    end
+
+    def negative?
+      false
+    end
 
     protected
 
@@ -28,11 +36,20 @@ module Remarkable
 
       # Iterates over the collection given yielding the block and return false
       # if any of them also returns false.
-      def assert_matcher_for(collection) #:nodoc:
-        collection.each do |item|
-          return false unless yield(item)
+      def assert_collection(key, collection, inspect=true) #:nodoc:
+        collection.each do |item|
+          value = yield(item)
+
+          if positive? == !value
+            if key
+              output = inspect ? item.inspect : item
+              return negative?, key => output
+            else
+              return negative?
+            end
+          end
         end
-        true
+        positive?
       end
 
       # Asserts that the given collection contains item x. If x is a regular

data/lib/remarkable/dsl/assertions.rb

@@ -280,15 +280,17 @@ module Remarkable
       def matches?(subject)
         @subject = subject
 
-        run_before_assert_callbacks
-
-        send_methods_and_generate_message(self.class.matcher_single_assertions) &&
-        assert_matcher_for(instance_variable_get("@#{self.class.matcher_arguments[:collection]}") || []) do |value|
-          instance_variable_set("@#{self.class.matcher_arguments[:as]}", value)
-          send_methods_and_generate_message(self.class.matcher_collection_assertions)
-        end
+        run_before_assert_callbacks
+
+        assertions = self.class.matcher_single_assertions
+        unless assertions.empty?
+          value = send_methods_and_generate_message(assertions)
+          return negative? if positive? == !value
+        end
+
+        matches_collection_assertions?
       end
-
+
       protected
 
         # You can overwrite this instance method to provide default options on
@@ -368,20 +370,42 @@ module Remarkable
           methods.each do |method|
             bool, hash = send(method)
 
-            unless bool
+            if positive? == !bool
               parent_scope = matcher_i18n_scope.split('.')
-              matcher_name = parent_scope.pop
-              lookup       = :"expectations.#{method.to_s.gsub(/(\?|\!)$/, '')}"
+              matcher_name = parent_scope.pop
+              method_name  = method.to_s.gsub(/(\?|\!)$/, '')
+
+              lookup = []
+              lookup << :"#{matcher_name}.negative_expectations.#{method_name}" if negative?
+              lookup << :"#{matcher_name}.expectations.#{method_name}"
+              lookup << :"negative_expectations.#{method_name}" if negative?
+              lookup << :"expectations.#{method_name}"
 
               hash = { :scope => parent_scope, :default => lookup }.merge(hash || {})
-              @expectation ||= Remarkable.t "#{matcher_name}.#{lookup}", default_i18n_options.merge(hash)
+              @expectation ||= Remarkable.t lookup.shift, default_i18n_options.merge(hash)
 
-              return false
+              return negative?
             end
           end
 
-          return true
+          return positive?
         end
+
+        def matches_single_assertions? #:nodoc:
+          assertions = self.class.matcher_single_assertions
+          send_methods_and_generate_message(assertions)
+        end
+
+        def matches_collection_assertions? #:nodoc:
+          arguments  = self.class.matcher_arguments
+          assertions = self.class.matcher_collection_assertions
+          collection = instance_variable_get("@#{self.class.matcher_arguments[:collection]}") || []
+
+          assert_collection(nil, collection) do |value|
+            instance_variable_set("@#{arguments[:as]}", value)
+            send_methods_and_generate_message(assertions)
+          end
+        end
 
 
     end

data/lib/remarkable/negative.rb

@@ -0,0 +1,24 @@
+module Remarkable
+  # Allows Remarkable matchers to work on the negative way. Your matcher has to
+  # follow some conventions to allow this to work by default.
+  #
+  # In negative cases, expectations can also be found under negative_expectations
+  # keys, falling back to expectations. This allows to set customized failure
+  # messages.
+  #
+  module Negative
+    def matches?(subject)
+      @negative ||= false
+      super
+    end
+
+    def does_not_match?(subject)
+      @negative = true
+      !matches?(subject)
+    end
+
+    def negative?
+      @negative
+    end
+  end
+end

data/lib/remarkable/version.rb

@@ -1,3 +1,3 @@
 module Remarkable
-  VERSION = '3.1.7' unless self.const_defined?(:VERSION)
+  VERSION = '3.1.8' unless self.const_defined?(:VERSION)
 end

data/spec/base_spec.rb

@@ -27,6 +27,11 @@ describe Remarkable::Base do
     should matcher
     matcher.instance_variable_get('@spec').class.ancestors.should include(Spec::Example::ExampleGroup)
   end
+
+  it 'should be positive' do
+    contain(1).should be_positive
+    contain(1).should_not be_negative
+  end
 
   it { should contain(1) }
   it { should_not contain(10) }

data/spec/matchers/contain_matcher.rb

@@ -9,7 +9,7 @@ module Remarkable
         def matches?(subject)
           @subject = subject
 
-          assert_matcher_for(@values) do |value|
+          assert_collection(nil, @values) do |value|
             @value = value
             included?
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable
 version: !ruby/object:Gem::Version 
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-05 00:00:00 +02:00
+date: 2009-07-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,7 @@ files:
 - lib/remarkable/matchers.rb
 - lib/remarkable/core_ext/array.rb
 - lib/remarkable/messages.rb
+- lib/remarkable/negative.rb
 - lib/remarkable.rb
 - locale/en.yml
 has_rdoc: true