remarkable 3.1.3 → 3.1.4

data/lib/remarkable/matchers.rb

@@ -18,8 +18,9 @@ module Remarkable
       end
     end
 
-    target.send :extend, Remarkable::Pending
-    target.send :extend, Remarkable::Macros
+    metaclass = (class << target; self; end)
+    target.send :extend, Remarkable::Pending unless metaclass.ancestors.include?(Remarkable::Pending)
+    target.send :extend, Remarkable::Macros  unless metaclass.ancestors.include?(Remarkable::Macros)
 
     if defined?(base::Matchers)
       target.send :include, base::Matchers

data/lib/remarkable/messages.rb

@@ -80,7 +80,7 @@ module Remarkable
 
       # Converts an array to a sentence
       #
-      def array_to_sentence(array, inspect=false)
+      def array_to_sentence(array, inspect=false, empty_default='')
         words_connector     = Remarkable.t 'remarkable.core.helpers.words_connector'
         two_words_connector = Remarkable.t 'remarkable.core.helpers.two_words_connector'
         last_word_connector = Remarkable.t 'remarkable.core.helpers.last_word_connector'
@@ -89,7 +89,7 @@ module Remarkable
 
         case array.length
           when 0
-            ''
+            empty_default
           when 1
             array[0].to_s
           when 2
@@ -97,7 +97,7 @@ module Remarkable
           else
             "#{array[0...-1].join(words_connector)}#{last_word_connector}#{array[-1]}"
         end
-      end
+      end
 
   end
 end

data/lib/remarkable/pending.rb

@@ -5,12 +5,14 @@ module Remarkable
     # 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
+    def self.extended(base) #:nodoc:
+      if base.respond_to?(:example)
+        class << base
+          alias_method :example_without_pending, :example
+          alias_method :example, :example_with_pending
+          alias :it :example
+          alias :specify :example
+        end
       end
     end
 

data/lib/remarkable/version.rb

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

data/spec/base_spec.rb

@@ -38,11 +38,4 @@ 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/matchers_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Remarkable::Matchers do
+  it 'should include matchers in a specified target' do
+    klass = Class.new
+
+    module Foo
+      module Matchers
+      end
+    end
+
+    Remarkable.include_matchers!(Foo, klass)
+    klass.ancestors.should include(Foo::Matchers)
+
+    meta = (class << klass; self; end)
+    meta.ancestors.should include(Remarkable::Macros)
+    meta.ancestors.should include(Remarkable::Pending)
+  end
+
+  it 'should include matchers in Remarkable::Matchers' do
+    klass = Class.new
+
+    module Foo
+      module Matchers
+      end
+    end
+
+    Remarkable.include_matchers!(Foo, klass)
+    Remarkable::Matchers.ancestors.should include(Foo::Matchers)
+    (class << Remarkable::Matchers; self; end).ancestors.should include(Foo::Matchers)
+  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
+
+  it 'should not include modules twice' do
+    klass = Class.new
+    meta = (class << klass; self; end)
+
+    meta.should_receive(:ancestors).twice.and_return([Remarkable::Pending, Remarkable::Macros])
+    klass.should_not_receive(:extend).with(Remarkable::Pending)
+    klass.should_not_receive(:extend).with(Remarkable::Macros)
+
+    Remarkable.include_matchers!(Module.new, klass)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable
 version: !ruby/object:Gem::Version 
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors: 
 - Carlos Brando
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 +02:00
+date: 2009-05-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,7 @@ test_files:
 - spec/i18n_spec.rb
 - spec/base_spec.rb
 - spec/spec_helper.rb
+- spec/matchers_spec.rb
 - spec/macros_spec.rb
 - spec/spec.opts
 - spec/pending_spec.rb