rspec-fire 1.1.1 → 1.1.2

data/HISTORY

@@ -35,3 +35,6 @@
 1.1.1 - 14 July 2012
   * Add MIT licence.
   * Handles string as well as symbol method names.
+
+1.1.2 - 10 August 2012
+  * Fix use of `const_{get,defined?}` to handle undefined consts like A::Hash.

data/lib/rspec/fire.rb

@@ -76,14 +76,53 @@ module RSpec
     end
 
     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; end`:
+      #
+      # On 1.8:
+      #   - A.const_get("Hash") # => ::Hash
+      #   - A.const_defined?("Hash") # => false
+      #   - Neither method accepts the extra `inherit` argument
+      # On 1.9:
+      #   - A.const_get("Hash") # => ::Hash
+      #   - A.const_defined?("Hash") # => true
+      #   - A.const_get("Hash", false) # => raises NameError
+      #   - A.const_defined?("Hash", false) # => 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
+      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
+      end
+
       def recursive_const_get name
-        name.split('::').inject(Object) {|klass,name| klass.const_get name }
+        name.split('::').inject(Object) {|klass,name| get_const_defined_on(klass, name) }
       end
 
       def recursive_const_defined? name
         !!name.split('::').inject(Object) {|klass,name|
-          if klass && klass.const_defined?(name)
-            klass.const_get name
+          if klass && const_defined_on?(klass, name)
+            get_const_defined_on(klass, name)
           end
         }
       end
@@ -243,21 +282,8 @@ module RSpec
 
           verify_constant_name if RSpec::Fire.configuration.verify_constant_names?
 
-          # TestDouble was added after rspec 2.9.0, and allows proper mocking
-          # of public methods that have clashing private methods. See spec for
-          # details.
-          if defined?(::RSpec::Mocks::TestDouble)
-            ::RSpec::Mocks::TestDouble.extend_onto self,
-              doubled_class, stubs.merge(:__declared_as => "FireClassDouble")
-          else
-            stubs.each do |message, response|
-              stub(message).and_return(response)
-            end
-
-            def self.method_missing(name, *args)
-              __mock_proxy.raise_unexpected_message_error(name, *args)
-            end
-          end
+          ::RSpec::Mocks::TestDouble.extend_onto self,
+            doubled_class, stubs.merge(:__declared_as => "FireClassDouble")
 
           def self.as_replaced_constant(options = {})
             RSpec::Mocks::ConstantStubber.stub(@__doubled_class_name, self, options)

data/rspec-fire.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'rspec-fire'
-  s.version  = '1.1.1'
+  s.version  = '1.1.2'
   s.summary  = 'More resilient test doubles for RSpec.'
   s.platform = Gem::Platform::RUBY
   s.authors  = ["Xavier Shay"]

data/spec/fire_double_spec.rb

@@ -193,6 +193,12 @@ describe '#fire_double' do
     double = fire_double("TestObject", :defined_method => 17)
     double.defined_method.should eq(17)
   end
+
+  it 'does not prevent stubbing methods on an unloaded nested constant with a name that matches a top-level constant' do
+    double = fire_double("TestObject::Hash")
+    double.stub(:foo).and_return("bar")
+    double.foo.should eq("bar")
+  end
 end
 
 describe '#fire_class_double' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-fire
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-15 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152396520 !ruby/object:Gem::Requirement
+  requirement: &2160766260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *2152396520
+  version_requirements: *2160766260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152395960 !ruby/object:Gem::Requirement
+  requirement: &2160765580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152395960
+  version_requirements: *2160765580
 description: 
 email:
 - hello@xaviershay.com