ocean-rails 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31b1b38b3c165623d55d20c2c50a4e8d0dfcf3af
-  data.tar.gz: 4953f5131a176fe9e62d5026170756069546cad0
+  metadata.gz: 2438ccfdaf98ac780b68714372b10bbb7182372c
+  data.tar.gz: 8f080fdec12373dc8cc8d9c0802f3260913e0389
 SHA512:
-  metadata.gz: 449a836b690b3246421c3a821469cd5ccd9bc2926803db306e58c0c875a6cb7b859938d08f724053d3a09b9262005b83c53f8206d11c946d17186a859aeae306
-  data.tar.gz: c29371feb920c6ae52c51617fc3c82db1684864d219bcf3c8a07af611145bd7a35187756afbb0207664b18117ea61fa2bd277bd9139f000a401c70c9508119ae
+  metadata.gz: c51f0ec1983312a743c9ae9d5ec8988f3c2eb0be46f76d5575f4f14428a524c734ad60b2079d1e1fcb3b4a7331bfe8b88827bbd82c5a6fd780886d568940c1be
+  data.tar.gz: 4fb09674fa65c1dc3aeb97be98f3a52255cfebecd853f891e4288ed31db5e9a1007adb82c5f9bec9e8008a5472c545b826742ef76d4ea419bad03023fda6f71f

data/lib/ocean/api_remote_resource.rb

@@ -13,7 +13,7 @@ class Api
   #   
   #   thing.resource_type => 'thing'
   #   thing.status => 200
-  #   thing.success? => true
+  #   thing.status_message => "OK"
   #
   # The last raw body can be read:
   #
@@ -41,25 +41,25 @@ class Api
   #
   # The following two are equivalent:
   #
-  #   Api::RemoteResource.new("foo").get
-  #   Api::RemoteResource.get("foo")
+  #   Api::RemoteResource.get("foo")         always returns a new RemoteResource
+  #   Api::RemoteResource.new("foo").get     always returns the RemoteResource  
   #
   # as are:
   #
-  #   Api::RemoteResource.new("foo").get!
-  #   Api::RemoteResource.get!("foo")
+  #   Api::RemoteResource.get!("foo")        returns a new RemoteResource or raises an error
+  #   Api::RemoteResource.new("foo").get!    returns the RemoteResource or raises an error
   #
   # #post, #post!, #put, #put!, #delete, and #delete! are also available.
   #
   # If get or get! retrieve an Ocean collection, they will return an array of RemoteResources.
   #
-  # <tt>thing.get!</tt> returns an Api::RemoteResource if successful. If not, raises an exception.
-  # <tt>thing.get</tt> does the same, but returns nil if unsuccessful.
+  # <tt>thing.get!</tt> returns the Api::RemoteResource if successful. If not, raises an exception.
+  # <tt>thing.get</tt> does the same, but always returns the Api::RemoteResource. The remote resource
+  # can be examined to see its status.
   #
   # Exceptions:
   #
   #  GetFailed          raised when the GET to obtain the remote resource has failed.
-  #  WrongContentType   raised when the Content-Type doesn't match :content_type.
   #  UnparseableJson    raised when the response body doesn't parse as JSON.
   #  JsonIsNoResource   raised when the structure of the parsed JSON body is not a resource.
   #
@@ -119,19 +119,14 @@ class Api
     end
 
     def self.get(*args)
-      begin
-        get!(*args)
-      rescue
-        nil
-      end
+      rr = new(*args)
+      rr.get! rescue nil
+      rr
     end
 
     def get
-      begin
-        get!
-      rescue
-        nil
-      end
+      get! rescue nil
+      self
     end
 
     def [](key)
@@ -157,7 +152,6 @@ class Api
 
 
     class GetFailed < StandardError; end
-    class WrongContentType < StandardError; end
     class UnparseableJson < StandardError; end
     class JsonIsNoResource < StandardError; end
 
@@ -179,8 +173,8 @@ class Api
       response = Api.request rr.uri, :get, headers: {}, credentials: credentials, x_api_token: token
       rr.send :status=, response.status
       rr.send :status_message=, response.message
+      rr.send :headers=, response.headers
       raise GetFailed unless response.success?
-      #raise WrongContentType unless response.headers['Content-Type'] == rr.content_type
       begin
         raw = response.body
       rescue JSON::ParserError
@@ -204,6 +198,7 @@ class Api
       self.resource = value
       self.resource_type = resource_type
       self.status = response.status
+      self.status_message = response.message
       self.headers = response.headers
       self.present = true
     end

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "3.3.1"
+  VERSION = "3.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Peter Bengtson