flowcommerce 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1842b096c2da037d9f4f7d4fb266bf5843e244e3
-  data.tar.gz: 45701273b18873308ddb1556a2f1ffb4615c2ee2
+  metadata.gz: 0754634abaa88c538758514d93837c807d6668c9
+  data.tar.gz: 498950a55b09d06d15580dac8d02ca0a97ca1a28
 SHA512:
-  metadata.gz: 9f11ea891ca18b1dafe753c8db3ec7d34f8116b9f961d31a94cc1fd2f584da8a4b9177ea21000fa35e6f841ef69e787447387a073cb79a298b40f35158fb922f
-  data.tar.gz: 4735c0c33eed10a4d33fe74ff492d2ab8ee64c94a15fac952b0f7f7f7ad9132ae743739f7d35f39ea56ba4518d3da7664dc05bbafb99ab48d095c5b6a5382944
+  metadata.gz: 509f5bad7cc26ce4be51514c05148c3034a8e20963f523fda9dc338ba06addf1276798caefa05f0b496578672b6edc2c67dacedcfbd83e83501b7c11c8dad258
+  data.tar.gz: 2f5597d0c73b79e0d3240770942e6a458c03881fd679410854932a403a87e963bd9f0855c15d53f55377f551f5e3b81ac99ce86abedcb57bf15b99d831edaae4

data/lib/flow_commerce/client.rb

@@ -13,6 +13,7 @@ module FlowCommerce
   def FlowCommerce.instance(opts={})
     base_url = opts[:base_url].to_s.strip
     token = opts[:token].to_s.strip
+    http_handler = opts[:http_handler]
 
     if token.empty?
       token = ENV['FLOW_TOKEN'].to_s.strip
@@ -38,9 +39,9 @@ module FlowCommerce
     auth = Io::Flow::V0::HttpClient::Authorization.basic(token)
 
     if base_url.empty?
-      Io::Flow::V0::Client.at_base_url(:authorization => auth)
+      Io::Flow::V0::Client.at_base_url(:authorization => auth, :http_handler => http_handler)
     else
-      Io::Flow::V0::Client.new(base_url, :authorization => auth)
+      Io::Flow::V0::Client.new(base_url, :authorization => auth, :http_handler => http_handler)
     end
   end
 

data/lib/flow_commerce/flow_api_v0_client.rb

@@ -1,6 +1,6 @@
 # Generated by apidoc - http://www.apidoc.me
 # Service version: 0.2.79
-# apidoc:0.11.74 http://www.apidoc.me/flow/api/0.2.80/ruby_client
+# apidoc:0.11.75 http://www.apidoc.me/flow/api/0.2.80/ruby_client
 
 require 'cgi'
 require 'net/http'
@@ -25,7 +25,7 @@ module Io
 
           BASE_URL = 'https://api.flow.io' unless defined?(Constants::BASE_URL)
           NAMESPACE = 'io.flow.v0' unless defined?(Constants::NAMESPACE)
-          USER_AGENT = 'apidoc:0.11.74 http://www.apidoc.me/flow/api/0.2.80/ruby_client' unless defined?(Constants::USER_AGENT)
+          USER_AGENT = 'apidoc:0.11.75 http://www.apidoc.me/flow/api/0.2.80/ruby_client' unless defined?(Constants::USER_AGENT)
           VERSION = '0.2.79' unless defined?(Constants::VERSION)
           VERSION_MAJOR = 0 unless defined?(VERSION_MAJOR)
 
@@ -35,8 +35,11 @@ module Io
 
         def initialize(url, opts={})
           @url = HttpClient::Preconditions.assert_class('url', url, String)
+          @base_url = URI(url)
           @authorization = HttpClient::Preconditions.assert_class_or_nil('authorization', opts.delete(:authorization), HttpClient::Authorization)
           @default_headers = HttpClient::Preconditions.assert_class('default_headers', opts.delete(:default_headers) || {}, Hash)
