rest 0.0.1 → 0.0.2

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
 :minor: 0
-:patch: 1
+:patch: 2
 :build: 

data/lib/rest/client.rb

@@ -5,6 +5,20 @@ require 'logger'
 # The purpose of this is so that users who can't install binaries easily (like windoze users) can have fallbacks that work
 
 module Rest
+
+  class ClientError < StandardError
+
+  end
+
+
+  class TimeoutError < ClientError
+    def initialize(msg=nil)
+      msg ||= "HTTP Request Timed out."
+      super(msg)
+    end
+  end
+
+
   def self.gem=(g)
     @gem = g
   end
@@ -16,115 +30,48 @@ module Rest
   begin
     require 'typhoeus'
     Rest.gem = :typhoeus
+    require_relative 'wrappers/typhoeus_wrapper'
   rescue LoadError => ex
     puts "Could not load typhoeus. #{ex.class.name}: #{ex.message}. Falling back to rest-client. Please install 'typhoeus' gem for best performance."
     require 'rest_client'
     Rest.gem = :rest_client
+    require_relative 'wrappers/typhoeus_wrapper'
   end
 
-  class RestClientResponseWrapper
-    def initialize(response)
-      @response = response
-    end
-
-    def code
-      @response.code
-    end
-
-    def body
-      @response.body
-    end
-
-  end
-
-  class ClientError < StandardError
-
-  end
-
-  class RestClientExceptionWrapper < ClientError
-    def initialize(ex)
-      super(ex.message)
-      @ex = ex
-    end
-  end
-
-  class TimeoutError < ClientError
-    def initialize(msg=nil)
-      msg ||= "HTTP Request Timed out."
-      super(msg)
-    end
-  end
-
-  class TyphoeusTimeoutError < TimeoutError
-    def initialize(response)
-      msg ||= "HTTP Request Timed out. Curl code: #{response.curl_return_code}. Curl error msg: #{response.curl_error_message}."
-      super(msg)
-    end
-  end
 
   class Client
 
+    # options:
+    # - :gem => specify gem explicitly
+    #
     def initialize(options={})
       @logger = Logger.new(STDOUT)
       @logger.level=Logger::INFO
 
-    end
-
-    def default_typhoeus_options
-      req_hash = {}
-      req_hash[:connect_timeout] = 5000
-      req_hash[:timeout] ||= 10000
-      req_hash[:follow_location] = true
-      req_hash[:max_redirects] = 2
-      req_hash
-    end
+      Rest.gem = options[:gem] if options[:gem]
 
-    def get(url, req_hash={})
       if Rest.gem == :typhoeus
-        req_hash = default_typhoeus_options.merge(req_hash)
-
-        # puts "REQ_HASH=" + req_hash.inspect
-        response = Typhoeus::Request.get(url, req_hash)
-        #p response
-        if response.timed_out?
-          raise TyphoeusTimeoutError.new(response)
-        end
+        @wrapper = Rest::Wrappers::TyphoeusWrapper.new
       else
-        begin
-          headers = req_hash[:headers] || {}
-          r2 = RestClient.get(url, req_hash.merge(headers))
-          response = RestClientResponseWrapper.new(r2)
-            # todo: make generic exception
-        rescue RestClient::Exception => ex
-          raise RestClientExceptionWrapper.new(ex)
-        end
+        @wrapper = Rest::Wrappers::RestClientWrapper.new
       end
-      response
+
     end
 
+
+    def get(url, req_hash={})
+      @wrapper.get(url, req_hash)
+    end
+
+    # req_hash options:
+    # - :body => post body
+    #
     def post(url, req_hash={})
-      if Rest.gem == :typhoeus
-        # todo: should change this timeout to longer if it's for posting file
-        req_hash[:connect_timeout] = 5000
-        req_hash[:timeout] ||= 10000
-        # puts "REQ_HASH=" + req_hash.inspect
-        response = Typhoeus::Request.post(url, req_hash)
-        #p response
-        if response.timed_out?
-          raise TyphoeusTimeoutError.new(response)
-        end
-      else
-        begin
-          headers = req_hash[:headers] || {}
-          r2 = RestClient.post(url, req_hash[:body], headers)
-          response = RestClientResponseWrapper.new(r2)
-            # todo: make generic exception
-        rescue RestClient::Exception => ex
-          raise RestClientExceptionWrapper.new(ex)
-        end
-      end
-      response
+      @wrapper.post(url, req_hash)
     end
 
+    def delete(url, req_hash={})
+      @wrapper.delete(url, req_hash)
+    end
   end
 end

data/lib/rest/wrappers/rest_client_wrapper.rb

