opal-rspec 0.4.3 → 0.5.0.beta1

data/{vendor_lib → rspec-mocks/lib}/rspec/mocks/mutate_const.rb

@@ -1,84 +1,11 @@
+RSpec::Support.require_rspec_support 'recursive_const_methods'
+
 module RSpec
   module Mocks
-    # Provides recursive constant lookup methods useful for
-    # constant stubbing.
-    # @api private
-    module RecursiveConstMethods
-      # We only want to consider constants that are defined directly on a
-      # particular module, and not include top-level/inherited constants.
-      # Unfortunately, the constant API changed between 1.8 and 1.9, so
-      # we need to conditionally define methods to ignore the top-level/inherited
-      # constants.
-      #
-      # Given:
-      #   class A; B = 1; end
-      #   class C < A; end
-      #
-      # On 1.8:
-      #   - C.const_get("Hash") # => ::Hash
-      #   - C.const_defined?("Hash") # => false
-      #   - C.constants # => ["B"]
-      #   - None of these methods accept the extra `inherit` argument
-      # On 1.9:
-      #   - C.const_get("Hash") # => ::Hash
-      #   - C.const_defined?("Hash") # => true
-      #   - C.const_get("Hash", false) # => raises NameError
-      #   - C.const_defined?("Hash", false) # => false
-      #   - C.constants # => [:B]
-      #   - C.constants(false) #=> []
-      if Module.method(:const_defined?).arity == 1
-        def const_defined_on?(mod, const_name)
-          mod.const_defined?(const_name)
-        end
-
-        def get_const_defined_on(mod, const_name)
-          if const_defined_on?(mod, const_name)
-            return mod.const_get(const_name)
-          end
-
-          raise NameError, "uninitialized constant #{mod.name}::#{const_name}"
-        end
-
-        def constants_defined_on(mod)
-          mod.constants.select { |c| const_defined_on?(mod, c) }
-        end
-      else
-        def const_defined_on?(mod, const_name)
-          mod.const_defined?(const_name, false)
-        end
-
-        def get_const_defined_on(mod, const_name)
-          mod.const_get(const_name, false)
-        end
-
-        def constants_defined_on(mod)
-          mod.constants(false)
-        end
-      end
-
-      def recursive_const_get(const_name)
-        normalize_const_name(const_name).split('::').inject(Object) do |mod, name|
-          get_const_defined_on(mod, name)
-        end
-      end
-
-      def recursive_const_defined?(const_name)
-        normalize_const_name(const_name).split('::').inject([Object, '']) do |(mod, full_name), name|
-          yield(full_name, name) if block_given? && !(Module === mod)
-          return false unless const_defined_on?(mod, name)
-          [get_const_defined_on(mod, name), [mod, name].join('::')]
-        end
-      end
-
-      def normalize_const_name(const_name)
-        const_name.sub(/\A::/, '')
-      end
-    end
-
     # Provides information about constants that may (or may not)
     # have been mutated by rspec-mocks.
     class Constant
-      extend RecursiveConstMethods
+      extend Support::RecursiveConstMethods
 
       # @api private
       def initialize(name)
@@ -96,7 +23,7 @@ module RSpec
       #   nil if the constant was not previously defined.
       attr_accessor :original_value
 
-      # @api private
+      # @private
       attr_writer :previously_defined, :stubbed, :hidden
 
       # @return [Boolean] Whether or not the constant was defined
@@ -123,12 +50,13 @@ module RSpec
         @hidden
       end
 
+      # The default `to_s` isn't very useful, so a custom version is provided.
       def to_s
         "#<#{self.class.name} #{name}>"
       end
       alias inspect to_s
 
-      # @api private
+      # @private
       def self.unmutated(name)
         const = new(name)
         const.previously_defined = recursive_const_defined?(name)
@@ -138,7 +66,6 @@ module RSpec
 
         const
       end
-      private_class_method :unmutated
 
       # Queries rspec-mocks to find out information about the named constant.
       #
@@ -146,14 +73,14 @@ module RSpec
       # @return [Constant] an object contaning information about the named
       #   constant.
       def self.original(name)
-        mutator = ConstantMutator.find(name)
+        mutator = ::RSpec::Mocks.space.constant_mutator_for(name)
         mutator ? mutator.to_constant : unmutated(name)
       end
     end
 
     # Provides a means to stub constants.
     class ConstantMutator
-      extend RecursiveConstMethods
+      extend Support::RecursiveConstMethods
 
       # Stubs a constant.
       #
@@ -166,17 +93,14 @@ module RSpec
       #  examples. This is an alternate public API that is provided
       #  so you can stub constants in other contexts (e.g. helper
       #  classes).
-      def self.stub(constant_name, value, options = {})
+      def self.stub(constant_name, value, options={})
         mutator = if recursive_const_defined?(constant_name, &raise_on_invalid_const)
-          DefinedConstantReplacer
-        else
-          UndefinedConstantSetter
-        end
+                    DefinedConstantReplacer
+                  else
+                    UndefinedConstantSetter
+                  end
 
-        mutate(mutator.new(constant_name, value, options.fetch(
-          :transfer_nested_constants,
-          RSpec::Mocks.configuration.transfer_nested_constants?
-        )))
+        mutate(mutator.new(constant_name, value, options[:transfer_nested_constants]))
         value
       end
 
@@ -190,17 +114,15 @@ module RSpec
       #  so you can hide constants in other contexts (e.g. helper
       #  classes).
       def self.hide(constant_name)
-        return unless recursive_const_defined?(constant_name)
-
-        mutate(ConstantHider.new(constant_name, nil, { }))
+        mutate(ConstantHider.new(constant_name, nil, {}))
         nil
       end
 
       # Contains common functionality used by all of the constant mutators.
       #
-      # @api private
+      # @private
       class BaseMutator
-        include RecursiveConstMethods
+        include Support::RecursiveConstMethods
 
         attr_reader :original_value, :full_constant_name
 
@@ -210,6 +132,7 @@ module RSpec
           @transfer_nested_constants = transfer_nested_constants
           @context_parts             = @full_constant_name.split('::')
           @const_name                = @context_parts.pop
+          @reset_performed           = false
         end
 
         def to_constant
@@ -218,13 +141,19 @@ module RSpec
 
           const
         end
+
+        def idempotently_reset
+          reset unless @reset_performed
+          @reset_performed = true
+        end
       end
 
       # Hides a defined constant for the duration of an example.
       #
-      # @api private
+      # @private
       class ConstantHider < BaseMutator
         def mutate
+          return unless (@defined = recursive_const_defined?(full_constant_name))
           @context = recursive_const_get(@context_parts.join('::'))
           @original_value = get_const_defined_on(@context, @const_name)
 
@@ -232,6 +161,8 @@ module RSpec
         end
 
         def to_constant
+          return Constant.unmutated(full_constant_name) unless @defined
+
           const = super
           const.hidden = true
           const.previously_defined = true
@@ -239,25 +170,31 @@ module RSpec
           const
         end
 
-        def rspec_reset
+        def reset
+          return unless @defined
           @context.const_set(@const_name, @original_value)
         end
       end
 
       # Replaces a defined constant for the duration of an example.
       #
-      # @api private
+      # @private
       class DefinedConstantReplacer < BaseMutator
+        def initialize(*args)
+          super
+          @constants_to_transfer = []
+        end
+
         def mutate
           @context = recursive_const_get(@context_parts.join('::'))
           @original_value = get_const_defined_on(@context, @const_name)
 
-          constants_to_transfer = verify_constants_to_transfer!
+          @constants_to_transfer = verify_constants_to_transfer!
 
           @context.__send__(:remove_const, @const_name)
           @context.const_set(@const_name, @mutated_value)
 
-          transfer_nested_constants(constants_to_transfer)
+          transfer_nested_constants
         end
 
         def to_constant
@@ -268,27 +205,31 @@ module RSpec
           const
         end
 
-        def rspec_reset
+        def reset
+          @constants_to_transfer.each do |const|
+            @mutated_value.__send__(:remove_const, const)
+          end
+
           @context.__send__(:remove_const, @const_name)
           @context.const_set(@const_name, @original_value)
         end
 
-        def transfer_nested_constants(constants)
-          constants.each do |const|
+        def transfer_nested_constants
+          @constants_to_transfer.each do |const|
             @mutated_value.const_set(const, get_const_defined_on(original_value, const))
           end
         end
 
         def verify_constants_to_transfer!
-          return [] unless @transfer_nested_constants
+          return [] unless should_transfer_nested_constants?
 
           { @original_value => "the original value", @mutated_value => "the stubbed value" }.each do |value, description|
-            unless value.respond_to?(:constants)
-              raise ArgumentError,
-                "Cannot transfer nested constants for #{@full_constant_name} " +
-                "since #{description} is not a class or module and only classes " +
-                "and modules support nested constants."
-            end
+            next if value.respond_to?(:constants)
+
+            raise ArgumentError,
+                  "Cannot transfer nested constants for #{@full_constant_name} " \
+                  "since #{description} is not a class or module and only classes " \
+                  "and modules support nested constants."
           end
 
           if Array === @transfer_nested_constants
@@ -298,9 +239,9 @@ module RSpec
             if undefined_constants.any?
               available_constants = constants_defined_on(@original_value) - @transfer_nested_constants
               raise ArgumentError,
-                "Cannot transfer nested constant(s) #{undefined_constants.join(' and ')} " +
-                "for #{@full_constant_name} since they are not defined. Did you mean " +
-                "#{available_constants.join(' or ')}?"
+                    "Cannot transfer nested constant(s) #{undefined_constants.join(' and ')} " \
+                    "for #{@full_constant_name} since they are not defined. Did you mean " \
+                    "#{available_constants.join(' or ')}?"
             end
 
             @transfer_nested_constants
@@ -308,26 +249,28 @@ module RSpec
             constants_defined_on(@original_value)
           end
         end
+
+        def should_transfer_nested_constants?
+          return true  if @transfer_nested_constants
+          return false unless RSpec::Mocks.configuration.transfer_nested_constants?
+          @original_value.respond_to?(:constants) && @mutated_value.respond_to?(:constants)
+        end
       end
 
       # Sets an undefined constant for the duration of an example.
       #
-      # @api private
+      # @private
       class UndefinedConstantSetter < BaseMutator
         def mutate
-          remaining_parts = @context_parts.dup
-          @deepest_defined_const = @context_parts.inject(Object) do |klass, name|
-            break klass unless const_defined_on?(klass, name)
-            remaining_parts.shift
-            get_const_defined_on(klass, name)
-          end
-
-          context = remaining_parts.inject(@deepest_defined_const) do |klass, name|
-            klass.const_set(name, Module.new)
+          @parent = @context_parts.inject(Object) do |klass, name|
+            if const_defined_on?(klass, name)
+              get_const_defined_on(klass, name)
+            else
+              ConstantMutator.stub(name_for(klass, name), Module.new)
+            end
           end
 
-          @const_to_remove = remaining_parts.first || @const_name
-          context.const_set(@const_name, @mutated_value)
+          @parent.const_set(@const_name, @mutated_value)
         end
 
         def to_constant
@@ -338,8 +281,19 @@ module RSpec
           const
         end
 
-        def rspec_reset
-          @deepest_defined_const.__send__(:remove_const, @const_to_remove)
+        def reset
+          @parent.__send__(:remove_const, @const_name)
+        end
+
+      private
+
+        def name_for(parent, name)
+          root = if parent == Object
+                   ''
+                 else
+                   parent.name
+                 end
+          root + '::' + name
         end
       end
 
@@ -347,42 +301,12 @@ module RSpec
       # the mutator is correctly registered so it can be backed out at the end
       # of the test.
       #
-      # @api private
+      # @private
       def self.mutate(mutator)
-        register_mutator(mutator)
+        ::RSpec::Mocks.space.register_constant_mutator(mutator)
         mutator.mutate
       end
 
-      # Resets all stubbed constants. This is called automatically
-      # by rspec-mocks when an example finishes.
-      #
-      # @api private
-      def self.reset_all
-        # We use reverse order so that if the same constant
-        # was stubbed multiple times, the original value gets
-        # properly restored.
-        mutators.reverse.each { |s| s.rspec_reset }
-
-        mutators.clear
-      end
-
-      # The list of constant mutators that have been used for
-      # the current example.
-      #
-      # @api private
-      def self.mutators
-        @mutators ||= []
-      end
-
-      # @api private
-      def self.register_mutator(mutator)
-        mutators << mutator
-      end
-
-      def self.find(name)
-        mutators.find { |s| s.full_constant_name == name }
-      end
-
       # Used internally by the constant stubbing to raise a helpful
       # error when a constant like "A::B::C" is stubbed and A::B is
       # not a module (and thus, it's impossible to define "A::B::C"
