shoulda-matchers 2.6.1 → 2.6.2

data/lib/shoulda/matchers/assertion_error.rb

@@ -1,10 +1,15 @@
 module Shoulda
   module Matchers
-    if Gem.ruby_version >= Gem::Version.new('1.8') && Gem.ruby_version < Gem::Version.new('1.9')
+    if defined?(ActiveSupport::TestCase)
+      # @private
+      AssertionError = ActiveSupport::TestCase::Assertion
+    elsif Gem.ruby_version >= Gem::Version.new('1.8') && Gem.ruby_version < Gem::Version.new('1.9')
       require 'test/unit'
+      # @private
       AssertionError = Test::Unit::AssertionFailedError
     elsif defined?(Test::Unit::AssertionFailedError)
       # Test::Unit has been loaded already, so we use it
+      # @private
       AssertionError = Test::Unit::AssertionFailedError
     elsif Gem.ruby_version >= Gem::Version.new("1.9")
       begin
@@ -12,6 +17,7 @@ module Shoulda
       rescue LoadError
         require 'minitest/unit'
       ensure
+      # @private
         AssertionError = MiniTest::Assertion
       end
     else

data/lib/shoulda/matchers/doublespeak.rb

@@ -2,11 +2,12 @@ require 'forwardable'
 
 module Shoulda
   module Matchers
+    # @private
     module Doublespeak
       class << self
         extend Forwardable
 
-        def_delegators :world, :register_double_collection,
+        def_delegators :world, :double_collection_for,
           :with_doubles_activated
 
         def world

data/lib/shoulda/matchers/doublespeak/double.rb

@@ -1,6 +1,7 @@
 module Shoulda
   module Matchers
     module Doublespeak
+      # @private
       class Double
         attr_reader :calls
 
@@ -45,7 +46,7 @@ module Shoulda
           end
         end
 
-        private
+        protected
 
         attr_reader :klass, :method_name, :implementation, :original_method
 
@@ -64,6 +65,7 @@ module Shoulda
 
         def restore_original_method
           original_method = @original_method
+          klass.__send__(:remove_method, method_name)
           klass.__send__(:define_method, method_name) do |*args, &block|
             original_method.bind(self).call(*args, &block)
           end

data/lib/shoulda/matchers/doublespeak/double_collection.rb

@@ -1,6 +1,7 @@
 module Shoulda
   module Matchers
     module Doublespeak
+      # @private
       class DoubleCollection
         def initialize(klass)
           @klass = klass
@@ -37,7 +38,7 @@ module Shoulda
           end
         end
 
-        private
+        protected
 
         attr_reader :klass, :doubles_by_method_name
 

data/lib/shoulda/matchers/doublespeak/double_implementation_registry.rb

@@ -1,6 +1,7 @@
 module Shoulda
   module Matchers
     module Doublespeak
+      # @private
       module DoubleImplementationRegistry
         class << self
           REGISTRY = {}

data/lib/shoulda/matchers/doublespeak/object_double.rb

@@ -1,6 +1,7 @@
 module Shoulda
   module Matchers
     module Doublespeak
+      # @private
       class ObjectDouble < BasicObject
         attr_reader :calls
 
@@ -23,7 +24,7 @@ module Shoulda
           nil
         end
 
-        private
+        protected
 
         attr_reader :calls_by_method_name
       end

data/lib/shoulda/matchers/doublespeak/proxy_implementation.rb

@@ -1,6 +1,7 @@
 module Shoulda
   module Matchers
     module Doublespeak
+      # @private
       class ProxyImplementation
         extend Forwardable
 
@@ -21,7 +22,7 @@ module Shoulda
           double.call_original_method(object, args, block)
         end
 
-        private
+        protected
 
         attr_reader :stub_implementation
       end

data/lib/shoulda/matchers/doublespeak/structs.rb

@@ -1,7 +1,9 @@
 module Shoulda
   module Matchers
     module Doublespeak
+      # @private
       MethodCall = Struct.new(:args, :block)
+      # @private
       MethodCallWithName = Struct.new(:method_name, :args, :block)
     end
   end

data/lib/shoulda/matchers/doublespeak/stub_implementation.rb

@@ -1,6 +1,7 @@
 module Shoulda
   module Matchers
     module Doublespeak
+      # @private
       class StubImplementation
         DoubleImplementationRegistry.register(self, :stub)
 
@@ -25,7 +26,7 @@ module Shoulda
           implementation.call(object, args, block)
         end
 
-        private
+        protected
 
         attr_reader :implementation
       end

data/lib/shoulda/matchers/doublespeak/world.rb

@@ -1,11 +1,10 @@
 module Shoulda
   module Matchers
     module Doublespeak
+      # @private
       class World
-        def register_double_collection(klass)
-          double_collection = DoubleCollection.new(klass)
-          double_collections_by_class[klass] = double_collection
-          double_collection
+        def double_collection_for(klass)
+          double_collections_by_class[klass] ||= DoubleCollection.new(klass)
         end
 
         def with_doubles_activated

data/lib/shoulda/matchers/error.rb

@@ -1,5 +1,6 @@
 module Shoulda
   module Matchers
+    # @private
     class Error < StandardError
       def self.create(attributes)
         allocate.tap do |error|

data/lib/shoulda/matchers/independent/delegate_matcher.rb

@@ -1,30 +1,117 @@
-module Shoulda # :nodoc:
+module Shoulda
   module Matchers
-    module Independent # :nodoc:
-
-      # Ensure that a given method is delegated properly.
+    module Independent
+      # The `delegate_method` matcher tests that an object forwards messages
+      # to other, internal objects by way of delegation.
+      #
+      # In this example, we test that Courier forwards a call to #deliver onto
+      # its PostOffice instance:
+      #
+      #     require 'forwardable'
+      #
+      #     class Courier
+      #       extend Forwardable
+      #
+      #       attr_reader :post_office
+      #
+      #       def_delegators :post_office, :deliver
+      #
+      #       def initialize
+      #         @post_office = PostOffice.new
+      #       end
+      #     end
+      #
+      #     # RSpec
+      #     describe Courier do
+      #       it { should delegate_method(:deliver).to(:post_office) }
+      #     end
+      #
+      #     # Test::Unit
+      #     class CourierTest < Test::Unit::TestCase
+      #       should delegate_method(:deliver).to(:post_office)
+      #     end
+      #
+      # To employ some terminology, we would say that Courier's #deliver method
+      # is the delegating method, PostOffice is the delegate object, and
+      # PostOffice#deliver is the delegate method.
+      #
+      # #### Qualifiers
+      #
+      # ##### as
+      #
+      # Use `as` if the name of the delegate method is different from the name
+      # of the delegating method.
+      #
+      # Here, Courier has a #deliver method, but instead of calling #deliver on
+      # the PostOffice, it calls #ship:
+      #
+      #     class Courier
+      #       attr_reader :post_office
+      #
+      #       def initialize
+      #         @post_office = PostOffice.new
+      #       end
+      #
+      #       def deliver(package)
+      #         post_office.ship(package)
+      #       end
+      #     end
+      #
+      #     # RSpec
+      #     describe Courier do
+      #       it { should delegate_method(:deliver).to(:post_office).as(:ship) }
+      #     end
+      #
+      #     # Test::Unit
+      #     class CourierTest < Test::Unit::TestCase
+      #       should delegate_method(:deliver).to(:post_office).as(:ship)
+      #     end
+      #
+      # ##### with_arguments
+      #
+      # Use `with_arguments` to assert that the delegate method is called with
+      # certain arguments.
+      #
+      # Here, when Courier#deliver calls PostOffice#ship, it adds an options
+      # hash:
+      #
+      #     class Courier
+      #       attr_reader :post_office
+      #
+      #       def initialize
+      #         @post_office = PostOffice.new
+      #       end
+      #
+      #       def deliver(package)
+      #         post_office.ship(package, expedited: true)
+      #       end
+      #     end
       #
-      # Basic Syntax:
-      #   it { should delegate_method(method_name).to(delegate_name) }
+      #     # RSpec
+      #     describe Courier do
+      #       it do
+      #         should delegate_method(:deliver).
+      #           to(:post_office).
+      #           as(:ship).
+      #           with_arguments(expedited: true)
+      #       end
+      #     end
       #
-      # Options:
-      # * <tt>:as</tt> - The name of the delegating method. Defaults to
-      #   method_name.
-      # * <tt>:with_arguments</tt> - Tests that the delegate method is called
-      #   with certain arguments.
+      #     # Test::Unit
+      #     class CourierTest < Test::Unit::TestCase
+      #       should delegate_method(:deliver).
+      #         to(:post_office).
+      #         as(:ship).
+      #         with_arguments(expedited: true)
+      #     end
       #
-      # Examples:
-      #   it { should delegate_method(:deliver_mail).to(:mailman) }
-      #   it { should delegate_method(:deliver_mail).to(:mailman).
-      #     as(:deliver_mail_via_mailman) }
-      #   it { should delegate_method(:deliver_mail).to(:mailman).
-      #     as(:deliver_mail_hastily).
-      #     with_arguments('221B Baker St.', hastily: true) }
+      # @return [DelegateMatcher]
       #
       def delegate_method(delegating_method)
         DelegateMatcher.new(delegating_method)
       end
 