@@ -0,0 +1,75 @@
+require 'rest_client'
+
+module Rest
+
+  module Wrappers
+    class RestClientExceptionWrapper < ClientError
+      def initialize(ex)
+        super(ex.message)
+        @ex = ex
+      end
+    end
+
+    class RestClientResponseWrapper
+      def initialize(response)
+        @response = response
+      end
+
+      def code
+        @response.code
+      end
+
+      def body
+        @response.body
+      end
+
+    end
+
+    class RestClientWrapper
+
+      def get(url, req_hash={})
+        response = nil
+        begin
+          req_hash[:method] = :get
+          req_hash[:url] = url
+          r2 = RestClient::Request.execute(req_hash)
+          response = RestClientResponseWrapper.new(r2)
+        rescue RestClient::Exception => ex
+          raise RestClientExceptionWrapper.new(ex)
+        end
+        response
+      end
+
+      def post(url, req_hash={})
+        response = nil
+        begin
+          req_hash[:method] = :post
+          req_hash[:url] = url
+          req_hash[:payload] = req_hash[:body] if req_hash[:body]
+          r2 = RestClient::Request.execute(req_hash)
+          response = RestClientResponseWrapper.new(r2)
+        rescue RestClient::Exception => ex
+          raise RestClientExceptionWrapper.new(ex)
+        end
+        response
+      end
+
+      def delete(url, req_hash={})
+        response = nil
+        begin
+          req_hash[:method] = :delete
+          req_hash[:url] = url
+          req_hash[:payload] = req_hash[:body] if req_hash[:body]
+          r2 = RestClient::Request.execute(req_hash)
+          response = RestClientResponseWrapper.new(r2)
+            # todo: make generic exception
+        rescue RestClient::Exception => ex
+          raise RestClientExceptionWrapper.new(ex)
+        end
+        response
+      end
+    end
+
+  end
+
+end

data/lib/rest/wrappers/typhoeus_wrapper.rb

@@ -0,0 +1,62 @@
+require 'typhoeus'
+
+module Rest
+
+  module Wrappers
+
+    class TyphoeusTimeoutError < Rest::TimeoutError
+      def initialize(response)
+        msg ||= "HTTP Request Timed out. Curl code: #{response.curl_return_code}. Curl error msg: #{response.curl_error_message}."
+        super(msg)
+      end
+    end
+
+    class TyphoeusWrapper
+
+      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[:timeout] = 10000
+        req_hash[:follow_location] = true
+        req_hash[:max_redirects] = 2
+        req_hash
+      end
+
+      def get(url, req_hash={})
+        req_hash = default_typhoeus_options.merge(req_hash)
+        # puts "REQ_HASH=" + req_hash.inspect
+        response = Typhoeus::Request.get(url, req_hash)
+        #p response
+        if response.timed_out?
+          raise TyphoeusTimeoutError.new(response)
+        end
+
+        response
+      end
+
+      def post(url, req_hash={})
+        req_hash = default_typhoeus_options.merge(req_hash)
+        # puts "REQ_HASH=" + req_hash.inspect
+        response = Typhoeus::Request.post(url, req_hash)
+        #p response
+        if response.timed_out?
+          raise TyphoeusTimeoutError.new(response)
+        end
+        response
+      end
+
+      def delete(url, req_hash={})
+        req_hash = default_typhoeus_options.merge(req_hash)
+        response = Typhoeus::Request.delete(url, req_hash)
+        if response.timed_out?
+          raise TyphoeusTimeoutError.new(response)
+        end
+        response
+      end
+
+    end
+
+  end
+
+end

data/rest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rest"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
-  s.date = "2011-12-16"
+  s.date = "2011-12-18"
   s.description = "Rest client wrapper that chooses best installed client."
   s.email = "travis@iron.io"
   s.extra_rdoc_files = [
@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
     "VERSION.yml",
     "lib/rest.rb",
     "lib/rest/client.rb",
+    "lib/rest/wrappers/rest_client_wrapper.rb",
+    "lib/rest/wrappers/typhoeus_wrapper.rb",
     "rest.gemspec",
     "test/test_base.rb",
     "test/test_rest.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000 Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &19547060 !ruby/object:Gem::Requirement
+  requirement: &17129060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19547060
+  version_requirements: *17129060
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &19546560 !ruby/object:Gem::Requirement
+  requirement: &17128580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19546560
+  version_requirements: *17128580
 description: Rest client wrapper that chooses best installed client.
 email: travis@iron.io
 executables: []
@@ -45,6 +45,8 @@ files:
 - VERSION.yml
 - lib/rest.rb
 - lib/rest/client.rb
+- lib/rest/wrappers/rest_client_wrapper.rb
+- lib/rest/wrappers/typhoeus_wrapper.rb
 - rest.gemspec
 - test/test_base.rb
 - test/test_rest.rb