flexirest 1.2.10 → 1.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c564fe224c8e375c4b642b3b9f8a168d5d63af41
-  data.tar.gz: bc07fc942ef8daeb435acac6321e58fa7b8f4645
+  metadata.gz: f0895842191e4a5b1b97906dcef2d4b25ad6599c
+  data.tar.gz: 1002378e63e287a23bf8b6b521056d70e4f6bfeb
 SHA512:
-  metadata.gz: b4a93604ff42353ccc6c6776d5703e0f9250251eccb7d39c3237ecade09b5a145e7edf798eaf4a7208f1395e6d9ffd1fe1a481934ca54919ce924a559bbbdfc9
-  data.tar.gz: e2cb5b1154e0758db0efa52d6850a78bfd84859aa7371124f680a286e8b1c97e8dcbd9548f3b8359db87d819b3bcc7b35d3e3fe56de02a2af5fb48edbaa9cba1
+  metadata.gz: e9971f5675b3c3f8dd1ce0064030b3ed535978532e626be1dfc44f48d0af0f27c813ecaaee5d01427cc3604a5de2321a124ab371bbbd1cc5538089d32c190832
+  data.tar.gz: d6b72acf376e1bad1d6249e7d1729fac6c997e4a2fe29a63ec60c1c30e16028db4b6a937187597da3e3700f108c119860bd103fdc0bd847de2adbaddb693a5ea

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.2.11
+
+Bugfixes:
+
+- Fixes the usage of :timeout on a per-request basis
+
 ## 1.2.10
 
 Bugfixes:

data/lib/flexirest/request.rb

@@ -328,6 +328,9 @@ module Flexirest
           :api_auth_secret_key => api_auth_secret_key
         }
       end
+      if @method[:options][:timeout]
+        request_options[:timeout] = @method[:options][:timeout]
+      end
 
       case http_method
       when :get

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.2.10"
+  VERSION = "1.2.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.11
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-02 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler