webmock 1.7.1 → 1.7.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.7.2
+
+* Redefined `const_get` and `constants` methods on the replaced `Net::HTTP` to return same values as original `Net::HTTP`
+
 ## 1.7.1
 
 * Redefined `const_defined?` on the replaced `Net::HTTP` so that it returns true if constant is defined on the original `Net::HTTP`. This fixes problems with `"Net::HTTP::Get".constantize`.

data/lib/webmock/http_lib_adapters/net_http.rb

@@ -75,10 +75,28 @@ module Net  #:nodoc: all
       alias_method :socket_type_without_webmock, :socket_type
       alias_method :socket_type, :socket_type_with_webmock
 
-      if ::RUBY_VERSION =~ /1.8/
+      if Module.method(:const_defined?).arity == 1
         def const_defined?(name)
           super || self.superclass.const_defined?(name)
         end
+      else
+        def const_defined?(name, inherit=true)
+          super || self.superclass.const_defined?(name, inherit)
+        end
+      end
+
+      if Module.method(:const_get).arity != 1
+        def const_get(name, inherit=true)
+          super
+        rescue NameError
+          self.superclass.const_get(name, inherit)
+        end
+      end
+
+      if Module.method(:constants).arity != 0
+        def constants(inherit=true)
+          super + self.superclass.constants(inherit)
+        end
       end
     end
 

data/lib/webmock/version.rb

@@ -1,3 +1,3 @@
 module WebMock
-  VERSION = '1.7.1' unless defined?(::WebMock::VERSION)
+  VERSION = '1.7.2' unless defined?(::WebMock::VERSION)
 end

data/spec/net_http_spec.rb

@@ -11,8 +11,36 @@ describe "Webmock with Net:HTTP" do
 
   let(:port){ WebMockServer.instance.port }
 
-  it "should still have const Get defined on replaced Net::HTTP" do
-    Object.const_get("Net").const_get("HTTP").const_defined?("Get").should be_true
+  describe "constants" do
+    it "should still have const Get defined on replaced Net::HTTP" do
+      Object.const_get("Net").const_get("HTTP").const_defined?("Get").should be_true
+    end
+
+    it "should still have const Get within constants on replaced Net::HTTP" do
+      Object.const_get("Net").const_get("HTTP").constants.map(&:to_s).should include("Get")
+    end
+
+    it "should still have const Get within constants on replaced Net::HTTP" do
+      Object.const_get("Net").const_get("HTTP").const_get("Get").should_not be_nil
+    end
+
+    if Module.method(:const_defined?).arity != 1
+      it "should still have const Get defined (and not inherited) on replaced Net::HTTP" do
+        Object.const_get("Net").const_get("HTTP").const_defined?("Get", false).should be_true
+      end
+    end
+
+    if Module.method(:const_get).arity != 1
+      it "should still be able to get non inherited constant Get on replaced Net::HTTP" do
+        Object.const_get("Net").const_get("HTTP").const_get("Get", false).should_not be_nil
+      end
+    end
+
+    if Module.method(:constants).arity != 0
+      it "should still Get within non inherited constants on replaced Net::HTTP" do
+        Object.const_get("Net").const_get("HTTP").constants(false).map(&:to_s).should include("Get")
+      end
+    end
   end
 
   it "should work with block provided" do

metadata

@@ -1,200 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: webmock
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 1.7.2
   prerelease: 
-  segments: 
-  - 1
-  - 7
-  - 1
-  version: 1.7.1
 platform: ruby
-authors: 
+authors:
 - Bartosz Blimke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152397720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 2
-        - 5
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 2.2.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: crack
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152397720
+- !ruby/object:Gem::Dependency
+  name: crack
+  requirement: &2152396440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 1
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.7
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2152396440
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2152395720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2152395720
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: &2152395000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 119
-        segments: 
-        - 2
-        - 1
-        - 5
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.5.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: patron
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2152395000
+- !ruby/object:Gem::Dependency
+  name: patron
+  requirement: &2152393780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 4
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.9
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2152393780
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &2152393200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 2
-        - 14
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.14
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: curb
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2152393200
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: &2152391900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.8
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: typhoeus
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2152391900
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: &2152373560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 2
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.4
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2152373560
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2152372620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 2
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.2
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2152372620
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2152371780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 5
-        - 0
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
-  version_requirements: *id010
-description: WebMock allows stubbing HTTP requests and setting expectations on HTTP requests.
-email: 
+  prerelease: false
+  version_requirements: *2152371780
+description: WebMock allows stubbing HTTP requests and setting expectations on HTTP
+  requests.
+email:
 - bartosz.blimke@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - .rvmrc
@@ -306,38 +243,29 @@ files:
 - webmock.gemspec
 homepage: http://github.com/bblimke/webmock
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: webmock
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Library for stubbing HTTP requests in Ruby.
-test_files: 
+test_files:
 - spec/curb_spec.rb
 - spec/curb_spec_helper.rb
 - spec/em_http_request_spec.rb