ecoportal-api-v2 1.1.7 → 1.1.8

data/lib/ecoportal/api/v2/page/component.rb

@@ -30,65 +30,64 @@ module Ecoportal
           class << self
             def new_doc(type: nil)
               {
-                "id"         => new_uuid
+                "id" => new_uuid
               }.tap do |base_doc|
                 if type
                   base_doc.merge!({"type" => type})
-                  if klass = get_class(base_doc)
+                  if (klass = get_class(base_doc))
                     base_doc.merge!(klass.new_doc || {})
                   end
                 end
               end
             end
 
-            def get_class(doc)
-              if doc.is_a?(Hash)
-                case doc["type"]
-                when "tag_field"
-                  tag_field_class
-                when "geo"
-                  geo_field_class
-                when "select"
-                  selection_field_class
-                when "date"
-                  date_field_class
-                when "number"
-                  number_field_class
-                when "gauge"
-                  gauge_field_class
-                when "plain_text"
-                  plain_text_field_class
-                when "rich_text"
-                  rich_text_field_class
-                when "people"
-                  people_field_class
-                when "contractor_entities"
-                  contractor_entities_field_class
-                when "checklist"
-                  checklist_field_class
-                when "page_action","checklist_task"
-                  action_field_class
-                when "actions_list"
-                  actions_field_class
-                when "file"
-                  files_field_class
-                when "image_gallery"
-                  images_field_class
-                when "signature"
-                  signature_field_class
-                when "cross_reference"
-                  reference_field_class
-                when "law"
-                  law_field_class
-                when "mailbox"
-                  mailbox_field_class
-                when "chart"
-                  chart_field_class
-                when "frequency_rate_chart"
-                  chart_fr_field_class
-                else
-                  self
-                end
+            def get_class(doc) # rubocop:disable Metrics/AbcSize
+              return nil unless doc.is_a?(Hash)
+              case doc["type"]
+              when "tag_field"
+                tag_field_class
+              when "geo"
+                geo_field_class
+              when "select"
+                selection_field_class
+              when "date"
+                date_field_class
+              when "number"
+                number_field_class
+              when "gauge"
+                gauge_field_class
+              when "plain_text"
+                plain_text_field_class
+              when "rich_text"
+                rich_text_field_class
+              when "people"
+                people_field_class
+              when "contractor_entities"
+                contractor_entities_field_class
+              when "checklist"
+                checklist_field_class
+              when "page_action", "checklist_task"
+                action_field_class
+              when "actions_list"
+                actions_field_class
+              when "file"
+                files_field_class
+              when "image_gallery"
+                images_field_class
+              when "signature"
+                signature_field_class
+              when "cross_reference"
+                reference_field_class
+              when "law"
+                law_field_class
+              when "mailbox"
+                mailbox_field_class
+              when "chart"
+                chart_field_class
+              when "frequency_rate_chart"
+                chart_fr_field_class
+              else
+                self
               end
             end
           end
@@ -103,7 +102,7 @@ module Ecoportal
           passarray   :refs
 
           def ooze
-            self._parent.ooze
+            _parent.ooze
           end
 
           def ref_backend
@@ -111,9 +110,9 @@ module Ecoportal
           end
 
           def ref(any_length: false)
-            if digest = self.class.hash_label(label, any_length: any_length)
-              [type, digest].join(".")
-            end
+            digest = self.class.hash_label(label, any_length: any_length)
+            return unless digest
+            [type, digest].join(".")
           end
 
           # Looks up the section that this component belongs to.
@@ -159,7 +158,7 @@ module Ecoportal
 
           # @return [Boolean] `true` if the component is bound to any force, `false` otherwise
           def bindings?
-            forces.count > 0
+            forces.count&.positive?
           end
 
           # If the field has bindings they are replaced by this new field
@@ -168,10 +167,10 @@ module Ecoportal
             if fld.section
               fld.move(section: self.section, before: self)
             else
-              self.section.add(fld, before: self)
+              section.add(fld, before: self)
             end
             replace_bindings(fld)
-            self.delete!
+            delete!
           end
 
           def replace_bindings(fld)
@@ -180,12 +179,12 @@ module Ecoportal
 
           def delete!
             bindings.each {|b| b.delete!}
-            self.unattach!
-            self._parent.delete!(self)
+            unattach!
+            _parent.delete!(self)
           end
 
           def move(section:, before: nil, after: nil, side: nil)
-            self.unattach!
+            unattach!
             section.add_component(self, before: before, after: after, side: side)
           end
 
@@ -212,9 +211,7 @@ module Ecoportal
               when :hide_reports
                 self.hidden_on_reports = true
               when Hash
-                if cnf.key?(:global)
-                  self.global_binding = cnf[:global]
-                end
+                self.global_binding = cnf[:global] if cnf.key?(:global)
               else
                 unused.push(cnf)
               end
@@ -222,7 +219,6 @@ module Ecoportal
               raise "Unsupported configuration options '#{unused}' for #{self.class}" unless unused.empty?
             end
           end
