remarkable 3.1.8 → 3.1.9

data/lib/remarkable/rspec.rb

@@ -1,24 +1,24 @@
-module Spec #:nodoc:
-  module Matchers #:nodoc:
-    # Overwrites to provide I18n on should and should_not.
-    #
-    def self.generated_description
-      return nil if last_should.nil?
-      verb = Remarkable.t "remarkable.core.#{last_should}", :default => last_should.to_s.gsub('_',' ')
-      "#{verb} #{last_description}"
-    end
-  end
-
-  module Example #:nodoc:
-    module ExampleGroupMethods #:nodoc:
-      # Overwrites to provide I18n on example disabled message.
-      #
-      def xexample(description=nil, opts={}, &block)
-        disabled = Remarkable.t 'remarkable.core.example_disabled', :default => 'Example disabled'
-        Kernel.warn("#{disabled}: #{description}")
-      end
-      alias_method :xit, :xexample
-      alias_method :xspecify, :xexample
-    end
-  end
-end
+module Spec #:nodoc:
+  module Matchers #:nodoc:
+    # Overwrites to provide I18n on should and should_not.
+    #
+    def self.generated_description
+      return nil if last_should.nil?
+      verb = Remarkable.t "remarkable.core.#{last_should}", :default => last_should.to_s.gsub('_',' ')
+      "#{verb} #{last_description}"
+    end
+  end
+
+  module Example #:nodoc:
+    module ExampleGroupMethods #:nodoc:
+      # Overwrites to provide I18n on example disabled message.
+      #
+      def xexample(description=nil, opts={}, &block)
+        disabled = Remarkable.t 'remarkable.core.example_disabled', :default => 'Example disabled'
+        Kernel.warn("#{disabled}: #{description}")
+      end
+      alias_method :xit, :xexample
+      alias_method :xspecify, :xexample
+    end
+  end
+end

data/lib/remarkable/version.rb

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

data/locale/en.yml

@@ -1,14 +1,14 @@
-en:
-  remarkable:
-    core:
-      not: "not"
-      should: "should"
-      should_not: "should not"
-      example_disabled: "Example disabled"
-      failure_message_for_should: "Expected {{expectation}}"
-      failure_message_for_should_not: "Did not expect {{expectation}}"
-
-      helpers:
-        words_connector: ", "
-        two_words_connector: " and "
-        last_word_connector: ", and "
+en:
+  remarkable:
+    core:
+      not: "not"
+      should: "should"
+      should_not: "should not"
+      example_disabled: "Example disabled"
+      failure_message_for_should: "Expected {{expectation}}"
+      failure_message_for_should_not: "Did not expect {{expectation}}"
+
+      helpers:
+        words_connector: ", "
+        two_words_connector: " and "
+        last_word_connector: ", and "

data/spec/base_spec.rb

@@ -1,46 +1,46 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe Remarkable::Base do
-  subject { [1, 2, 3] }
-
-  it 'should provide default structure to matchers' do
-    [1, 2, 3].should contain(1)
-    [1, 2, 3].should contain(1, 2)
-    [1, 2, 3].should contain(1, 2, 3)
-
-    [1, 2, 3].should_not contain(4)
-    [1, 2, 3].should_not contain(1, 4)
-  end
-
-  it 'should not change rspec matchers default behavior' do
-    should include(3)
-    [1, 2, 3].should include(3)
-
-    1.should == 1
-    true.should be_true
-    false.should be_false
-    proc{ 1 + '' }.should raise_error(TypeError)
-  end
-
-  it 'should store spec instance binding' do
-    matcher = contain(1)
-    should matcher
-    matcher.instance_variable_get('@spec').class.ancestors.should include(Spec::Example::ExampleGroup)
-  end
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Remarkable::Base do
+  subject { [1, 2, 3] }
+
+  it 'should provide default structure to matchers' do
+    [1, 2, 3].should contain(1)
+    [1, 2, 3].should contain(1, 2)
+    [1, 2, 3].should contain(1, 2, 3)
+
+    [1, 2, 3].should_not contain(4)
+    [1, 2, 3].should_not contain(1, 4)
+  end
+
+  it 'should not change rspec matchers default behavior' do
+    should include(3)
+    [1, 2, 3].should include(3)
+
+    1.should == 1
+    true.should be_true
+    false.should be_false
+    proc{ 1 + '' }.should raise_error(TypeError)
+  end
+
+  it 'should store spec instance binding' do
+    matcher = contain(1)
+    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) }
-
-  class MatchersSandbox
-    include Remarkable::Matchers
-  end
-
-  it 'should allow Macros and Matchers to be added to any class' do
-    MatchersSandbox.new.should respond_to(:contain)
-  end
-end
+
+  it { should contain(1) }
+  it { should_not contain(10) }
+
+  class MatchersSandbox
+    include Remarkable::Matchers
+  end
+
+  it 'should allow Macros and Matchers to be added to any class' do
+    MatchersSandbox.new.should respond_to(:contain)
+  end
+end

data/spec/dsl/assertions_spec.rb

@@ -1,54 +1,54 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Remarkable::DSL::Assertions do
-  subject { [1, 2, 3] }
-
-  before(:each) do
-    @matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1, 2, 3)
-  end
-
-  it 'should provide default structure for assertions' do
-    should collection_contain(1)
-    should collection_contain(1, 2)
-    should collection_contain(1, 2, 3)
-
-    should_not collection_contain(4)
-    should_not collection_contain(1, 4)
-  end
-
-  it 'should provide default structure for single assertions' do
-    should single_contain(1)
-    should_not single_contain(4)
-    nil.should_not single_contain(1)
-  end
-
-  it 'should provide collection in description' do
-    @matcher.description.should == 'contain 1, 2, and 3'
-  end
-
-  it 'should provide value to expectation messages' do
-    @matcher.matches?([4])
-    @matcher.failure_message.should == 'Expected that 1 is included in [4]'
-  end
-
-  it 'should accept blocks as argument' do
-    should_not single_contain(4)
-    should single_contain(4){ self << 4 }
-  end
-
-  it 'should provide an interface for default_options hook' do
-    matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1, :args => true)
-    matcher.instance_variable_get('@options').should == { :working => true, :args => true }
-  end
-
-  it 'should provide an interface for after_initialize hook' do
-    matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1)
-    matcher.instance_variable_get('@after_initialize').should be_true
-  end
-
-  it 'should provide an interface for before_assert hook' do
-    matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1)
-    [1, 2, 3].should matcher
-    matcher.instance_variable_get('@before_assert').should be_true
-  end
-end
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Remarkable::DSL::Assertions do
+  subject { [1, 2, 3] }
+
+  before(:each) do
+    @matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1, 2, 3)
+  end
+
+  it 'should provide default structure for assertions' do
+    should collection_contain(1)
+    should collection_contain(1, 2)
+    should collection_contain(1, 2, 3)
+
+    should_not collection_contain(4)
+    should_not collection_contain(1, 4)
+  end
+
+  it 'should provide default structure for single assertions' do
+    should single_contain(1)
+    should_not single_contain(4)
+    nil.should_not single_contain(1)
+  end
+
+  it 'should provide collection in description' do
+    @matcher.description.should == 'contain 1, 2, and 3'
+  end
+
+  it 'should provide value to expectation messages' do
+    @matcher.matches?([4])
+    @matcher.failure_message.should == 'Expected that 1 is included in [4]'
+  end
+
+  it 'should accept blocks as argument' do
+    should_not single_contain(4)
+    should single_contain(4){ self << 4 }
+  end
+
+  it 'should provide an interface for default_options hook' do
+    matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1, :args => true)
+    matcher.instance_variable_get('@options').should == { :working => true, :args => true }
+  end
+
+  it 'should provide an interface for after_initialize hook' do
+    matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1)
+    matcher.instance_variable_get('@after_initialize').should be_true
+  end
+
+  it 'should provide an interface for before_assert hook' do
+    matcher = Remarkable::Specs::Matchers::CollectionContainMatcher.new(1)
+    [1, 2, 3].should matcher
+    matcher.instance_variable_get('@before_assert').should be_true
+  end
+end

data/spec/dsl/optionals_spec.rb

@@ -1,237 +1,237 @@
-# encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-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é'
-
-        @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
-
-      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é'
-
-        @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
-
-        matcher.options[:age].should == 18
-      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 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(10)
-      matcher.description.should == 'contain 1 with blank equal 10'
-
-      matcher.allow_blank(true)
-      matcher.description.should == 'contain 1 with blank equal true'
-
-      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'
-
-      matcher.allow_nil(true)
-      matcher.description.should == 'contain 1 allowing nil'
-
-      matcher.allow_nil(false)
-      matcher.description.should == 'contain 1 not allowing nil'
-    end
-  end
-end
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+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é'
+
+        @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
+
+      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é'
+
+        @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
+
+        matcher.options[:age].should == 18
+      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 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(10)
+      matcher.description.should == 'contain 1 with blank equal 10'
+
+      matcher.allow_blank(true)
+      matcher.description.should == 'contain 1 with blank equal true'
+
+      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'
+
+      matcher.allow_nil(true)
+      matcher.description.should == 'contain 1 allowing nil'
+
+      matcher.allow_nil(false)
+      matcher.description.should == 'contain 1 not allowing nil'
+    end
+  end
+end