eco-helpers 0.9.5 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8824e93753de01f752b0b655339fcc09ddf4da24dfdad76b25cadb25bed11225
-  data.tar.gz: 9db399712ea74e57ea62c696802f2dcf80e8fe01dd476f18edc4a938a66ca4ab
+  metadata.gz: 9e365c79c49402a5c46ebc79964b0b4d5848bc7822ac611c7ee882ed56a60888
+  data.tar.gz: 89616bae7fc5cf0755bd4b68f3ccc141be5b4fb95fa1ce16324244a98542ac39
 SHA512:
-  metadata.gz: d655f7beb82c00655a86d3e75e0444d4e0eb9f233a8e8b265413384d41e50c5e985ecd0588f37fb3e45209a296f9a4a8f6d02a90bb2cea8e7d09b6da2385a509
-  data.tar.gz: 325555d794297d40c3bfaffb8e3f500d622b3f16c274ad71001c0b56235a2560168cd6e18ce1fdfe5284bf0c91e75c5f0127b179e425f54195191629973d5349
+  metadata.gz: 719745fdba1d0e15a489553b424220f9c83f22fb431935682006c1299093fff99a8ee4c51b6af57b4db64d8bae0e98fd74445bd96f09fe5274fecf00a4829fad
+  data.tar.gz: 0e1f61a386be4dfebb8fe02942f26629aeeb1b83d982ed76e5a85d750ede88c6e758108152b0c3587e63962fe9896c3d3af8e81964baf3c42619245d2a1d0c22

data/eco-helpers.gemspec

@@ -22,16 +22,16 @@ Gem::Specification.new do |s|
   #s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "bundler",   "~> 1.16"
+  s.add_development_dependency "bundler",   "~> 2.0.1"
   s.add_development_dependency "rspec",     "~> 3",   ">= 3.8"
-  s.add_development_dependency "rake",      "~> 10.0"
+  s.add_development_dependency "rake",      "~> 12.3.0"
   s.add_development_dependency "yard",      "~> 0.9", ">= 0.9.18"
-  s.add_development_dependency "redcarpet", "~> 3.4", ">= 3.4.0"
+  s.add_development_dependency "redcarpet", "~> 3.5", ">= 3.5.0"
 
-  s.add_dependency 'ecoportal-api', '~> 0.4',  '>= 0.4.3'
+  s.add_dependency 'ecoportal-api', '~> 0.5',  '>= 0.5.1'
   s.add_dependency 'aws-sdk-s3',    '~> 1.30', '>= 1.30.1'
   s.add_dependency 'aws-sdk-ses',   '~> 1.14', '>= 1.14.0'
   s.add_dependency 'dotenv',        '~> 2.6',  '>= 2.6.0'
-  s.add_dependency 'faker',         '~> 1',    '>= 1.9'
+  s.add_dependency 'faker',         '~> 2',    '>= 2.1'
   s.add_dependency 'distribution',  '~> 0.7',  '>= 0.7.3'
 end

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

@@ -218,18 +218,28 @@ module Eco
 
           def _set_to_core(person, attr, value)
             value = value&.downcase if attr == "email"
-            person.send("#{attr}=", value&.strip)
+            multiple = ["filter_tags"].include?(attr)
+            if multiple
+              value   = @person_parser.parse(:multiple, value)
+              value   = value.map { |v| v&.upcase } if attr == "filter_tags"
+              # preserve previous order
+              current = into_a(person.send(attr))
+              value   = (current & value) + (value - current)
+            else
+              value   = value&.strip
+            end
+
+            person.send("#{attr}=", value)
           end
 
           def _set_to_account(person, attr, value)
             return if !person.account
-            multiple = ["policy_group_ids", "filter_tags"].include?(attr)
+            multiple = ["policy_group_ids"].include?(attr)
             if multiple
-              value = @person_parser.parse(:multiple, value)
-              value = value.map { |v| v&.upcase } if attr == "filter_tags"
+              value   = @person_parser.parse(:multiple, value)
               # preserve previous order
               current = into_a(person.account.send(attr))
-              value = (current & value) + (value - current)
+              value   = (current & value) + (value - current)
             end
 
             person.account.send("#{attr}=", value)

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

@@ -9,8 +9,8 @@ module Eco
         # @attr_reader details_attrs [Array<String>] internal names of schema details attributes.
         # @attr_reader all_attrs [Array<String>] all the internal name attributes, including _core_, _account_ and _details_.
         class PersonParser
-          CORE_ATTRS    = ["id", "external_id", "email", "name", "supervisor_id"]
-          ACCOUNT_ATTRS = ["policy_group_ids", "filter_tags", "default_tag"]
+          CORE_ATTRS    = ["id", "external_id", "email", "name", "supervisor_id", "filter_tags"]
+          ACCOUNT_ATTRS = ["policy_group_ids", "default_tag"]
           TYPE          = [:select, :text, :date, :number, :phone_number, :boolean, :multiple]
           FORMAT        = [:csv, :xml, :json]
 

data/lib/eco/api/usecases/default_cases/create_case.rb

@@ -17,12 +17,24 @@ module Eco
                 else
                   person = session.new_person
                   core_excluded = ["supervisor_id"]
+
+                  ini_tags   = person.filter_tags || []
                   entry.set_core(person, exclude: core_excluded)
+
+                  if session.tagtree
+                    person.filter_tags = session.tagtree.user_tags(
+                      initial:          ini_tags,
+                      final:            person.filter_tags,
+                      preserve_custom:  true,
+                      add_custom:       true
+                    )
+                  end
+
+
                   entry.set_details(person) unless options.dig(:exclude, :details)
 
                   unless options.dig(:exclude, :account)
                     ini_pg_ids = person.account&.policy_group_ids || []
-                    ini_tags   = person.account&.filter_tags || []
                     entry.set_account(person)
 
                     person.account&.send_invites = options[:send_invites] if options.key?(:send_invites)
@@ -35,15 +47,9 @@ module Eco
                     person.account.permissions_custom = session.new_preset(person)
 
                     if session.tagtree
-                      person.account.filter_tags = session.tagtree.user_tags(
-                        initial:          ini_tags,
-                        final:            person.account.filter_tags,
-                        preserve_custom:  true,
-                        add_custom:       true
-                      )
-                      person.account.default_tag = session.tagtree.default_tag(*person.account.filter_tags)
+                      person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
                     else
-                      tags = person.account.filter_tags
+                      tags = person.filter_tags
                       person.account.default_tag = tags.first unless tags.length > 1
                     end
                   end

data/lib/eco/api/usecases/default_cases/hris_case.rb

@@ -37,7 +37,7 @@ module Eco
 
                 person.account.permissions_custom = session.new_preset(person) unless !create && options.dig(:exclude, :abilities)
 
-                person.account.default_tag = person.account.filter_tags.first if person.account.filter_tags.length == 1
+                person.account.default_tag = person.filter_tags.first if person.filter_tags.length == 1
 
 
                 creation.add(person) if create

data/lib/eco/api/usecases/default_cases/set_default_tag_case.rb

@@ -30,7 +30,7 @@ module Eco
 
               people.each_with_index  do |person, i|
                 #next unless person.id == "5c527ba63f7690001243f5b2"
-                person.account.default_tag = session.tagtree.default_tag(*person.account.filter_tags)
+                person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
                 update.add(person)
               end
 

data/lib/eco/api/usecases/default_cases/update_case.rb

@@ -23,14 +23,28 @@ module Eco
 
               entries.each.with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)
+
                   core_excluded = ["supervisor_id"]
                   core_excluded.push("email") if options.dig(:exclude, :email)
-                  entry.set_core(person, exclude: core_excluded) unless options.dig(:exclude, :core)
+
+                  unless options.dig(:exclude, :core)
+                    ini_tags   = person.filter_tags || []
+                    entry.set_core(person, exclude: core_excluded)
+
+                    if session.tagtree
+                      person.filter_tags = session.tagtree.user_tags(
+                        initial:          ini_tags,
+                        final:            person.filter_tags,
+                        preserve_custom:  true,
+                        add_custom:       true
+                      )
+                    end
+                  end
+                  
                   entry.set_details(person) unless options.dig(:exclude, :details)
 
                   unless options.dig(:exclude, :account)
                     ini_pg_ids = person.account&.policy_group_ids || []
-                    ini_tags   = person.account&.filter_tags || []
                     entry.set_account(person)
 
                     person.account.policy_group_ids   = pgs.user_pg_ids(
@@ -41,15 +55,9 @@ module Eco
                     person.account.permissions_custom = session.new_preset(person) unless options.dig(:exclude, :abilities)
 
                     if session.tagtree
-                      person.account.filter_tags = session.tagtree.user_tags(
-                        initial:          ini_tags,
-                        final:            person.account.filter_tags,
-                        preserve_custom:  true,
-                        add_custom:       true
-                      )
-                      person.account.default_tag = session.tagtree.default_tag(*person.account.filter_tags)
+                      person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
                     else
-                      tags = person.account.filter_tags
+                      tags = person.filter_tags
                       person.account.default_tag = tags.first unless tags.length > 1
                     end
 

data/lib/eco/api/usecases/default_cases/upsert_case.rb

@@ -19,12 +19,24 @@ module Eco
 
                 core_excluded = ["supervisor_id"]
                 core_excluded.push("email") if options.dig(:exclude, :email) && !create
-                entry.set_core(person, exclude: core_excluded) unless options.dig(:exclude, :core) && !create
+
+                unless options.dig(:exclude, :core) && !create
+                  ini_tags   = person.filter_tags || []
+                  entry.set_core(person, exclude: core_excluded) 
+                  if session.tagtree
+                    person.filter_tags = session.tagtree.user_tags(
+                      initial:          ini_tags,
+                      final:            person.filter_tags,
+                      preserve_custom:  true,
+                      add_custom:       true
+                    )
+                  end
+                end
+
                 entry.set_details(person) unless options.dig(:exclude, :details)
 
                 unless options.dig(:exclude, :account)
                   ini_pg_ids = person.account&.policy_group_ids || []
-                  ini_tags   = person.account&.filter_tags || []
                   entry.set_account(person)
 
                   person.account.send_invites = options[:send_invites] if options.key?(:send_invites)
@@ -37,15 +49,9 @@ module Eco
                   person.account.permissions_custom = session.new_preset(person) unless !create && options.dig(:exclude, :abilities)
 
                   if session.tagtree
-                    person.account.filter_tags = session.tagtree.user_tags(
-                      initial:          ini_tags,
-                      final:            person.account.filter_tags,
-                      preserve_custom:  true,
-                      add_custom:       true
-                    )
-                    person.account.default_tag = session.tagtree.default_tag(*person.account.filter_tags)
+                    person.account.default_tag = session.tagtree.default_tag(*person.filter_tags)
                   else
-                    tags = person.account.filter_tags
+                    tags = person.filter_tags
                     person.account.default_tag = tags.first unless tags.length > 1
                   end
 

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "0.9.5"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 1.0.2
 platform: ruby
 authors:
 - Oscar Segura
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -84,40 +84,40 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: ecoportal-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -184,20 +184,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: distribution
   requirement: !ruby/object:Gem::Requirement