rest 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest (1.0.0)
+    rest (1.1.0)
       rest-client (>= 0.3.0)
 
 GEM
@@ -10,6 +10,7 @@ GEM
     ffi (1.0.11)
     mime-types (1.18)
     net-http-persistent (2.7)
+    quicky (0.0.1)
     rake (0.9.2.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -24,6 +25,7 @@ PLATFORMS
 
 DEPENDENCIES
   net-http-persistent
+  quicky
   rake
   rest!
   test-unit

data/README.md

@@ -28,7 +28,7 @@ Supported http libraries are:
 Then use it:
 
 GET
-=========
+------
 
     @rest.get(url, options...)
 
@@ -38,7 +38,7 @@ options:
 - :headers => headers
 
 POST
-======
+-----
 
     @rest.post(url, options...)
 
@@ -48,7 +48,7 @@ options:
 - :headers => headers
 
 PUT
-======
+------
 
     @rest.put(url, options...)
 
@@ -58,9 +58,15 @@ options:
 - :headers => headers
 
 DELETE
-======
+-------- 
 
     @rest.delete(url, options...)
 
+Responses
+=========
+
+The response object you get back will always be consistent and will have the following functions:
 
+    response.code
+    response.body
 

data/lib/rest/client.rb

@@ -19,9 +19,11 @@ module Rest
     end
   end
 
-  def self.puts(s)
-    Kernel.puts("rest gem: #{s}")
-  end
+  require_relative 'wrappers/base_wrapper'
+
+  #def self.puts(s)
+  #  Kernel.puts("rest gem: #{s}")
+  #end
 
   class Client
 
@@ -43,15 +45,15 @@ module Rest
       if @gem == :typhoeus
         require_relative 'wrappers/typhoeus_wrapper'
         @wrapper = Rest::Wrappers::TyphoeusWrapper.new
-        Rest.puts "Using typhoeus gem."
+        @logger.debug "Using typhoeus gem."
       elsif @gem == :net_http_persistent
         require_relative 'wrappers/net_http_persistent_wrapper'
         @wrapper = Rest::Wrappers::NetHttpPersistentWrapper.new(self)
-        Rest.puts "Using net-http-persistent gem."
+        @logger.debug "Using net-http-persistent gem."
       else
-        require_relative 'wrappers/rest_client_wrapper'
         @wrapper = Rest::Wrappers::RestClientWrapper.new
-        Rest.puts "Using rest-client gem. Please install 'typhoeus' or net-http-persistent gem for best performance."
+        hint = (options[:gem] ? "" : " Please install 'typhoeus' or net-http-persistent gem for best performance.")
+        @logger.debug "Using rest-client gem.#{hint}"
       end
     end
 
@@ -65,7 +67,6 @@ module Rest
           # try net-http-persistent
           require 'net/http/persistent'
           @gem = :net_http_persistent
-
         rescue LoadError => ex
          require 'rest_client'
           @gem = :rest_client
@@ -134,6 +135,14 @@ module Rest
       return res
     end
 
+    def post_file(url, req_hash={})
+      res = nil
+      perform_op do
+        res = @wrapper.post_file(url, req_hash)
+      end
+      return res
+    end
+
     def close
       @wrapper.close
     end

data/lib/rest/version.rb

@@ -1,3 +1,3 @@
 module Rest
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/rest/wrappers/base_wrapper.rb

@@ -1,7 +1,32 @@
 class BaseWrapper
 
+  def post_file(url, req_hash={})
+    response = nil
+    begin
+      if req_hash[:body]
+        req_hash = req_hash.merge(req_hash[:body])
+        req_hash.delete(:body)
+      end
+
+      headers = {}
+      if req_hash[:headers]
+        headers = req_hash[:headers]
+        req_hash.delete(:headers)
+      end
+
+      r2 = RestClient.post(url, req_hash, headers)
+      response = Rest::Wrappers::RestClientResponseWrapper.new(r2)
+    rescue RestClient::Exception => ex
+      raise Rest::Wrappers::RestClientExceptionWrapper.new(ex)
+    end
+    response
+  end
+
   # if wrapper has a close/shutdown, override this
   def close
 
   end
-end
+end
+
+# we need it for post_file, ok as gem already depends on it
+require_relative 'rest_client_wrapper'

data/lib/rest/wrappers/net_http_persistent_wrapper.rb

@@ -1,5 +1,4 @@
 require 'net/http/persistent'
-require_relative 'base_wrapper'
 
 module Rest
 
@@ -155,4 +154,4 @@ module Rest
 
   end
 
-end
+end

data/lib/rest/wrappers/rest_client_wrapper.rb

@@ -25,7 +25,7 @@ module Rest
 
     end
 
-    class RestClientWrapper
+    class RestClientWrapper < BaseWrapper
 
       def default_headers
         {}
@@ -97,4 +97,4 @@ module Rest
 
   end
 
-end
+end

data/lib/rest/wrappers/typhoeus_wrapper.rb

@@ -11,7 +11,7 @@ module Rest
       end
     end
 
-    class TyphoeusWrapper
+    class TyphoeusWrapper < BaseWrapper
 
       def default_typhoeus_options
         req_hash = {}
@@ -78,4 +78,4 @@ module Rest
 
   end
 
-end
+end

data/rest.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |gem|
   gem.required_rubygems_version = ">= 1.3.6"
   gem.required_ruby_version = Gem::Requirement.new(">= 1.9")
   gem.add_runtime_dependency "rest-client", ">= 0.3.0"
+  gem.add_runtime_dependency "net-http-persistent"
 
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "uber_config"
   gem.add_development_dependency "typhoeus"
-  gem.add_development_dependency "net-http-persistent"
+  gem.add_development_dependency "quicky"
 
 end
 

data/test/test_performance.rb

@@ -1,8 +1,8 @@
-# Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
-
 gem 'test-unit'
 require 'test/unit'
 require 'yaml'
+require 'quicky'
+
 require_relative 'test_base'
 
 class TestTests < TestBase
@@ -13,30 +13,27 @@ class TestTests < TestBase
 
   def test_get_performance
 
-    times = 100
+    times = 10
 
-    collector = []
+    quicky = Quicky::Timer.new
 
-    collector << run_perf(times, :typhoeus)
-    collector << run_perf(times, :rest_client)
-    collector << run_perf(times, :net_http_persistent)
+    to_run = [:typhoeus, :rest_client, :net_http_persistent]
+    to_run.each do |gem|
+      run_perf(quicky, times, gem)
+    end
 
-    collector.each do |c|
-      p c
+    quicky.results.each_pair do |k, v|
+      puts "#{k}: #{v.duration}"
     end
 
   end
 
-  def run_perf(times, gem)
+  def run_perf(quicky, times, gem)
     puts "Starting #{gem} test..."
-    t = Time.now
     client = Rest::Client.new(:gem => gem)
-    times.times do |i|
+    quicky.loop(gem, times) do
       client.get("http://requestb.in/ydyd4nyd")
     end
-    duration = Time.now.to_f - t.to_f
-    puts "#{times} posts took #{duration}"
-    {:gem=>gem, :duration=>duration}
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: quicky
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: