remarkable 3.0.8 → 3.0.9

data/spec/dsl/assertions_spec.rb

@@ -33,7 +33,7 @@ describe Remarkable::DSL::Assertions do
 
   it 'should accept blocks as argument' do
     should_not single_contain(4)
-    should single_contain(4){ |array| array << 4 }
+    should single_contain(4){ self << 4 }
   end
 
   it 'should provide an interface for default_options hook' do

data/spec/dsl/optionals_spec.rb

@@ -1,53 +1,236 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Remarkable::DSL::Optionals do
-  before(:each) do
-    @matcher = Remarkable::Specs::Matchers::BeAPersonMatcher.new
-  end
+describe Remarkable::DSL::Optionals do
+
+  describe "without config blocks" do
+
+    before(:each) do
+      @matcher = Remarkable::Specs::Matchers::BeAPersonMatcher.new
+    end
+
+    describe "as optionals" do
+      it "should allow optionals to be set" do
+        @matcher.first_name('José')
+        @matcher.options[:first_name].should == 'José'
 
-  it "should create optional methods on the fly" do
-    @matcher.first_name('José')
-    @matcher.instance_variable_get('@options')[:first_name].should == 'José'
+        @matcher.last_name('Valim')
+        @matcher.options[:last_name].should == 'Valim'
+      end
+
+      it "should allow defaults values" do
+        @matcher.age
+        @matcher.options[:age].should == 18
+      end
 
-    @matcher.last_name('Valim')
-    @matcher.instance_variable_get('@options')[:last_name].should == 'Valim'
-  end
+      it "should allow alias to be set" do
+        @matcher.family_name('Valim')
+        @matcher.options[:last_name].should == 'Valim'
+      end
+
+      it "should allow multiple options to be given" do
+        @matcher.bands(:incubus, :foo_fighters)
+        @matcher.options[:bands].should == [:incubus, :foo_fighters]
+      end
+
+      it "should allow multiple options to be appended once at a time" do
+        @matcher.bands(:incubus)
+        @matcher.bands(:foo_fighters)
+        @matcher.options[:bands].should == [:incubus, :foo_fighters]
+      end
+
+      it "should allow blocks to given to options" do
+        @matcher.builder {|i| i + 10 }
+        @matcher.options[:builder].call(10).should == 20
+
+        @matcher.builder proc{|i| i + 20 }
+        @matcher.options[:builder].call(10).should == 30
+      end
+    end
+
+    describe "as optionals=" do
+      it "should allow optionals to be set" do
+        @matcher.first_name = 'José'
+        @matcher.options[:first_name].should == 'José'
 
-  it "should allow defaults values" do
-    @matcher.age
-    @matcher.instance_variable_get('@options')[:age].should == 18
-  end
+        @matcher.last_name = 'Valim'
+        @matcher.options[:last_name].should == 'Valim'
+      end
+
+      it "should allow alias to be set" do
+        @matcher.family_name = 'Valim'
+        @matcher.options[:last_name].should == 'Valim'
+      end
+
+      it "should allow multiple options to be given" do
+        @matcher.bands = [ :incubus, :foo_fighters ]
+        @matcher.options[:bands].should == [ :incubus, :foo_fighters ]
+      end
+
+      it "should overwrite previous options" do
+        @matcher.bands = [ :incubus ]
+        @matcher.bands = [ :foo_fighters ]
+        @matcher.options[:bands].should == [:foo_fighters]
+      end
+
+      it "should allow blocks to given to options" do
+        @matcher.builder = proc{|i| i + 20 }
+        @matcher.options[:builder].call(10).should == 30
+      end
+    end
+
+  end
+
+  describe "with config blocks" do
+
+    def builder(*args, &block)
+      Remarkable::Specs::Matchers::BeAPersonMatcher.new(*args, &block)
+    end
+
+    describe "as optionals" do
+      it "should allow optionals to be set" do
+        matcher = builder do |m|
+          m.first_name 'José'
+          m.last_name 'Valim'
+        end
+
+        matcher.options[:first_name].should == 'José'
+        matcher.options[:last_name].should == 'Valim'
+      end
+
+      it "should allow defaults values" do
+        matcher = builder do |m|
+          m.age
+        end
 
-  it "should allow alias to be set" do
-    @matcher.family_name('Valim')
-    @matcher.instance_variable_get('@options')[:last_name].should == 'Valim'
-  end
+        matcher.options[:age].should == 18
+      end
 
-  it 'should provide a description with optionals' do
-    @matcher = Remarkable::Specs::Matchers::SingleContainMatcher.new(1)
-    @matcher.description.should == 'contain 1 not checking for blank'
+      it "should allow alias to be set" do
+        matcher = builder do |m|
+          m.family_name 'Valim'
+        end
 
-    @matcher.allow_blank(10)
-    @matcher.description.should == 'contain 1 with blank equal 10'
+        matcher.options[:last_name].should == 'Valim'
+      end
+
+      it "should allow multiple options to be given" do
+        matcher = builder do |m|
+          m.bands(:incubus, :foo_fighters)
+        end
+
+        matcher.options[:bands].should == [:incubus, :foo_fighters]
+      end
+
+      it "should allow multiple options to be appended once at a time" do
+        matcher = builder do |m|
+          m.bands(:incubus)
+          m.bands(:foo_fighters)
+        end
+
+        matcher.options[:bands].should == [:incubus, :foo_fighters]
+      end
+
+      it "should allow blocks to given to options" do
+        matcher = builder do |m|
+          m.builder {|i| i + 10 }
+        end
+
+        matcher.options[:builder].call(10).should == 20
+
+        matcher = builder do |m|
+          m.builder proc {|i| i + 20 }
+        end
+
+        matcher.options[:builder].call(10).should == 30
+      end
+    end
+
+    describe "as optionals=" do
+      it "should allow optionals to be set" do
+        matcher = builder do |m|
+          m.first_name = 'José'
+          m.last_name = 'Valim'
+        end
+
+        matcher.options[:first_name].should == 'José'
+        matcher.options[:last_name].should == 'Valim'
+      end
+
+      it "should allow alias to be set" do
+        matcher = builder do |m|
+          m.family_name = 'Valim'
+        end
+
+        matcher.options[:last_name].should == 'Valim'
+      end
+
+      it "should allow multiple options to be given" do
+        matcher = builder do |m|
+          m.bands = [ :incubus, :foo_fighters ]
+        end
+
+        matcher.options[:bands].should == [ :incubus, :foo_fighters ]
+      end
+
+      it "should overwrite previous options" do
+        matcher = builder do |m|
+          m.bands = [ :incubus ]
+          m.bands = [ :foo_fighters ]
+        end
+
+        matcher.options[:bands].should == [ :foo_fighters ]
+      end
+
+      it "should allow blocks to given to options" do
+        matcher = builder do |m|
+          m.builder = proc {|i| i + 20 }
+        end
+
+        matcher.options[:builder].call(10).should == 30
+      end
+    end
+
+  end
+
+  describe "description" do
+    it "should provide a description with optionals" do
+      matcher = Remarkable::Specs::Matchers::SingleContainMatcher.new(1)
+      matcher.description.should == 'contain 1 not checking for blank'
 
-    @matcher.allow_blank(true)
-    @matcher.description.should == 'contain 1 with blank equal true'
+      matcher.allow_blank(10)
+      matcher.description.should == 'contain 1 with blank equal 10'
 
-    @matcher.allow_nil(true)
-    @matcher.description.should == 'contain 1 allowing nil and with blank equal true'
+      matcher.allow_blank(true)
+      matcher.description.should == 'contain 1 with blank equal true'
 
-    @matcher.allow_nil(false)
-    @matcher.description.should == 'contain 1 not allowing nil and with blank equal true'
-  end
+      matcher.allow_nil(true)
+      matcher.description.should == 'contain 1 allowing nil and with blank equal true'
+
+      matcher.allow_nil(false)
+      matcher.description.should == 'contain 1 not allowing nil and with blank equal true'
+    end
+
+    it "should provide a sentence interpolation option to optionals" do
+      matcher = Remarkable::Specs::Matchers::SingleContainMatcher.new(1)
+      matcher.values(1, 2, 3)
+      matcher.description.should == 'contain 1 not checking for blank and values equal to 1, 2, and 3'
+    end
+
+    it "should inspect values in sentence interpolation options" do
+      matcher = Remarkable::Specs::Matchers::SingleContainMatcher.new(1)
+      matcher.values(:a, :b, :c)
+      matcher.description.should == 'contain 1 not checking for blank and values equal to :a, :b, and :c'
+    end
 
-  it 'should provide a description with optionals through namespace lookup' do
-    @matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1)
-    @matcher.description.should == 'contain 1'
+    it "should provide a description with optionals through namespace lookup" do
+      matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1)
+      matcher.description.should == 'contain 1'
 
-    @matcher.allow_nil(true)
-    @matcher.description.should == 'contain 1 allowing nil'
+      matcher.allow_nil(true)
+      matcher.description.should == 'contain 1 allowing nil'
 
-    @matcher.allow_nil(false)
-    @matcher.description.should == 'contain 1 not allowing nil'
+      matcher.allow_nil(false)
+      matcher.description.should == 'contain 1 not allowing nil'
+    end
   end
 end

data/spec/locale/en.yml

@@ -15,7 +15,9 @@ en:
             negative: "not allowing nil"
           allow_blank:
             positive: "with blank equal {{inspect}}"
-            not_given: "not checking for blank"
+            not_given: "not checking for blank"
+          values:
+            positive: "values equal to {{sentence}}"
       collection_contain:
         description: "contain {{values}}"
         expectations:

data/spec/macros_spec.rb

@@ -21,6 +21,6 @@ describe Remarkable::Macros do
     subject { [1, 2, 3] }
 
     should_not_single_contain(4)
-    should_single_contain(4){ |array| array << 4 }
+    should_single_contain(4){ self << 4 }
   end
 end

data/spec/matchers/be_a_person_matcher.rb

@@ -6,7 +6,11 @@ module Remarkable
 
         optional :first_name
         optional :age, :default => 18
-        optional :last_name, :alias => :family_name
+        optional :last_name, :alias => :family_name
+        optional :bands, :splat => true
+        optional :builder, :block => true
+
+        attr_reader :options
 
         def description
           "be a person"

data/spec/matchers/collection_contain_matcher.rb

@@ -24,8 +24,8 @@ module Remarkable
         end
       end
 
-      def collection_contain(*args)
-        CollectionContainMatcher.new(*args).spec(self)
+      def collection_contain(*args, &block)
+        CollectionContainMatcher.new(*args, &block).spec(self)
       end
     end
   end

data/spec/matchers/contain_matcher.rb

@@ -23,8 +23,8 @@ module Remarkable
         end
       end
 
-      def contain(*args)
-        ContainMatcher.new(*args).spec(self)
+      def contain(*args, &block)
+        ContainMatcher.new(*args, &block).spec(self)
       end
     end
   end

data/spec/matchers/single_contain_matcher.rb

@@ -7,13 +7,14 @@ module Remarkable
         assertions :is_array?, :included?
 
         optional :allow_nil
-        optional :allow_blank
+        optional :allow_blank
+        optional :values, :splat => true
 
         after_initialize :set_after_initialize
 
         before_assert do
-          @before_assert = true
-          @iterator.call(@subject) if @iterator
+          @before_assert = true
+          @subject.instance_eval(&@iterator) if @iterator
         end
 
         protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable
 version: !ruby/object:Gem::Version 
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 +02:00
+date: 2009-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,6 @@ files:
 - lib/remarkable/pending.rb
 - lib/remarkable/dsl/assertions.rb
 - lib/remarkable/dsl/optionals.rb
-- lib/remarkable/dsl/matches.rb
 - lib/remarkable/dsl/callbacks.rb
 - lib/remarkable/rspec.rb
 - lib/remarkable/base.rb

data/lib/remarkable/dsl/matches.rb

@@ -1,139 +0,0 @@
-module Remarkable
-  module DSL
-    module Matches
-
-      # For each instance under the collection declared in <tt>arguments</tt>,
-      # this method will call each method declared in <tt>collection_assertions</tt>.
-      #
-      # As an example, let's assume you have the following matcher:
-      #
-      #   arguments  :collection => :attributes
-      #   assertions :allow_nil?, :allow_blank?
-      #
-      # For each attribute in @attributes, we will set the instance variable
-      # @attribute and then call allow_nil? and allow_blank?. Assertions should
-      # return true if it pass or false if it fails. When it fails, it will use
-      # I18n API to find the proper failure message:
-      #
-      #   expectations:
-      #     allow_nil?: allowed the value to be nil
-      #     allow_blank?: allowed the value to be blank
-      #
-      # Or you can set the message in the instance variable @expectation in the
-      # assertion method if you don't want to rely on I18n API.
-      #
-      # This method also call the methods declared in single_assertions. Which
-      # work the same way as assertions, except it doesn't loop for each value in
-      # the collection.
-      #
-      # It also provides a before_assert callback that you might want to use it
-      # to manipulate the subject before the assertions start.
-      #
-      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
-      end
-
-      protected
-
-        # Overwrite to provide default options.
-        #
-        def default_options
-          {}
-        end
-
-        # Overwrites default_i18n_options to provide arguments and optionals
-        # to interpolation options.
-        #
-        # If you still need to provide more other interpolation options, you can
-        # do that in two ways:
-        #
-        # 1. Overwrite interpolation_options:
-        #
-        #   def interpolation_options
-        #     { :real_value => real_value }
-        #   end
-        #
-        # 2. Return a hash from your assertion method:
-        #
-        #   def my_assertion
-        #     return true if real_value == expected_value
-        #     return false, :real_value => real_value
-        #   end
-        #
-        # In both cases, :real_value will be available as interpolation option.
-        #
-        def default_i18n_options #:nodoc:
-          i18n_options = {}
-
-          @options.each do |key, value|
-            i18n_options[key] = value.inspect
-          end if @options
-
-          # Also add arguments as interpolation options.
-          self.class.matcher_arguments[:names].each do |name|
-            i18n_options[name] = instance_variable_get("@#{name}").inspect
-          end
-
-          # Add collection interpolation options.
-          i18n_options.update(collection_interpolation)
-
-          # Add default options (highest priority). They should not be overwritten.
-          i18n_options.update(super)
-        end
-
-        # Method responsible to add collection as interpolation.
-        #
-        def collection_interpolation #:nodoc:
-          options = {}
-
-          if collection_name = self.class.matcher_arguments[:collection]
-            collection_name = collection_name.to_sym
-            collection = instance_variable_get("@#{collection_name}")
-            options[collection_name] = array_to_sentence(collection) if collection
-
-            object_name = self.class.matcher_arguments[:as].to_sym
-            object = instance_variable_get("@#{object_name}")
-            options[object_name] = object if object
-          end
-
-          options
-        end
-
-        # Send the assertion methods given and create a expectation message
-        # if any of those methods returns false.
-        #
-        # Since most assertion methods ends with an question mark and it's not
-        # readable in yml files, we remove question and exclation marks at the
-        # end of the method name before translating it. So if you have a method
-        # called is_valid? on I18n yml file we will check for a key :is_valid.
-        #
-        def send_methods_and_generate_message(methods) #:nodoc:
-          methods.each do |method|
-            bool, hash = send(method)
-
-            unless bool
-              parent_scope = matcher_i18n_scope.split('.')
-              matcher_name = parent_scope.pop
-              lookup       = :"expectations.#{method.to_s.gsub(/(\?|\!)$/, '')}"
-
-              hash = { :scope => parent_scope, :default => lookup }.merge(hash || {})
-              @expectation ||= Remarkable.t "#{matcher_name}.#{lookup}", default_i18n_options.merge(hash)
-
-              return false
-            end
-          end
-
-          return true
-        end
-
-    end
-  end
-end