hyperresource 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 524a169b824f7c61e5aa5c05109415206095ad99
-  data.tar.gz: 70538dc63539ed231dfb71d5cedaccedaf081bda
+  metadata.gz: af24d48bc701443215065bd5c689530014860cfd
+  data.tar.gz: 47b4d6f60ae59bf154ca9395dc42404f1aea0124
 SHA512:
-  metadata.gz: 875712e54fc2b58369277dc07d4b2418b8726aeef5dac678584ba0cbc5d617ab6a626d57365381ce3dd3ec3924de0b714060a6f6472e61396258c4cb40439fd8
-  data.tar.gz: 97a73477ec2d1f378b0ae5904f0c09228dd581b7f8d21289e07311c012f3b8ee2ee2f3fef08a04d15e7ba9d2af4b09ab1d19b5f489e1c7e17912dc51d6abb124
+  metadata.gz: 599e643a3ff95f29a9616b0465228a8e233748c91abc1234ceb67e467f3418f82ae5a003ba63f6805807af73b528e0e5142bfacea5f9f298fb4b799f6832ec1d
+  data.tar.gz: cb51756aef3602776930786acf55889163ffd6e7a0cc03ff017822909b6a21617bc486673a39beb2b6221619dff80ac250a9efbf6070ac97a0e3476cfca67847

data/lib/hyper_resource/link.rb

@@ -54,6 +54,7 @@ class HyperResource
       self.templated = !!link_spec['templated']
       self.params = link_spec['params'] || {}
       self.default_method = link_spec['method'] || 'get'
+      @headers = link_spec['headers'] || {}
     end
 
     ## Returns this link's href, applying any URI template params.
@@ -85,7 +86,28 @@ class HyperResource
                      'name' => self.name,
                      'templated' => self.templated,
                      'params' => self.params.merge(params),
-                     'method' => self.default_method)
+                     'method' => self.default_method,
+                     'headers' => @headers)
+    end
+
+    ## When called with a hash, returns a new scope with the given headers;
+    ## that is, returns a copy of itself with the given headers applied.
+    ## These headers will be merged with `resource.headers` at request time.
+    ##
+    ## When called with no arguments, returns the headers for this link.
+    def headers(*args)
+      if args.count == 0
+        @headers
+      else
+        self.class.new(self.resource,
+                       'href' => self.base_href,
+                       'name' => self.name,
+                       'templated' => self.templated,
+                       'params' => self.params,
+                       'method' => self.default_method,
+                       'headers' => @headers.merge(args[0]))
+
+      end
     end
 
     ## Unrecognized methods invoke an implicit load of the resource pointed

data/lib/hyper_resource/modules/http.rb

@@ -22,6 +22,12 @@ class HyperResource
     to_link.get
   end
 
+  ## Performs a GET request to this resource's URL, and returns a
+  ## `Faraday::Response` object representing the response.
+  def get_response
+    to_link.get_response
+  end
+
   ## Performs a POST request to this resource's URL, sending all of
   ## `attributes` as a request body unless an `attrs` Hash is given.
   ## Returns a new resource representing the response.
@@ -29,6 +35,13 @@ class HyperResource
     to_link.post(attrs)
   end
 
+  ## Performs a POST request to this resource's URL, sending all of
+  ## `attributes` as a request body unless an `attrs` Hash is given.
+  ## Returns a `Faraday::Response` object representing the response.
+  def post_response(attrs=nil)
+    to_link.post_response(attrs)
+  end
+
   ## Performs a PUT request to this resource's URL, sending all of
   ## `attributes` as a request body unless an `attrs` Hash is given.
   ## Returns a new resource representing the response.
@@ -36,6 +49,13 @@ class HyperResource
     to_link.put(*args)
   end
 
+  ## Performs a PUT request to this resource's URL, sending all of
+  ## `attributes` as a request body unless an `attrs` Hash is given.
+  ## Returns a `Faraday::Response` object representing the response.
+  def put_response(*args)
+    to_link.put_response(*args)
+  end
+
   ## Performs a PATCH request to this resource's URL, sending
   ## `attributes.changed_attributes` as a request body
   ## unless an `attrs` Hash is given.  Returns a new resource
@@ -44,10 +64,24 @@ class HyperResource
     self.to_link.patch(*args)
   end
 
+  ## Performs a PATCH request to this resource's URL, sending
+  ## `attributes.changed_attributes` as a request body
+  ## unless an `attrs` Hash is given.
+  ## Returns a `Faraday::Response` object representing the response.
+  def patch_response(*args)
+    self.to_link.patch_response(*args)
+  end
+
   ## Performs a DELETE request to this resource's URL.  Returns a new
   ## resource representing the response.
-  def delete(*args)
-    to_link.delete(*args)
+  def delete
+    to_link.delete
+  end
+
+  ## Performs a DELETE request to this resource's URL.
+  ## Returns a `Faraday::Response` object representing the response.
+  def delete_response
+    to_link.delete_response
   end
 
   ## Creates a Link representing this resource.  Used for HTTP delegation.
@@ -85,6 +119,13 @@ class HyperResource
       ## resource will be blessed into its "proper" class, if
       ## +self.class.namespace != nil+.
       def get
+        new_resource_from_response(self.get_response)
+      end
+
+      ## Performs a GET request on the given link, and returns the
+      ## response as a `Faraday::Response` object.
+      ## Does not parse the response as a `HyperResource` object.
+      def get_response
         ## Adding default_attributes to URL query params is not automatic
         url = FuzzyURL.new(self.url || '')
         query_str = url[:query] || ''
@@ -94,8 +135,7 @@ class HyperResource
         if attrs_str != ''
           url = FuzzyURL.new(url.to_hash.merge(:query => attrs_str))
         end
-        response = faraday_connection.get(url.to_s)
-        new_resource_from_response(response)
+        faraday_connection.get(url.to_s)
       end
 
       ## By default, calls +post+ with the given arguments. Override to
@@ -109,15 +149,22 @@ class HyperResource
       ## POSTs the given attributes to this resource's href, and returns
       ## the response resource.
       def post(attrs=nil)
+        new_resource_from_response(post_response(attrs))
+      end
+
+      ## POSTs the given attributes to this resource's href, and returns the
+      ## response as a `Faraday::Response` object.
+      ## Does not parse the response as a `HyperResource` object.
+      def post_response(attrs=nil)
         attrs ||= self.resource.attributes
         attrs = (self.resource.default_attributes || {}).merge(attrs)
         response = faraday_connection.post do |req|
           req.body = self.resource.adapter.serialize(attrs)
         end
-        new_resource_from_response(response)
+        response
       end
 
-      ## By default, calls +puwt+ with the given arguments.  Override to
+      ## By default, calls +put+ with the given arguments.  Override to
       ## change this behavior.
       def update(*args)
         _hr_deprecate('HyperResource::Link#update is deprecated. Please use '+
@@ -129,30 +176,50 @@ class HyperResource
       ## the response resource.  If attributes are given, +put+ uses those
       ## instead.
       def put(attrs=nil)
+        new_resource_from_response(put_response(attrs))
+      end
+
+      ## PUTs this resource's attributes to this resource's href, and returns
+      ## the response as a `Faraday::Response` object.
+      ## Does not parse the response as a `HyperResource` object.
+      def put_response(attrs=nil)
         attrs ||= self.resource.attributes
         attrs = (self.resource.default_attributes || {}).merge(attrs)
         response = faraday_connection.put do |req|
           req.body = self.resource.adapter.serialize(attrs)
         end
-        new_resource_from_response(response)
+        response
       end
 
       ## PATCHes this resource's changed attributes to this resource's href,
       ## and returns the response resource.  If attributes are given, +patch+
       ## uses those instead.
       def patch(attrs=nil)
+        new_resource_from_response(patch_response(attrs))
+      end
+
+      ## PATCHes this resource's changed attributes to this resource's href,
+      ## and returns the response as a `Faraday::Response` object.
+      ## Does not parse the response as a `HyperResource` object.
+      def patch_response(attrs=nil)
         attrs ||= self.resource.attributes.changed_attributes
         attrs = (self.resource.default_attributes || {}).merge(attrs)
         response = faraday_connection.patch do |req|
           req.body = self.resource.adapter.serialize(attrs)
         end
-        new_resource_from_response(response)
+        response
       end
 
       ## DELETEs this resource's href, and returns the response resource.
       def delete
-        response = faraday_connection.delete
-        new_resource_from_response(response)
+        new_resource_from_response(delete_response)
+      end
+
+      ## DELETEs this resource's href, and returns the response as a
+      ## `Faraday::Response` object.
+      ## Does not parse the response as a `HyperResource` object.
+      def delete_response
+        faraday_connection.delete
       end
 
     private
@@ -162,7 +229,7 @@ class HyperResource
       def faraday_connection(url=nil)
         rsrc = self.resource
         url ||= self.url
-        headers = rsrc.headers_for_url(url) || {}
+        headers = (rsrc.headers_for_url(url) || {}).merge(self.headers)
         auth = rsrc.auth_for_url(url) || {}
 
         key = ::Digest::MD5.hexdigest({

data/lib/hyper_resource/version.rb

@@ -1,5 +1,5 @@
 class HyperResource
-  VERSION = '0.9.0'
-  VERSION_DATE = '2014-05-29'
+  VERSION = '0.9.1'
+  VERSION_DATE = '2015-03-25'
 end
 

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: hyperresource
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Pete Gamache
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-29 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri_template
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -70,56 +70,56 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.4
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
 description: |2
@@ -158,19 +158,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extensible hypermedia client for Ruby
 test_files: []
-has_rdoc: true