hyperresource 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd19a34f267866e9a5086a1c9100cbb63f958ab5
-  data.tar.gz: 40856af8a0367f37c64e9e70996ef74f79b5424f
+  metadata.gz: 0351125c7599e00df4a647dc4eb96b7633a0f76a
+  data.tar.gz: 3c0e3dc94c9f4099bc7643d493bf5faeda0b3f38
 SHA512:
-  metadata.gz: 01761608b3cddd8794bff9c8e58a918a4561c71cc39fe6f0946bd9cfa1a79cc2c54b1b828b57128c7a62f6382265301d567821aec14ea815546b4ba6edaa9ddd
-  data.tar.gz: 356516ad4974076570bb2031e46423a7d397949c80f2476140cdfce6c20a22a7f061ea849ff250b8b1afde649ad6c7f00ece3ea2e8d3714808c1956d3d5496be
+  metadata.gz: c9ee522c76596b6f0ef95f993e0e9897f5cea5d8348d093e2a9cdfdf8387e1bcde49a3b09d26a88909642511e2cd9b2110b05449480dc69748e97b071560f7c5
+  data.tar.gz: 416e7d9cbdbf294bbcb47d4b8464674b47dd1f2844d9bb474eb656b27fe074b629d36bca382d9f9b8d452d4e777f172aadbdbfb62ad2a0cbe4441b4445109ccb

data/lib/hyper_resource.rb

@@ -44,6 +44,10 @@ public
   ##
   ## [headers] Headers to send along with requests for this resource (as
   ##           well as its eventual child resources, if any).
+  ##
+  ## [faraday_options] Configuration passed to +Faraday::Connection.initialize+,
+  ##                   such as +{request: {timeout: 30}}+.
+  ##
   def initialize(opts={})
     return init_from_resource(opts) if opts.kind_of?(HyperResource)
 
@@ -53,6 +57,8 @@ public
     self.namespace  = opts[:namespace] || self.class.namespace
     self.headers    = DEFAULT_HEADERS.merge(self.class.headers || {}).
                                       merge(opts[:headers]     || {})
+    self.faraday_options = opts[:faraday_options] ||
+                               self.class.faraday_options || {}
 
     ## There's a little acrobatics in getting Attributes, Links, and Objects
     ## into the correct subclass.
@@ -135,7 +141,7 @@ public
 
   #### Magic
 
-  ## method_missing will load this resource if not yet loaded, then 
+  ## method_missing will load this resource if not yet loaded, then
   ## attempt to delegate to +attributes+, then +objects+, then +links+.
   ## Override with care.
   def method_missing(method, *args)
@@ -188,11 +194,12 @@ public
 
   ## Return a new HyperResource based on this object and a given href.
   def _hr_new_from_link(href) # @private
-    self.class.new(:root    => self.root,
-                   :auth    => self.auth,
-                   :headers => self.headers,
-                   :namespace => self.namespace,
-                   :href    => href)
+    self.class.new(:root            => self.root,
+                   :auth            => self.auth,
+                   :headers         => self.headers,
+                   :namespace       => self.namespace,
+                   :faraday_options => self.faraday_options,
+                   :href            => href)
   end
 
 

data/lib/hyper_resource/modules/http.rb

@@ -70,7 +70,7 @@ class HyperResource
         key = "faraday_connection_#{url}"
         return Thread.current[key] if Thread.current[key]
 
-        fc = Faraday.new(:url => url)
+        fc = Faraday.new(self.faraday_options.merge(:url => url))
         fc.headers.merge!('User-Agent' => "HyperResource #{HyperResource::VERSION}")
         fc.headers.merge!(self.headers || {})
         if ba=self.auth[:basic]

data/lib/hyper_resource/modules/internal_attributes.rb

@@ -25,7 +25,8 @@ module HyperResource::Modules
           :auth,             ## e.g. {:basic => ['username', 'password']}
           :headers,          ## e.g. {'Accept' => 'application/vnd.example+json'}
           :namespace,        ## e.g. 'ExampleAPI', or the class ExampleAPI itself
-          :adapter           ## subclass of HR::Adapter
+          :adapter,          ## subclass of HR::Adapter
+          :faraday_options   ## e.g. {:request => {:timeout => 30}}
         ]
       end
 
@@ -36,6 +37,7 @@ module HyperResource::Modules
           :headers,
           :namespace,
           :adapter,
+          :faraday_options,
 
           :request,
           :response,

data/lib/hyper_resource/version.rb

@@ -1,4 +1,4 @@
 class HyperResource
-  VERSION = '0.2.1'
-  VERSION_DATE = '2013-11-10'
+  VERSION = '0.2.2'
+  VERSION_DATE = '2014-02-21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperresource
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Pete Gamache
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri_template
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Extensible hypermedia client for Ruby