ecoportal-api 0.9.8 → 0.10.2

data/lib/ecoportal/api/logger.rb

@@ -1,24 +1,26 @@
 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
+      TIMESTAMP_PATTERN  = "%Y-%m-%dT%H:%M:%S".freeze
+
+      STDOUT_FORMAT_PROC = proc do |severity, _datetime, _progname, msg|
+        prefix = "%5s > " % severity # rubocop:disable Style/FormatString
         msg.lines.map.with_index do |line, idx|
           if idx.zero?
             prefix + line.chomp
           else
-            " "*prefix.length + line.chomp
+            (" " * 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)]
+
+      FILE_FORMAT_PROC = proc do |severity, datetime, _progname, msg|
+        prefix = "%5s(%s) > " % [severity, datetime.strftime(TIMESTAMP_PATTERN)] # rubocop:disable Style/FormatString, Style/FormatStringToken
         msg.lines.map.with_index do |line, idx|
           if idx.zero?
             prefix + line.chomp
           else
-            " "*prefix.length + line.chomp
+            (" " * prefix.length) + line.chomp
           end
         end.join("\n")+"\n"
       end
@@ -34,7 +36,7 @@ module Ecoportal
         @file    = make_file_logger(file_level, output_file)
       end
 
-      %w(unknown fatal error warn info debug).each do |type|
+      %w[unknown fatal error warn info debug].each do |type|
         define_method(type) do |&block|
           @console.send(type, &block)
           @file&.send(type, &block)
@@ -44,7 +46,7 @@ module Ecoportal
       private
 
       def make_stdout_logger(level)
-        ::Logger.new(STDOUT).tap do |logger|
+        ::Logger.new($stdout).tap do |logger|
           logger.formatter = STDOUT_FORMAT_PROC
           logger.level     = level
         end

data/lib/ecoportal/api/v1/job_status.rb

@@ -0,0 +1,33 @@
+module Ecoportal
+  module API
+    class V1
+      class JobStatus
+        attr_reader :id, :progress
+
+        def initialize(id, complete, errored, progress)
+          @id       = id
+          @complete = complete
+          @errored  = errored
+          @progress = progress
+        end
+
+        def complete?(total = nil)
+          return @complete if total.nil?
+
+          progress >= total
+        end
+
+        def errored?
+          @errored
+        end
+
+        def to_s
+          msg = complete? ? "Completed" : "In progress"
+          msg = "Errored" if errored?
+          msg << " with #{progress} done."
+          msg
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/v1/people.rb

@@ -1,13 +1,14 @@
 module Ecoportal
   module API
     class V1
-      # @attr_reader client [Common::Client] a `Common::Client` object that holds the configuration of the api connection.
+      # @attr_reader client [Common::Client] a `Common::Client` object that
+      #   holds the configuration of the api connection.
       class People
         extend Common::BaseClass
-        include Enumerable
         include Common::DocHelpers
+        include Common::TimeOut
+        include Enumerable
 
-        JOB_TIMEOUT = 240
         DELAY_STATUS_CHECK = 5
 
         class_resolver :person_class, "Ecoportal::API::V1::Person"
@@ -30,35 +31,49 @@ module Ecoportal
         # @param silent [Boolean] `false` to show percentage of progress.
         # @yield [person] does some stuff with the person.
         # @yieldparam person [Person]
-        def each(params: {}, silent: false, &block)
-          return to_enum(:each, params: params, silent: silent) unless block
-          cursor_id = nil; results = 0
+        def each(params: {}, silent: false) # rubocop:disable Metrics/AbcSize
+          return to_enum(:each, params: params, silent: silent) unless block_given?
+
+          cursor_id = nil
+          results   = 0
+
           puts "\n" unless silent
+
           loop do
             params.update(cursor_id: cursor_id) if cursor_id
-            body = nil; response = nil; count = 5
+
+            body     = nil
+            response = nil
+            count    = 5
+
             loop do
               response = client.get("/people", params: params)
               body     = response && body_data(response.body)
               break if response.success? || count <= 0
