ocean-rails 3.9.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c03d917f00041083de25676b0e29d98840a38e88
-  data.tar.gz: 364ddfa8ad3ef5f0bf3c371cc92569b1bd982dab
+  metadata.gz: 2680dfb63919db3bb5b39740682bb6bb5c2714b7
+  data.tar.gz: 968ce1425b26201205c8972b35286c611a89566d
 SHA512:
-  metadata.gz: 98554e6882e089e75b0751bdd879c7e3d9c4dde7ff90a1f2d778c17b552fc3ae71d99e4b5003bf8d02df144052bfa8ac016ed892037e63ac4348a9e2a03a65b4
-  data.tar.gz: edbe8eee4187fc1fe0a284f69e6bffb33ec825c1d203f275d66c41a65fd04a886c6d19ac788643088e9ec88c9be324b3e42375ff63519fe713a7fca01b94139f
+  metadata.gz: d66569c6c23db6e252a9ce5c0a30ccba12658cca50a27422e18e2802f6e1e63c5cada7f4f96265466b51ebdbbdad9b6cff71eae9e33da94ec446ff322c0eb7dc
+  data.tar.gz: bbb575ba4514f23dcfe627fcb8fad0fb0336590bb40f251444519acadea8dc15e03a8d57d06256bf4679294a0946eab2c3eea837479165e25ba87b847ef687f1

data/lib/ocean/api.rb

@@ -190,7 +190,7 @@ class Api
     response = nil
 
     # This is a Proc when run queues the request and schedules retries
-    enqueue_request = Proc.new do
+    enqueue_request = lambda do
       # First construct a request. It will not be sent yet.
       request = Typhoeus::Request.new(url,
                                       method: http_method, 
@@ -290,66 +290,66 @@ class Api
   class TimeoutError < StandardError; end
   class NoResponseError < StandardError; end
 
-  #
-  # Makes an internal HTTP request to +host_url+ using the HTTP method +method+. The +resource_name+
-  # is used to obtain the latest version string of the resource. The arg +path+ is the
-  # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
-  #
-  # Returns the response in its entirety so that the caller can examine its status and body.
-  #
-  # It is quite probable that this method will become deprecated. The main reason for its existence
-  # is the version computation, nothing more, and separating host and path isn't ideal.
-  #
-  def self.call(host_url, http_method, resource_name, path, args=nil, headers={})
-    if [:post, :put].include? http_method
-      request "#{host_url}/#{version_for resource_name}#{path}", http_method,
-                    headers: headers, body: args 
-    else
-      request "#{host_url}/#{version_for resource_name}#{path}", http_method,
-                    headers: headers, args: args 
-    end
-  end
-
-
-  #
-  # Convenience method to make an internal +GET+ request to the Ocean Api. The +resource_name+
-  # is used to obtain the latest version string of the resource. The arg +path+ is the
-  # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
-  #
-  # Returns the response in its entirety so that the caller can examine its status and body.
-  #
-  #
-  def self.get(*args)    call(INTERNAL_OCEAN_API_URL, :get, *args);    end
-
-  #
-  # Convenience method to make an internal +POST+ request to the Ocean Api. The +resource_name+
-  # is used to obtain the latest version string of the resource. The arg +path+ is the
-  # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
-  #
-  # Returns the response in its entirety so that the caller can examine its status and body.
-  #
-  #
-  def self.post(*args)   call(INTERNAL_OCEAN_API_URL, :post, *args);   end
-
-  #
-  # Convenience method to make an internal +PUT+ request to the Ocean Api. The +resource_name+
-  # is used to obtain the latest version string of the resource. The arg +path+ is the
-  # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
-  #
-  # Returns the response in its entirety so that the caller can examine its status and body.
-  #
-  #
-  def self.put(*args)    call(INTERNAL_OCEAN_API_URL, :put, *args);    end
-
-  #
-  # Convenience method to make an internal +DELETE+ request to the Ocean Api. The +resource_name+
-  # is used to obtain the latest version string of the resource. The arg +path+ is the
-  # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
-  #
-  # Returns the response in its entirety so that the caller can examine its status and body.
-  #
-  #
-  def self.delete(*args) call(INTERNAL_OCEAN_API_URL, :delete, *args); end
+  # #
+  # # Makes an internal HTTP request to +host_url+ using the HTTP method +method+. The +resource_name+
+  # # is used to obtain the latest version string of the resource. The arg +path+ is the
+  # # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
+  # #
+  # # Returns the response in its entirety so that the caller can examine its status and body.
+  # #
+  # # It is quite probable that this method will become deprecated. The main reason for its existence
+  # # is the version computation, nothing more, and separating host and path isn't ideal.
+  # #
+  # def self.call(host_url, http_method, resource_name, path, args=nil, headers={})
+  #   if [:post, :put].include? http_method
+  #     request "#{host_url}/#{version_for resource_name}#{path}", http_method,
+  #                   headers: headers, body: args 
+  #   else
+  #     request "#{host_url}/#{version_for resource_name}#{path}", http_method,
+  #                   headers: headers, args: args 
+  #   end
+  # end
+
+
+  # #
+  # # Convenience method to make an internal +GET+ request to the Ocean Api. The +resource_name+
+  # # is used to obtain the latest version string of the resource. The arg +path+ is the
+  # # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
+  # #
+  # # Returns the response in its entirety so that the caller can examine its status and body.
+  # #
+  # #
+  # def self.get(*args)    call(INTERNAL_OCEAN_API_URL, :get, *args);    end
+
+  # #
+  # # Convenience method to make an internal +POST+ request to the Ocean Api. The +resource_name+
+  # # is used to obtain the latest version string of the resource. The arg +path+ is the
+  # # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
+  # #
+  # # Returns the response in its entirety so that the caller can examine its status and body.
+  # #
+  # #
+  # def self.post(*args)   call(INTERNAL_OCEAN_API_URL, :post, *args);   end
+
+  # #
+  # # Convenience method to make an internal +PUT+ request to the Ocean Api. The +resource_name+
+  # # is used to obtain the latest version string of the resource. The arg +path+ is the
+  # # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
+  # #
+  # # Returns the response in its entirety so that the caller can examine its status and body.
+  # #
+  # #
+  # def self.put(*args)    call(INTERNAL_OCEAN_API_URL, :put, *args);    end
+
+  # #
+  # # Convenience method to make an internal +DELETE+ request to the Ocean Api. The +resource_name+
+  # # is used to obtain the latest version string of the resource. The arg +path+ is the
+  # # local path, +args+ is a hash of query args, and +headers+ a hash of extra HTTP headers.
+  # #
+  # # Returns the response in its entirety so that the caller can examine its status and body.
+  # #
+  # #
+  # def self.delete(*args) call(INTERNAL_OCEAN_API_URL, :delete, *args); end
 
 
   #
@@ -415,8 +415,8 @@ class Api
   # If not successful, +nil+ is returned.
   #
   def self.authenticate(username=API_USER, password=API_PASSWORD)
-    response = Api.post(:auth, "/authentications", nil, 
-                               {'X-API-Authenticate' => credentials(username, password)})
+    response = Api.request "#{INTERNAL_OCEAN_API_URL}/v1/authentications", :post,
+                           headers: {'X-API-Authenticate' => credentials(username, password)}
     case response.status
     when 201
       token = response.body['authentication']['token']

data/lib/ocean/api_remote_resource.rb

@@ -447,7 +447,7 @@ class Api
     end
 
 
-    def _retrieve#(args: nil)
+    def _retrieve
       credentials, token = _credentials(self)
       response = Api.request Api.internalize_uri(uri), :get, args: args,
                              headers: {}, 

data/lib/ocean/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus