desk 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf6cdb20333938ba846729b567cb0a18297354f6
-  data.tar.gz: 8a2b4d82b8e86a7fde28b53d6d9b56540c8469ba
+  metadata.gz: 42e1712d947838feea34f602ca87d2f773dba88c
+  data.tar.gz: 96e5918ca38eb81dd57f23ead92a21f590d99921
 SHA512:
-  metadata.gz: 4df4acd8e57b70fccedbab77ff9f94a4e087c0775bfd88b3410bbd1791561365c1ca58fc7cab94d0f657cd841fcbaec3d71b50821680bd27d4023a7c43c24cc9
-  data.tar.gz: f55c90b816664f3d557a299e05e6934ce3b7b2a663a543b0f1593979889feb73a986c849937cac60fc7456e143c9f9af4df2f8814dc20bd4081be7583cf258b0
+  metadata.gz: 6cf9add4e495307e8d2e69fad7dfd8cd83ad074d9ca4cc47f4bd1abc975e2d81e9792f47b7b1d6986193110126e1ffafd6d1c584f75b066d9c259ac25f5acdfd
+  data.tar.gz: f690dd4a4c8ea7ecf4e4599db7f7491b47d6f4fe0499474e32830f59758e2be205b1b8b03d7981e6caa9ec15a5f403ba5f9e9170e5a085fd2b131cbdc4488000

data/lib/desk/configuration.rb

@@ -24,6 +24,7 @@ module Desk
       :support_email,
       :use_max_requests,
       :user_agent,
+      :timeout,
       :version].freeze
 
     # An array of valid request/response formats
@@ -92,6 +93,9 @@ module Desk
     # By default, don't set a support email address
     DEFAULT_SUPPORT_EMAIL = nil
 
+    # By default, don't set a default timeout
+    DEFAULT_TIMEOUT = nil
+
     attr_reader :DEFAULT_ADAPTER
     # @private
     attr_accessor *VALID_OPTIONS_KEYS
@@ -239,6 +243,14 @@ module Desk
       Thread.current[:version] = val
     end
 
+    def timeout
+      Thread.current[:timeout] ||= DEFAULT_TIMEOUT
+    end
+
+    def timeout=(val)
+      Thread.current[:timeout] = val
+    end
+
     # Reset all configuration options to defaults
     def reset
       self.adapter            = DEFAULT_ADAPTER
@@ -259,6 +271,7 @@ module Desk
       self.use_max_requests   = DEFAULT_USE_MAX_REQUESTS
       self.user_agent         = DEFAULT_USER_AGENT
       self.version            = DEFAULT_VERSION
+      self.timeout            = DEFAULT_TIMEOUT
       self
     end
   end

data/lib/desk/connection.rb

@@ -15,8 +15,11 @@ module Desk
         :proxy => proxy,
         :ssl => {:verify => false, :version => 'SSLv23'},
         :url => api_endpoint,
+        :request => {},
       }
 
+      options[:request][:timeout] = timeout if timeout
+
       Faraday.new(options) do |builder|
         builder.use Faraday::Request::MultipartWithFile
         if authenticated?

data/lib/desk/version.rb

@@ -1,4 +1,4 @@
 module Desk
   # The version of the gem
-  VERSION = '1.0.9'.freeze unless defined?(::Desk::VERSION)
+  VERSION = '1.0.10'.freeze unless defined?(::Desk::VERSION)
 end

data/spec/desk_spec.rb

@@ -108,6 +108,19 @@ describe Desk do
     end
   end
 
+  describe ".timeout" do
+    it "should return the default timeout" do
+      Desk.timeout.should == Desk::Configuration::DEFAULT_TIMEOUT
+    end
+  end
+
+  describe ".timeout=" do
+    it "should set the timeout" do
+      Desk.timeout = 30
+      Desk.timeout.should == 30
+    end
+  end
+
   describe ".version=" do
     before do
       Desk.version = "v4"
@@ -134,7 +147,7 @@ describe Desk do
       Desk.format.should == 'xml'
     end
   end
-  
+
   describe ".max_requests" do
     it "should return the default max requests" do
       Desk.max_requests.should == Desk::Configuration::DEFAULT_MAX_REQUESTS
@@ -186,30 +199,30 @@ describe Desk do
       end
     end
   end
-  
+
   describe ".counter" do
     before do
       Desk.counter = 0
       stub_get("cases").
         to_return(:body => fixture("cases"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
-    
+
     it "should be 0 in the beginning" do
       Desk.counter.should == 0
     end
-    
+
     it "should count the requests" do
       5.times {
         Desk.cases
       }
       Desk.counter.should == 5
     end
-    
+
     context "max requests enabled" do
       before do
         Desk.use_max_requests = true
       end
-      
+
       it "should only allow 60 requests" do
         expect {
           70.times {
@@ -217,7 +230,7 @@ describe Desk do
           }
         }.to raise_error
       end
-      
+
       it "should only allow defined requests" do
         Desk.max_requests = 50
         expect {
@@ -226,14 +239,14 @@ describe Desk do
           }
         }.to raise_error
       end
-      
+
       def make_request
         Desk.cases
       rescue Desk::TooManyRequests
         sleep(5)
         make_request
       end
-      
+
       xit "should allow more requests after minute has passed" do
         70.times {
           make_request
@@ -242,12 +255,12 @@ describe Desk do
       end
     end
   end
-  
+
   describe ".minute" do
     before do
       Desk.minute = Time.now.min
     end
-    
+
     it "should be the current minute" do
       Desk.minute.should == Time.now.min
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desk
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Chris Warren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri