ecoportal-api 0.5.8 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168542de09c5a87edcd4952acdf84cdf01944c03339238a27c310e29b71e9c14
-  data.tar.gz: 2f43b32d289f6232eccff32516717ab82cd86cbe0144d6f8f2eac74f30637cd8
+  metadata.gz: f2afaf2e4ef28b96b6e1c7bac6e4d97b7c53299a127aed1e22e990a4ca4ac9e3
+  data.tar.gz: 5883d799e43fa71151674b91a2c7557fd968f2552895a86fe656b86e16617460
 SHA512:
-  metadata.gz: 1c539315189039d7baed7c48db646969525a47d51cdd88b63a2ac53b651f089aa6e219fa91624943700c1c73144525d9482f4cff8b9e1ca5cbbc9862c0a138e4
-  data.tar.gz: 3c145a2fcea2c476fb39ad914b6b3ec2ff390ffe5378ab9795ddd466238f0af55fbbae59a5e87cadb415a49165cf0e05d6697e45dc74bd6235581c30268d1e45
+  metadata.gz: 33ffe71c4bb72543ab2289d5a945aed1264f955adeae5432a8f6580d5311590f258448a64d49b8ed2e1f73fdabf1482d936fc290d0e92152ba6830b36905b961
+  data.tar.gz: 2038ebf5714308446d54ab0b56a70612b6f8ab02b96f28ca8f860e21f1223dc9e2879e53bb05fe25592c7482b3b6d24877c07ed08d872e5086a32fe6ae231464

data/CHANGELOG.md

@@ -1,13 +1,86 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.7.3] - 2020-11-30
+
+### Added
+
+### Fixed
+  - `Ecoportal::API::V1::Person#email=`: was not showing the incorrect value in the error message
+  - added `compact` to remove `null` values on:
+    - `Ecoportal::API::V1::Person#filter_tags=`
+    - `Ecoportal::API::Internal::Account#policy_group_ids=`
+    - `Ecoportal::API::Internal::Account#login_provider_ids=`
+    - `Ecoportal::API::Internal::Account#starred_ids=`
+
+### Changed
+
+
+## [0.7.2] - 2020-10-19
+
+### Added
+  - `Ecoportal::API::V1::Person#email=`:
+    - do a minimum validation (no blanks in the email)
+    - set in lower case (as this is how it's in the server)
+### Fixed
+  - `Ecoportal::API::V1::People#each`: when `silent` it shouldn't print a blank line
+  - fixed so they return empty array `[]` when `nil`:
+    - `Ecoportal::API::V1::Person#filter_tags`
+    - `Ecoportal::API::Internal::Account#policy_group_ids`
+    - `Ecoportal::API::Internal::Account#login_provider_ids`
+    - `Ecoportal::API::Internal::Account#starred_ids`
+### Changed
+  - made it so some methods the `Array` with `uniq` values:
+    - `Ecoportal::API::V1::Person#filter_tags=`
+    - `Ecoportal::API::Internal::Account#policy_group_ids=`
+  - made it so it only updates the keys defined in the `Hash` passed to the setter:
+    - `Ecoportal::API::Internal::Account#permissions_custom=`
+    - `Ecoportal::API::Internal::Account#preferences=`
+
+
+## [0.7.1] - 2020-09-30
+
+### Added
+  - `Ecoportal::API::Internal::Permissions`: **update for new ability `tasks` of ecoPortal release `1.5.3`**
+  - `Ecoportal::API::V1::People#each`: added keyword argument `silent:` to display download progress
+### Fixed
+  - `Ecoportal::API::V1::People#each`: when no block provided, it was creating an `Enumarator` without preserving the parameters (i.e. `:q` or `per_page` were lost)
+
+## [0.7.0] - 2020-09-11
+
+### Added
+### Changed
+  - `Ecoportal::API::Internal::Permissions`: **update for new abilities of ecoPortal release `1.5.2`**
+    - decoupled abilities: `person_core` into `person_core_create`, `person_core_edit`
+### Fixed
+
+
+## [0.6.0] - 2020-07-14
+
+### Added
+  - `Ecoportal::API::Common::BaseModel#initial_doc`: `#consolidate!` modifies `original_doc`
+    - this helper allows to know what was the initial document the object was created with
+  - `Ecoportal::API::Common::BaseModel#as_update`: added parameter (default: `:last` => compare with `original_doc`)
+    - calling it with `:total` will compare the current `doc` with the `initial_doc`
+### Changed
+  - `Ecoportal::API::Internal::Permissions`: **update for new abilities of ecoPortal release `1.5.0`**
+    - added abilities: `person_core`, `person_account`, `person_details`
+    - removed ability: `people`
+  - renamed `print` to `pretty_print` to avoid overriding `$stdout.print`, on:
+    - `Ecoportal::API::Common::BaseModel`
+    - `Ecoportal::API::Common::BatchReponse`
+    - `Ecoportal::API::Common::Response`
+    - `Ecoportal::API::Common::WrappedResponse`
+### Fixed
+  - `Ecoportal::API::Internal::Preferences`: **kiosk** settings should default to `false` (`nil`)
+
 ## [0.5.8] - 2020-06-23
 
 ### Added
 ### Changed
 ### Fixed
-- `Ecoportal::API::V1::Person#filter_tags=`: `original_doc["filter_tags"]` is `nil` when creating a person
-- `Ecoportal::API::Internal::Account#policy_group_ids=`: `original_doc["account"]` is `nil` when creating a person
+  - `Ecoportal::API::V1::Person#filter_tags=`: `original_doc["filter_tags"]` is `nil` when creating a person
+  - `Ecoportal::API::Internal::Account#policy_group_ids=`: `original_doc["account"]` is `nil` when creating a person
 
 
 ## [0.5.7] - 2020-06-22

data/ecoportal-api.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec",     "~> 3",   ">= 3.9"
   spec.add_development_dependency "yard",      "~> 0.9", ">= 0.9.18"
   spec.add_development_dependency "redcarpet", "~> 3.5", ">= 3.5.0"
-  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry"      , "~> 0.13"
 
   spec.add_dependency 'http',          '~> 3'
   spec.add_dependency 'hash-polyfill', '~> 0'

data/lib/ecoportal/api/common/base_model.rb

@@ -48,6 +48,7 @@ module Ecoportal
           if !_parent || !_key
             @doc          = doc
             @original_doc = JSON.parse(@doc.to_json)
+            @initial_doc  = JSON.parse(@doc.to_json)
           end
         end
 
@@ -63,6 +64,12 @@ module Ecoportal
           _parent.original_doc.dig(*[_key].flatten)
         end
 
+        def initial_doc
+          raise UnlinkedModel.new  unless linked?
+          return @initial_doc if is_root?
+          _parent.initial_doc.dig(*[_key].flatten)
+        end
+
         def as_json
           doc
         end
@@ -71,9 +78,10 @@ module Ecoportal
           doc.to_json(*args)
         end
 
-        def as_update
+        def as_update(ref = :last)
           new_doc = as_json
-          Common::HashDiff.diff(new_doc, original_doc)
+          ref_doc = ref == :total ? initial_doc : original_doc
+          Common::HashDiff.diff(new_doc, ref_doc)
         end
 
         def dirty?
@@ -100,7 +108,7 @@ module Ecoportal
           end
         end
 
-        def print
+        def pretty_print
           puts JSON.pretty_generate(as_json)
           self
         end

data/lib/ecoportal/api/common/batch_response.rb

@@ -20,10 +20,10 @@ module Ecoportal
             yield doc
           end
         end
-        
-        def print
+
+        def pretty_print
           if success?
-            each(&:print)
+            each(&:pretty_print)
           else
             puts "Request failed."
           end

data/lib/ecoportal/api/common/response.rb

@@ -19,8 +19,8 @@ module Ecoportal
         def success?
           @status.success?
         end
-        
-        def print
+
+        def pretty_print
           puts "Status: #{@status.code}"
           puts "Body:"
           puts JSON.pretty_generate(@body)

data/lib/ecoportal/api/common/wrapped_response.rb

@@ -40,14 +40,14 @@ module Ecoportal
           response.success?
         end
 
-        def print
+        def pretty_print
           if success?
-            each(&:print)
+            each(&:pretty_print)
           else
             puts "Request failed."
           end
         end
-        
+
       end
     end
   end

data/lib/ecoportal/api/internal/account.rb

@@ -13,14 +13,49 @@ module Ecoportal
         embeds_one  :preferences, klass: :preferences_class
 
         # Sets the `policy_group_ids`
+        # @note it preserves the original order
+        # @param value [Array<String>] the policy group ids to be set.
         def policy_group_ids=(value)
           unless value.is_a?(Array)
             raise "policy_group_ids= needs to be passed an Array, got #{value.class}"
           end
 
+          value.uniq!
           ini_ids = (original_doc && original_doc["policy_group_ids"]) || []
           # preserve original order to avoid false updates
           doc["policy_group_ids"] = (ini_ids & value) + (value - ini_ids)
+          doc["policy_group_ids"].compact!
+        end
+
+        # @return [Array<String>] the policy group ids of this user.
+        def policy_group_ids
+          doc["policy_group_ids"] ||= []
+        end
+
+        # Sets the `login_provider_ids`
+        def login_provider_ids=(value)
+          unless value.is_a?(Array)
+            raise "login_provider_ids= needs to be passed an Array, got #{value.class}"
+          end
+          doc["login_provider_ids"] = value.compact!
+        end
+
+        # @return [Array<String>] the login provider ids of this user.
+        def login_provider_ids
+          doc["login_provider_ids"] ||= []
+        end
+
+        # Sets the `starred_ids`
+        def starred_ids=(value)
+          unless value.is_a?(Array)
+            raise "starred_ids= needs to be passed an Array, got #{value.class}"
+          end
+          doc["starred_ids"] = value.compact!
+        end
+
+        # @return [Array<String>] the starred page ids of this user.
+        def starred_ids
+          doc["starred_ids"] ||= []
         end
 
         # Sets the `permissions_preset`.
@@ -37,6 +72,20 @@ module Ecoportal
           self.permissions_preset.nil? ? "custom" : self.permissions_preset
         end
 
+        # It preserves the values of keys that are not defined in `value`.
+        # @param value [Hash] the abilities that you want to update.
+        def permissions_custom=(value)
+          doc["permissions_custom"] ||= {}
+          doc["permissions_custom"].merge!(value)
+        end
+
+        # It preserves the values of keys that are not defined in `value`.
+        # @param value [Hash] the preferences that you want to update.
+        def preferences=(value)
+          doc["preferences"] ||= {}
+          doc["preferences"].merge!(value)
+        end
+
         def as_json
           super.tap do |hash|
             if preset == "custom"

data/lib/ecoportal/api/internal/permissions.rb

@@ -2,7 +2,10 @@ module Ecoportal
   module API
     class Internal
       class Permissions < Common::BaseModel
-        passthrough :files, :data, :reports, :organization, :people, :pages, :page_editor, :registers
+        passthrough :files, :data, :reports
+        passthrough :organization, :person_core, :person_core_create, :person_core_edit
+        passthrough :person_account, :person_details
+        passthrough :pages, :page_editor, :registers, :tasks
       end
     end
   end

data/lib/ecoportal/api/internal/preferences.rb

@@ -2,21 +2,17 @@ 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,
-          :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_task_bubbles
         ].map(&:to_s).each do |field|
           define_method(field) do
             if doc.key?(field)

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

@@ -27,15 +27,27 @@ module Ecoportal
         # @param params [Hash]
         # @option params [String] :per_page the number of people you get per request.
         # @option params [String] :q some text to search. Omit this parameter to target all the people.
+        # @param silent [Boolean] `false` to show percentage of progress.
         # @yield [person] does some stuff with the person.
         # @yieldparam person [Person]
-        def each(params: {}, &block)
-          return to_enum(:each) unless block
-          cursor_id = nil
+        def each(params: {}, silent: false, &block)
+          return to_enum(:each, params: params, silent: silent) unless block
+          cursor_id = nil; results = 0
+          puts "\n" unless silent
           loop do
             params.update(cursor_id: cursor_id) if cursor_id
             response = client.get("/people", params: params)
-            raise "Request failed." unless response.success?
+            raise "Request failed - Status #{response.status}: #{response.body}" unless response.success?
+
+            unless silent || (total = response.body["total_results"]) == 0
+              results += response.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"
+              $stdout.flush
+            end
+
             response.body["results"].each do |person|
               yield person_class.new(person)
             end
@@ -45,13 +57,14 @@ module Ecoportal
         end
 
         # Gets all the people via api requests.
-        # @note it ignores the key `:page` in `params:`.
+        # @note it ignores the key `:cursor_id` in `params:`.
         # @param params [Hash]
         # @option params [Integer] :per_page the number of people you get per request.
         # @option params [String] :q some text to search.
+        # @param silent [Boolean] `false` to show percentage of progress.
         # @return [Array<Person>] the array of people got via api.
-        def get_all(params: {})
-          each(params: params).to_a
+        def get_all(params: {}, silent: false)
+          each(params: params, silent: silent).to_a
         end
 
         # Gets a person via api.

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

@@ -15,6 +15,7 @@ module Ecoportal
         embeds_one :details, nullable: true, klass: :person_details_class
 
         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`.
         #
@@ -41,8 +42,17 @@ module Ecoportal
           self.supervisor_id = person&.id || person&.external_id
         end
 
+        # 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
+          doc["email"] = value&.downcase
+        end
+
         # Validates the string tags of the array, and sets the `filter_tags` property of the account.
-        # @note all is set in upper case.
+        # @note all is set in upper case and preserves the original order.
         # @raise [Exception] if there was any invalid string tag.
         # @param value [Array<String>] array of tags.
         def filter_tags=(value)
@@ -54,11 +64,17 @@ module Ecoportal
               raise "Invalid filter tag #{tag.inspect}"
             end
             tag.upcase
-          end
+          end.uniq
 
           ini_tags = (original_doc && original_doc["filter_tags"]) || []
           # preserve original order to avoid false updates
           doc["filter_tags"] = (ini_tags & end_tags) + (end_tags - ini_tags)
+          doc["filter_tags"].compact!
+        end
+
+        # @return [Array<String>] the filter tags of this person.
+        def filter_tags
+          doc["filter_tags"] ||= []
         end
 
         def as_json

data/lib/ecoportal/api/version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    VERSION = "0.5.8"
+    VERSION = "0.7.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.7.3
 platform: ruby
 authors:
 - Tapio Saarinen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-23 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,16 +108,16 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +163,6 @@ files:
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -183,7 +182,6 @@ files:
 - lib/ecoportal/api/common/response.rb
 - lib/ecoportal/api/common/wrapped_response.rb
 - lib/ecoportal/api/internal.rb
-- lib/ecoportal/api/internal/.git-keep
 - lib/ecoportal/api/internal/account.rb
 - lib/ecoportal/api/internal/login_provider.rb
 - lib/ecoportal/api/internal/login_providers.rb
@@ -200,7 +198,6 @@ files:
 - lib/ecoportal/api/internal/schema_field_value.rb
 - lib/ecoportal/api/logger.rb
 - lib/ecoportal/api/v1.rb
-- lib/ecoportal/api/v1/.git-keep
 - lib/ecoportal/api/v1/people.rb
 - lib/ecoportal/api/v1/person.rb
 - lib/ecoportal/api/v1/person_details.rb