+          @http_handler = opts.delete(:http_handler) || HttpClient::DefaultHttpHandler.new
+
           HttpClient::Preconditions.assert_empty_opts(opts)
           HttpClient::Preconditions.check_state(url.match(/http.+/i), "URL[%s] must start with http" % url)
         end
@@ -48,7 +51,7 @@ module Io
 
         def request(path=nil)
           HttpClient::Preconditions.assert_class_or_nil('path', path, String)
-          request = HttpClient::Request.new(URI.parse(@url + path.to_s)).with_header('User-Agent', Constants::USER_AGENT).with_header('X-Apidoc-Version', Constants::VERSION).with_header('X-Apidoc-Version-Major', Constants::VERSION_MAJOR)
+          request = HttpClient::Request.new(@http_handler, @base_url, path.to_s).with_header('User-Agent', Constants::USER_AGENT).with_header('X-Apidoc-Version', Constants::VERSION).with_header('X-Apidoc-Version-Major', Constants::VERSION_MAJOR)
 
           @default_headers.each do |key, value|
             request = request.with_header(key, value)
@@ -22949,10 +22952,86 @@ module Io
       # ===== END OF SERVICE DEFINITION =====
       module HttpClient
 
+        class HttpHandler
+
+          # Returns a client instance to use
+          #
+          # @param base_uri The base URI for this API
+          # @param path the Requested full http path (including any query strings)
+          def instance(base_uri, path)
+            raise "Override in subclass"
+          end
+
+        end
+
+        class HttpHandlerInstance
+
+          # Executes a request. The provided request object will be an
+          # instance of Net::HTTP (e.g. Net::HTTP::Get)
+          def execute(request)
+            raise "Override in subclass"
+          end
+
+        end
+
+        class DefaultHttpHandler < HttpHandler
+
+          def instance(base_uri, path)
+            DefaultHttpHandlerInstance.new(base_uri)
+          end
+
+        end
+
+        class DefaultHttpHandlerInstance < HttpHandlerInstance
+
+          attr_reader :client
+
+          def initialize(base_uri)
+            @base_uri = Preconditions.assert_class('base_uri', base_uri, URI)
+            @client = Net::HTTP.new(@base_uri.host, @base_uri.port)
+            if @base_uri.scheme == "https"
+              configure_ssl
+            end
+          end
+
+          def execute(request)
+            response = begin
+                         @client.request(request)
+                       rescue SocketError => e
+                         raise Exception.new("Error accessing uri[#{full_uri(request.path)}]: #{e}")
+                       end
+
+            case response
+            when Net::HTTPSuccess
+              response.body
+            else
+              body = response.body rescue nil
+              raise HttpClient::ServerError.new(response.code.to_i, response.message, :body => body, :uri => full_uri(request.path).to_s)
+            end
+          end
+
+          def full_uri(path)
+            File.join(@base_uri.to_s, path)
+          end
+
+          # Called to configure SSL if the base uri requires it
+          def configure_ssl
+            @client.use_ssl = true
+            @client.verify_mode = OpenSSL::SSL::VERIFY_PEER
+            @client.cert_store = OpenSSL::X509::Store.new
+            @client.cert_store.set_default_paths
+          end
+
+        end
+
         class Request
 
-          def initialize(uri)
-            @uri = Preconditions.assert_class('uri', uri, URI)
+          attr_reader :path
+
+          def initialize(http_handler, base_uri, path)
+            @http_handler = http_handler
+            @base_uri = Preconditions.assert_class('base_uri', base_uri, URI)
+            @path = Preconditions.assert_class('path', path, String)
             @params = nil
             @body = nil
             @auth = nil
@@ -23002,26 +23081,6 @@ module Io
             self
           end
 
-          # Creates a new Net:HTTP client. The client returned should be
-          # fully configured to make a request.
-          def new_http_client
-            client = Net::HTTP.new(@uri.host, @uri.port)
-            if @uri.scheme == "https"
-              configure_ssl(client)
-            end
-            client
-          end
-
-          # If HTTPS is required, this method accepts an HTTP Client and configures SSL
-          def configure_ssl(http)
-            Preconditions.assert_class('http', http, Net::HTTP)
-            http.use_ssl = true
-            http.ssl_version = :TLSv1_2
-            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-            http.cert_store = OpenSSL::X509::Store.new
-            http.cert_store.set_default_paths
-          end
-
           def get(&block)
             do_request(Net::HTTP::Get, &block)
           end
@@ -23053,7 +23112,7 @@ module Io
           def do_request(klass)
             Preconditions.assert_class('klass', klass, Class)
 
-            uri = @uri.to_s
+            uri = path.dup
             if q = to_query(@params)
               uri += "?%s" % q
             end
@@ -23086,10 +23145,10 @@ module Io
               request.add_field(key, value)
             }
 
-            curl << "'%s'" % uri
+            curl << "'%s%s'" % [@base_uri, path]
             # DEBUG puts curl.join(" ")
 
-            raw_response = http_request(request)
+            raw_response = @http_handler.instance(@base_uri, request.path).execute(request)
             response = raw_response.to_s == "" ? nil : JSON.parse(raw_response)
 
             if block_given?
@@ -23111,21 +23170,6 @@ module Io
             parts.empty? ? nil : parts.join("&")
           end
 
-          def http_request(request)
-            response = begin
-                         new_http_client.request(request)
-                       rescue SocketError => e
-                         raise Exception.new("Error accessing uri[#{@uri}]: #{e}")
-                       end
-
-            case response
-            when Net::HTTPSuccess
-              response.body
-            else
-              body = response.body rescue nil
-              raise HttpClient::ServerError.new(response.code.to_i, response.message, :body => body, :uri => @uri.to_s)
-            end
-          end
         end
 
         class ServerError < StandardError

data/lib/flowcommerce.rb

@@ -2,3 +2,4 @@ dir = File.dirname(__FILE__)
 
 load File.join(dir, 'flow_commerce/flow_api_v0_client.rb')
 load File.join(dir, 'flow_commerce/client.rb')
+

data/lib/logging_http_client.rb

@@ -0,0 +1,39 @@
+require 'logger'
+require 'time'
+
+class LoggingHttpClient < ::Io::Flow::V0::HttpClient::DefaultHttpHandler
+
+  def initialize(base_uri, path)
+    super(base_uri)
+    @logger = Logger.new(path)
+  end
+
+  def execute(request)
+    original_open = client.open_timeout
+    original_read = client.read_timeout
+
+    start_time = Time.now.utc.round(10)
+    @logger.info "start %s %s" % [request.method, request.path]
+
+    if request.path.start_with?("/organizations")
+      # Contrived example to show how client settings can be adjusted
+      client.open_timeout = 60
+      client.read_timeout = 60
+    end
+
+    begin
+      super
+    ensure
+      client.open_timeout = original_open
+      client.read_timeout = original_read
+
+      end_time = Time.now.utc.round(10)
+      duration = ((end_time - start_time)*1000).round(0)
+      @logger.info "complete %s %s %s ms" % [request.method, request.path, duration]
+    end    
+    
+  end
+
+end
+
+  

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Flow Commerce, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   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: bigdecimal
   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'
 description: Native ruby client for the Flow REST API. Detailed information at http://apidoc.me/flow
@@ -48,6 +48,7 @@ files:
 - lib/flow_commerce/client.rb
 - lib/flow_commerce/flow_api_v0_client.rb
 - lib/flowcommerce.rb
+- lib/logging_http_client.rb
 homepage: https://github.com/flowcommerce/ruby-sdk
 licenses:
 - MIT
@@ -58,17 +59,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Native ruby client for the Flow REST API.