eco-helpers 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb97e964a09a628b29aa507f3f6d764df82b7c8dbdd568f86245ab05fdfb4bb
-  data.tar.gz: 1f09ede76add050f3800d6683717a1ccd8f45e6af46f030e53d24edee74f7273
+  metadata.gz: aa39fb0038e03d65a129a3d7df06f5c3fba60518ef847cd89cfe0d973f27065e
+  data.tar.gz: f22d6d27a952af99e4f84eb1ed29a8b930d7226f0a67d60c86f6eabb4a15715f
 SHA512:
-  metadata.gz: c0d9585e4c20c5e9f0f8ca0101789dc9e50e6e08a71297c0376f1c2334abe602fbe24ca5fee178c840c2c52e0ee6a1446c26eee0103a377f29e99fbe9afece46
-  data.tar.gz: e3894a74b853858da71ee783f460eed18cbd68dae92a941ea755a687b84c7b27f4899a675c7cb16ecbb83d0eb4105aa8380d8dea3ac64493a7e82f6802a14e37
+  metadata.gz: 070ee0c500e334ef8bf149bdf3ec24fd20480a16a3b4742f25247fccd09a8ef476a3bdfcfb45119a4fa37dc1c0dbe415cf53de2fa6ecd4722fa81f65c3762450
+  data.tar.gz: c4456bbbfd19b4e03734f6dd9b388087c7a7aee44dba138ec2aa1dfc78ceff0024c222589d5e9857561b25ef730faf3f9e8008dfb5d4dd006cfaa47c15c197a7

data/lib/eco-helpers.rb

@@ -6,6 +6,7 @@ require 'pp'
 module Eco
 end
 
+require_relative 'eco/csv'
 require_relative 'eco/language'
 require_relative 'eco/common'
 require_relative 'eco/data'

data/lib/eco/api/common/people.rb

@@ -15,5 +15,6 @@ require_relative 'people/person_parser'
 require_relative 'people/default_parsers'
 require_relative 'people/person_entry_attribute_mapper'
 require_relative 'people/person_entry'
+require_relative 'people/supervisor_helpers'
 require_relative 'people/entries'
 require_relative 'people/entry_factory'

data/lib/eco/api/common/people/default_parsers/boolean_parser.rb

@@ -18,7 +18,7 @@ module Eco
             private
 
             def truthy (value)
-              %w[true y yes x].include?(value.to_s&.downcase)
+              %w[true y yes x].include?(value.to_s.strip.downcase)
             end
           end
         end

data/lib/eco/api/common/people/default_parsers/csv_parser.rb

@@ -9,7 +9,10 @@ module Eco
               @parsers.define_attribute(:csv, dependencies: @options) do |parser|
                 parser.def_parser  do |data, deps|
                   arr_hash = []
-                  CSV.parse(data, headers: true).each do |row|
+                  CSV.parse(data, headers: true, skip_blanks: true).reject do |row|
+                    values = row.to_hash.values
+                    values.all?(&:nil?) || values.map(&:to_s).all?(&:empty?)
+                  end.each do |row|
                     row_hash = row.headers.uniq.each_with_object({}) do |attr, hash|
                       value      = row[attr]
                       hash[attr] = value.to_s.empty?? nil : value

data/lib/eco/api/common/people/default_parsers/numeric_parser.rb

@@ -8,7 +8,7 @@ module Eco
             def process
               @parsers.define_attribute(:number, dependencies: @options) do |parser|
                 parser.def_parser  do |value, deps|
-                  value = value.to_s.strip == "" ? nil : (value.to_f rescue nil)
+                  value = value.to_s.strip.empty? ? nil : (value.to_f rescue nil)
                 end.def_serializer do |value|
                   value.is_a?(Array) ? value.map { |v| v.to_s } : value.to_s
                 end

data/lib/eco/api/common/people/entries.rb

@@ -10,11 +10,20 @@ module Eco
 
           alias_method :entries, :to_a
 
+          include Eco::API::Common::People::SupervisorHelpers
+
           def initialize(data = [], klass:, factory:)
             super(data, klass: klass, factory: factory)
             @caches_init = false
           end
 