+      # @private
       class DelegateMatcher
         def initialize(delegating_method)
           @delegating_method = delegating_method
@@ -84,7 +171,7 @@ module Shoulda # :nodoc:
         end
         alias failure_message_for_should_not failure_message_when_negated
 
-        private
+        protected
 
         attr_reader \
           :delegated_arguments,
@@ -164,7 +251,7 @@ module Shoulda # :nodoc:
 
         def register_subject_double_collection
           double_collection =
-            Doublespeak.register_double_collection(subject.singleton_class)
+            Doublespeak.double_collection_for(subject.singleton_class)
           double_collection.register_stub(target_method).
             to_return(target_double)
 
@@ -196,6 +283,7 @@ module Shoulda # :nodoc:
           string
         end
 
+        # @private
         class TargetNotDefinedError < StandardError
           def message
             'Delegation needs a target. Use the #to method to define one, e.g.

data/lib/shoulda/matchers/independent/delegate_matcher/stubbed_target.rb

@@ -1,6 +1,7 @@
-module Shoulda # :nodoc:
+module Shoulda
   module Matchers
-    module Independent # :nodoc:
+    module Independent
+      # @private
       class DelegateMatcher::StubbedTarget # :nodoc:
         def initialize(method)
           @received_method = false
@@ -16,7 +17,7 @@ module Shoulda # :nodoc:
           args == received_arguments
         end
 
-        private
+        protected
 
         def stub_method(method)
           class_eval do

data/lib/shoulda/matchers/integrations/nunit_test_case_detection.rb

@@ -1,6 +1,8 @@
 module Shoulda
   module Matchers
+    # @private
     module Integrations
+      # @private
       module NUnitTestCaseDetection
         def self.possible_test_case_constants
           [
@@ -29,6 +31,7 @@ module Shoulda
       end
     end
 
+    # @private
     def self.nunit_test_case_constants
       Integrations::NUnitTestCaseDetection.test_case_constants
     end

data/lib/shoulda/matchers/rails_shim.rb

@@ -1,6 +1,7 @@
-module Shoulda # :nodoc:
+module Shoulda
   module Matchers
-    class RailsShim # :nodoc:
+    # @private
+    class RailsShim
       def self.layouts_ivar
         if action_pack_major_version >= 4
           '@_layouts'

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,6 @@
 module Shoulda
   module Matchers
-    VERSION = '2.6.1'.freeze
+    # @private
+    VERSION = '2.6.2'.freeze
   end
 end

data/lib/shoulda/matchers/warn.rb

@@ -1,5 +1,6 @@
 module Shoulda
   module Matchers
+    # @private
     def self.warn(msg)
       Kernel.warn "Warning from shoulda-matchers:\n\n#{msg}"
     end

data/script/SUPPORTED_VERSIONS

@@ -0,0 +1 @@
+1.9.2 1.9.3 2.0.0 2.1.1

data/script/install_gems_in_all_appraisals

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+SUPPORTED_VERSIONS=$(<script/SUPPORTED_VERSIONS)
+
+install-gems-for-version() {
+  local version="$1"
+  (export RBENV_VERSION=$version; bundle && bundle exec appraisal install)
+}
+
+for version in $SUPPORTED_VERSIONS; do
+  echo
+  echo "*** Installing gems for $version ***"
+  install-gems-for-version $version
+done

data/script/run_all_tests

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+SUPPORTED_VERSIONS=$(<script/SUPPORTED_VERSIONS)
+
+run-tests-for-version() {
+  local version="$1"
+  (export RBENV_VERSION=$version; bundle exec rake)
+}
+
+for version in $SUPPORTED_VERSIONS; do
+  echo
+  echo "*** Running tests for $version ***"
+  run-tests-for-version $version
+done

data/shoulda-matchers.gemspec

@@ -20,14 +20,4 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.2'
   s.add_dependency('activesupport', '>= 3.0.0')
-
-  s.add_development_dependency('appraisal',   '~> 1.0.0.beta2')
-  s.add_development_dependency('aruba')
-  s.add_development_dependency('pry')
-  s.add_development_dependency('bourne',      '~> 1.3')
-  s.add_development_dependency('bundler',     '~> 1.1')
-  s.add_development_dependency('cucumber',    '~> 1.1')
-  s.add_development_dependency('rails',       '~> 3.0')
-  s.add_development_dependency('rake',        '>= 0.9.2')
-  s.add_development_dependency('rspec-rails', '>= 2.13.1', '< 3')
 end