httpi 2.2.5 → 2.2.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTg1OTVkMjUyODliYTU2NTE1YTk4ZTVmM2MwODczOTM2YWIyN2VmNg==
-  data.tar.gz: !binary |-
-    NWJhMGMyMzljNmUxNGNlYWE1OTllNWNhZDhiNTgwNjAxNDJjMmIyNg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDQ4MjVjMWUxNzZiOWViMWY1YjJkZTZlOWQ1ZDRjNWM0NTlmNWM3MDA3NWU1
-    N2Q2M2EzMDE5Nzc5MDAxZWMyZGFlZjM1NDM0NTQxNzM1YzVjOWUxZTYxZWRk
-    Njc4NmM1ZWQxNmYwMzU2NjkzY2I1NzYzMTA5NGFhZjU4Mjg3Y2E=
-  data.tar.gz: !binary |-
-    MzM3ZjZmOWJhOWNmZjgwMTA0MzcxZmJiNjQ1MDlmODk1MjlmN2Q3MWU4YWNj
-    NzNhMDYyNzJjZGQxNGU2ZGYwZDEyMDdiYjI5ZDc4M2RhOTI1MTE0Mjc2NGY4
-    NTU5YWRmYjFkODc1MWFkOWU3NTYxMzhkNzJjYWU5ZTQwYTE0Yzg=
+SHA1:
+  metadata.gz: b2a6ca966957f93efb1b07b859d41b08539b9af8
+  data.tar.gz: 1f6e86b25d395cb9c2865d3983eb3a270d345cd9
+SHA512:
+  metadata.gz: b824b5b23daff84b3440b16fd56576a377ce5c02e5178d9f6994ad88fac05aeac465999a80e293083a351aa8658eca4388159e3f5545b185f2369eb31521b4e0
+  data.tar.gz: b7d465a83a459e33e4cd6aca4fe3921f88c431825c8aa8a764ab382873c6f1404082b71f976c6d813d970f1e92d6c6b4fea2133fd4ba8a9eed7e9b04f043712a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.2.6
+
+* Fix: [#128](https://github.com/savonrb/httpi/pull/128) Fix for libcURL crash on some ssystems.
+
 ### 2.2.5
 
 * Feature: [#123](https://github.com/savonrb/httpi/pull/123) Don't warn about missing rubyntlm gem if it is optional. Thanks to [PChambino](https://github.com/PChambino)

data/httpi.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version     = HTTPI::VERSION
   s.authors     = ['Daniel Harrington', 'Martin Tepper']
   s.email       = 'me@rubiii.com'
-  s.homepage    = 'http://github.com/savonrb/#{s.name}'
+  s.homepage    = "http://github.com/savonrb/#{s.name}"
   s.summary     = "Common interface for Ruby's HTTP libraries"
   s.description = s.summary
 

data/lib/httpi.rb

@@ -1,6 +1,7 @@
 require "httpi/version"
 require "httpi/logger"
 require "httpi/request"
+require "httpi/query_builder"
 
 require "httpi/adapter/httpclient"
 require "httpi/adapter/curb"
@@ -99,6 +100,25 @@ module HTTPI
 
   class << self
 
+    def query_builder
+      @query_builder || HTTPI::QueryBuilder::Flat
+    end
+
+    def query_builder=(builder)
+      if builder.is_a?(Symbol)
+        builder_name = builder.to_s.capitalize
+        begin
+          builder = HTTPI::QueryBuilder.const_get(builder_name)
+        rescue NameError => ex
+          raise ArgumentError, "Invalid builder. Available builders are: [:flat, :nested]"
+        end
+      end
+      unless builder.respond_to?(:build)
+        raise ArgumentError, "Query builder object should respond to build method"
+      end
+      @query_builder = builder
+    end
+
     # Executes an HTTP GET request.
     def get(request, adapter = nil, &block)
       request = Request.new(request) if request.kind_of? String

data/lib/httpi/adapter/curb.rb

@@ -75,6 +75,10 @@ module HTTPI
         @client.connect_timeout = @request.open_timeout if @request.open_timeout
         @client.headers = @request.headers.to_hash
         @client.verbose = false
+        # cURL workaround
+        # see: http://stackoverflow.com/a/10755612/102920
+        #      https://github.com/typhoeus/typhoeus/issues/260
+        @client.set(:NOSIGNAL, true)
       end
 
       def setup_http_auth
@@ -105,7 +109,7 @@ module HTTPI
 
           @client.ssl_verify_peer = ssl.verify_mode == :peer
         end
-        
+
         @client.ssl_version = case ssl.ssl_version
           when :TLSv1 then 1
           when :SSLv2 then 2

data/lib/httpi/query_builder.rb

@@ -0,0 +1,47 @@
+module HTTPI
+  module QueryBuilder
+
+    class Flat
+
+      # Returns a +query+ string given a +Hash+.
+      # Example:
+      #
+      #   build({names => ['Bruno', 'Samantha', 'Alexandre']})
+      #   # => "names=Bruno&names=Samantha&names=Alexandre"
+      def self.build(query)
+        Rack::Utils.build_query(query)
+      end
+
+    end
+
+    class Nested
+
+      # Returns a +query+ string given a +Hash+.
+      # Example:
+      #
+      #   build({names => ['Bruno', 'Samantha', 'Alexandre']})
+      #   # => "names[]=Bruno&names[]=Samantha&names[]=Alexandre"
+      def self.build(query)
+        stringfied_query = stringify_hash_values(query)
+        Rack::Utils.build_nested_query(stringfied_query)
+      end
+
+      private
+
+      # Changes Hash values into Strings
+      def self.stringify_hash_values(query)
+        query.each do |param, value|
+          if value.kind_of?(Hash)
+            query[param] = stringify_hash_values(value)
+          elsif value.kind_of?(Array)
+            query[param] = value.map(&:to_s)
+          else
+            query[param] = value.to_s
+          end
+        end
+      end
+
+    end
+
+  end
+end

data/lib/httpi/request.rb

@@ -35,7 +35,7 @@ module HTTPI
     def query=(query)
       raise ArgumentError, "Invalid URL: #{self.url}" unless self.url.respond_to?(:query)
       if query.kind_of?(Hash)
-        query = Rack::Utils.build_query(query)
+        query = build_query_from_hash(query)
       end
       query = query.to_s unless query.is_a?(String)
       self.url.query = query
@@ -96,7 +96,7 @@ module HTTPI
 
     # Sets a body request given a String or a Hash.
     def body=(params)
-      @body = params.kind_of?(Hash) ? Rack::Utils.build_query(params) : params
+      @body = params.kind_of?(Hash) ? build_query_from_hash(params) : params
     end
 
     # Sets the block to be called while processing the response. The block
@@ -143,5 +143,10 @@ module HTTPI
       url.kind_of?(URI) ? url : URI(url)
     end
 
+    # Returns a +query+ string given a +Hash+
+    def build_query_from_hash(query)
+      HTTPI.query_builder.build(query)
+    end
+
   end
 end

data/lib/httpi/version.rb

@@ -1,3 +1,3 @@
 module HTTPI
-  VERSION = "2.2.5"
+  VERSION = '2.2.6'
 end

data/spec/httpi/httpi_spec.rb

@@ -34,6 +34,33 @@ describe HTTPI do
     end
   end
 
+  describe ".query_builder" do
+    it "gets flat builder by default" do
+      expect(client.query_builder).to eq(HTTPI::QueryBuilder::Flat)
+    end
+    context "setter" do
+      after { client.query_builder = HTTPI::QueryBuilder::Flat }
+      it "looks up for class if symbol" do
+        client.query_builder = :nested
+        expect(client.query_builder).to eq(HTTPI::QueryBuilder::Nested)
+      end
+      it "validates if symbol is a valid option" do
+        expect do
+          client.query_builder = :xxx
+        end.to raise_error(ArgumentError)
+      end
+      it "validates if value respond to build" do
+        expect do
+          client.query_builder = nil
+        end.to raise_error(ArgumentError)
+      end
+      it "accepts valid class" do
+        client.query_builder = HTTPI::QueryBuilder::Nested
+        expect(client.query_builder).to eq(HTTPI::QueryBuilder::Nested)
+      end
+    end
+  end
+
   describe ".get(request)" do
     it "executes a GET request using the default adapter" do
       request = HTTPI::Request.new("http://example.com")

data/spec/httpi/request_spec.rb

@@ -47,28 +47,57 @@ describe HTTPI::Request do
     it "raises an ArgumentError if url not respond to query" do
       expect { request.query = "q=query" }.to raise_error(ArgumentError)
     end
-    it "lets you specify query parameter as String" do
-      request.url = "http://example.com"
-      request.query = "q=query"
-      expect(request.url.to_s).to eq("http://example.com?q=query")
-    end
-    it "lets you specify query parameter as Hash" do
-      request.url = "http://example.com"
-      request.query = {:q => "query"}
-      expect(request.url.to_s).to eq("http://example.com?q=query")
-    end
+
     it "getter return nil for invalid url" do
       expect(request.query).to be_nil
     end
-    it "getter return String for query parameter as String" do
-      request.url = "http://example.com"
-      request.query = "q=query"
-      expect(request.query).to eq("q=query")
+
+    context "with query parameter as String" do
+      it "lets you specify query parameter as String" do
+        request.url = "http://example.com"
+        request.query = "q=query"
+        expect(request.url.to_s).to eq("http://example.com?q=query")
+      end
+
+      it "getter return String for query parameter as String" do
+        request.url = "http://example.com"
+        request.query = "q=query"
+        expect(request.query).to eq("q=query")
+      end
     end
-    it "getter return String for query parameter as Hash" do
-      request.url = "http://example.com"
-      request.query = {:q => "query"}
-      expect(request.query).to eq("q=query")
+
+    context "with query parameter as Hash" do
+      context "with flat query builder" do
+        before do
+          request.url = "http://example.com"
+          request.query = {:q => ["nested", "query"]}
+        end
+
+        it "lets you specify query parameter as Hash" do
+          expect(request.url.to_s).to eq("http://example.com?q=nested&q=query")
+        end
+
+        it "getter return String for query parameter as Hash" do
+          expect(request.query).to eq("q=nested&q=query")
+        end
+      end
+      context "with nested query builder" do
+        before do
+          HTTPI.query_builder = :nested
+
+          request.url = "http://example.com"
+          request.query = {:q => ["nested", "query"]}
+        end
+        after { HTTPI.query_builder = :flat }
+
+        it "lets you specify query parameter as Hash" do
+          expect(request.url.to_s).to eq("http://example.com?q[]=nested&q[]=query")
+        end
+
+        it "getter return String for query parameter as Hash" do
+          expect(request.query).to eq("q[]=nested&q[]=query")
+        end
+      end
     end
   end
 
@@ -168,14 +197,41 @@ describe HTTPI::Request do
   end
 
   describe "#body" do
-    it "lets you specify the HTTP request body using a String" do
-      request.body = "<some>xml</some>"
-      expect(request.body).to eq("<some>xml</some>")
+    context "with query parameter as String" do
+      it "lets you specify the HTTP request body using a String" do
+        request.body = "<some>xml</some>"
+        expect(request.body).to eq("<some>xml</some>")
+      end
     end
-
-    it "lets you specify the HTTP request body using a Hash" do
-      request.body = {:foo => :bar, :baz => :foo}
-      expect(request.body.split("&")).to match_array(["foo=bar", "baz=foo"])
+    context "with flat query builder" do
+      it "lets you specify the HTTP request body using a Hash" do
+        request.body = {:foo => :bar, :baz => :foo}
+        expect(request.body.split("&")).to match_array(["foo=bar", "baz=foo"])
+      end
+    end
+    context "with query parameter as Hash" do
+      context "with flat query builder" do
+        it "request body using a Hash" do
+          request.body = {:foo => :bar, :baz => :foo}
+          expect(request.body.split("&")).to match_array(["foo=bar", "baz=foo"])
+        end
+        it "request body using a Hash with Array" do
+          request.body = {:foo => :bar, :baz => [:foo, :tst]}
+          expect(request.body.split("&")).to match_array(["foo=bar", "baz=foo", "baz=tst"])
+        end
+      end
+      context "with nested query builder" do
+        before { HTTPI.query_builder = :nested }
+        after  { HTTPI.query_builder = :flat }
+        it "request body using a Hash" do
+          request.body = {:foo => :bar, :baz => :foo}
+          expect(request.body.split("&")).to match_array(["foo=bar", "baz=foo"])
+        end
+        it "request body using a Hash with Array" do
+          request.body = {:foo => :bar, :baz => [:foo, :tst]}
+          expect(request.body.split("&")).to match_array(["foo=bar", "baz[]=foo", "baz[]=tst"])
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Daniel Harrington
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.2
 description: Common interface for Ruby's HTTP libraries
@@ -101,9 +101,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -126,6 +126,7 @@ files:
 - lib/httpi/cookie_store.rb
 - lib/httpi/dime.rb
 - lib/httpi/logger.rb
+- lib/httpi/query_builder.rb
 - lib/httpi/request.rb
 - lib/httpi/response.rb
 - lib/httpi/version.rb
@@ -167,7 +168,7 @@ files:
 - spec/support/error_helper.rb
 - spec/support/fixture.rb
 - spec/support/matchers.rb
-homepage: http://github.com/savonrb/#{s.name}
+homepage: http://github.com/savonrb/httpi
 licenses:
 - MIT
 metadata: {}
@@ -177,17 +178,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: httpi
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Common interface for Ruby's HTTP libraries