ocean-rails 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c83063a322b488fd41e8d27e8707d1a334289e07
-  data.tar.gz: 444ae29d27f0daddfc13ae6dc5474b58302e3ec9
+  metadata.gz: 70bf4729704338768d5f743d77131a57a3b5f727
+  data.tar.gz: 230ebe6ac4905c2ee3439fd2adc04a7561779847
 SHA512:
-  metadata.gz: 13aeae1e044da60c6f20d484a9b6a0c99b50e4a9610eefa25611e25e3505ae15a6e82799d9e5556413989071fb5058bdc2a07023aee44621269b707e74ab8eaf
-  data.tar.gz: 4a47d1f913704b6e93192a73f6954fb7f29b6d6195c24c9d6d0d22a2c0c4c72bde2bc907c81f17ea48562fd53b04cf048ead4c553a2ce46fc9998cc061de6f20
+  metadata.gz: 679ce12c6732acf220721832b9ce61b6688f87533b9607f83c268a7d2648d5488714d963283856edff99564547db87a64f7a9c4c90786ea2aa378e95a4ff5a9f
+  data.tar.gz: edae51c49986ccf4e2533acad819fdbab3673e9baafb15c4b626c64f1e4a7958d23d10a7b70eff41239782c239d05190edd4b1f4f883e9e72bc77f44cf0c9cdf

data/lib/ocean/api.rb

@@ -1,29 +1,29 @@
-# #
-# # We need to monkey-patch Faraday to pull off PURGE and BAN
-# #
-# require 'faraday'
-# require 'faraday_middleware'
-
-# module Faraday #:nodoc: all
-#   class Connection
-
-#     METHODS << :purge
-#     METHODS << :ban
-
-#     # purge/ban(url, params, headers)
-#     %w[purge ban].each do |method|
-#       class_eval <<-RUBY, __FILE__, __LINE__ + 1
-#         def #{method}(url = nil, params = nil, headers = nil)
-#           run_request(:#{method}, url, nil, headers) { |request|
-#             request.params.update(params) if params
-#             yield request if block_given?
-#           }
-#         end
-#       RUBY
-#     end
-
-#   end
-# end
+#
+# We need to monkey-patch Faraday to pull off PURGE and BAN
+#
+require 'faraday'
+require 'faraday_middleware'
+
+module Faraday #:nodoc: all
+  class Connection
+
+    METHODS << :purge
+    METHODS << :ban
+
+    # purge/ban(url, params, headers)
+    %w[purge ban].each do |method|
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{method}(url = nil, params = nil, headers = nil)
+          run_request(:#{method}, url, nil, headers) { |request|
+            request.params.update(params) if params
+            yield request if block_given?
+          }
+        end
+      RUBY
+    end
+
+  end
+end
 
 require 'typhoeus'
 
@@ -119,37 +119,37 @@ class Api
   # Returns the response in its entirety so that the caller can examine its status and body.
   #
 
-  # def self.call(host_url, http_method, resource_name, path, args={}, headers={})
-  #   # Set up the connection parameters
-  #   conn = Faraday.new(host_url) do |c|
-  #     c.response :json, :content_type => /\bjson$/    # Convert the response body to JSON
-  #     c.adapter Faraday.default_adapter               # Use net-http
-  #   end
-  #   api_version = version_for resource_name
-  #   path = "/#{api_version}#{path}"
-  #   # Make the call. TODO: retries?
-  #   response = conn.send(http_method, path, args, headers) do |request|
-  #     request.headers['Accept'] = 'application/json'
-  #     request.headers['Content-Type'] = 'application/json'
-  #   end
-  #   response
-  # end
-
-  def self.call(host_url, http_method, resource_name, path, args_or_body={}, headers={})
-    # Set up the request
-    url = "#{host_url}/#{version_for resource_name}#{path}"
-    headers['Accept'] = "application/json"
-    headers['Content-Type'] = "application/json"
-    headers['User-Agent'] = "Ocean"
-    request = Typhoeus::Request.new(url, method: http_method, headers: headers,
-                                    params: args_or_body.is_a?(String) ? nil : args_or_body, 
-                                    body:   args_or_body.is_a?(String) ? args_or_body : nil
-                                   )
-    # Run it
-    response = request.run
-    # Return the response
-    Response.new(response)
-  end 
+  def self.call(host_url, http_method, resource_name, path, args={}, headers={})
+    # Set up the connection parameters
+    conn = Faraday.new(host_url) do |c|
+      c.response :json, :content_type => /\bjson$/    # Convert the response body to JSON
+      c.adapter Faraday.default_adapter               # Use net-http
+    end
+    api_version = version_for resource_name
+    path = "/#{api_version}#{path}"
+    # Make the call. TODO: retries?
+    response = conn.send(http_method, path, args, headers) do |request|
+      request.headers['Accept'] = 'application/json'
+      request.headers['Content-Type'] = 'application/json'
+    end
+    response
+  end
+
+  # def self.call(host_url, http_method, resource_name, path, args_or_body={}, headers={})
+  #   # Set up the request
+  #   url = "#{host_url}/#{version_for resource_name}#{path}"
+  #   headers['Accept'] = "application/json"
+  #   headers['Content-Type'] = "application/json"
+  #   headers['User-Agent'] = "Ocean"
+  #   request = Typhoeus::Request.new(url, method: http_method, headers: headers,
+  #                                   params: args_or_body.is_a?(String) ? nil : args_or_body, 
+  #                                   body:   args_or_body.is_a?(String) ? args_or_body : nil
+  #                                  )
+  #   # Run it
+  #   response = request.run
+  #   # Return the response
+  #   Response.new(response)
+  # end 
 
   #
   # Convenience method to make an internal +GET+ request to the Ocean Api. The +resource_name+

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Peter Bengtson
@@ -10,6 +10,34 @@ bindir: bin
 cert_chain: []
 date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: faraday
+  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: faraday_middleware
+  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: typhoeus
   requirement: !ruby/object:Gem::Requirement