hyperresource 0.1.9 → 0.1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4befe203aa8c4fc93c4ba6d09c03bcc9d76a2183
-  data.tar.gz: 1deed89d174bd9ac761763a731d69c06b70eb318
+  metadata.gz: 294b14e1ecc640c411926b683c3b47755e00701f
+  data.tar.gz: 3a7ed8ec37100074abba126ec84509b61134d862
 SHA512:
-  metadata.gz: 4122f5fb687c63252bb05724cc8477c4ae64f3f72a2340af09e21d070066165591292ad6756c16c27381eb6aff43c6ea294ae88d482f5e8520fc9c4adb4adfef
-  data.tar.gz: e5170d246d1642ce97b5cdb312d47d1a3af99c462ca16116a146af39d1dd54e95e91313226d79853a4d115cf102d1fa55183d8e2a567cf48ae2f66575ae3fa44
+  metadata.gz: 792029a5bc68c4a83d6699b6142318dd96ede36749ae080e4c5ec797aa4a1543565cf910eca7fd623489897b54a109d479112227395c8b8b778d568944525f3d
+  data.tar.gz: 46d604b2574111678c0a58f937c765e452e99d2d35b0ec07ae62ac184ffd6246dc381ebac2a4f24cd94e8bd7172fdacb14d7678f3bd9f37992dbee03307dff93

data/lib/hyper_resource/adapter/hal_json.rb

@@ -81,13 +81,15 @@ class HyperResource
 
         def apply_attributes(resp, rsrc)
           rsrc.attributes = rsrc.get_response_class::Attributes.new(rsrc)
-          attrs = rsrc.attributes
 
-          (resp.keys - ['_links', '_embedded']).map(&:to_s).each do |attr|
-            attrs[attr] = resp[attr]
+          given_attrs = resp.reject{|k,v| %w(_links _embedded).include?(k)}
+          filtered_attrs = rsrc.incoming_body_filter(given_attrs)
+
+          filtered_attrs.keys.each do |attr|
+            rsrc.attributes[attr] = filtered_attrs[attr]
           end
 
-          attrs.create_methods!
+          rsrc.attributes.create_methods!
         end
 
       end

data/lib/hyper_resource/exceptions.rb

@@ -1,12 +1,16 @@
-class HyperResource::Exception < Exception
-end
+class HyperResource
+  class Exception < ::Exception
+    attr_accessor :response  # response object which led to this exception
+    attr_accessor :cause     # internal exception which led to this exception
 
-class HyperResource::ResponseError < HyperResource::Exception
-end
+    def initialize(message, opts={})
+      self.response = opts[:response]
+      self.cause = opts[:cause]
+      super(message)
+    end
+  end
 
-class HyperResource::ClientError < HyperResource::ResponseError
+  class ResponseError < Exception; end
+  class ClientError   < Exception; end
+  class ServerError   < Exception; end
 end
-
-class HyperResource::ServerError < HyperResource::ResponseError
-end
-

data/lib/hyper_resource/link.rb

@@ -20,7 +20,8 @@ class HyperResource::Link
   ## Returns this link's href, applying any URI template params.
   def href
     if self.templated?
-      URITemplate.new(self.base_href).expand(params)
+      filtered_params = self.parent_resource.outgoing_uri_filter(params)
+      URITemplate.new(self.base_href).expand(filtered_params)
     else
       self.base_href
     end
@@ -29,6 +30,7 @@ class HyperResource::Link
   ## Returns a new scope with the given params; that is, returns a copy of
   ## itself with the given params applied.
   def where(params)
+    params = Hash[ params.map{|(k,v)| [k.to_s, v]} ]
     self.class.new(self.parent_resource,
                    'href' => self.base_href,
                    'name' => self.name,

data/lib/hyper_resource/modules/http.rb

@@ -30,9 +30,18 @@ module HyperResource::Modules::HTTP
 private
 
   def finish_up
-    self.loaded = true
-    self.response_object = self.adapter.deserialize(self.response.body)
+    begin
+      self.response_object = self.adapter.deserialize(self.response.body)
+    rescue Exception => e
+      raise HyperResource::ResponseError.new(
+        "Error when deserializing response body",
+        :response => self.response,
+        :cause => e
+      )
+    end
+
     self.adapter.apply(self.response_object, self)
+    self.loaded = true
 
     status = self.response.status
     if status / 100 == 2
@@ -40,11 +49,14 @@ private
     elsif status / 100 == 3
       ## TODO redirect logic?
     elsif status / 100 == 4
-      raise HyperResource::ClientError, status.to_s
+      raise HyperResource::ClientError.new(status.to_s,
+                                           :response => self.response)
     elsif status / 100 == 5
-      raise HyperResource::ServerError, status.to_s
+      raise HyperResource::ServerError.new(status.to_s,
+                                           :response => self.response)
     else ## 1xx? really?
-      raise HyperResource::ResponseError, "Got status #{status}, wtf?"
+      raise HyperResource::ResponseError.new("Got status #{status}, wtf?",
+                                             :response => self.response)
     end
   end
 

data/lib/hyper_resource/version.rb

@@ -1,4 +1,4 @@
 class HyperResource
-  VERSION = '0.1.9'
+  VERSION = '0.1.9.2'
   VERSION_DATE = '2013-09-27'
 end

data/lib/hyper_resource.rb

@@ -15,7 +15,6 @@ require 'hyper_resource/adapter/hal_json'
 require 'pp'
 
 ## TODO:
-## incoming_filter, outgoing_filter
 ## as_json, to_json (in adapter?)
 ## save, update, create, delete
 
@@ -148,15 +147,31 @@ public
     response_class.new(self)
   end
 
-  def incoming_filter(attr_hash)
+
+  ## +incoming_body_filter+ filters a hash of attribute keys and values
+  ## on their way from a response body to a HyperResource.  Override this
+  ## in a subclass of HyperResource to implement filters on incoming data.
+  def incoming_body_filter(attr_hash)
     attr_hash
   end
 
-  def outgoing_filter(attr_hash)
+  ## +outgoing_body_filter+ filters a hash of attribute keys and values
+  ## on their way from a HyperResource to a request body.  Override this
+  ## in a subclass of HyperResource to implement filters on outgoing data.
+  def outgoing_body_filter(attr_hash)
     attr_hash
   end
 
-  def get_response_class
+  ## +outgoing_uri_filter+ filters a hash of attribute keys and values
+  ## on their way from a HyperResource to a URL.  Override this
+  ## in a subclass of HyperResource to implement filters on outgoing URI
+  ## parameters.
+  def outgoing_uri_filter(attr_hash)
+    attr_hash
+  end
+
+
+  def get_response_class # :nodoc:
     self.namespace ||= self.class.to_s unless self.class.to_s=='HyperResource'
     self.class.get_response_class(self.response, self.namespace)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyperresource
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.9.2
 platform: ruby
 authors:
 - Pete Gamache