ecoportal-api 0.2.2 → 0.3.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a48c4137d9f3a6fd2c2089e984257ee11122bf14e62ab67d8d9d5d5450cd4ec
-  data.tar.gz: cf156327767d58bf8b6db87793122fa1790ef8f4ddcf343d86d7f866a395e148
+  metadata.gz: 83c71a815e9029a177b05a72733165c2a4d4868a8df3c9ef6c93f27a7a5e2458
+  data.tar.gz: 57e7f0759ca52ad93150da122fd92220ad043668b4402128c8550c284c90f91b
 SHA512:
-  metadata.gz: 2b63ff282e00e7d550cc90d350712505ab57d258f84365b13f8484be00c440f01c9b98183dcbecad42e124ca714076277a6ffd668cea997125496e3ee852530e
-  data.tar.gz: 162e54978d470815a3c2c43e3f9c39b84a5bb591b50567e3e338e26ef9715eca2a91a1a4fa76e72fb70658af2e45aafa36d2a6ac0b4b00c9de71f9ad83491f17
+  metadata.gz: bf01726252c61adbb66f8ff78f4b0d5c05efec942b3248ef64b92df8e66c2d105e886d9e7bbb61f4d305d233359e73706659ed40522e5114387f5736e83572f9
+  data.tar.gz: e2b12acff4f9fbf1fdd6841ccce074c4c41ff330aa5f59de7184462b29f8642b8afa467babbc80583f0f91f5e7bb0c52c34b39c3499ddfb304d03a9173477d25

data/lib/ecoportal/api.rb

@@ -1,4 +1,5 @@
 require "cgi"
+require "logger"
 require "hash-polyfill"
 require "ecoportal/api/version"
 

data/lib/ecoportal/api/common.rb

@@ -5,6 +5,7 @@ module Ecoportal
   end
 end
 require 'ecoportal/api/common/client'
+require 'ecoportal/api/common/logging'
 require 'ecoportal/api/common/response'
 require 'ecoportal/api/common/wrapped_response'
 require 'ecoportal/api/common/base_model'

data/lib/ecoportal/api/common/client.rb

@@ -3,37 +3,52 @@ module Ecoportal
   module API
     module Common
       class Client
-        def initialize(api_key:, version: "v1", host: "live.ecoportal.com")
+        def initialize(api_key:, version: "v1", host: "live.ecoportal.com", logger: nil)
           @version  = version
           @api_key  = api_key
+          @logger   = logger
           if host.match(/^localhost|^127\.0\.0\.1/)
             @base_uri = "http://#{host}/api/"
           else
             @base_uri = "https://#{host}/api/"
           end
+          log(:info) { "#{version} client initialized pointing at #{host}" }
+          log(:info) { "Api-key: #{@api_key}" }
+        end
+
+        def log(level, &block)
+          @logger.send(level, &block) if @logger
         end
 
         def get(path, params: {})
-          request do |http|
-            http.get(url_for(path), params: params)
+          instrument("GET", path, params) do
+            request do |http|
+              http.get(url_for(path), params: params)
+            end
           end
         end
 
         def post(path, data:)
-          request do |http|
-            http.post(url_for(path), json: data)
+          instrument("POST", path, data) do
+            request do |http|
+              http.post(url_for(path), json: data)
+            end
           end
         end
 
         def patch(path, data:)
-          request do |http|
-            http.patch(url_for(path), json: data)
+          instrument("PATCH", path, data) do
+            request do |http|
+              http.patch(url_for(path), json: data)
+            end
           end
         end
 
         def delete(path)
-          request do |http|
-            http.delete(url_for(path))
+          instrument("DELETE", path) do
+            request do |http|
+              http.delete(url_for(path))
+            end
           end
         end
 
@@ -52,6 +67,29 @@ module Ecoportal
         def url_for(path)
           @base_uri+@version+path
         end
+
+        private
+
+        def instrument(method, path, data = nil)
+          start_time = Time.now.to_f
+          log :info do
+            "GET #{url_for(path)}"
+          end
+          JSON.pretty_generate(data).lines.each.with_index do |line, index|
+            line = "Data: " + line if index.zero?
+            log(:info) { line.chomp }
+          end
+          yield.tap do |result|
+            end_time = Time.now.to_f
+            log :info do
+              "Took %.2fs, Status #{result.status}" % (end_time - start_time)
+            end
+            JSON.pretty_generate(result.body).lines.each.with_index do |line, index|
+              line = "Response: " + line if index.zero?
+              log(:debug) { line.chomp }
+            end
+          end
+        end
       end
     end
   end

data/lib/ecoportal/api/common/logging.rb

@@ -0,0 +1,17 @@
+module Ecoportal
+  module API
+    module Common
+      module Logging
+        private
+        def default_logger
+          Logger.new(STDOUT).tap do |_logger|
+            _logger.formatter = proc do |severity, datetime, progname, msg|
+              "#{severity.to_s[0]}: #{datetime.strftime("%Y-%m-%d %H:%M:%S")} > #{msg}\n"
+            end
+            _logger.level = Logger::DEBUG
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/internal.rb

@@ -1,12 +1,15 @@
 module Ecoportal
   module API
     class Internal
-      attr_reader :client
-      def initialize(api_key, host: "live.ecoportal.com")
+      include Common::Logging
+      attr_reader :client, :logger
+      def initialize(api_key, host: "live.ecoportal.com", logger: default_logger)
+        @logger = logger
         @client = Common::Client.new(
           api_key: api_key,
           host:    host,
-          version: "v0"
+          version: "v0",
+          logger:  @logger
         )
       end
       def people
@@ -28,4 +31,4 @@ end
 require 'ecoportal/api/internal/people'
 require 'ecoportal/api/internal/person_schemas'
 require 'ecoportal/api/internal/policy_groups'
-require 'ecoportal/api/internal/login_providers'
+require 'ecoportal/api/internal/login_providers'

data/lib/ecoportal/api/v1.rb

@@ -1,12 +1,15 @@
 module Ecoportal
   module API
     class V1
-      attr_reader :client
-      def initialize(api_key, host: "live.ecoportal.com")
+      include Common::Logging
+      attr_reader :client, :logger
+      def initialize(api_key, host: "live.ecoportal.com", logger: default_logger)
+        @logger = logger
         @client = Common::Client.new(
           api_key: api_key,
           host:    host,
-          version: "v1"
+          version: "v1",
+          logger:  @logger
         )
       end
       def people

data/lib/ecoportal/api/version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    VERSION = "0.2.2"
+    VERSION = "0.3.0.pre1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0.pre1
 platform: ruby
 authors:
 - Tapio Saarinen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/ecoportal/api/common/client.rb
 - lib/ecoportal/api/common/doc_helpers.rb
 - lib/ecoportal/api/common/hash_diff.rb
+- lib/ecoportal/api/common/logging.rb
 - lib/ecoportal/api/common/response.rb
 - lib/ecoportal/api/common/wrapped_response.rb
 - lib/ecoportal/api/internal.rb
@@ -149,9 +150,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6