+
               puts "Request failed - Status #{response.status}: #{body}"
               count -= 1
+
               sleep(0.5)
             end
+
             raise "Request failed - Status #{response.status}: #{body}" unless response.success?
 
-            unless silent || (total = body["total_results"]) == 0
+            unless silent || (total = body["total_results"])&.zero?
               results += body["results"].length
               percent  = results * 100 / total
+
               msg      = "People GET"
-              msg     += " (search=#{params[:q]})" if params.key?(:q)
-              print "#{msg}: #{percent.round}% (of #{total})\r"
+              msg     << " (search=#{params[:q]})" if params.key?(:q)
+
+              print "#{msg}: #{percent.round}% (of #{total}): #{results}\r"
               $stdout.flush
             end
 
             body["results"].each do |person|
               yield person_class.new(person)
             end
+
             break unless (cursor_id = body["cursor_id"])
           end
           self
@@ -81,9 +96,10 @@ module Ecoportal
         # @return [Person] the person with `id` (internal or external) contained in `doc`.
         def get(doc)
           id       = get_id(doc)
-          response = client.get("/people/"+CGI.escape(id))
+          response = client.get("/people/#{CGI.escape(id)}")
           body     = body_data(response.body)
           return person_class.new(body) if response.success?
+
           raise "Could not get person #{id} - Error #{response.status}: #{body}"
         end
 
@@ -93,7 +109,7 @@ module Ecoportal
         def update(doc)
           body = get_body(doc)
           id   = get_id(doc)
-          client.patch("/people/"+CGI.escape(id), data: body)
+          client.patch("/people/#{CGI.escape(id)}", data: body)
         end
 
         # Requests to create a person via api.
@@ -110,7 +126,7 @@ module Ecoportal
         def upsert(doc)
           body = get_body(doc)
           id   = get_id(doc)
-          client.post("/people/"+CGI.escape(id), data: body)
+          client.post("/people/#{CGI.escape(id)}", data: body)
         end
 
         # Requests to completelly remove from an organization an existing person via api.
@@ -118,7 +134,7 @@ module Ecoportal
         # @return [Response] an object with the api response.
         def delete(doc)
           id = get_id(doc)
-          client.delete("/people/"+CGI.escape(id))
+          client.delete("/people/#{CGI.escape(id)}")
         end
 
         # Creates a `BatchOperation` and yields it to the given bock.
@@ -128,8 +144,15 @@ module Ecoportal
         # @return [Ecoportal::API::Common::Response] the results of the batch
         def batch(job_mode: true, &block)
           return job(&block) if job_mode
-          operation = Common::BatchOperation.new("/people", person_class, logger: client.logger)
+
+          operation = Common::BatchOperation.new(
+            "/people",
+            person_class,
+            logger: client.logger
+          )
+
           yield operation
+
           # The batch operation is responsible for logging the output
           client.post("/people/batch", data: operation.as_json).tap do |response|
             operation.process_response(response)
@@ -138,16 +161,30 @@ module Ecoportal
 
         # @return [Ecoportal::API::Common::Response] the results of the batch job
         def job
-          operation = Common::BatchOperation.new("/people", person_class, logger: client.logger)
+          operation = Common::BatchOperation.new(
+            "/people",
+            person_class,
+            logger: client.logger
+          )
+
           yield operation
-          job_id = create_job(operation)
-          status = wait_for_job_completion(job_id)
 
-          if status&.complete?
+          total   = operation.count
+          timeout = timeout_for(total)
+
+          job_id  = create_job(operation)
+          status  = wait_for_job_completion(job_id, timeout: timeout, total: total)
+
+          # @todo
+          # if total == status.progress
+          if status&.complete?(total)
             job_result(job_id, operation)
           else
