ocean-rails 3.8.9 → 3.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25d86f8d69015565033c12e60edb7017186d6829
-  data.tar.gz: 83a3f9b85153a9708225aa5ab46ad58e5b7837fa
+  metadata.gz: c03d917f00041083de25676b0e29d98840a38e88
+  data.tar.gz: 364ddfa8ad3ef5f0bf3c371cc92569b1bd982dab
 SHA512:
-  metadata.gz: e7540bf449eb3e0d3aa5755f2fa75fd9ed22b8e74f6fd7409908a4836bd6f3e858e4f82cadbeb50a6236fe50d17d39cc891b9a87068347d14201e7ba8b084a1e
-  data.tar.gz: 00618f27d71e1446ac3f1135757c8944a0b8dd69873d5978166f6d058b6694e47173892ccbbf22bd4104511dc1afc4b41d5a8542e9d3acff1cf783c732b24448
+  metadata.gz: 98554e6882e089e75b0751bdd879c7e3d9c4dde7ff90a1f2d778c17b552fc3ae71d99e4b5003bf8d02df144052bfa8ac016ed892037e63ac4348a9e2a03a65b4
+  data.tar.gz: edbe8eee4187fc1fe0a284f69e6bffb33ec825c1d203f275d66c41a65fd04a886c6d19ac788643088e9ec88c9be324b3e42375ff63519fe713a7fca01b94139f

data/lib/ocean/api_remote_resource.rb

@@ -130,7 +130,7 @@ class Api
   #
   class RemoteResource
 
-  	attr_reader :uri, :content_type, :retries, :backoff_time, :backoff_rate, :backoff_max
+  	attr_reader :uri, :args, :content_type, :retries, :backoff_time, :backoff_rate, :backoff_max
     attr_reader :raw, :resource, :resource_type, :status, :headers, :credentials, :x_api_token
     attr_reader :status_message, :response, :etag
 
@@ -140,11 +140,12 @@ class Api
     # the default values, they will be used instead. Specifying only one of them is not
     # permitted.
     #
-  	def initialize(uri, type="application/json",
+  	def initialize(uri, type="application/json", args: nil,
                    credentials: nil, x_api_token: nil,
   		             retries: 3, backoff_time: 1, backoff_rate: 0.9, backoff_max: 30)
       super()
   	  @uri = uri
+      @args = args
   	  @content_type = type
       @retries = retries
       @backoff_time = backoff_time
@@ -253,7 +254,7 @@ class Api
     # otherwise returns the resource itself. The args are passed directly to +new+.
     #
     def self.get!(*args)
-      _retrieve new(*args)
+      new(*args).send :_retrieve
     end
 
     #
@@ -272,14 +273,15 @@ class Api
     # if they occur, otherwise will return the resource itself.
     #
     def get!(hlink=nil, args: nil)
-      RemoteResource._retrieve self unless present?
+      _retrieve unless present?
       hlink = hlink.to_s if hlink
-      if !hlink || hlink == 'self' 
+      if !args && (!hlink || hlink == 'self')
         self
       else
         hl_data = hyperlink[hlink]
         raise HyperlinkMissing, "#{resource_type} has no #{hlink} hyperlink" unless hl_data
-        RemoteResource.get!(hl_data['href'])
+        RemoteResource.get!(hl_data['href'], args: args, retries: retries, backoff_time: backoff_time, 
+                                             backoff_rate: backoff_rate, backoff_max: backoff_max)
       end
     end
 
@@ -288,15 +290,16 @@ class Api
     # exceptions if problems occur, but will always return the resource itself.
     # A missing hyperlink, though, will always raise a HyperlinkMissing exception.
     #
-    def get(hlink=nil)
+    def get(hlink=nil, args: nil)
       get! rescue nil
       hlink = hlink.to_s if hlink
-      if !hlink || hlink == 'self' 
+      if !args && (!hlink || hlink == 'self')
         self
       else
         hl_data = hyperlink[hlink]
         raise HyperlinkMissing, "#{resource_type} has no #{hlink} hyperlink" unless hl_data
-        RemoteResource.get(hl_data['href'])
+        RemoteResource.get(hl_data['href'], args: args, retries: retries, backoff_time: backoff_time, 
+                                            backoff_rate: backoff_rate, backoff_max: backoff_max)
       end
     end
 
@@ -308,13 +311,14 @@ class Api
     def put!(hlink=nil, args: nil, body: {})
       get!
       hlink = hlink.to_s if hlink
-      if !hlink || hlink == 'self' 
+      if !args && (!hlink || hlink == 'self')
         _modify(body)
         self
       else
         hl_data = hyperlink[hlink]
         raise HyperlinkMissing, "#{resource_type} has no #{hlink} hyperlink" unless hl_data
-        hl_res = RemoteResource.new(hl_data['href'])
+        hl_res = RemoteResource.new(hl_data['href'], retries: retries, backoff_time: backoff_time, 
+                                                     backoff_rate: backoff_rate, backoff_max: backoff_max)
         hl_res.send :_modify, body, args: args
         hl_res
       end
@@ -328,13 +332,14 @@ class Api
     def put(hlink=nil, args: nil, body: {})
       get
       hlink = hlink.to_s if hlink
-      if !hlink || hlink == 'self' 
+      if !args && (!hlink || hlink == 'self')
         _modify(body) rescue nil
         self
       else
         hl_data = hyperlink[hlink]
         raise HyperlinkMissing, "#{resource_type} has no #{hlink} hyperlink" unless hl_data
-        hl_res = RemoteResource.new(hl_data['href'])
+        hl_res = RemoteResource.new(hl_data['href'], retries: retries, backoff_time: backoff_time, 
+                                                     backoff_rate: backoff_rate, backoff_max: backoff_max)
         hl_res.send :_modify, body, args: args
         hl_res
       end
@@ -347,7 +352,7 @@ class Api
     #
     def post!(hlink=nil, args: nil, body: {})
       get!
-      hlink = (hlink || 'self').to_s
+      hlink = (hlink || !args && 'self').to_s
       hl_data = hyperlink[hlink]
       raise HyperlinkMissing, "#{resource_type} has no #{hlink} hyperlink" unless hl_data
       _create(hl_data['href'], body, args: args)
@@ -360,7 +365,7 @@ class Api
     #
     def post(hlink=nil, args: nil, body: {})
       get
-      hlink = (hlink || 'self').to_s
+      hlink = (hlink || !args && 'self').to_s
       hl_data = hyperlink[hlink]
       raise HyperlinkMissing, "#{resource_type} has no #{hlink} hyperlink" unless hl_data
       _create(hl_data['href'], body, args: args) rescue nil
@@ -433,52 +438,49 @@ class Api
     attr_writer :etag
 
 
-    def self._credentials(rr)
+    def _credentials(rr)
       if rr.credentials.present? && rr.credentials != Api.credentials(API_USER, API_PASSWORD)
-        credentials = rr.credentials
-        token = rr.x_api_token
+        [rr.credentials, rr.x_api_token]
       else
-        credentials = nil
-        token = rr.x_api_token || Api.service_token
+        [nil, rr.x_api_token || Api.service_token]
       end
-      [credentials, token]
     end
 
 
-    def self._retrieve(rr)
-      credentials, token = _credentials(rr)
-      response = Api.request Api.internalize_uri(rr.uri), :get, 
+    def _retrieve#(args: nil)
+      credentials, token = _credentials(self)
+      response = Api.request Api.internalize_uri(uri), :get, args: args,
                              headers: {}, 
                              credentials: credentials, x_api_token: token,
-                             retries: rr.retries, backoff_time: rr.backoff_time, backoff_rate: rr.backoff_rate, 
-                             backoff_max: rr.backoff_max
-      rr.send :response=, response
-      rr.send :status=, response.status
-      rr.send :status_message=, response.message
-      rr.send :headers=, response.headers
+                             retries: retries, backoff_time: backoff_time, backoff_rate: backoff_rate, 
+                             backoff_max: backoff_max
+      self.response = response
+      self.status = response.status
+      self.status_message = response.message
+      self.headers = response.headers
       raise GetFailed, "#{response.status} #{response.message}" unless response.success?
       begin
         raw = response.body
       rescue JSON::ParserError
         raise UnparseableJson
       end
-      rr.send :_setup, raw, response
-      rr
+      _setup raw, response
+      self
     end
 
 
     def _conditional_get
-      credentials, token = RemoteResource._credentials(self)
-      response = Api.request Api.internalize_uri(uri), :get, 
+      credentials, token = _credentials(self)
+      response = Api.request Api.internalize_uri(uri), :get, args: args,
                              headers: {"If-None-Match" => etag}, 
                              credentials: credentials, x_api_token: token,
                              retries: retries, backoff_time: backoff_time, backoff_rate: backoff_rate, 
                              backoff_max: backoff_max
-      send :response=, response
+      self.response = response
       return if response.status == 304
-      send :status=, response.status
-      send :status_message=, response.message
-      send :headers=, response.headers
+      self.status = response.status
+      self.status_message = response.message
+      self.headers = response.headers
       raise ConditionalGetFailed, "#{response.status} #{response.message}" unless response.success?
       begin
         raw = response.body
@@ -517,7 +519,7 @@ class Api
 
 
     def _modify(body, args: nil)
-      credentials, token = RemoteResource._credentials(self)
+      credentials, token = _credentials(self)
       response = Api.request Api.internalize_uri(uri), :put, headers: {}, body: body.to_json,
                              credentials: credentials, x_api_token: token,
                              retries: retries, backoff_time: backoff_time, backoff_rate: backoff_rate, 
@@ -542,7 +544,7 @@ class Api
 
 
     def _create(post_uri, body, args: nil)
-      credentials, token = RemoteResource._credentials(self)
+      credentials, token = _credentials(self)
       response = Api.request Api.internalize_uri(post_uri), :post, headers: {}, body: body.to_json,
                              credentials: credentials, x_api_token: token,
                              retries: retries, backoff_time: backoff_time, backoff_rate: backoff_rate, 
@@ -558,7 +560,8 @@ class Api
         raise UnparseableJson
       end
       type, resource = verify_resource(response.body)
-      created = RemoteResource.new(post_uri)
+      created = RemoteResource.new(post_uri, retries: retries, backoff_time: backoff_time, 
+                                             backoff_rate: backoff_rate, backoff_max: backoff_max)
       created.send :_setup, raw, response
       created.send :etag=, nil
       created
@@ -566,7 +569,7 @@ class Api
 
 
     def _destroy(delete_uri, args: nil)
-      credentials, token = RemoteResource._credentials(self)
+      credentials, token = _credentials(self)
       response = Api.request Api.internalize_uri(delete_uri), :delete, headers: {},
                              credentials: credentials, x_api_token: token,
                              retries: retries, backoff_time: backoff_time, backoff_rate: backoff_rate, 

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "3.8.9"
+  VERSION = "3.9.0"
 end

metadata

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