@@ -391,16 +315,10 @@ module RSpec
       # @api private
       def self.raise_on_invalid_const
         lambda do |const_name, failed_name|
-          raise "Cannot stub constant #{failed_name} on #{const_name} " +
+          raise "Cannot stub constant #{failed_name} on #{const_name} " \
                 "since #{const_name} is not a module."
         end
       end
     end
-
-    # Keeps backwards compatibility since we had released an rspec-mocks that
-    # only supported stubbing. Later, we released the hide_const feature and
-    # decided that the term "mutator" was a better term to wrap up the concept
-    # of both stubbing and hiding.
-    ConstantStubber = ConstantMutator
   end
 end

data/{vendor_lib → rspec-mocks/lib}/rspec/mocks/object_reference.rb

@@ -1,28 +1,28 @@
 module RSpec
   module Mocks
-
-    # @api private
+    # @private
     class ObjectReference
       # Returns an appropriate Object or Module reference based
       # on the given argument.
-      def self.for(object_module_or_name, allow_direct_object_refs = false)
+      def self.for(object_module_or_name, allow_direct_object_refs=false)
         case object_module_or_name
-          when Module then DirectModuleReference.new(object_module_or_name)
-          when String then NamedObjectReference.new(object_module_or_name)
+        when Module then DirectModuleReference.new(object_module_or_name)
+        when String then NamedObjectReference.new(object_module_or_name)
+        else
+          if allow_direct_object_refs
+            DirectObjectReference.new(object_module_or_name)
           else
-            if allow_direct_object_refs
-              DirectObjectReference.new(object_module_or_name)
-            else
-              raise ArgumentError,
-                "Module or String expected, got #{object_module_or_name.inspect}"
-            end
+            raise ArgumentError,
+                  "Module or String expected, got #{object_module_or_name.inspect}"
+          end
         end
       end
     end
 
     # Used when an object is passed to `object_double`.
     # Represents a reference to that object.
-    # @api private
+    #
+    # @private
     class DirectObjectReference
       def initialize(object)
         @object = object
@@ -34,7 +34,7 @@ module RSpec
 
       def const_to_replace
         raise ArgumentError,
-          "Can not perform constant replacement with an object."
+              "Can not perform constant replacement with an object."
       end
 
       def defined?
@@ -48,7 +48,8 @@ module RSpec
 
     # Used when a module is passed to `class_double` or `instance_double`.
     # Represents a reference to that module.
-    # @api private
+    #
+    # @private
     class DirectModuleReference < DirectObjectReference
       def const_to_replace
         @object.name
@@ -60,7 +61,8 @@ module RSpec
     # or `object_double`.
     # Represents a reference to the object named (via a constant lookup)
     # by the string.
-    # @api private
+    #
+    # @private
     class NamedObjectReference
       def initialize(const_name)
         @const_name = const_name
@@ -75,11 +77,11 @@ module RSpec
       end
       alias description const_to_replace
 
-      def when_loaded(&block)
+      def when_loaded(&_block)
         yield object if object
       end
 
-   private
+    private
 
       def object
         @object ||= Constant.original(@const_name).original_value
@@ -87,4 +89,3 @@ module RSpec
     end
   end
 end
-

data/{vendor_lib → rspec-mocks/lib}/rspec/mocks/order_group.rb

@@ -25,10 +25,10 @@ module RSpec
       # @private
       def consume
         remaining_expectations.each_with_index do |expectation, index|
-          if expectation.ordered?
-            @index += index + 1
-            return expectation
-          end
+          next unless expectation.ordered?
+
+          @index += index + 1
+          return expectation
         end
         nil
       end
@@ -76,7 +76,6 @@ module RSpec
       def expectation_for(message)
         @expectations.find { |e| message == e }
       end
-
     end
   end
 end