-            msg = "Job `#{job_id}` not complete. Probably timeout after #{JOB_TIMEOUT} seconds. Current status: #{status}"
-            raise API::Errors::TimeOut.new msg
+            msg  = "Job '#{job_id}' not complete (size: #{total}).\n"
+            msg << "  Probably timeout after #{timeout} seconds.\n"
+            msg << "  Current status: #{status}"
+
+            raise API::Errors::TimeOut, msg
           end
         end
 
@@ -159,17 +196,15 @@ module Ecoportal
 
         private
 
-        JobStatus = Struct.new(:id, :complete?, :errored?, :progress)
         def job_status(job_id)
           response = client.get("/people/job/#{CGI.escape(job_id)}/status")
           body     = response && body_data(response.body)
-          raise "Status error (#{response.status}) - Errors: #{body}" unless response.success?
-          JobStatus.new(
-            body["id"],
-            body["complete"],
-            body["errored"],
-            body["progress"]
-          )
+
+          msg      = "Status error (#{response.status}) - "
+          msg     << "Errors: #{body}"
+          raise msg unless response.success?
+
+          JobStatus.new(*body.values_at(*%w[id complete errored progress]))
         end
 
         # @return [Ecoportal::API::Common::Response] the results of the batch job
@@ -179,14 +214,26 @@ module Ecoportal
           end
         end
 
-        def wait_for_job_completion(job_id)
+        def wait_for_job_completion(job_id, timeout:, total:)
           # timeout library is evil. So we make poor-man timeout.
           # https://jvns.ca/blog/2015/11/27/why-rubys-timeout-is-dangerous-and-thread-dot-raise-is-terrifying/
           before = Time.now
-          while true
+
+          loop do
             status = job_status(job_id)
-            break status if status.complete?
-            break status if Time.now >= before + JOB_TIMEOUT
+            break status if status.complete?(total)
+
+            left = (before + timeout) - Time.now
+            break status unless left.positive?
+            # break status if Time.now >= before + timeout
+
+            msg  = " ... Await job "
+            msg << "('#{job_id}'; done: #{status.progress}): "
+            msg << "#{left.ceil} sec.    \r"
+
+            print msg
+            $stdout.flush
+
             sleep(DELAY_STATUS_CHECK)
             status
           end
@@ -207,7 +254,6 @@ module Ecoportal
         def body_data(body)
           body
         end
-
       end
     end
   end

data/lib/ecoportal/api/v1/person.rb

@@ -9,14 +9,16 @@ module Ecoportal
       # @attr details [PersonDetails, nil] the details of the person or `nil` if missing.
       class Person < Common::BaseModel
         passthrough :id, :external_id, :name, :email, :filter_tags
+        passthrough :archived
         passthrough :supervisor_id, :contractor_organization_id
+        passthrough :brand_id
         passthrough :freemium
 
         class_resolver :person_schema_class,  "Ecoportal::API::V1::PersonSchema"
         class_resolver :person_details_class, "Ecoportal::API::V1::PersonDetails"
         embeds_one :details, nullable: true, klass: :person_details_class
 
-        VALID_TAG_REGEX = /^[A-Za-z0-9 &_'\/.-]+$/
+        VALID_TAG_REGEX   = /^[A-Za-z0-9 &_'\/.-]+$/
         VALID_EMAIL_REGEX = /^[^@\s]+@[^@\s]+\.[^@\s]+$/
 
         # Gets the supervisor (`Person`) of this person, with given his `supervisor_id`.
@@ -47,9 +49,8 @@ module Ecoportal
         # Sets the email of a person.
         # @param value [String, nil] the email of this person.
         def email=(value)
-          unless !value || value.match(VALID_EMAIL_REGEX)
-            raise "Invalid email #{value.inspect}"
-          end
+          raise "Invalid email #{value.inspect}" if value && !value.match(VALID_EMAIL_REGEX)
+
           doc["email"] = value&.downcase
         end
 
@@ -58,15 +59,16 @@ module Ecoportal
         # @raise [Exception] if there was any invalid string tag.
         # @param value [Array<String>] array of tags.
         def filter_tags=(value)
-          unless value.is_a?(Array)
-            raise "filter_tags= needs to be passed an Array, got #{value.class}"
-          end
+          msg = "filter_tags= needs to be passed an Array, got #{value.class}"
+          raise ArgumentError, msg unless value.is_a?(Array)
+
           end_tags = value.compact.map do |tag|
-            unless tag.match(VALID_TAG_REGEX)
-              raise "Invalid filter tag #{tag.inspect}"
-            end
+            msg = "Invalid filter tag #{tag.inspect}"
+            raise ArgumentError, msg unless tag.match(VALID_TAG_REGEX)
+
             tag.upcase
           end
+
           set_uniq_array_keep_order("filter_tags", end_tags)
         end
 
@@ -105,8 +107,10 @@ module Ecoportal
         end
 
         # Sets the PersonDetails to the person, depending on the parameter received:
-        #  - `PersonSchema`: initializes the `PersonDetails` as per the schema specified (`schema_id` and `fields`).
-        #  - `String`: it just sets the `schema_id` on the `PersonDetails` (as `fields` is not include, `details[key]=` will throw error).
+        #  - `PersonSchema`: initializes the `PersonDetails` as per the schema specified
+        #    (`schema_id` and `fields`).
+        #  - `String`: it just sets the `schema_id` on the `PersonDetails`
+        #    (as `fields` is not include, `details[key]=` will throw error).
         # (see #details=)
         # @note
         #   - this method alone only sets the internal structure of the details.
@@ -130,7 +134,6 @@ module Ecoportal
             }
           end
         end
-
       end
     end
   end

data/lib/ecoportal/api/v1/person_details.rb

@@ -40,7 +40,8 @@ module Ecoportal
 
         # Gets the value of one specific field of the PersonDetails.
         # @param id [String] the `id` or the `alt_id` of the target field.
-        # @return [String, Array<String>, Boolean, Array<Boolean>, Date, Array<Date>, Numberic, Array<Numeric>] the value of field or `nil` if missing.
+        # @return [String, Array<String>, Boolean, Array<Boolean>, Date, Array<Date>, Numberic, Array<Numeric>]
+        #   the value of field or `nil` if missing.
         def [](id)
           get_field(id)&.value
         end
@@ -50,11 +51,10 @@ module Ecoportal
         # @param id [String] the `id` or the `alt_id` of the target field.
         # @return [void]
         def []=(id, value)
-          if field = get_field(id)
-            field.value = value
-          else
-            raise MissingId.new("details[#{id.inspect}] is missing. Did you forget to load the schema?")
-          end
+          msg = "details[#{id.inspect}] is missing. Did you forget to load the schema?"
+          raise MissingId, msg unless (field = get_field(id))
+
+          field.value = value
         end
 
         # Checks if an `id` or `alt_id` exists
@@ -67,12 +67,14 @@ module Ecoportal
 
         # @return [Boolean] `true` if `id` exists and `value` has changed, `false` otherwise
         def changed?(id, doc = :original)
-          return false unless field = get_field(id)
+          return false unless (field = get_field(id))
+
           field.as_update.key?("value")
         end
 
         def original_value(id)
-          return nil unless field = get_field(id)
+          return nil unless (field = get_field(id))
+
           field.original_doc["value"]
         end
 
@@ -87,7 +89,6 @@ module Ecoportal
             @fields_by_alt_id[wrapped.alt_id] = wrapped
           end
         end
-
       end
     end
   end

data/lib/ecoportal/api/v1/person_schema.rb

@@ -30,6 +30,7 @@ module Ecoportal
         def index_fields
           @fields_by_id     = {}
           @fields_by_alt_id = {}
+
           doc["fields"].each do |field|
             wrapped = schema_field_class.new(field)
             @fields_by_id[wrapped.id] = wrapped
@@ -45,7 +46,6 @@ module Ecoportal
             )
           end
         end
-
       end
     end
   end

