httparty 0.6.0 → 0.6.1

data/History

@@ -1,3 +1,11 @@
+== 0.6.1
+* minor enhancements
+  * updated to crack 0.1.8
+* bug fixes
+  * subclasses always merge into the parent's default_options and
+  default_cookies (l4rk).
+  * subclasses play nicely with grand parents. gh-49
+
 == 0.6.0 2010-06-13
 * major enhancements
   * Digest Auth (bartiaco, sbecker, gilles, and aaronrussell)

data/Rakefile

@@ -1,15 +1,19 @@
 require 'rake'
+require File.expand_path('../lib/httparty', __FILE__)
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "httparty"
-    gem.summary = %Q{Makes http fun! Also, makes consuming restful web services dead easy.}
+    gem.name        = "httparty"
+    gem.summary     = %Q{Makes http fun! Also, makes consuming restful web services dead easy.}
     gem.description = %Q{Makes http fun! Also, makes consuming restful web services dead easy.}
-    gem.email = "nunemaker@gmail.com"
-    gem.homepage = "http://httparty.rubyforge.org"
-    gem.authors = ["John Nunemaker", "Sandro Turriate"]
-    gem.add_dependency 'crack', '0.1.7'
+    gem.email       = "nunemaker@gmail.com"
+    gem.homepage    = "http://httparty.rubyforge.org"
+    gem.authors     = ["John Nunemaker", "Sandro Turriate"]
+    gem.version     = HTTParty::VERSION
+
+    gem.add_dependency 'crack', HTTParty::CRACK_DEPENDENCY
+
     gem.add_development_dependency "activesupport", "~>2.3"
     gem.add_development_dependency "cucumber", "~>0.7"
     gem.add_development_dependency "fakeweb", "~>1.2"
@@ -29,6 +33,7 @@ end
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.ruby_opts << '-rubygems'
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
   spec.spec_opts = ['--options', 'spec/spec.opts']

data/features/basic_authentication.feature

@@ -5,16 +5,16 @@ Feature:  Basic Authentication
   Because that is not an uncommon requirement
 
   Scenario: Passing no credentials to a page requiring Basic Authentication
-    Given a restricted page at '/protected.html'
-    When I call HTTParty#get with '/protected.html'
+    Given a restricted page at '/basic_auth.html'
+    When I call HTTParty#get with '/basic_auth.html'
     Then it should return a response with a 401 response code
 
   Scenario: Passing proper credentials to a page requiring Basic Authentication
     Given a remote service that returns 'Authenticated Page'
-    And that service is accessed at the path '/protected.html'
+    And that service is accessed at the path '/basic_auth.html'
     And that service is protected by Basic Authentication
     And that service requires the username 'jcash' with the password 'maninblack'
-    When I call HTTParty#get with '/protected.html' and a basic_auth hash:
+    When I call HTTParty#get with '/basic_auth.html' and a basic_auth hash:
        | username | password   |
        | jcash    | maninblack |
     Then the return value should match 'Authenticated Page'

data/features/deals_with_http_error_codes.feature

@@ -7,20 +7,20 @@ Feature: Deals with HTTP error codes
 
   Scenario: A response of '404 - Not Found'
     Given a remote service that returns a 404 status code
-    And that service is accessed at the path '/service.html'
-    When I call HTTParty#get with '/service.html'
+    And that service is accessed at the path '/404_service.html'
+    When I call HTTParty#get with '/404_service.html'
     Then it should return a response with a 404 response code
 
   Scenario: A response of '500 - Internal Server Error'
     Given a remote service that returns a 500 status code
-    And that service is accessed at the path '/service.html'
-    When I call HTTParty#get with '/service.html'
+    And that service is accessed at the path '/500_service.html'
+    When I call HTTParty#get with '/500_service.html'
     Then it should return a response with a 500 response code
 
   Scenario: A non-successful response where I need the body
     Given a remote service that returns a 400 status code
     And the response from the service has a body of 'Bad response'
-    And that service is accessed at the path '/service.html'
-    When I call HTTParty#get with '/service.html'
+    And that service is accessed at the path '/400_service.html'
+    When I call HTTParty#get with '/400_service.html'
     Then it should return a response with a 400 response code
     And the return value should match 'Bad response'

data/features/digest_authentication.feature

@@ -5,16 +5,16 @@ Feature:  Digest Authentication
   Because that is not an uncommon requirement
 
   Scenario: Passing no credentials to a page requiring Digest Authentication
-    Given a restricted page at '/protected.html'
-    When I call HTTParty#get with '/protected.html'
+    Given a restricted page at '/digest_auth.html'
+    When I call HTTParty#get with '/digest_auth.html'
     Then it should return a response with a 401 response code
 
   Scenario: Passing proper credentials to a page requiring Digest Authentication
     Given a remote service that returns 'Digest Authenticated Page'
-    And that service is accessed at the path '/protected.html'
+    And that service is accessed at the path '/digest_auth.html'
     And that service is protected by Digest Authentication
     And that service requires the username 'jcash' with the password 'maninblack'
-    When I call HTTParty#get with '/protected.html' and a digest_auth hash:
+    When I call HTTParty#get with '/digest_auth.html' and a digest_auth hash:
        | username | password   |
        | jcash    | maninblack |
     Then the return value should match 'Digest Authenticated Page'

data/features/handles_compressed_responses.feature

@@ -7,13 +7,13 @@ Feature: Handles Compressed Responses
   Scenario: Supports deflate encoding
     Given a remote deflate service
     And the response from the service has a body of '<h1>Some HTML</h1>'
-    And that service is accessed at the path '/service.html'
-    When I call HTTParty#get with '/service.html'
+    And that service is accessed at the path '/deflate_service.html'
+    When I call HTTParty#get with '/deflate_service.html'
     Then the return value should match '<h1>Some HTML</h1>'
 
   Scenario: Supports gzip encoding
     Given a remote gzip service
     And the response from the service has a body of '<h1>Some HTML</h1>'
-    And that service is accessed at the path '/service.html'
-    When I call HTTParty#get with '/service.html'
+    And that service is accessed at the path '/gzip_service.html'
+    When I call HTTParty#get with '/gzip_service.html'
     Then the return value should match '<h1>Some HTML</h1>'

data/features/handles_multiple_formats.feature

@@ -8,9 +8,9 @@ Feature: Handles Multiple Formats
 
   Scenario: An HTML service
     Given a remote service that returns '<h1>Some HTML</h1>'
-    And that service is accessed at the path '/service.html'
+    And that service is accessed at the path '/html_service.html'
     And the response from the service has a Content-Type of 'text/html'
-    When I call HTTParty#get with '/service.html'
+    When I call HTTParty#get with '/html_service.html'
     Then it should return a String
     And the return value should match '<h1>Some HTML</h1>'
 

data/features/steps/httparty_response_steps.rb

@@ -1,5 +1,5 @@
 Then /it should return an? (\w+)$/ do |class_string|
-  @response_from_httparty.should be_an_instance_of(class_string.constantize)
+  @response_from_httparty.should be_an_instance_of(class_string.class)
 end
 
 Then /the return value should match '(.*)'/ do |expected_text|

data/features/steps/mongrel_helper.rb

@@ -1,3 +1,4 @@
+require 'base64'
 class BasicMongrelHandler < Mongrel::HttpHandler
   attr_accessor :content_type, :custom_headers, :response_body, :response_code, :preprocessor, :username, :password
 

data/features/supports_redirection.feature

@@ -7,8 +7,8 @@ Feature: Supports Redirection
 
   Scenario: A service that redirects once
     Given a remote service that returns 'Service Response'
-    And that service is accessed at the path '/service.html'
-    And the url '/redirector.html' redirects to '/service.html'
+    And that service is accessed at the path '/landing_service.html'
+    And the url '/redirector.html' redirects to '/landing_service.html'
     When I call HTTParty#get with '/redirector.html'
     Then the return value should match 'Service Response'
 

data/features/supports_timeout_option.feature

@@ -5,9 +5,9 @@ Feature: Supports the timeout option
 
   Scenario: A long running response
     Given a remote service that returns '<h1>Some HTML</h1>'
-    And that service is accessed at the path '/service.html'
+    And that service is accessed at the path '/long_running_service.html'
     And that service takes 2 seconds to generate a response
     When I set my HTTParty timeout option to 1
-    And I call HTTParty#get with '/service.html'
+    And I call HTTParty#get with '/long_running_service.html'
     Then it should raise a Timeout::Error exception
     And I wait for the server to recover

data/httparty.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker", "Sandro Turriate"]
-  s.date = %q{2010-06-13}
+  s.date = %q{2010-07-07}
   s.default_executable = %q{httparty}
   s.description = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
   s.email = %q{nunemaker@gmail.com}
@@ -105,14 +105,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<crack>, ["= 0.1.7"])
+      s.add_runtime_dependency(%q<crack>, ["= 0.1.8"])
       s.add_development_dependency(%q<activesupport>, ["~> 2.3"])
       s.add_development_dependency(%q<cucumber>, ["~> 0.7"])
       s.add_development_dependency(%q<fakeweb>, ["~> 1.2"])
       s.add_development_dependency(%q<mongrel>, ["~> 1.1"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<crack>, ["= 0.1.7"])
+      s.add_dependency(%q<crack>, ["= 0.1.8"])
       s.add_dependency(%q<activesupport>, ["~> 2.3"])
       s.add_dependency(%q<cucumber>, ["~> 0.7"])
       s.add_dependency(%q<fakeweb>, ["~> 1.2"])
@@ -120,7 +120,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<crack>, ["= 0.1.7"])
+    s.add_dependency(%q<crack>, ["= 0.1.8"])
     s.add_dependency(%q<activesupport>, ["~> 2.3"])
     s.add_dependency(%q<cucumber>, ["~> 0.7"])
     s.add_dependency(%q<fakeweb>, ["~> 1.2"])

data/lib/httparty.rb

@@ -12,8 +12,8 @@ require dir + 'httparty/cookie_hash'
 require dir + 'httparty/net_digest_auth'
 
 module HTTParty
-  VERSION = "0.6.0".freeze
-  CRACK_DEPENDENCY = "0.1.7".freeze
+  VERSION          = "0.6.1".freeze
+  CRACK_DEPENDENCY = "0.1.8".freeze
 
   module AllowedFormatsDeprecation
     def const_missing(const)

data/lib/httparty/module_inheritable_attributes.rb

@@ -15,9 +15,18 @@ module HTTParty
       end
 
       def inherited(subclass)
+        super
         @mattr_inheritable_attrs.each do |inheritable_attribute|
-          instance_var = "@#{inheritable_attribute}"
-          subclass.instance_variable_set(instance_var, instance_variable_get(instance_var).clone)
+          ivar = "@#{inheritable_attribute}"
+          subclass.instance_variable_set(ivar, instance_variable_get(ivar).clone)
+          if instance_variable_get(ivar).respond_to?(:merge)
+            method = <<-EOM
+              def self.#{inheritable_attribute}
+                #{ivar} = superclass.#{inheritable_attribute}.merge #{ivar}
+              end
+            EOM
+            subclass.class_eval method
+          end
         end
       end
     end

data/spec/httparty_spec.rb

@@ -416,6 +416,9 @@ describe HTTParty do
     before(:each) do
       @parent = Class.new do
         include HTTParty
+        def self.name
+          "Parent"
+        end
       end
 
       @child1 = Class.new(@parent)
@@ -431,6 +434,59 @@ describe HTTParty do
 
       @parent.default_options.should == { }
     end
+
+    it "inherits default_options from the superclass" do
+      @parent.basic_auth 'user', 'password'
+      @child1.default_options.should == {:basic_auth => {:username => 'user', :password => 'password'}}
+      @child1.basic_auth 'u', 'p' # modifying child1 has no effect on child2
+      @child2.default_options.should == {:basic_auth => {:username => 'user', :password => 'password'}}
+    end
+
+    it "doesn't modify the parent's default options" do
+      @parent.basic_auth 'user', 'password'
+
+      @child1.basic_auth 'u', 'p'
+      @child1.default_options.should == {:basic_auth => {:username => 'u', :password => 'p'}}
+
+      @child1.basic_auth 'email', 'token'
+      @child1.default_options.should == {:basic_auth => {:username => 'email', :password => 'token'}}
+
+      @parent.default_options.should == {:basic_auth => {:username => 'user', :password => 'password'}}
+    end
+
+    it "inherits default_cookies from the parent class" do
+      @parent.cookies 'type' => 'chocolate_chip'
+      @child1.default_cookies.should == {"type" => "chocolate_chip"}
+      @child1.cookies 'type' => 'snickerdoodle'
+      @child1.default_cookies.should == {"type" => "snickerdoodle"}
+      @child2.default_cookies.should == {"type" => "chocolate_chip"}
+    end
+
+    it "doesn't modify the parent's default cookies" do
+      @parent.cookies 'type' => 'chocolate_chip'
+
+      @child1.cookies 'type' => 'snickerdoodle'
+      @child1.default_cookies.should == {"type" => "snickerdoodle"}
+
+      @parent.default_cookies.should == {"type" => "chocolate_chip"}
+    end
+  end
+
+  describe "grand parent with inherited callback" do
+    before do
+      @grand_parent = Class.new do
+        def self.inherited(subclass)
+          subclass.instance_variable_set(:@grand_parent, true)
+        end
+      end
+      @parent = Class.new(@grand_parent) do
+        include HTTParty
+      end
+    end
+    it "continues running the #inherited on the parent" do
+      child = Class.new(@parent)
+      child.instance_variable_get(:@grand_parent).should be_true
+    end
   end
 
   describe "#get" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -04:00
+date: 2010-07-07 00:00:00 -04:00
 default_executable: httparty
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +28,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 7
-        version: 0.1.7
+        - 8
+        version: 0.1.8
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency