ecoportal-api 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60133e693723fd363c8c32e89e7f5b308522771573708b3bf7e2fdac9b2a108f
-  data.tar.gz: 0eb957b5d9dbf62a67d34cf82e53d39f5eff3457c3dfffe7bd3180ec743b0830
+  metadata.gz: c843c0e60dae847a8d25dfa7ece7415800ab6db094542225ffc36be691b3475e
+  data.tar.gz: 7bdc9008eeacc38d6df779b0d553ab392ffb117816f1b849bd0b9831aa3ff43a
 SHA512:
-  metadata.gz: 3e6a5f4ad981f35bc49d855e257b15c62876f305fb3cb3e969809ef50e6825a0437697222bdf8b8158e747e4d1d0dfd4065c8e60f7b7406515a983b37ec187ab
-  data.tar.gz: ec50e3d7da8ddbd6487040efd30207eb87a9340d54442af1edd984acacec08c14d9ffcf2e4751b7b0fa3bd46102600af742569c05647022eaf2eb9730d829661
+  metadata.gz: c5d8a9cc96bd7dac8644e216109c94a28e46baf4d2c1decef356bdd11b5e78cfd96c50108bbfe8647e7318c8bbef76eeed3f1595e804395b8c11303b32c09f51
+  data.tar.gz: 269031a257355f64b6ee725b12e4a7d118f8a9f29308701fb4ddecfa2b05f03a2d9c4a2bb6e85cab31f64f30a8c941de587c6b2de2b82bc69c207dab3ff5e310

data/lib/ecoportal/api.rb

@@ -8,6 +8,7 @@ module Ecoportal
   end
 end
 
+require "ecoportal/api/logger"
 require "ecoportal/api/common"
 require "ecoportal/api/v1"
 require "ecoportal/api/internal"

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

@@ -72,21 +72,15 @@ module Ecoportal
 
         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
+          log(:info) { "#{method} #{url_for(path)}" }
+          log(:debug) { "Data: #{JSON.pretty_generate(data)}" }
           yield.tap do |result|
             end_time = Time.now.to_f
-            log :info do
+            log(result.success?? :info : :warn) 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 }
+            log(result.success?? :debug : :warn) do
+              "Response: #{JSON.pretty_generate(result.body)}"
             end
           end
         end

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

@@ -4,12 +4,7 @@ module Ecoportal
       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
+          Ecoportal::API::Logger.new
         end
       end
     end

data/lib/ecoportal/api/internal/account.rb

@@ -2,7 +2,7 @@ module Ecoportal
   module API
     class Internal
       class Account < Common::BaseModel
-        passthrough :policy_group_ids, :landing_page_id, :permissions_preset, :permissions_custom, :preferences, :prefilter, :filter_tags, :login_provider_ids, :starred_ids, :accept_eula, :send_invites, to: :doc
+        passthrough :policy_group_ids, :landing_page_id, :permissions_preset, :permissions_custom, :preferences, :prefilter, :filter_tags, :login_provider_ids, :starred_ids, :accept_eula, :send_invites, :default_tag, to: :doc
 
         VALID_TAG_REGEX = /^[A-Za-z0-9 &_'\/-]+$/
 

data/lib/ecoportal/api/logger.rb

@@ -0,0 +1,62 @@
+module Ecoportal
+  module API
+    class Logger
+      TIMESTAMP_PATTERN  = "%Y-%m-%dT%H:%M:%S"
+      STDOUT_FORMAT_PROC = proc do |severity, datetime, progname, msg|
+        prefix = "%5s > " % severity
+        msg.lines.map.with_index do |line, idx|
+          if idx.zero?
+            prefix + line.chomp
+          else
+            " "*prefix.length + line.chomp
+          end
+        end.join("\n")+"\n"
+      end
+      FILE_FORMAT_PROC = proc do |severity, datetime, progname, msg|
+        prefix = "%5s(%s) > " % [severity, datetime.strftime(TIMESTAMP_PATTERN)]
+        msg.lines.map.with_index do |line, idx|
+          if idx.zero?
+            prefix + line.chomp
+          else
+            " "*prefix.length + line.chomp
+          end
+        end.join("\n")+"\n"
+      end
+
+      attr_reader :console, :file
+
+      def initialize(
+        console_level: ::Logger::INFO,
+        file_level:   ::Logger::DEBUG,
+        output_file:  File.join(Dir.getwd, "API_Log-#{Time.now.strftime(TIMESTAMP_PATTERN)}.txt")
+      )
+        @console = make_stdout_logger(console_level)
+        @file    = make_file_logger(file_level, output_file)
+      end
+
+      %w(unknown fatal error warn info debug).each do |type|
+        define_method(type) do |&block|
+          @console.send(type, &block)
+          @file&.send(type, &block)
+        end
+      end
+
+      private
+
+      def make_stdout_logger(level)
+        ::Logger.new(STDOUT).tap do |logger|
+          logger.formatter = STDOUT_FORMAT_PROC
+          logger.level     = level
+        end
+      end
+
+      def make_file_logger(level, output_file)
+        return unless output_file
+        ::Logger.new(File.open(output_file, "a")).tap do |logger|
+          logger.formatter = FILE_FORMAT_PROC
+          logger.level     = level
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    VERSION = "0.3.1"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Tapio Saarinen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,7 @@ files:
 - lib/ecoportal/api/internal/preferences.rb
 - lib/ecoportal/api/internal/schema_field.rb
 - lib/ecoportal/api/internal/schema_field_value.rb
+- lib/ecoportal/api/logger.rb
 - lib/ecoportal/api/v1.rb
 - lib/ecoportal/api/v1/.git-keep
 - lib/ecoportal/api/v1/people.rb