data/lib/ecoportal/api/v1/person_schemas.rb

@@ -38,8 +38,6 @@ module Ecoportal
           return to_enum(:each) unless block
           get_all.each(&block)
         end
-
-
       end
     end
   end

data/lib/ecoportal/api/v1/schema_field.rb

@@ -22,11 +22,10 @@ module Ecoportal
               Date.parse(line) rescue return nil, false
             end
           end.compact
-          if multiple
-            return values, true
-          else
-            return values.first, true
-          end
+
+          out = values
+          out = values.first unless multiple
+          [out, true]
         end
       end
     end

data/lib/ecoportal/api/v1/schema_field_value.rb

@@ -6,29 +6,27 @@ module Ecoportal
         passthrough :id, :alt_id, :type, :name, :shared, :multiple
 
         def clear
-          if multiple
-            doc["value"] = []
-          else
-            doc["value"] = nil
-          end
+          return doc["value"] = [] if multiple
+
+          doc["value"] = nil
         end
 
         def value
           case type
           when "text", "phone_number", "number", "boolean", "select"
-           doc["value"]
+            doc["value"]
           when "date"
-           if doc["value"]
-             maybe_multiple(doc["value"]) do |v|
-               Date.iso8601(v)
-             end
-           end
+            if doc["value"]
+              maybe_multiple(doc["value"]) do |v|
+                Date.iso8601(v)
+              end
+            end
           else
-           raise "Unknown type #{type}"
+            raise "Unknown type #{type}"
           end
         end
 
-        def value=(value)
+        def value=(value) # rubocop:disable Metrics/AbcSize
           case type
           when "text", "phone_number", "select"
             doc["value"] = maybe_multiple(value) do |v|
@@ -36,19 +34,21 @@ module Ecoportal
             end
           when "number"
             maybe_multiple(value) do |v|
-              unless v.nil? || v.is_a?(Numeric)
-                raise "Invalid number type #{v.class}"
-              end
+              next if v.nil? || v.is_a?(Numeric)
+
+              raise "Invalid number type #{v.class}"
             end
+
             doc["value"] = value
           when "boolean"
             doc["value"] = !!value
           when "date"
             maybe_multiple(value) do |v|
-              unless v.nil? || v.respond_to?(:to_date)
-                raise "Invalid date type #{v.class}"
-              end
+              next if v.nil? || v.respond_to?(:to_date)
+
+              raise "Invalid date type #{v.class}"
             end
+
             doc["value"] = maybe_multiple(value) do |v|
               v&.to_date&.to_s
             end
@@ -57,12 +57,11 @@ module Ecoportal
           end
         end
 
-        def maybe_multiple(value)
+        def maybe_multiple(value, &block)
           if multiple
-            unless value.is_a?(Array)
-              raise "Expected Array, got #{value.class}"
-            end
-            value.map {|v| yield v }
+            raise "Expected Array, got #{value.class}" unless value.is_a?(Array)
+
+            value.map(&block)
           else
             yield value
           end

data/lib/ecoportal/api/v1.rb

@@ -6,9 +6,10 @@ module Ecoportal
       extend Common::BaseClass
       include Common::Logging
 
-      VERSION = "v1"
-      class_resolver :people_class,  "Ecoportal::API::V1::People"
-      class_resolver :person_schemas_class,  "Ecoportal::API::V1::PersonSchemas"
+      VERSION = "v1".freeze
+
+      class_resolver :people_class, "Ecoportal::API::V1::People"
+      class_resolver :person_schemas_class, "Ecoportal::API::V1::PersonSchemas"
 
       attr_reader :client, :logger
 
@@ -45,5 +46,6 @@ module Ecoportal
   end
 end
 
+require 'ecoportal/api/v1/job_status'
 require 'ecoportal/api/v1/person_schemas'
 require 'ecoportal/api/v1/people'

data/lib/ecoportal/api/version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    VERSION = "0.9.8".freeze
+    VERSION = '0.10.2'.freeze
   end
 end