eco-helpers 2.3.3 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf51ce07b09a2eaa798de0b8524206de5a91160bd3d5df2af980c8985bfbdda
-  data.tar.gz: a203cc025f972e1b35c605450f42556911b913d43f8b860ff8e6f346eb93fb91
+  metadata.gz: 84e0b3626647d968a77ecc7dbc9dbe052be392ff7590f9f32c2402d4a0fdb45b
+  data.tar.gz: cfd6e253e91d50bd62ffb4cbad8556214a3519ccaf9fdd148c681170ad150466
 SHA512:
-  metadata.gz: ff86775ef30897999f6e109cb7a442fb0d8eaeae789715a91f62483d56c181a553f99a8d6c6aa7ce406da0577bfe1b0c90a02fcc918dbde7d8cecba398df032a
-  data.tar.gz: a16c1de5d41090ad98adcd8540da800a5bb0857c7f15bbc9c88898d0885d2f9ae9392a1b699c4d26e8378d9799d750a509230924076ffc1570a2418b08bfffb0
+  metadata.gz: 4162b785935a8f161ad5030e8ffbd72defd3ed10f50b6d4944b219c0faed84f5cd57efee5a1c43ed41c2f4efdbbcb5ab7356c426dbecd2ebaca2a0da79bba90a
+  data.tar.gz: 5c5ad42b25f53b92fcac214555fb7b2ab9b5af0c033367b375b6ae55334ce0ffa7ecca74d05bac7dd3a75aba7761d9f7be91d5fab44310eb664eeed3df758f83

data/CHANGELOG.md

@@ -1,15 +1,23 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.3.4] - 2023-03-xx
+## [2.4.4] - 2023-03-xx
 
 ### Added
-  - Added new option `-input-encoding` to specify the encoding of an input file
-
 ### Changed
-  - `ecoportal-api` **gem** update
+### Fixed
+
+## [2.4.3] - 2023-03-23
 
 ### Fixed
+  - `Eco::API::MicroCases#take_email_from_account` it was failing at the very (when restoring the original account)
+    - Comes from back-end issue. Adding account with preferences.kiosk_enabled would return:
+    - `{"errors"=>["account > preferences > kiosk_enabled is an unknown field"]}`
+
+## [2.4.2] - 2023-03-17
+
+### Fixed
+  - `Eco::API::Common::People::EntryFactory#entries` _bom_ **encoding** (get back support)
 
 ## [2.3.3] - 2023-03-16
 
@@ -18,7 +26,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
   - `ecoportal-api` **gem** update
-  
+
 
 ## [2.3.2] - 2023-03-10
 

data/eco-helpers.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://www.ecoportal.com"
   spec.licenses      = %w[MIT]
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.7.2'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   #spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler",   ">= 2.2.17",  "< 2.3"
+  spec.add_development_dependency "bundler",   ">= 2.4.8",  "< 2.5"
   spec.add_development_dependency "rspec",     ">= 3.10.0", "< 3.11"
   spec.add_development_dependency "rake",      ">= 13.0.3", "< 13.1"
   spec.add_development_dependency "yard",      ">= 0.9.26", "< 0.10"

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

@@ -193,14 +193,16 @@ module Eco
               logger.error("File does not exist: #{file}")
               exit(1)
             end
-            ext        = File.extname(file)
+            #ext        = File.extname(file)
             encoding ||= Eco::API::Common::Session::FileManager.encoding(file)
+            encoding   = (encoding == "bom") ? "#{encoding}|utf-8": encoding
+            puts "File encoding: '#{encoding}'" unless !encoding || encoding == 'utf-8'
             read_with_tolerance(file, encoding: encoding)
           end
 
           def read_with_tolerance(file, encoding:)
             if content = File.read(file, encoding: encoding)
-              content = content.encode("utf-8")
+              content = content.encode("utf-8") unless encoding.include?('utf-8')
               tolerance = 5
               content.scrub do |bytes|
                 replacement = '<' + bytes.unpack('H*')[0] + '>'

data/lib/eco/api/microcases/take_email_from_account.rb

@@ -36,27 +36,33 @@ module Eco
           return false if dest_email.to_s.strip.empty?
         end
 
-        account_json  = JSON.parse(account.to_json)
+        account_json  = _take_email_account_json(account)
         person.email = account_email
 
         if success = _take_email_remove_account!(person, context: context)
           if success = _take_email_acquire_account!(person, target_email, account: {}, context: context)
             if success = _take_email_email_free_up!(person, dest_email: dest_email, context: context)
               if success = _take_email_remove_account!(person, context: context)
+                # Bring back the original account
                 if success = _take_email_acquire_account!(person, account_email, account: account_json, context: context)
+                  success = true
                   person.email = target_email
                 end
               end
             else # free up target email
               # restore
-              if _take_email_remove_account!(person, context: context)
-                _take_email_acquire_account!(person, account_email, account: account_json, context: context)
+              reverted = false
+              if reverted ||= _take_email_remove_account!(person, context: context)
+                reverted ||= _take_email_acquire_account!(person, account_email, account: account_json, context: context)
               end
+              puts "Could not revert back to the original account #{person.identify}" unless reverted
               success = false
             end
           else # aquire other account
             # restore
-            _take_email_acquire_account!(person, account_email, account: account_json, context: context)
+            unless _take_email_acquire_account!(person, account_email, account: account_json, context: context)
+              puts "Could not bring back the original account we want to update the email to '#{target_email}' #{person.identify}"
+            end
             success = false
           end
         end
@@ -65,6 +71,21 @@ module Eco
 
       private
 
+      def _take_email_account_json(account)
+         JSON.parse(account.to_json).tap do |hash|
+           hash.delete("user_id")
+           hash.delete("permissions_merged")
+           hash.delete("permissions_preset")
+           hash.delete("prefilter")
+           if pref = hash["preferences"]
+             hash["preferences"] = pref.reject do |attr, value|
+               attr.start_with?("kiosk")
+             end
+           end
+         end
+      end
+
+      # Bring the account of the `target_email` taken, so we can change the email of this account
       def _take_email_acquire_account!(person, target_email, account: {}, context: "Session")
         person.account = account
         person.account.send_invites = false
@@ -72,6 +93,7 @@ module Eco
         micro.person_update!(person, reason: "bring account with email '#{target_email}'", context: context)
       end
 
+      # Free up the email (`target_email`) of the account that has it taken to `dest_email`
       def _take_email_email_free_up!(person, dest_email:, target_email: nil, context: "Session")
         target_email ||= person.email
         person.email   = dest_email.is_a?(Proc)? dest_email.call(target_email) : dest_email
@@ -83,7 +105,6 @@ module Eco
         person.account = nil
         micro.person_update!(person, reason: "remove account", context: context)
       end
-
     end
   end
 end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.3.3"
+  VERSION = "2.4.3"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.3
 platform: ruby
 authors:
 - Oscar Segura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-09-05 00:00:00.000000000 Z
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.17
+        version: 2.4.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.17
+        version: 2.4.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -390,7 +390,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: 
+description:
 email:
 - oscar@ecoportal.co.nz
 executables: []
@@ -675,7 +675,7 @@ homepage: https://www.ecoportal.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -683,15 +683,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: eco-helpers to manage people api cases
 test_files: []