+          # Override `each` to make it work with supervisor hiearchy
+          def each(params: {}, &block)
+            return to_enum(:each) unless block
+            @array_supers = sort_by_supervisors(@items) unless @caches_init
+            @array_supers.each(&block)
+          end
+
           def [](id_or_ext)
             id(id_or_ext) || external_id(id_or_ext)
           end
@@ -96,6 +105,7 @@ module Eco
             @by_id          = to_h
             @by_external_id = to_h('external_id')
             @by_email       = to_h('email')
+            @array_supers   = sort_by_supervisors(@items)
             @caches_init = true
           end
 

data/lib/eco/api/common/people/supervisor_helpers.rb

@@ -0,0 +1,142 @@
+module Eco
+  module API
+    module Common
+      module People
+        # Used with `Enumerable` of objects that have the following methods:
+        #   * `supervisor_id`
+        #   * `external_id`
+        #   * `id`
+        module SupervisorHelpers
+
+          # Reorders as follows:
+          #   1. supervisors, people with no supervisor or where their supervisor not present
+          #   2. subordinates
+          def sort_by_supervisors(values, supervisors_first: true)
+            raise "Expected non hash Enumerable. Given: #{values.class}" if values.is_a?(Hash)
+            return [] unless values && values.is_a?(Enumerable)
+            roam = Proc.new do |tree|
+              [].tap do |out|
+                sub_outs = tree.empty?? [] : tree.map {|sup, subtree| roam.call(subtree)}
+                tree.each do |sup, subtree|
+                  sout = subtree.empty?? [] :roam.call(subtree)
+                  supervisors_first ? sout.unshift(sup) : sout.push(sup)
+                  out.concat(sout)
+                end
+              end
+            end
+
+            roam.call(supervisors_tree(values))
+          end
+
+          def tree_to_str(tree, lev: 0)
+            raise "Required Hash tree structure. Given: #{tree.class}" unless tree.is_a?(Hash)
+            "".tap do |str|
+              tree.each do |entry, subtree|
+                str << "#{"  " * lev}+-- #{entry.id || entry.external_id}\n"
+                str << tree_to_str(subtree, lev: lev + 1) unless !subtree || subtree.empty?
+              end
+            end
+          end
+
+          def print_tree(tree, lev: 0)
+            puts tree_to_str(tree)
+          end
+
+          # Generates a `Hash` tree structure, where:
+          #   * **keys** are nodes
+          #   * **values** are `Hash` subtree structures of `key` subordinates
+          # @note it is resilient to cyclic supervisors (it will just add the last at the top)
+          # @param values [Enumerable<Object>] of objects with methods:
+          #  `id`, `external_id` and `supervisor_id`
+          # @return [Hash] the tree structure
+          def supervisors_tree(values)
+            raise "Expected non hash Enumerable. Given: #{values.class}" if values.is_a?(Hash)
+            return {} unless values && values.is_a?(Enumerable)
+            idx = get_super_indexes(values)
+
+            processed = []
+            subtree = Proc.new do |entry, level, toptree|
+              if processed.include?(entry)
+                next {} unless toptree.key?(entry) && level > 0
+                # needs to be moved as a child
+                subnodes = toptree.delete(entry)
+                processed.delete(entry)
+              end
+
+              subnodes ||= {}.tap do |tree|
+                subs = idx[:subordinates].call(entry)
+                processed.push(entry)
+                next nil unless subs && !subs.empty?
+                subs.each do |sub|
+                  sub_tree = subtree.call(sub, level + 1, toptree)
+                  tree.merge!(sub_tree)
+                end
+              end
+
+              {entry => subnodes}
+            end
+
+            {}.tap do |tree|
+              idx[:by_sup].keys.each do |sup_id|
+                if sup = idx[:supers][sup_id]
+                  tree.merge!(subtree.call(sup, 0, tree))
+                else
+                  idx[:by_sup][sup_id].each do |sub|
+                    tree.merge!(subtree.call(sub, 0, tree))
+                  end
+                end
+              end
+            end
+          end
+
+          private
+
+          def get_super_indexes(values)
+            raise "Expected non hash Enumerable. Given: #{values.class}" if values.is_a?(Hash)
+            {}.tap do |indexes|
+              indexes[:by_id]  = values.map do |e|
+                e.id && [e.id, e]
+              end.compact.to_h
+              indexes[:by_ext] = values.map do |e|
+                e.external_id && [e.external_id, e]
+              end.compact.to_h
+
+              indexes[:by_sup] = {}.tap do |by_s|
+                values.group_by do |e|
+                  e.supervisor_id
+                end.tap do |by_sup|
+                  by_s[nil] = by_sup.delete(nil) if by_sup.key?(nil)
+                  by_s.merge!(by_sup)
+                end
+              end
+
+              indexes[:supers] = {}.tap do |sups|
+                indexes[:by_ext].select do |ext, e|
+                  ext && indexes[:by_sup].key?(ext)
+                end.tap {|found| sups.merge!(found)}
+                indexes[:by_id].select do |id, e|
+                  id && indexes[:by_sup].key?(id)
+                end.tap {|found| sups.merge!(found)}
+              end
+
+              indexes[:is_super]     = Proc.new do |entry|
+                !!(indexes[:supers][entry.id] || indexes[:supers][entry.external_id])
+              end
+
+              indexes[:subordinates] = Proc.new do |entry|
+                subs = nil
+                if sup = indexes[:supers][entry.id] || indexes[:supers][entry.external_id]
+                  subs ||= indexes[:by_sup][sup.id]          unless !sup.id
+                  subs ||= indexes[:by_sup][sup.external_id] unless !sup.external_id
+                end
+                subs
+              end
+            end
+
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/eco/cli/config/default/filters.rb

@@ -56,13 +56,13 @@ ASSETS.cli.config do |cnf|
       end
 
       options.deep_merge!(people: {filter: {details: {schema_id: sch_id}}})
-      session.logger.info("Filtering for schema #{sch_name}")
-
-      session.schema = sch_id
-
+      session.logger.info("Filtering people entries with schema #{session.schemas.to_name(sch_id)}")
+      
       filtered = people.select do |person|
         person.details && (person.details.schema_id == sch_id)
       end
+      session.logger.info("Filtered #{filtered.count} people out of #{people.count} total")
+
       people.newFrom filtered
     end
 

data/lib/eco/cli/config/default/options.rb

@@ -1,6 +1,22 @@
 ASSETS.cli.config do |cnf|
   cnf.options_set do |options_set, options|
 
+    options_set.add("-schema-id") do |options, session|
+      sch_name = SCR.get_arg("-schema-id", with_param: true)
+      sch_id   = session.schemas.to_id(sch_name)
+
+      unless sch_id
+        msg = "You need to specify a schema id or name. '#{sch_id}' does not exist"
+        session.logger.error(msg)
+        exit(1)
+      end
+
+      options.deep_merge!(people: {filter: {details: {schema_id: sch_id}}})
+      session.logger.info("Setting schema #{session.schemas.to_name(sch_id)}")
+
+      session.schema = sch_id
+    end
+
     options_set.add("-entries-from") do |options, session|
       options.deep_merge!(input: {entries_from: true})
     end

data/lib/eco/csv.rb

@@ -0,0 +1,33 @@
+require 'csv'
+
+module Eco
+  class CSV < ::CSV
+
+    class << self
+
+      def parse(data, **kargs, &block)
+        kargs = {headers: true, skip_blanks: true}.merge(kargs)
+        out = super(data, **kargs, &block).reject do |row|
+          values = row.to_hash.values
+          values.all?(&:nil?) || values.map(&:to_s).all?(&:empty?)
+        end
+        Eco::CSV::Table.new(out)
+      end
+
+      def read(file, **kargs)
+        coding = Eco::API::Common::Session::FileManager.encoding(file)
+        kargs = {headers: true,  skip_blanks: true,  encoding: coding}.merge(kargs)
+        out = super(file, **kargs).reject do |row|
+          values = row.to_hash.values
+          values.all?(&:nil?) || values.map(&:to_s).all?(&:empty?)
+        end
+        Eco::CSV::Table.new(out)
+      end
+
+    end
+
+
+  end
+end
+
+require_relative 'csv/table'

data/lib/eco/csv/table.rb

@@ -0,0 +1,79 @@
+
+module Eco
+  class CSV
+    class Table < ::CSV::Table
+
+      # @param ary_arrays [Array<Row>, Array<Array>, Eco::CSV::Table, ::CSV::Table]
+      #   - when `Array<Array>` => all `rows` as arrays where first array is the **header**
+      def initialize(input)
+        super(to_rows_array(input))
+      end
+
+      # @return [Array<::CSV::Row>]
+      def rows
+        [].tap do |out|
+          self.each {|row| out << row}
+        end
+      end
+
+      # @return [Integer] total number of rows not including the header
+      def length
+        to_a.length - 1
+      end
+
+      # @return [Array<Array>] each array is the column header followed by its values
+      def columns
+        to_a.transpose
+      end
+
+      # Adds a new column at the end
+      # @param header_name [String] header of the new column
+      # @return [Eco::CSV::Table] with a new empty column
+      def add_column(header_name)
+        new_col = Array.new(length).unshift(header_name)
+        columns_to_table(columns.push(new_col))
+      end
+
+      # @note it will override columns with same header name
+      # @return [Hash] keys are headers, values are arrays
+      def columns_hash
+        columns.map do |col|
+          [col.first, col[1..-1]]
+        end.to_h
+      end
+
+      private
+
+      def columns_to_table(columns_array)
+        data = to_rows_array(columns_array.transpose)
+        self.class.new(data)
+      end
+
+      def to_rows_array(data)
+        case data
+        when Array
+          return data unless data.length > 0
+          if data.first.is_a?(::CSV::Row)
+            data
+          elsif data.first.is_a?(Array)
+            headers  = data.shift
+            data.map do |arr_row|
+              CSV::Row.new(headers, arr_row)
+            end.compact
+          else
+            raise "Expected data that can be transformed into Array<Array>"
+          end
+        when ::CSV::Table
+          to_rows_array(data.to_a)
+        when Hash
+          # hash of columns header as key and column array as value
+          rows_arrays = [a.keys].concat(a.values.first.zip(*a.values[1..-1]))
+          to_rows_array(data.keys)
+        else
+          raise "Input type not supported. Given: #{data.class}"
+        end
+      end
+
+    end
+  end
+end

data/lib/eco/language/models/collection.rb

@@ -154,10 +154,9 @@ module Eco
           self.attr(attr, value, modifier)
         end
 
-        def group_by(attr)
-          to_h(attr)
-          #return {} if !attr
-          #self.to_a.group_by { |object| object.method(attr).call }
+        def group_by(attr = nil, &block)
+          return to_h(attr) if attr
+          to_a.group_by(&block) if block
         end
 
         def to_h(attr)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Oscar Segura
@@ -82,22 +82,22 @@ dependencies:
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: ecoportal-api
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +142,42 @@ dependencies:
   name: aws-sdk-ses
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.14.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.14.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,7 @@ files:
 - lib/eco/api/common/people/person_factory.rb
 - lib/eco/api/common/people/person_modifier.rb
 - lib/eco/api/common/people/person_parser.rb
+- lib/eco/api/common/people/supervisor_helpers.rb
 - lib/eco/api/common/session.rb
 - lib/eco/api/common/session/base_session.rb
 - lib/eco/api/common/session/environment.rb
@@ -344,6 +345,8 @@ files:
 - lib/eco/cli/scripting/argument.rb
 - lib/eco/cli/scripting/arguments.rb
 - lib/eco/common.rb
+- lib/eco/csv.rb
+- lib/eco/csv/table.rb
 - lib/eco/data.rb
 - lib/eco/data/crypto.rb
 - lib/eco/data/crypto/encryption.rb
@@ -384,7 +387,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: eco-helpers to manage people api cases