eco-helpers 1.3.18 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61c411db84db417e4d9004d2e8f9359b423cb91ac31b40eaf390e9b3e7a4f0a
-  data.tar.gz: 3431111bd4259b33a8c6ac38ad5ce67226c4e2a8c9c95b311142d7896f9d68f1
+  metadata.gz: 27ff9c6e496ac4cc7d08cb7f8fec22096ccd6aa915103de89048229e334cbc46
+  data.tar.gz: 0baecbe3aeb2ea75ce995395f15d2daba1b59a8e5587d2ce1537d99c92db9c61
 SHA512:
-  metadata.gz: afae206900769f68a8733dbe72d3277cf610fd4d7e92a1adda5197685889511fb80c9a424987f59306c59fa251b79a6f929d0dfc566c301cd3703c5fc6c5a2bf
-  data.tar.gz: 19d0d4c7c3a24c194b02faee98bd2ad2c55d8a8d7522681f2d1918594207cf673b827e4a510646c1f21b302105290b7b31da41be98a80112ff6d8c0c6e398826
+  metadata.gz: 5c435f203bf8d3829829e8d00b74714a479544f48f0d0e081c83b1441a84a5bf6d9be678cab4aa60c09e9f5de3642388904ea52462477c83d259ba6960bab109
+  data.tar.gz: 7750b44622529f48bc58d577e4783affa8b1b5c7db58e780ff974634ee88dadcc4b0a93fe86879eec8cc4854959ce95ffa5cf7c256d5f458a2814715c7b9b6bc

data/CHANGELOG.md

@@ -1,7 +1,42 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [1.3.18] - 2020-07-xx
+## [1.5.0] - 2020-09-11
+
+### Added
+  - `Eco::Data::Files#file_empty?` to prevent error when checking encoding
+### Changed
+  - change abilities to align with ecoPortal release `1.5.2`
+### Fixed
+  - `Eco::CSV#parse` and `Eco::CSV#read` should use the proper `encoding` when it's `bom`
+    * apparently, this can only be achieved by passing an argument such as `rb:bom|utf-8`
+    * best reference found: https://stackoverflow.com/a/60794851/4352306
+
+## [1.4.2] - 2020-07-23
+
+### Added
+### Changed
+### Fixed
+- preserve backtrace on logging
+
+## [1.4.0] - 2020-07-14
+
+### Added
+### Changed
+  - change abilities to align with ecoPortal release `1.5.0`
+  - remove some patches on `ecoportal-api`
+  - removed patch method `Ecoportal::API::V1::Person#sync`
+### Fixed
+  - `Eco::CSV#parse` and `Eco::CSV#read` should use the proper `:encoding` when it's `bom`
+
+## [1.3.19] - 2020-07-23
+
+### Added
+### Changed
+### Fixed
+  - preserve backtrace on logging
+
+## [1.3.18] - 2020-07-08
 
 ### Added
 ### Changed

data/eco-helpers.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard",      "~> 0.9", ">= 0.9.18"
   s.add_development_dependency "redcarpet", "~> 3.5", ">= 3.5.0"
 
-  s.add_dependency 'ecoportal-api', '~> 0.5',  '>= 0.5.8'
+  s.add_dependency 'ecoportal-api', '~> 0.7',  '>= 0.7.0'
   s.add_dependency 'aws-sdk-s3',    '~> 1',    '>= 1.64.0'
   s.add_dependency 'aws-sdk-ses',   '~> 1',    '>= 1.29.0'
   s.add_dependency 'dotenv',        '~> 2.7',  '>= 2.7.0'

data/lib/eco/api/common/version_patches/ecoportal_api.rb

@@ -1,4 +1,2 @@
-require_relative 'ecoportal_api/base_model'
 require_relative 'ecoportal_api/external_person'
 require_relative 'ecoportal_api/internal_person'
-require_relative 'ecoportal_api/account_preferences'

data/lib/eco/api/common/version_patches/ecoportal_api/external_person.rb

@@ -3,10 +3,6 @@ module Ecoportal
     class V1
       class Person
 
-        def sync
-          consolidate!
-        end
-
         def reset_details!
           doc["details"] = JSON.parse(original_doc["details"])
         end

data/lib/eco/api/common/version_patches/exception.rb

@@ -1,8 +1,8 @@
 class ::Exception
   def patch_full_message
     msg = []
-    msg << "#{backtrace.shift} #{message} (#{self.class.to_s})"
-    backtrace.each {|bt| msg << "#{" "*8}from #{bt}"}
+    msg << "\n#{backtrace.first} \n#{message} (#{self.class.to_s})"
+    backtrace[1..-1].each_with_index {|bt, i| msg << "#{" "*8}#{i+1}: from #{bt}"}
     msg.join("\n")
   end
 end

data/lib/eco/api/organization/presets_reference.json

@@ -5,6 +5,11 @@
     "reports": "view",
     "organization": null,
     "people": null,
+    "person_core": null,
+    "person_core_create": null,
+    "person_core_edit": null,
+    "person_account": null,
+    "person_details": null,
     "pages": "view",
     "page_editor": null,
     "registers": "view"
@@ -14,7 +19,11 @@
     "data": "view",
     "reports": "view",
     "organization": null,
-    "people": "attach",
+    "person_core": "attach",
+    "person_core_create": null,
+    "person_core_edit": null,
+    "person_account": null,
+    "person_details": "view",
     "pages": "create",
     "page_editor": "basic",
     "registers": "view"
@@ -24,7 +33,11 @@
     "data": "update",
     "reports": "edit",
     "organization": "view",
-    "people": "view",
+    "person_core": "view_people_manager",
+    "person_core_create": null,
+    "person_core_edit": null,
+    "person_account": "view",
+    "person_details": "view",
     "pages": "create",
     "page_editor": "intermediate",
     "registers": "view"
@@ -34,7 +47,11 @@
     "data": "administrate",
     "reports": "administrate",
     "organization": "administrate",
-    "people": "edit",
+    "person_core": "view_people_manager",
+    "person_core_create": "create",
+    "person_core_edit": "edit",
+    "person_account": "edit",
+    "person_details": "edit_private",
     "pages": "administrate",
     "page_editor": "advanced",
     "registers": "dashboard"

data/lib/eco/api/organization/presets_values.json

@@ -3,7 +3,11 @@
   "data": [null, "view", "update", "administrate", "implement"],
   "reports": [null, "view", "edit", "administrate"],
   "organization": [null, "view", "administrate", "implement"],
-  "people": [null, "attach", "view", "view_private", "edit", "dashboard"],
+  "person_core": [null, "attach", "view_people_manager", "dashboard"],
+  "person_core_create": [null, "create"],
+  "person_core_edit": [null, "edit"],
+  "person_account": [null, "view", "create", "edit"],
+  "person_details": [null, "view", "edit_public", "view_private", "edit_private"],
   "pages": [null, "view", "update", "create", "administrate"],
   "page_editor": [null, "basic", "intermediate", "advanced", "implement"],
   "registers": [null, "view", "dashboard", "administrate", "implement"]

data/lib/eco/csv.rb

@@ -15,9 +15,14 @@ module Eco
       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|
+        kargs = {headers: true,  skip_blanks: true}.merge(kargs)
+
+        args = [file].tap do |arg|
+          coding = Eco::API::Common::Session::FileManager.encoding(file)
+          arg.push("rb:bom|utf-8") if coding == "bom"
+        end
+
+        out = super(*args, **kargs).reject do |row|
           values = row.to_hash.values
           values.all?(&:nil?) || values.map(&:to_s).all?(&:empty?)
         end

data/lib/eco/data/files/helpers.rb

@@ -62,8 +62,13 @@ module Eco
           File.write(dest_file, File.read(source_file))
         end
 
+        def file_empty?(path)
+          return true if !File.file?(path)
+          File.zero?(path)
+        end
+
         def has_bom?(path)
-          return false if !path
+          return false if !path || file_empty?(path)
           File.open(path, "rb") do |f|
             bytes = f.read(3)
             return bytes.unpack("C*") == [239, 187, 191]
@@ -71,7 +76,7 @@ module Eco
         end
 
         def encoding(path)
-          has_bom?(path) ? "bom|utf-8" : "utf-8"
+          has_bom?(path) ? "bom" : "utf-8"
         end
 
         def script_subfolder

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.3.18"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 1.3.18
+  version: 1.5.0
 platform: ruby
 authors:
 - Oscar Segura
@@ -108,22 +108,22 @@ dependencies:
   name: ecoportal-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 0.7.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -253,8 +253,6 @@ files:
 - lib/eco/api/common/session/sftp.rb
 - lib/eco/api/common/version_patches.rb
 - lib/eco/api/common/version_patches/ecoportal_api.rb
-- lib/eco/api/common/version_patches/ecoportal_api/account_preferences.rb
-- lib/eco/api/common/version_patches/ecoportal_api/base_model.rb
 - lib/eco/api/common/version_patches/ecoportal_api/external_person.rb
 - lib/eco/api/common/version_patches/ecoportal_api/internal_person.rb
 - lib/eco/api/common/version_patches/exception.rb

data/lib/eco/api/common/version_patches/ecoportal_api/account_preferences.rb

@@ -1,32 +0,0 @@
-module Ecoportal
-  module API
-    class Internal
-      class Preferences < Common::BaseModel
-        passthrough  :kiosk_enabled, :kiosk_workflow_message, :kiosk_create_button_label,
-            :kiosk_create_button_help, :kiosk_return_button_label, :kiosk_return_button_help,
-            :kiosk_dashboard_button_label, :kiosk_dashboard_button_help
-
-        [
-          :show_sidebar,
-          :show_shortcuts,
-          :show_coming_soon,
-          :show_recently_visited_forms,
-          :show_tasks,
-          :show_task_bubbles
-        ].map(&:to_s).each do |field|
-          define_method(field) do
-            if doc.key?(field)
-              doc[field]
-            else
-              true
-            end
-          end
-          define_method("#{field}=") do |value|
-            doc[field] = !!value
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/eco/api/common/version_patches/ecoportal_api/base_model.rb

@@ -1,27 +0,0 @@
-module Ecoportal
-  module API
-    module Common
-      class BaseModel
-
-        attr_reader :initial_doc
-
-        def initialize(doc = {}, parent: self, key: nil)
-          @_parent = parent
-          @_key    = key
-          if !_parent || !_key
-            @doc          = doc
-            @original_doc = JSON.parse(@doc.to_json)
-            @initial_doc  = JSON.parse(@doc.to_json)
-          end
-        end
-
-        def initial_doc
-          raise UnlinkedModel.new  unless linked?
-          return @initial_doc if is_root?
-          _parent.initial_doc.dig(*[_key].flatten)
-        end
-
-      end
-    end
-  end
-end