rest 2.1.1 → 2.2.0

data/.gitignore

@@ -1,2 +1,3 @@
 .idea
 pkg/
+*.gem

data/Gemfile.lock

@@ -1,27 +1,29 @@
 PATH
   remote: .
   specs:
-    rest (2.1.0)
+    rest (2.2.0)
       net-http-persistent
       rest-client (>= 0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    excon (0.16.3)
-    ffi (1.1.5)
+    ethon (0.5.7)
+      ffi (~> 1.2.0)
+      mime-types (~> 1.18)
+    excon (0.16.10)
+    ffi (1.2.1)
     mime-types (1.19)
-    minitest (3.5.0)
+    minitest (4.4.0)
     net-http-persistent (2.8)
-    quicky (0.1.1)
-    rake (0.9.2.2)
+    quicky (0.4.0)
+    rake (10.0.3)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    test-unit (2.5.2)
-    typhoeus (0.4.2)
-      ffi (~> 1.0)
-      mime-types (~> 1.18)
-    uber_config (0.0.6)
+    test-unit (2.5.3)
+    typhoeus (0.5.4)
+      ethon (~> 0.5.7)
+    uber_config (1.0.5)
 
 PLATFORMS
   ruby
@@ -29,9 +31,9 @@ PLATFORMS
 DEPENDENCIES
   excon
   minitest
-  quicky
+  quicky (>= 0.4.0)
   rake
   rest!
   test-unit
-  typhoeus
+  typhoeus (>= 0.5.4)
   uber_config

data/README.md

@@ -16,6 +16,7 @@ Features
 * Chooses best client you have installed on your system based on what we have found performs the best.
   * Currently net_http_persistent and typhoeus are nearly the same, but since net_http_persistent doesn't have a binary
     dependency, it wins.
+* Handles 503 errors with exponential backoff.
 
 
 Getting Started
@@ -59,7 +60,8 @@ POST
 options:
 
 - :body => POST body
-- :headers => headers
+- :headers => headers hash
+- :form_data => hash of fields/values, sent form encoded (only tested with default net-http-persistent)
 
 PUT
 ------

data/lib/rest.rb

@@ -1 +1 @@
-require_relative 'rest/client'
+require 'rest/client'

data/lib/rest/client.rb

@@ -1,3 +1,8 @@
+if RUBY_VERSION.split('.')[1].to_i == 8
+  require 'rubygems'
+  gem 'json'
+end
+
 require 'json'
 require 'logger'
 
@@ -5,11 +10,11 @@ require 'logger'
 # The purpose of this is so that users who can't install binaries easily (like windoze users)
 # can have fallbacks that work.
 
-require_relative 'errors'
+require 'rest/errors'
 
 module Rest
 
-  require_relative 'wrappers/base_wrapper'
+  require 'rest/wrappers/base_wrapper'
 
   def self.logger=(logger)
     @logger = logger
@@ -39,15 +44,15 @@ module Rest
       end
 
       if @gem == :excon
-        require_relative 'wrappers/excon_wrapper'
+        require 'rest/wrappers/excon_wrapper'
         @wrapper = Rest::Wrappers::ExconWrapper.new(self)
         @logger.debug "Using excon gem."
       elsif @gem == :typhoeus
-        require_relative 'wrappers/typhoeus_wrapper'
+        require 'rest/wrappers/typhoeus_wrapper'
         @wrapper = Rest::Wrappers::TyphoeusWrapper.new
         @logger.debug "Using typhoeus gem."
       elsif @gem == :net_http_persistent
-        require_relative 'wrappers/net_http_persistent_wrapper'
+        require 'rest/wrappers/net_http_persistent_wrapper'
         @wrapper = Rest::Wrappers::NetHttpPersistentWrapper.new(self)
         @logger.debug "Using net-http-persistent gem."
       else
@@ -129,7 +134,7 @@ module Rest
 
             pow = (4 ** (current_retry)) * 100 # milliseconds
                                                #puts 'pow=' + pow.to_s
-            s = Random.rand * pow
+            s = rand * pow
                                                #puts 's=' + s.to_s
             sleep_secs = 1.0 * s / 1000.0
                                                #puts 'sleep for ' + sleep_secs.to_s

data/lib/rest/version.rb

@@ -1,3 +1,3 @@
 module Rest
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/lib/rest/wrappers/base_wrapper.rb

@@ -53,4 +53,5 @@ module Rest
 end
 
 # we need it for post_file, ok as gem already depends on it
-require_relative 'rest_client_wrapper'
+require 'rest/wrappers/rest_client_wrapper'
+

data/lib/rest/wrappers/net_http_persistent_wrapper.rb

@@ -80,14 +80,7 @@ module Rest
           #p uri.request_uri
           #puts "query: " + uri.query.inspect
           #puts "fragment: " + uri.fragment.inspect
-          if req_hash[:params]
-            new_q = URI.encode_www_form(req_hash[:params])
-            if uri.query
-              new_q = uri.query + "&" + new_q
-            end
-            #puts "new_q: " + new_q
-            uri.query = new_q
-          end
+          append_query_params(req_hash, uri)
           #p uri.request_uri
           post = Net::HTTP::Get.new fix_path(uri.request_uri)
           add_headers(post, req_hash, default_headers)
@@ -120,6 +113,17 @@ module Rest
         r
       end
 
+      def append_query_params(req_hash, uri)
+        if req_hash[:params]
+          new_q = URI.encode_www_form(req_hash[:params])
+          if uri.query
+            new_q = uri.query + "&" + new_q
+          end
+          #puts "new_q: " + new_q
+          uri.query = new_q
+        end
+      end
+
       def fix_path(path)
         return "/" if path.nil? || path == ""
         path
@@ -129,9 +133,12 @@ module Rest
       def post(url, req_hash={})
         r = nil
         uri = URI(url)
+        append_query_params(req_hash, uri)
         post = Net::HTTP::Post.new fix_path(uri.request_uri)
         add_headers(post, req_hash, default_headers)
         post.body = stringed_body(req_hash[:body]) if req_hash[:body]
+        post.set_form_data req_hash[:form_data] if req_hash[:form_data]
+        Rest.logger.debug "POST request to #{uri}. body: #{post.body}"
         response = http.request uri, post
         r = NetHttpPersistentResponseWrapper.new(response)
         case response
@@ -152,6 +159,7 @@ module Rest
       def put(url, req_hash={})
         r = nil
         uri = URI(url)
+        append_query_params(req_hash, uri)
         post = Net::HTTP::Put.new fix_path(uri.request_uri)
         add_headers(post, req_hash, default_headers)
         post.body = stringed_body(req_hash[:body]) if req_hash[:body]
@@ -167,6 +175,7 @@ module Rest
       def delete(url, req_hash={})
         r = nil
         uri = URI(url)
+        append_query_params(req_hash, uri)
         post = Net::HTTP::Delete.new fix_path(uri.request_uri)
         add_headers(post, req_hash, default_headers)
         post.body = stringed_body(req_hash[:body]) if req_hash[:body]

data/lib/rest/wrappers/typhoeus_wrapper.rb

@@ -36,10 +36,10 @@ module Rest
       def default_typhoeus_options
         req_hash = {}
         # todo: should change this timeout to longer if it's for posting file
-        req_hash[:connect_timeout] = 5000
+        req_hash[:connecttimeout] = 5000
         req_hash[:timeout] = 10000
-        req_hash[:follow_location] = true
-        req_hash[:max_redirects] = 2
+        req_hash[:followlocation] = true
+        req_hash[:maxredirs] = 2
         req_hash
       end
 

data/rest.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.version       = Rest::VERSION
 
   gem.required_rubygems_version = ">= 1.3.6"
-  gem.required_ruby_version = Gem::Requirement.new(">= 1.9")
+  gem.required_ruby_version = Gem::Requirement.new(">= 1.8")
   gem.add_runtime_dependency "rest-client", ">= 0.3.0"
   gem.add_runtime_dependency "net-http-persistent"
 
@@ -23,8 +23,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "uber_config"
-  gem.add_development_dependency "typhoeus"
-  gem.add_development_dependency "quicky"
+  gem.add_development_dependency "typhoeus", ">= 0.5.4"
+  gem.add_development_dependency "quicky", ">= 0.4.0"
   gem.add_development_dependency "excon"
 
 end

data/test/test_base.rb

@@ -1,4 +1,3 @@
-gem 'test-unit'
 require 'test/unit'
 require 'yaml'
 begin
@@ -16,6 +15,9 @@ class TestBase < Test::Unit::TestCase
 
   end
 
+  def test_fake
+  end
+
   ALL_OPS = [:get, :put, :post, :delete]
 
 

data/test/test_performance.rb

@@ -1,9 +1,8 @@
-gem 'test-unit'
 require 'test/unit'
 require 'yaml'
 require 'quicky'
 
-require_relative 'test_base'
+require 'test_base'
 
 class TestPerformance < TestBase
   def setup

data/test/test_rest.rb

@@ -1,9 +1,8 @@
 # Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
 
-gem 'test-unit'
 require 'test/unit'
 require 'yaml'
-require_relative 'test_base'
+require 'test_base'
 
 class TestRest < TestBase
   def setup
@@ -17,11 +16,11 @@ class TestRest < TestBase
     p response.code
     assert response.code == 200
     p response.body
-    assert response.body.include?("Social Coding")
+    assert response.body.include?("Explore GitHub")
   end
 
   def test_backoff
-    response = @rest.get("http://rest-test.iron.io/code/503?switch_after=3&switch_to=200")
+    response = @rest.get("http://rest-test.iron.io/code/503?switch_after=2&switch_to=200")
     p response
     p response.code
     assert response.tries == 3
@@ -159,7 +158,7 @@ class TestRest < TestBase
   end
 
   def test_form_post
-    r = @rest.post("http://google.com/search", :params=>{q: "Rick Astley"})
+    r = @rest.post("http://google.com/search", :params=>{:q => "Rick Astley"})
     p r
   end
 

data/test/tmp.rb

@@ -1,7 +1,6 @@
-gem 'test-unit'
 require 'test/unit'
 require 'yaml'
-require_relative 'test_base'
+require 'test_base'
 
 class TestTemp < TestBase
   def setup
@@ -11,7 +10,7 @@ class TestTemp < TestBase
 
 
   def test_form_post
-    r = @rest.post("http://google.com/search", :params=>{q: "Rick Astley"})
+    r = @rest.post("http://google.com/search", :params=>{:q => "Rick Astley"})
     p r
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: quicky
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: