grifter 0.0.12 → 0.0.13

data/Gemfile.lock

@@ -1,33 +1,65 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.5)
     awesome_print (1.1.0)
+    builder (3.2.2)
     coderay (1.0.9)
     diff-lcs (1.2.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     git (1.2.5)
-    jeweler (1.8.4)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (2.0.5)
+    highline (1.6.19)
+    httpauth (0.2.0)
+    jeweler (1.8.6)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
-    method_source (0.8.1)
-    pry (0.9.12.1)
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    method_source (0.8.2)
+    multi_json (1.7.8)
+    multi_xml (0.5.4)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.0.4)
+    rack (1.5.2)
+    rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    slop (3.4.4)
+    rspec-mocks (2.14.2)
+    slop (3.4.6)
 
 PLATFORMS
   ruby

data/grifter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "grifter"
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert Schultheis"]
-  s.date = "2013-07-09"
+  s.date = "2013-08-05"
   s.description = "convention based approach to interfacing with an HTTP JSON API."
   s.email = "rob@knewton.com"
   s.executables = ["grift"]
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/knewton/grifter"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Make calls to HTTP JSON APIs with ease and confidence"
 
   if s.respond_to? :specification_version then

data/lib/grifter/http_service.rb

@@ -19,6 +19,8 @@ class Grifter
       @http = Net::HTTP.new(@config[:hostname], @config[:port])
       @http.use_ssl = @config[:ssl]
       @http.verify_mode = OpenSSL::SSL::VERIFY_NONE if @config[:ignore_ssl_cert]
+      @http.read_timeout = @config[:timeout] if @config[:timeout]
+      p @config
 
       @headers = {
         'accept' => 'application/json',
@@ -42,12 +44,29 @@ class Grifter
     attr_reader :last_request, :last_response
 
     RequestLogSeperator = '-'*40
-    def do_request req
+
+    # do_request performs the actual request, and does associated logging
+    # options can include:
+    # - :timeout, which specifies num secs the request should timeout in
+    #   (this turns out to be kind of annoying to implement)
+    def do_request req, options={}
       Log.debug RequestLogSeperator
       Log.debug "#{req.class} #{req.path}"
       Log.debug "HEADERS: #{req.to_hash}"
       Log.debug "BODY:\n#{req.body}" if req.request_body_permitted?
+
+      if options.has_key? :timeout
+        cur_timeout = @http.read_timeout
+        Log.debug "Overriding timeout to: #{options[:timeout]}"
+        @http.read_timeout = options[:timeout]
+      end
+
       response = @http.request(req)
+
+      if cur_timeout
+        @http.read_timeout = cur_timeout
+      end
+
       Log.debug "RESPONSE CODE: #{response.code}"
       Log.debug "RESPONSE HEADERS: #{response.to_hash}"
       Log.debug "RESPONSE BODY:\n#{jsonify response.body}\n"
@@ -86,46 +105,46 @@ class Grifter
 
     def get path, options={}
       req = Net::HTTP::Get.new(*req_args(path, options))
-      do_request req
+      do_request req, options
     end
 
     def head path, options={}
       req = Net::HTTP::Head.new(*req_args(path, options))
-      do_request req
+      do_request req, options
     end
 
     def options path, options={}
       req = Net::HTTP::Options.new(*req_args(path, options))
-      do_request req
+      do_request req, options
     end
 
     def delete path, options={}
       req = Net::HTTP::Delete.new(*req_args(path, options))
-      do_request req
+      do_request req, options
     end
 
     def post path, obj, options={}
       req = Net::HTTP::Post.new(*req_args(path, options))
       req.body = jsonify(obj)
-      do_request req
+      do_request req, options
     end
 
     def put path, obj, options={}
       req = Net::HTTP::Put.new(*req_args(path, options))
       req.body = jsonify(obj)
-      do_request req
+      do_request req, options
     end
 
     def patch path, obj, options={}
       req = Net::HTTP::Patch.new(*req_args(path, options))
       req.body = jsonify(obj)
-      do_request req
+      do_request req, options
     end
 
     def post_form path, params, options={}
       request_obj = Net::HTTP::Post.new(*req_args(path, options))
       request_obj.set_form_data params
-      do_request request_obj
+      do_request request_obj, options
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grifter
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1820127751693407514
+      hash: 664082340422287715
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Make calls to HTTP JSON APIs with ease and confidence