hyperresource 0.1.9.3 → 0.1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9eb3362f2f929049439543e8aa9cd140f808b9b
-  data.tar.gz: 6ae500a90b57bb69715db82268d8c8e56d5af4cd
+  metadata.gz: dbbf6ab86efd5ba75dc1c7831f92336b7cfbee64
+  data.tar.gz: 72b1877082068c781f3730fc95977cd3b09f60bc
 SHA512:
-  metadata.gz: b0b44a45fba55b7bf5b7e4522a46fb04705a3d3d9aa877a516e1582819513b9f622428a847d153f9f920a37644404929ecd7dc3ce4772711bc7298916e1cf313
-  data.tar.gz: c6143d7034ea27cc735706edf8b4aead7bb5717f745f866721a2c8e340cd88cc5bbfb2d2d0ef3e24fc0f65353d620bfeda177d18940b2de2d3abfccfff0fe6ce
+  metadata.gz: 1750d932e5ee8499dd146e52a31090d02809a68b1141d5aed3aaaede921366a33f4a81634b98d960ce083cddf7c28331c873b6386eb64f3681e6b5b4c1c217b6
+  data.tar.gz: 5399981c4f2c35b440f4029168392753371244580c4804ba84a044edee22b878a072f38448d0c0b6c6d49436a74bb9cb558f906e05af312cc4eb68fdda1621c7

data/lib/hyper_resource.rb

@@ -1,6 +1,10 @@
-this_dir = File.dirname(File.absolute_path(__FILE__))
+this_dir = File.dirname(__FILE__)
 Dir.glob(this_dir + '/hyper_resource/**/*.rb') {|f| require f}
 
+if RUBY_VERSION[0..2] == '1.8'
+  require 'rubygems'
+end
+
 require 'pp'
 
 class HyperResource
@@ -149,7 +153,7 @@ public
     self.get unless self.loaded
 
     method = method.to_s
-    if method[-1] == '='
+    if method[-1,1] == '='
       return attributes[method[0..-2]] = args.first if attributes[method[0..-2]]
     else
       return attributes[method] if attributes && attributes[method]
@@ -249,8 +253,8 @@ public
   def self._get_response_data_type(response) # :nodoc:
     return nil unless response
     return nil unless content_type = response['content-type']
-    return nil unless m=content_type.match(/;\s* type=(?<type> [0-9A-Za-z:]+)/x)
-    m[:type][0].upcase + m[:type][1..-1]
+    return nil unless m=content_type.match(/;\s* type=([0-9A-Za-z:]+)/x)
+    m[1][0,1].upcase + m[1][1..-1]
   end
 
   def _get_response_data_type # :nodoc:

data/lib/hyper_resource/adapter/hal_json.rb

@@ -1,3 +1,4 @@
+require 'rubygems' if RUBY_VERSION[0..2] == '1.8'
 require 'json'
 
 class HyperResource
@@ -40,12 +41,12 @@ class HyperResource
 
           resp['_embedded'].each do |name, collection|
             if collection.is_a? Hash
-              r = rc.new
+              r = rc.new(:root => rsrc.root, :namespace => rsrc.namespace)
               r.response_object = collection
               objs[name] = apply(collection, r)
             else
               objs[name] = collection.map do |obj|
-                r = rc.new
+                r = rc.new(:root => rsrc.root, :namespace => rsrc.namespace)
                 r.response_object = obj
                 apply(obj, r)
               end

data/lib/hyper_resource/attributes.rb

@@ -52,6 +52,12 @@ class HyperResource
       return @_hr_changed.keys.count > 0
     end
 
+    ## Returns a hash of the attributes and values which have been changed
+    ## since creation time.
+    def changed_attributes
+      @_hr_changed.select{|k,v| v}.keys.inject({}) {|h,k| h[k]=self[k]; h}
+    end
+
     def []=(attr, value) # :nodoc:
       _hr_mark_changed(attr)
       super(attr.to_s, value)

data/lib/hyper_resource/exceptions.rb

@@ -1,11 +1,23 @@
 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
+    attr_accessor :response         # Response body which led to this
+    attr_accessor :response_object  # Response object which led to this
+    attr_accessor :cause            # Internal exception which led to this
 
     def initialize(message, opts={})
       self.response = opts[:response]
+      self.response_object = opts[:response_object]
       self.cause = opts[:cause]
+
+      ## Try to help out with the message
+      if self.response_object
+        if error = self.response_object['error']
+          message = "#{message} (#{error})"
+        end
+      elsif self.response
+        message = "#{message} (\"#{self.response.inspect}\")"
+      end
+
       super(message)
     end
   end

data/lib/hyper_resource/modules/http.rb

@@ -2,8 +2,8 @@ require 'faraday'
 require 'uri'
 require 'json'
 
-module HyperResource::Modules
-  module HTTP
+class HyperResource
+  module Modules; module HTTP
 
     ## Loads and returns the resource pointed to by +href+.  The returned
     ## resource will be blessed into its "proper" class, if
@@ -13,9 +13,33 @@ module HyperResource::Modules
       finish_up
     end
 
-    ## Returns a per-thread Faraday connection for this object.
+    def create(*args); post(*args) end
+    def post(params=nil)
+      params ||= self.attributes
+      self.response = faraday_connection.post do |req|
+        req.body = adapter.serialize(params)
+      end
+      finish_up
+    end
+
+    def update(*args); put(*args) end
+    def put(params=nil)
+      params ||= self.attributes.changed_attributes
+      self.response = faraday_connection.put do |req|
+        req.body = adapter.serialize(params)
+      end
+      finish_up
+    end
+
+    def delete
+      self.response = faraday_connection.delete
+      finish_up
+    end
+
+    ## Returns a raw Faraday connection to this resource's URL, with proper
+    ## headers (including auth).
     def faraday_connection(url=nil)
-      url ||= self.root
+      url ||= URI.join(self.root, self.href)
       key = "faraday_connection_#{url}"
       return Thread.current[key] if Thread.current[key]
 
@@ -33,7 +57,7 @@ module HyperResource::Modules
     def finish_up
       begin
         self.response_object = self.adapter.deserialize(self.response.body)
-      rescue Exception => e
+      rescue StandardError => e
         raise HyperResource::ResponseError.new(
           "Error when deserializing response body",
           :response => self.response,
@@ -51,16 +75,21 @@ module HyperResource::Modules
         ## TODO redirect logic?
       elsif status / 100 == 4
         raise HyperResource::ClientError.new(status.to_s,
-                                             :response => self.response)
+                                             :response => self.response,
+                                             :response_object => self.response_object)
       elsif status / 100 == 5
         raise HyperResource::ServerError.new(status.to_s,
-                                             :response => self.response)
+                                             :response => self.response,
+                                             :response_object => self.response_object)
+
       else ## 1xx? really?
         raise HyperResource::ResponseError.new("Got status #{status}, wtf?",
-                                               :response => self.response)
+                                               :response => self.response,
+                                               :response_object => self.response_object)
+
       end
     end
 
-  end
+  end end
 end
 

data/lib/hyper_resource/objects.rb

@@ -32,12 +32,12 @@ class HyperResource
     ## Returns the first item in the first collection in +self+.
     alias_method :first_orig, :first
     def first
-      self.first_orig[1][0] rescue caller
+      self.first_orig[1][0]
     end
 
     ## Returns the ith item in the first collection in +self+.
     def ith(i)
-      self.first_orig[1][i] rescue caller
+      self.first_orig[1][i]
     end
 
     def []=(attr, value) # :nodoc:

data/lib/hyper_resource/version.rb

@@ -1,4 +1,4 @@
 class HyperResource
-  VERSION = '0.1.9.3'
-  VERSION_DATE = '2013-10-02'
+  VERSION = '0.1.9.4'
+  VERSION_DATE = '2013-10-07'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperresource
 version: !ruby/object:Gem::Version
-  version: 0.1.9.3
+  version: 0.1.9.4
 platform: ruby
 authors:
 - Pete Gamache
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uri_template
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !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
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -104,17 +118,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hyper_resource/adapter/hal_json.rb
-- lib/hyper_resource/adapter.rb
-- lib/hyper_resource/attributes.rb
-- lib/hyper_resource/exceptions.rb
-- lib/hyper_resource/link.rb
 - lib/hyper_resource/links.rb
+- lib/hyper_resource/adapter.rb
 - lib/hyper_resource/modules/http.rb
 - lib/hyper_resource/modules/utils.rb
 - lib/hyper_resource/objects.rb
 - lib/hyper_resource/response.rb
+- lib/hyper_resource/adapter/hal_json.rb
 - lib/hyper_resource/version.rb
+- lib/hyper_resource/link.rb
+- lib/hyper_resource/exceptions.rb
+- lib/hyper_resource/attributes.rb
 - lib/hyper_resource.rb
 - lib/hyperresource.rb
 homepage: https://github.com/gamache/hyperresource
@@ -137,9 +151,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Extensible hypermedia client for Ruby
 test_files: []
-has_rdoc: true