remarkable 3.1.2 → 3.1.3

data/CHANGELOG

@@ -1,5 +1,7 @@
 # v3.1
 
+* Remarkable.include_matchers! require just one argument [#80]
+
 * Pending groups show proper backtrace and run by default in execute mode [#49]
 
 * Added support to blocks configuration. All Remarkable matcher and macros can

data/lib/remarkable/matchers.rb

@@ -9,7 +9,15 @@ module Remarkable
   # If the module to be included responds to :after_include, it's called with the
   # target as argument.
   #
-  def self.include_matchers!(base, target)
+  def self.include_matchers!(base, target=nil)
+    if target.nil?
+      if rspec_defined?
+        target = Spec::Example::ExampleGroup
+      else
+        raise ArgumentError, "You haven't supplied the target to include_matchers! and RSpec is not loaded, so we cannot infer one."
+      end
+    end
+
     target.send :extend, Remarkable::Pending
     target.send :extend, Remarkable::Macros
 
@@ -23,5 +31,9 @@ module Remarkable
     if base.respond_to?(:after_include)
       base.after_include(target)
     end
+  end
+
+  def self.rspec_defined? #:nodoc:
+    defined?(Spec)
   end
 end

data/lib/remarkable/pending.rb

@@ -1,62 +1,66 @@
 module Remarkable
-  module Pending
-
-    # We cannot put the alias method in the module because it's a Ruby 1.8 bug
-    # http://coderrr.wordpress.com/2008/03/28/alias_methodmodule-bug-in-ruby-18/
-    #
-    def self.extended(base) #:nodoc:
-      class << base
-        alias :it :example
-        alias :specify :example
-      end
-    end
-
-    # Adds a pending block to your specs.
-    #
-    # == Examples
-    #
-    #   pending 'create manager resource' do
-    #     should_have_one :manager
-    #     should_validate_associated :manager
-    #   end
-    #
-    # By default, it executes the examples inside the pending block. So as soon
-    # as you add the has_one :manager relationship to your model, your specs
-    # will say that this was already fixed and there is no need to be treated
-    # as pending. To disable this behavior, you can give :execute => false:
-    #
-    #   pending 'create manager resource', :execute => false
+
+  module Pending
+
+    # We cannot put the alias method in the module because it's a Ruby 1.8 bug
+    # http://coderrr.wordpress.com/2008/03/28/alias_methodmodule-bug-in-ruby-18/
+    #
+    def self.extended(base) #:nodoc:
+      class << base
+        alias_method :example_without_pending, :example
+        alias_method :example, :example_with_pending
+        alias :it :example
+        alias :specify :example
+      end
+    end
+
+    # Adds a pending block to your specs.
+    #
+    # == Examples
+    #
+    #   pending 'create manager resource' do
+    #     should_have_one :manager
+    #     should_validate_associated :manager
+    #   end
+    #
+    # By default, it executes the examples inside the pending block. So as soon
+    # as you add the has_one :manager relationship to your model, your specs
+    # will say that this was already fixed and there is no need to be treated
+    # as pending. To disable this behavior, you can give :execute => false:
+    #
+    #   pending 'create manager resource', :execute => false
     #
-    def pending(*args, &block)
-      options = { :execute => true }.merge(args.extract_options!)
-
-      @_pending_group = true
-      @_pending_group_description = args.first || "TODO"
-      @_pending_group_execute = options.delete(:execute)
-
-      self.instance_eval(&block)
-
-      @_pending_group = false
-      @_pending_group_description = nil
-      @_pending_group_execute = nil
-    end
-
-    def example(description=nil, options={}, backtrace=nil, &implementation) #:nodoc:
-      if block_given? && @_pending_group
-        pending_caller      = caller.detect{ |c| c !~ /method_missing'/ }
-        pending_description = @_pending_group_description
-
-        pending_block = if @_pending_group_execute
-          proc{ pending(pending_description){ self.instance_eval(&implementation) } }
-        else
-          proc{ pending(pending_description) }
-        end
-
-        super(description, options, backtrace || pending_caller, &pending_block)
-      else
-        super(description, options, backtrace || caller(0)[1], &implementation)
-      end
-    end
+    def pending(*args, &block)
+      options = { :execute => true }.merge(args.extract_options!)
+
+      @_pending_group = true
+      @_pending_group_description = args.first || "TODO"
+      @_pending_group_execute = options.delete(:execute)
+
+      self.instance_eval(&block)
+
+      @_pending_group = false
+      @_pending_group_description = nil
+      @_pending_group_execute = nil
+    end
+
+    def example_with_pending(description=nil, options={}, backtrace=nil, &implementation) #:nodoc:
+      if block_given? && @_pending_group
+        pending_caller      = caller.detect{ |c| c !~ /method_missing'/ }
+        pending_description = @_pending_group_description
+
+        pending_block = if @_pending_group_execute
+          proc{ pending(pending_description){ self.instance_eval(&implementation) } }
+        else
+          proc{ pending(pending_description) }
+        end
+
+        example_without_pending(description, options, backtrace || pending_caller, &pending_block)
+      else
+        example_without_pending(description, options, backtrace || caller(0)[1], &implementation)
+      end
+    end
 
   end
+
 end

data/lib/remarkable/version.rb

@@ -1,3 +1,3 @@
 module Remarkable
-  VERSION = '3.1.2' unless self.const_defined?('VERSION')
+  VERSION = '3.1.3' unless self.const_defined?('VERSION')
 end

data/spec/base_spec.rb

@@ -38,5 +38,11 @@ describe Remarkable::Base do
   it 'should allow Macros and Matchers to be added to any class' do
     MatchersSandbox.new.should respond_to(:contain)
   end
-
+
+  it 'should raise an error if include matchers is called without target and rspec is not loaded' do
+    Remarkable.stub!(:rspec_defined?).and_return(false)
+    lambda {
+      Remarkable.include_matchers!(String)
+    }.should raise_error(ArgumentError, "You haven't supplied the target to include_matchers! and RSpec is not loaded, so we cannot infer one.")
+  end
 end

data/spec/dsl/optionals_spec.rb

@@ -1,22 +1,23 @@
+# encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Remarkable::DSL::Optionals do
-
+describe Remarkable::DSL::Optionals do
+
   describe "without config blocks" do
-
+
     before(:each) do
       @matcher = Remarkable::Specs::Matchers::BeAPersonMatcher.new
-    end
-
-    describe "as optionals" do
+    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
-
+      end
+
       it "should allow defaults values" do
         @matcher.age
         @matcher.options[:age].should == 18
@@ -25,173 +26,173 @@ describe Remarkable::DSL::Optionals do
       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
+      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
-
+      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
-
+      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)
+
+    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
+
+    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
+      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
+      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
+      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'
+        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
-
+      end
+
       it "should allow alias to be set" do
-        matcher = builder do |m|
-          m.family_name = 'Valim'
-        end
+        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
+
+      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)
@@ -207,21 +208,21 @@ describe Remarkable::DSL::Optionals do
       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.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.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
-
+      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'
@@ -231,6 +232,6 @@ describe Remarkable::DSL::Optionals do
 
       matcher.allow_nil(false)
       matcher.description.should == 'contain 1 not allowing nil'
-    end
+    end
   end
 end

data/spec/messages_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Remarkable::Messages do

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 $TESTING=true
 
 require 'rubygems'
-require 'ruby-debug'
 
 dir = File.dirname(__FILE__)
 require File.join(dir, '..', 'lib', 'remarkable')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable
 version: !ruby/object:Gem::Version 
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-15 00:00:00 +02:00
+date: 2009-05-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency