patron 0.4.11 → 0.4.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patron (0.4.10)
+    patron (0.4.12)
 
 GEM
   remote: http://rubygems.org/

data/ext/patron/extconf.rb

@@ -29,6 +29,8 @@ end
 require 'mkmf'
 require 'rbconfig'
 
+dir_config('curl')
+
 if find_executable('curl-config')
   $CFLAGS << " #{`curl-config --cflags`.strip}"
   $LIBS << " #{`curl-config --libs`.strip}"

data/lib/patron/request.rb

@@ -23,7 +23,7 @@
 ##
 ## -------------------------------------------------------------------
 
-require 'cgi'
+require 'patron/util'
 
 module Patron
 
@@ -71,7 +71,7 @@ module Patron
     def upload_data=(data)
       @upload_data = case data
       when Hash
-        self.multipart ? data : hash_to_string(data)
+        self.multipart ? data : Util.build_query_string_from_hash(data, @action == :post)
       else
         data
       end
@@ -138,20 +138,5 @@ module Patron
       "#{username}:#{password}"
     end
 
-  private
-
-    # serialize hash for Rails-style params
-    def hash_to_string(hash)
-      pairs = []
-      recursive = Proc.new do |h, prefix|
-        h.each_pair do |k,v|
-          key = prefix == '' ? k : "#{prefix}[#{k}]"
-                                    @action == :post ? v = CGI::escape(v.to_s) : v
-          v.is_a?(Hash) ? recursive.call(v, key) : pairs << "#{key}=#{v}"
-        end
-      end
-      recursive.call(hash, '')
-      return pairs.join('&')
-    end
   end
 end

data/lib/patron/session.rb

@@ -22,11 +22,13 @@
 ## THE SOFTWARE.
 ##
 ## -------------------------------------------------------------------
+
+require 'uri'
 require 'patron/error'
 require 'patron/request'
 require 'patron/response'
 require 'patron/session_ext'
-
+require 'patron/util'
 
 module Patron
 
@@ -196,8 +198,15 @@ module Patron
       req.insecure = insecure
       req.buffer_size = buffer_size
 
-      req.url = self.base_url.to_s + url.to_s
-      raise ArgumentError, "Empty URL" if req.url.empty?
+      url = self.base_url.to_s + url.to_s
+      uri = URI.parse(url)
+      query = uri.query.to_s.split('&')
+      query += options[:query].is_a?(Hash) ? Util.build_query_pairs_from_hash(options[:query]) : options[:query].to_s.split('&')
+      uri.query = query.join('&')
+      uri.query = nil if uri.query.empty?
+      url = uri.to_s
+      raise ArgumentError, "Empty URL" if url.empty?
+      req.url = url
 
       handle_request(req)
     end

data/lib/patron/util.rb

@@ -0,0 +1,50 @@
+## -------------------------------------------------------------------
+##
+## Patron HTTP Client: Request class
+## Copyright (c) 2008 The Hive http://www.thehive.com/
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
+##
+## -------------------------------------------------------------------
+
+require 'cgi'
+
+module Patron
+  module Util
+    extend self
+    
+    def build_query_pairs_from_hash(hash, escape_values=false)
+      pairs = []
+      recursive = Proc.new do |h, prefix|
+        h.each_pair do |k,v|
+          key = prefix == '' ? k : "#{prefix}[#{k}]"
+          v = CGI::escape(v.to_s) if escape_values
+          v.is_a?(Hash) ? recursive.call(v, key) : pairs << "#{key}=#{v}"
+        end
+      end
+      recursive.call(hash, '')
+      pairs
+    end
+    
+    def build_query_string_from_hash(hash, escape_values=false)
+      build_query_pairs_from_hash(hash, escape_values).join('&')
+    end
+    
+  end
+end

data/lib/patron/version.rb

@@ -1,3 +1,3 @@
 module Patron
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

data/spec/session_spec.rb

@@ -243,6 +243,20 @@ describe Patron::Session do
 
     body.request_method.should == "GET"
   end
+  
+  it "should serialize query params and append them to the url" do
+    response = @session.request(:get, "/test", {}, :query => {:foo => "bar"})
+    request = YAML::load(response.body)
+    request.parse
+    (request.path + '?' + request.query_string).should == "/test?foo=bar"
+  end
+  
+  it "should merge parameters in the :query option with pre-existing query parameters" do
+    response = @session.request(:get, "/test?foo=bar", {}, :query => {:baz => "quux"})
+    request = YAML::load(response.body)
+    request.parse
+    (request.path + '?' + request.query_string).should == "/test?foo=bar&baz=quux"
+  end
 
   def encode_authz(user, passwd)
     "Basic " + Base64.encode64("#{user}:#{passwd}").strip

data/spec/util_spec.rb

@@ -0,0 +1,92 @@
+## -------------------------------------------------------------------
+##
+## Copyright (c) 2008 The Hive http://www.thehive.com/
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included in
+## all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+## IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+## AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+## THE SOFTWARE.
+##
+## -------------------------------------------------------------------
+require File.expand_path("./spec") + '/spec_helper.rb'
+
+describe Patron::Util do
+  
+  describe :build_query_pairs_from_hash do
+    it "correctly serializes a simple hash" do
+      hash = {:foo => "bar", "baz" => 42}
+      array = Patron::Util.build_query_pairs_from_hash(hash)
+      array.size.should == 2
+      array.should include("foo=bar")
+      array.should include("baz=42")
+    end
+    it "correctly serializes a more complex hash" do
+      hash = {
+        :foo => "bar",
+        :baz => {
+          "quux" => {
+            :zing => {
+              :ying => 42
+            }
+          },
+          :blargh => {
+            :spaz => "sox",
+            :razz => "matazz"
+          }
+        }
+      }
+      array = Patron::Util.build_query_pairs_from_hash(hash)
+      array.size.should == 4
+      array.should include("foo=bar")
+      array.should include("baz[quux][zing][ying]=42")
+      array.should include("baz[blargh][spaz]=sox")
+      array.should include("baz[blargh][razz]=matazz")
+    end
+  end
+  
+  describe :build_query_string_from_hash do
+    it "correctly serializes a simple hash" do
+      hash = {:foo => "bar", "baz" => 42}
+      array = Patron::Util.build_query_string_from_hash(hash).split('&')
+      array.size.should == 2
+      array.should include("foo=bar")
+      array.should include("baz=42")
+    end
+    it "correctly serializes a more complex hash" do
+      hash = {
+        :foo => "bar",
+        :baz => {
+          "quux" => {
+            :zing => {
+              :ying => 42
+            }
+          },
+          :blargh => {
+            :spaz => "sox",
+            :razz => "matazz"
+          }
+        }
+      }
+      array = Patron::Util.build_query_string_from_hash(hash).split('&')
+      array.size.should == 4
+      array.should include("foo=bar")
+      array.should include("baz[quux][zing][ying]=42")
+      array.should include("baz[blargh][spaz]=sox")
+      array.should include("baz[blargh][razz]=matazz")
+    end
+  end
+  
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: patron
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 4
-  - 11
-  version: 0.4.11
+  prerelease: 
+  version: 0.4.12
 platform: ruby
 authors: 
 - Phillip Toland
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 -06:00
+date: 2011-06-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id001
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 5
         version: 0.7.5
   type: :development
   version_requirements: *id002
@@ -55,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   version_requirements: *id003
@@ -70,10 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 9
         version: 0.9.9
   type: :development
   version_requirements: *id004
@@ -105,6 +85,7 @@ files:
 - lib/patron/request.rb
 - lib/patron/response.rb
 - lib/patron/session.rb
+- lib/patron/util.rb
 - lib/patron/version.rb
 - patron.gemspec
 - script/console
@@ -114,6 +95,7 @@ files:
 - spec/response_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
+- spec/util_spec.rb
 has_rdoc: true
 homepage: https://github.com/toland/patron
 licenses: []
@@ -129,23 +111,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: patron
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Patron HTTP Client