-
         end
       end
     end

data/lib/ecoportal/api/v2/page/components.rb

@@ -5,28 +5,28 @@ module Ecoportal
         class Components < Common::Content::CollectionModel
           class_resolver :component_class, "Ecoportal::API::V2::Page::Component"
 
-          self.klass do |doc|
+          klass do |doc|
             component_class.get_class(doc).tap do |klass|
               klass.key = :id
             end
           end
 
-          order_matters = true
+          #self.order_matters = true
 
           def ooze
-            self._parent.ooze
+            _parent.ooze
           end
 
           # @return [Ecoportal::API::V2::Page::Component] the field with `id`
           def get_by_id(id)
-            self.find do |comp|
+            find do |comp|
               comp.id == id
             end
           end
 
           # @return [Array<Ecoportal::API::V2::Page::Component>] the fields of that `type`
           def get_by_type(type)
-            self.select do |comp|
+            select do |comp|
               comp.type.downcase == type.to_s.strip.downcase
             end
           end
@@ -53,19 +53,19 @@ module Ecoportal
           def add(doc: nil, label: doc && doc["label"], type: doc && doc["type"])
             fld_doc = doc ? JSON.parse(doc.to_json) : component_class.new_doc(type: type)
             upsert!(fld_doc) do |fld|
-              fld.label  = label if !doc
-              yield(fld) if block_given?
+              fld.label = label unless doc
+              yield(fld)        if block_given?
             end
           end
 
           # @return [Array<Ecoportal::API::V2::Page::Component>] **orphaned** fields (with no section).
           def unattached
-            select {|comp| !comp.attached?}
+            reject(&:attached?)
           end
 
           # @return [Array<Ecoportal::API::V2::Page::Component>] fields belonging to more than one section.
           def multi_section
-            select {|comp| comp.multi_section?}
+            select(&:multi_section?)
           end
         end
       end

data/lib/ecoportal/api/v2/page/force.rb

@@ -8,8 +8,8 @@ module Ecoportal
           class << self
             def new_doc
               {
-                "id"      => new_uuid,
-                "weight"  => INITIAL_WEIGHT
+                "id"     => new_uuid,
+                "weight" => INITIAL_WEIGHT
               }
             end
           end
@@ -23,11 +23,11 @@ module Ecoportal
           passdate    :last_synced_at
           passthrough :custom_script
           passthrough :script, read_only: true
-          embeds_many :bindings,  enum_class: :bindings_class
-          embeds_many :helpers,  klass: :helper_class
+          embeds_many :bindings, enum_class: :bindings_class
+          embeds_many :helpers, klass: :helper_class
 
           def ooze
-            self._parent.ooze
+            _parent.ooze
           end
 
           # @see Ecoportal::API::V2::Page::Force::Bindings#add
@@ -39,7 +39,6 @@ module Ecoportal
           def custom_script=(value)
             doc["custom_script"] = value
             update_script
-            value
           end
 
           # It sets the `script` value by using `custom_script` and `helpers[N..1].script`

data/lib/ecoportal/api/v2/page.rb

@@ -2,16 +2,16 @@ module Ecoportal
   module API
     class V2
       class Page < Common::Content::DoubleModel
-        ALLOWED_KEYS  = [
-          "id", "patch_ver", "name", "template_id",
-          "base_tags", "tags",
-          "time_zone", "created_at", "updated_at",
-          "components", "sections", "stages",
-          "permits", "mould_counter", "mould",
-          "state", "task_priority",
-          "votes_enabled", "upvotes", "downvotes",
-          "forces", "force_errors", "subtags"
-        ]
+        ALLOWED_KEYS = %w[
+          id patch_ver name template_id
+          base_tags tags
+          time_zone created_at updated_at
+          components sections stages
+          permits mould_counter mould
+          state task_priority
+          votes_enabled upvotes downvotes
+          forces force_errors subtags
+        ].freeze
 
         passkey     :id
         passforced  :patch_ver, default: 1
@@ -41,7 +41,7 @@ module Ecoportal
 
         def as_update
           super.tap do |hash|
-            unless !hash
+            if hash
               hash["data"].select! do |key, value|
                 ALLOWED_KEYS.include?(key)
               end
@@ -51,14 +51,14 @@ module Ecoportal
         end
 
         def stages?
-          self.doc["stages"] && (self.stages.count > 0)
+          doc["stages"] && stages.count.positive?
         end
 
         # @return [String] with feedback, if for this page instance, there are any of:
         #   1. components multi-section (fields belonging to more than one section)
         def validate
           msg = ""
-          if (multi = components.multi_section).length > 0
+          if (multi = components.multi_section).length.positive?
             msg += "There are fields attached to more than one section:\n  • "
             msg += multi.map do |fld|
               fld.label
@@ -96,7 +96,6 @@ module Ecoportal
             end
           end
         end
-
       end
     end
   end

data/lib/ecoportal/api/v2_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GEM2_VERSION = "1.1.7"
+    GEM2_VERSION = "1.1.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-v2
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler