ocean-rails 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd17c75234b88f4b72f4d8b635abb238c21791c3
-  data.tar.gz: ea63b031115d253f2f7f54c626bc87fec69926a2
+  metadata.gz: abf28d724166e842023309df785a57664db29c84
+  data.tar.gz: e36c67e240cfbecd146858221ba21ab8dfd3a950
 SHA512:
-  metadata.gz: caa19c434c68eb565d9b04606daab2154aa92cb2b2af5b1c4381f2060da5f82e08c29a99c9dd540c088473ed43ebe887014866e2c8aa859ddb54eb63e8aee44b
-  data.tar.gz: b1d93f16a85cab64dc4b34989dcde7708a207fdd619989e9e977fd9497f851f558444f1a32c512753cc9475a2b1fc7e440f5863e839e0010488a00a781b647ef
+  metadata.gz: a07c6ee6bb67c43f9f75a2ea7a8414e3455433b0925656478d271543782e32a0339217bc67a3af3f1dab3e3edae1f18857ebf325024ed2200309ce5227abf644
+  data.tar.gz: c2c2e990a31207d2919192c014f0408a89053f8da01ed49e344d1df0318329002f81ad38f607f48ceb6dced67f2857c28430f9bc51b96970e7f77bfc7f2b019f

data/lib/ocean/api.rb

@@ -1,30 +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
+# #
+# # We need to monkey-patch Faraday to pull off PURGE and BAN
+# #
+# require 'faraday'
+# require 'faraday_middleware'
 
-  end
-end
+# 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
 
 #
 # This class encapsulates all logic for calling other API services.
@@ -83,6 +82,33 @@ class Api
   end
 
 
+  class Response
+    
+    def initialize(response)
+      @response = response
+      @headers = nil
+      @body = nil
+    end
+
+    def status
+      @response.response_code
+    end
+
+    def headers
+      @headers ||= (@response.response_headers || "").split("\r\n").inject({}) do |acc, h|
+                     k, v = h.split(": ")
+                     acc[k] = v
+                     acc
+                   end
+    end
+
+    def body
+      @body ||= @response.response_body.blank? ? nil : JSON.parse(@response.response_body)
+    end
+
+  end
+
+
   #
   # Makes a 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
@@ -90,22 +116,39 @@ 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={}, 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+
   # is used to obtain the latest version string of the resource. The arg +path+ is the
@@ -146,25 +189,18 @@ class Api
   #
   def self.delete(*args) call(INTERNAL_OCEAN_API_URL, :delete, *args); end
 
-
-  #
-  # Like Api.call, but makes the requests in parallel. (Parallel calls not implemented yet.)
-  #
-  def self.call_p(url, http_method, path, args={}, headers={})
-    conn = Faraday.new(url) do |c|
-      c.adapter Faraday.default_adapter               # Use net-http
-    end
-    conn.send(http_method, path, args, headers)
-  end
-
   #
   # Makes an internal +PURGE+ call to all Varnish instances. The call is made in parallel.
   # Varnish will only accept +PURGE+ requests coming from the local network.
   #
   def self.purge(*args)  
+    hydra = Typhoeus::Hydra.hydra
     LOAD_BALANCERS.each do |host| 
-      call_p("http://#{host}", :purge, *args)
+      url = "http://#{host}#{path}"
+      request = Typhoeus::Request.new(url, method: :purge, headers: {})
+      hydra.queue request
     end
+    hydra.run
   end
 
   #
@@ -172,9 +208,14 @@ class Api
   # Varnish will only accept +BAN+ requests coming from the local network.
   #
   def self.ban(path)     
+    hydra = Typhoeus::Hydra.hydra
+    escaped_path = escape(path)
     LOAD_BALANCERS.each do |host| 
-      call_p("http://#{host}", :ban, escape(path))
+      url = "http://#{host}#{escaped_path}"
+      request = Typhoeus::Request.new(url, method: :ban, headers: {})
+      hydra.queue request
     end
+    hydra.run
   end
 
 

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+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