httparty 0.9.0 → 0.10.0

data/History

@@ -1,3 +1,7 @@
+== 0.10.0 2013-01-10
+* changes
+  * removed yaml support because of security risk (see rails yaml issues)
+
 == 0.9.0 2012-09-07
 * new
   * [support for connection adapters](https://github.com/jnunemaker/httparty/pull/157)

data/examples/custom_parsers.rb

@@ -1,7 +1,7 @@
 class ParseAtom
   include HTTParty
 
-  # Support Atom along with the default parsers: xml, json, yaml, etc.
+  # Support Atom along with the default parsers: xml, json, etc.
   class Parser::Atom < HTTParty::Parser
     SupportedFormats.merge!({"application/atom+xml" => :atom})
 

data/lib/httparty.rb

@@ -299,7 +299,7 @@ module HTTParty
       default_options[:query_string_normalizer] = normalizer
     end
 
-    # Allows setting of SSL version to use. This only works in Ruby 1.9.
+    # Allows setting of SSL version to use. This only works in Ruby 1.9+.
     # You can get a list of valid versions from OpenSSL::SSL::SSLContext::METHODS.
     #
     #   class Foo
@@ -310,6 +310,19 @@ module HTTParty
       default_options[:ssl_version] = version
     end
 
+    # Allows setting of SSL ciphers to use.  This only works in Ruby 1.9+.
+    # You can get a list of valid specific ciphers from OpenSSL::Cipher.ciphers.
+    # You also can specify a cipher suite here, listed here at openssl.org: 
+    # http://www.openssl.org/docs/apps/ciphers.html#CIPHER_SUITE_NAMES
+    #
+    #   class Foo
+    #     include HTTParty
+    #     ciphers "RC4-SHA"
+    #   end
+    def ciphers(cipher_names)
+      default_options[:ciphers] = cipher_names
+    end
+
     # Allows setting an OpenSSL certificate authority file
     #
     #   class Foo

data/lib/httparty/connection_adapter.rb

@@ -47,6 +47,10 @@ module HTTParty
   # * :+connection_adapter_options+: contains the hash your passed to HTTParty.connection_adapter when you configured your connection adapter
   class ConnectionAdapter
 
+    # Private: Regex used to strip brackets from IPv6 URIs.
+    StripIpv6BracketsRegex = /\A\[(.*)\]\z/
+
+    # Public
     def self.call(uri, options)
       new(uri, options).connection
     end
@@ -61,7 +65,8 @@ module HTTParty
     end
 
     def connection
-      http = Net::HTTP.new(uri.host, uri.port, options[:http_proxyaddr], options[:http_proxyport], options[:http_proxyuser], options[:http_proxypass])
+      host = clean_host(uri.host)
+      http = Net::HTTP.new(host, uri.port, options[:http_proxyaddr], options[:http_proxyport], options[:http_proxyuser], options[:http_proxypass])
 
       http.use_ssl = ssl_implied?(uri)
 
@@ -76,10 +81,23 @@ module HTTParty
         http.set_debug_output(options[:debug_output])
       end
 
+      if options[:ciphers]
+        http.ciphers = options[:ciphers]
+      end
+
       return http
     end
 
     private
+
+    def clean_host(host)
+      strip_ipv6_brackets(host)
+    end
+
+    def strip_ipv6_brackets(host)
+      StripIpv6BracketsRegex =~ host ? $1 : host
+    end
+
     def ssl_implied?(uri)
       uri.port == 443 || uri.instance_of?(URI::HTTPS)
     end

data/lib/httparty/module_inheritable_attributes.rb

@@ -5,12 +5,19 @@ module HTTParty
     end
 
     # borrowed from Rails 3.2 ActiveSupport
-    def self.hash_deep_dup(h)
-      duplicate = h.dup
-      duplicate.each_pair do |k,v|
-        tv = duplicate[k]
-        duplicate[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? hash_deep_dup(tv) : v
+    def self.hash_deep_dup(hash)
+      duplicate = hash.dup
+
+      duplicate.each_pair do |key, value|
+        duplicate[key] = if value.is_a?(Hash)
+          hash_deep_dup(value)
+        elsif value.is_a?(Proc)
+          duplicate[key] = value.dup
+        else
+          value
+        end
       end
+
       duplicate
     end
 
@@ -18,9 +25,11 @@ module HTTParty
       def mattr_inheritable(*args)
         @mattr_inheritable_attrs ||= [:mattr_inheritable_attrs]
         @mattr_inheritable_attrs += args
+
         args.each do |arg|
           module_eval %(class << self; attr_accessor :#{arg} end)
         end
+
         @mattr_inheritable_attrs
       end
 
@@ -29,12 +38,15 @@ module HTTParty
         @mattr_inheritable_attrs.each do |inheritable_attribute|
           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 ModuleInheritableAttributes.hash_deep_dup(#{ivar})
+                duplicate = ModuleInheritableAttributes.hash_deep_dup(#{ivar})
+                #{ivar} = superclass.#{inheritable_attribute}.merge(duplicate)
               end
             EOM
+
             subclass.class_eval method
           end
         end

data/lib/httparty/parser.rb

@@ -1,5 +1,5 @@
 module HTTParty
-  # The default parser used by HTTParty, supports xml, json, html, yaml, and
+  # The default parser used by HTTParty, supports xml, json, html, and
   # plain text.
   #
   # == Custom Parsers
@@ -45,8 +45,6 @@ module HTTParty
       'application/javascript' => :json,
       'text/javascript'        => :json,
       'text/html'              => :html,
-      'application/x-yaml'     => :yaml,
-      'text/yaml'              => :yaml,
       'text/plain'             => :plain
     }
 
@@ -120,10 +118,6 @@ module HTTParty
       end
     end
 
-    def yaml
-      YAML.load(body)
-    end
-
     def html
       body
     end

data/lib/httparty/request.rb

@@ -10,7 +10,7 @@ module HTTParty
       Net::HTTP::Options
     ]
 
-    SupportedURISchemes  = [URI::HTTP, URI::HTTPS]
+    SupportedURISchemes  = [URI::HTTP, URI::HTTPS, URI::Generic]
 
     NON_RAILS_QUERY_STRING_NORMALIZER = Proc.new do |query|
       Array(query).map do |key, value|
@@ -24,7 +24,8 @@ module HTTParty
       end.flatten.sort.join('&')
     end
 
-    attr_accessor :http_method, :path, :options, :last_response, :redirect, :last_uri
+    attr_accessor :http_method, :options, :last_response, :redirect, :last_uri
+    attr_reader :path
 
     def initialize(http_method, path, o={})
       self.http_method = http_method
@@ -42,6 +43,14 @@ module HTTParty
       @path = URI.parse(uri)
     end
 
+    def request_uri(uri)
+      if uri.respond_to? :request_uri
+        uri.request_uri
+      else
+        uri.path
+      end
+    end
+
     def uri
       new_uri = path.relative? ? URI.parse("#{base_uri}#{path}") : path
 
@@ -51,7 +60,7 @@ module HTTParty
       end
 
       unless SupportedURISchemes.include? new_uri.class
-        raise UnsupportedURIScheme, "'#{new_uri}' Must be HTTP or HTTPS"
+        raise UnsupportedURIScheme, "'#{new_uri}' Must be HTTP, HTTPS or Generic"
       end
 
       @last_uri = new_uri
@@ -130,7 +139,7 @@ module HTTParty
     end
 
     def setup_raw_request
-      @raw_request = http_method.new(uri.request_uri)
+      @raw_request = http_method.new(request_uri(uri))
       @raw_request.body = body if body
       @raw_request.initialize_http_header(options[:headers])
       @raw_request.basic_auth(username, password) if options[:basic_auth]

data/lib/httparty/version.rb

@@ -1,3 +1,3 @@
 module HTTParty
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

data/spec/httparty/connection_adapter_spec.rb

@@ -78,6 +78,7 @@ describe HTTParty::ConnectionAdapter do
           it { should use_ssl }
         end
 
+
         context "when ssl version is set" do
           let(:options) { {:ssl_version => :TLSv1} }
 
@@ -87,6 +88,22 @@ describe HTTParty::ConnectionAdapter do
         end if RUBY_VERSION > '1.9'
       end
 
+      context "when dealing with IPv6" do
+        let(:uri) { URI 'http://[fd00::1]' }
+
+        it "strips brackets from the address" do
+          subject.address.should == 'fd00::1'
+        end
+      end
+
+      context "specifying ciphers" do
+        let(:options) { {:ciphers => 'RC4-SHA' } }
+
+        it "should set the ciphers on the connection" do
+          subject.ciphers.should == 'RC4-SHA'
+        end
+      end if RUBY_VERSION > '1.9'
+
       context "when timeout is not set" do
         it "doesn't set the timeout" do
           http = mock("http", :null_object => true)

data/spec/httparty/parser_spec.rb

@@ -155,11 +155,6 @@ describe HTTParty::Parser do
       subject.send(:json)
     end
 
-    it "parses yaml" do
-      YAML.should_receive(:load).with('body')
-      subject.send(:yaml)
-    end
-
     it "parses html by simply returning the body" do
       subject.send(:html).should == 'body'
     end

data/spec/httparty/request_spec.rb

@@ -225,12 +225,6 @@ describe HTTParty::Request do
       @request.send(:parse_response, json).should == {'books' => {'book' => {'id' => '1234', 'name' => 'Foo Bar!'}}}
     end
 
-    it 'should handle yaml automatically' do
-      yaml = "books: \n  book: \n    name: Foo Bar!\n    id: \"1234\"\n"
-      @request.options[:format] = :yaml
-      @request.send(:parse_response, yaml).should == {'books' => {'book' => {'id' => '1234', 'name' => 'Foo Bar!'}}}
-    end
-
     it "should include any HTTP headers in the returned response" do
       @request.options[:format] = :html
       response = stub_response "Content"

data/spec/httparty_spec.rb

@@ -45,6 +45,14 @@ describe HTTParty do
     end
   end
 
+  describe 'ciphers' do
+    it 'should set the ciphers content' do
+      @klass.default_options[:ciphers].should be_nil
+      @klass.ciphers 'RC4-SHA'
+      @klass.default_options[:ciphers].should == 'RC4-SHA'
+    end
+  end
+
   describe 'http_proxy' do
     it 'should set the address' do
       @klass.http_proxy 'proxy.foo.com', 80
@@ -376,11 +384,6 @@ describe HTTParty do
       @klass.default_options[:format].should == :json
     end
 
-    it "should allow yaml" do
-      @klass.format :yaml
-      @klass.default_options[:format].should == :yaml
-    end
-
     it "should allow plain" do
       @klass.format :plain
       @klass.default_options[:format].should == :plain
@@ -395,7 +398,7 @@ describe HTTParty do
     it 'should only print each format once with an exception' do
       lambda do
         @klass.format :foobar
-      end.should raise_error(HTTParty::UnsupportedFormat, "':foobar' Must be one of: html, json, plain, xml, yaml")
+      end.should raise_error(HTTParty::UnsupportedFormat, "':foobar' Must be one of: html, json, plain, xml")
     end
 
     it 'sets the default parser' do
@@ -578,6 +581,20 @@ describe HTTParty do
       @child1.default_options[:headers].should == {'Accept' => 'application/xml'}
     end
 
+    it "works with lambda values" do
+      @child1.default_options[:imaginary_option] = lambda { "This is a new lambda "}
+      @child1.default_options[:imaginary_option].should be_a Proc
+    end
+
+    it 'should dup the proc on the child class' do
+      imaginary_option = lambda { "This is a new lambda" }
+      @parent.default_options[:imaginary_option] = imaginary_option
+      @parent.default_options[:imaginary_option].should be_equal imaginary_option
+      @child1.default_options[:imaginary_option]
+      @child1.default_options[:imaginary_option].should == imaginary_option
+      @child1.default_options[:imaginary_option].should_not be_equal imaginary_option
+    end
+
     it "inherits default_cookies from the parent class" do
       @parent.cookies 'type' => 'chocolate_chip'
       @child1.default_cookies.should == {"type" => "chocolate_chip"}
@@ -688,10 +705,11 @@ describe HTTParty do
       end.should_not raise_error(HTTParty::UnsupportedURIScheme)
     end
 
-    it "should raise an ArgumentError on URIs that are not http or https" do
+    it "should accept webcal URIs" do
+      stub_http_response_with('google.html')
       lambda do
-        HTTParty.get("file:///there_is_no_party_on/my/filesystem")
-      end.should raise_error(HTTParty::UnsupportedURIScheme)
+        HTTParty.get('webcal://google.com')
+      end.should_not raise_error(HTTParty::UnsupportedURIScheme)
     end
 
     it "should raise an InvalidURIError on URIs that can't be parsed at all" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70139029121860 !ruby/object:Gem::Requirement
+  requirement: &70244756875780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139029121860
+  version_requirements: *70244756875780
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70139029121440 !ruby/object:Gem::Requirement
+  requirement: &70244756914000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70139029121440
+  version_requirements: *70244756914000
 description: Makes http fun! Also, makes consuming restful web services dead easy.
 email:
 - nunemaker@gmail.com
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1568840353759951881
+      hash: -707685205189815714
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1568840353759951881
+      hash: -707685205189815714
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10