ecoportal-api-v2 2.0.16 → 3.1.1

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

@@ -12,34 +12,35 @@ module Ecoportal
             passthrough :renews_every, :renews_unit
             passdate    :renews_until
 
-            ISO8601 = "%Y-%m-%dT%H:%M:00Z" # "%Y-%m-%dT%H:%M:00.00Z"
+            ISO8601 = '%Y-%m-%dT%H:%M:00Z'.freeze # '%Y-%m-%dT%H:%M:00.00Z'
 
             def empty?
               !value
             end
 
             def value=(val)
-              doc["value"] = self.class.to_time(val).yield_self do |datetime|
+              doc['value'] = self.class.to_time(val).then do |datetime|
                 datetime = datetime.utc.strftime(ISO8601) if datetime
                 datetime
               end
             end
 
             def value
-              if val = doc["value"]
-                (Time.parse(val) rescue nil).yield_self do |datetime|
-                  datetime.localtime if datetime
+              if (val = doc['value'])
+                (Time.parse(val) rescue nil).then do |datetime| # rubocop:disable Style/RescueModifier
+                  datetime&.localtime
                 end
               end
             end
 
             def create_event=(value)
               self.past_only = false
-              doc["create_event"] = !!value
+              doc['create_event'] = !!value
             end
 
             def to_s
-              return nil unless value
+              return unless value
+
               to_local_time(value).strftime(ISO8601)
             end
 
@@ -69,14 +70,15 @@ module Ecoportal
                   self.create_event = true
                 when Hash
                   supported = [:reminder]
-                  unless (rest = hash_except(cnf.dup, *supported)).empty?
+                  unless (rest = hash_except!(cnf.dup, *supported)).empty?
                     unused.push(rest)
                   end
-                  if cnf.key?(:reminder) then configure_reminder(cnf[:reminder]) end
+
+                  configure_reminder(cnf[:reminder]) if cnf.key?(:reminder)
                 else
                   unused.push(cnf)
                 end
-              end.yield_self do |unused|
+              end.then do |unused|
                 super(*unused)
               end
             end
@@ -103,22 +105,21 @@ module Ecoportal
             def configure_reminder(value)
               case value
               when :never, NilClass
-                self.remind_me_in = "never"
+                self.remind_me_in = 'never'
               when :one_day
-                self.remind_me_in = "1.day"
+                self.remind_me_in = '1.day'
               when :three_days
-                self.remind_me_in = "3.days"
+                self.remind_me_in = '3.days'
               when :one_week
-                self.remind_me_in = "1.week"
+                self.remind_me_in = '1.week'
               when :two_weeks
-                self.remind_me_in = "2.weeks"
+                self.remind_me_in = '2.weeks'
               when :one_month
-                self.remind_me_in = "1.month"
-              else
+                self.remind_me_in = '1.month'
+              # else
                 # Unsupported
               end
             end
-
           end
         end
       end

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

@@ -7,8 +7,8 @@ module Ecoportal
             class << self
               def new_doc
                 {
-                  "id"         => new_uuid,
-                  "position"   => 99
+                  'id'       => new_uuid,
+                  'position' => 99
                 }
               end
             end
@@ -22,7 +22,7 @@ module Ecoportal
             passdate    :file_update_at, read_only: true
 
             def to_s
-              [label, file_container_id].join(" => ")
+              [label, file_container_id].join(' => ')
             end
           end
         end

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

@@ -4,20 +4,23 @@ module Ecoportal
       class Page
         class Component
           class FilesField < Page::Component
-            embeds_many :items, klass: "Ecoportal::API::V2::Page::Component::File", order_key: :position
+            embeds_many :items, klass: 'Ecoportal::API::V2::Page::Component::File', order_key: :position
 
             def empty?
               items.empty?
             end
-            
+
             def add_file(container_id, pos: NOT_USED, before: NOT_USED, after: NOT_USED)
               file_doc = items.items_class.new_doc
               items.upsert!(file_doc, pos: pos, before: before, after: after) do |file|
-                file.file_container_id  = container_id
-                if prev = previous_file(file)
+                file.file_container_id = container_id
+
+                if (prev = previous_file(file))
                   file.position = prev.position
                 end
+
                 yield(file) if block_given?
+
                 fix_file_positions!
               end
             end
@@ -43,10 +46,10 @@ module Ecoportal
             def previous_file(value)
               fls = ordered_files
               pos = fls.index(value) - 1
-              return if pos < 0
+              return if pos.negative?
+
               fls[pos]
             end
-
           end
         end
       end

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

@@ -7,16 +7,17 @@ module Ecoportal
             passthrough :value, :max
             passthrough :active_color, read_only: true
 
-            embeds_many :stops, klass: "Ecoportal::API::V2::Page::Component::GaugeStop", order_key: :threshold
+            embeds_many :stops, klass: 'Ecoportal::API::V2::Page::Component::GaugeStop', order_key: :threshold
 
             def empty?
               !value
             end
-            
+
             # Adds a stop at `threshold` with `color`
             # @return [Ecoportal::API::V2::Page::Component::GaugeStop]
             def add_stop(threshold: 0.0, color: '#e256d1')
               stop_doc = stops.items_class.new_doc
+
               stops.upsert!(stop_doc) do |stop|
                 stop.threshold = threshold
                 stop.color     = color

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

@@ -4,13 +4,12 @@ module Ecoportal
       class Page
         class Component
           class GaugeStop < Ecoportal::API::Common::Content::DoubleModel
-
             class << self
               def new_doc
                 {
-                  "id"         => new_uuid,
-                  "threshold"  => nil,
-                  "color"      => nil
+                  'id'        => new_uuid,
+                  'threshold' => nil,
+                  'color'     => nil
                 }
               end
             end
@@ -26,8 +25,8 @@ module Ecoportal
             #   - :yellow, :orange, :pumpkin, :red, :magenta, :fuchsia, :purple, :violet
             # @param value [String, Symbol] you can use a `symbol` to specify a color
             def color=(value)
-              value  = to_color(value) if value.is_a?(Symbol)
-              doc["color"] = value
+              value = to_color(value) if value.is_a?(Symbol)
+              doc['color'] = value
             end
 
             # @return [Symbol] to get the `color` sym code
@@ -35,20 +34,22 @@ module Ecoportal
               color_maps.each do |k, v|
                 return k if color == v
               end
+
               :undefined
             end
 
             private
 
             def to_color(value)
-              return nil unless valid_color?(value)
+              return       unless valid_color?(value)
               return value if value.is_a?(String)
+
               color_maps[value]
             end
 
             def valid_color?(value)
-              return true if value.is_a?(String) && colors.any? {|c| c == value}
-              return true if value.is_a?(Symbol) && color_syms.any? {|s| s == value}
+              return true if value.is_a?(String) && colors.any?     {|c| c == value}
+              true        if value.is_a?(Symbol) && color_syms.any? {|s| s == value}
             end
 
             def color_syms
@@ -61,25 +62,24 @@ module Ecoportal
 
             def color_maps
               @color_maps ||= [
-                [:blue, "#5656e2"],
-                [:blue_greyed, "#568be2"],
-                [:blue_light, "#56c0e2"],
-                [:turquoise, "#56e2cf"],
-                [:jade, "#56e29b"],
-                [:green, "#56e267"],
-                [:pistachio, "#79e256"],
-                [:avocado, "#aee256"],
-                [:yellow, "#e2e156"],
-                [:orange, "#e2ad56"],
-                [:pumpkin, "#e27956"],
-                [:red, "#e25667"],
-                [:magenta, "#e2569c"],
-                [:fuchsia, "#e256d1"],
-                [:purple, "#be56e2"],
-                [:violet, "#8a56e2"]
+                [:blue,         '#5656e2'],
+                [:blue_greyed,  '#568be2'],
+                [:blue_light,   '#56c0e2'],
+                [:turquoise,    '#56e2cf'],
+                [:jade,         '#56e29b'],
+                [:green,        '#56e267'],
+                [:pistachio,    '#79e256'],
+                [:avocado,      '#aee256'],
+                [:yellow,       '#e2e156'],
+                [:orange,       '#e2ad56'],
+                [:pumpkin,      '#e27956'],
+                [:red,          '#e25667'],
+                [:magenta,      '#e2569c'],
+                [:fuchsia,      '#e256d1'],
+                [:purple,       '#be56e2'],
+                [:violet,       '#8a56e2']
               ].to_h
             end
-
           end
         end
       end

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

@@ -5,12 +5,12 @@ module Ecoportal
         class Component
           class GeoField < Page::Component
             passthrough :address
-            embeds_one  :coordinates, klass: "Ecoportal::API::V2::Page::Component::GeoCoordinates"
+            embeds_one  :coordinates, klass: 'Ecoportal::API::V2::Page::Component::GeoCoordinates'
 
             def empty?
               coordinates.empty?
             end
-            
+
             def to_s
               coordinates.to_s
             end

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

@@ -7,8 +7,8 @@ module Ecoportal
             class << self
               def new_doc
                 {
-                  "id"         => new_uuid,
-                  "weight"     => 9999
+                  'id'     => new_uuid,
+                  'weight' => 9999
                 }
               end
             end
@@ -21,10 +21,11 @@ module Ecoportal
             passthrough :dimensions, :styles
 
             def upload_id=(value)
-              if value != self.upload_id
-                doc["src_id"] = doc["upload_id"] = value
+              if value != upload_id
+                doc['src_id'] = doc['upload_id'] = value
               end
-              self.upload_id
+
+              upload_id
             end
           end
         end

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

@@ -4,31 +4,34 @@ module Ecoportal
       class Page
         class Component
           class ImagesField < Page::Component
-
             class << self
               def new_doc
                 {
-                  "layout" => "third"
+                  'layout' => 'third'
                 }
               end
             end
 
             passthrough :layout
             passboolean :strech, :no_popup, :hide_options
-            embeds_many :images, klass: "Ecoportal::API::V2::Page::Component::Image", order_key: :weight
+            embeds_many :images, klass: 'Ecoportal::API::V2::Page::Component::Image', order_key: :weight
 
             def empty?
               images.empty?
             end
-            
+
             def add_image(upload_id, pos: NOT_USED, before: NOT_USED, after: NOT_USED)
               image_doc = images.items_class.new_doc
+
               images.upsert!(image_doc, pos: pos, before: before, after: after) do |image|
-                image.upload_id  = upload_id
-                if prev = previous_image(image)
+                image.upload_id = upload_id
+
+                if (prev = previous_image(image))
                   image.weight = prev.weight
                 end
+
                 yield(image) if block_given?
+
                 fix_image_positions!
               end
             end
@@ -63,17 +66,17 @@ module Ecoportal
                 when :layout_button
                   self.hide_options = false
                 when Hash
-                  supported = [:layout_button, :layout]
-                  unless (rest = hash_except(cnf.dup, *supported)).empty?
+                  supported = %i[layout_button layout]
+                  unless (rest = hash_except!(cnf.dup, *supported)).empty?
                     unused.push(rest)
                   end
 
-                  if cnf.key?(:layout_button) then self.hide_options = !cnf[:layout_button] end
-                  if cnf.key?(:layout) then configure_layour cnf[:layout] end
+                  self.hide_options = !cnf[:layout_button] if cnf.key?(:layout_button)
+                  configure_layout(cnf[:layout])           if cnf.key?(:layout)
                 else
                   unused.push(cnf)
                 end
-              end.yield_self do |unused|
+              end.then do |unused|
                 super(*unused)
               end
             end
@@ -88,26 +91,24 @@ module Ecoportal
 
             def previous_image(value)
               imgs = ordered_images
-              pos = imgs.index(value) - 1
-              return if pos < 0
+              pos  = imgs.index(value) - 1
+              return if pos.negative?
+
               imgs[pos]
             end
 
             def configure_layout(value)
               case value
               when :three
-                self.layout = "third"
+                self.layout = 'third'
               when :two
-                self.layout = "half"
+                self.layout = 'half'
               when :one
-                self.layout = "fill"
+                self.layout = 'fill'
               when :three_crop
-                self.layout = "third_crop"
-              else
-                # Unsupported
+                self.layout = 'third_crop'
               end
             end
-
           end
         end
       end

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

@@ -4,12 +4,11 @@ module Ecoportal
       class Page
         class Component
           class Law < Ecoportal::API::Common::Content::DoubleModel
-
             class << self
               def new_doc
                 {
-                  "id"         => new_uuid,
-                  "weight"     => 999
+                  'id'     => new_uuid,
+                  'weight' => 999
                 }
               end
             end
@@ -22,7 +21,7 @@ module Ecoportal
             passdate    :updated_at, read_only: true
 
             def to_s
-              [legislation, title, category, topic].join(" <:> ")
+              [legislation, title, category, topic].join(' <:> ')
             end
           end
         end

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

@@ -4,12 +4,12 @@ module Ecoportal
       class Page
         class Component
           class LawField < Page::Component
-            embeds_many :snippets, klass: "Ecoportal::API::V2::Page::Component::Law", order_key: :weight
+            embeds_many :snippets, klass: 'Ecoportal::API::V2::Page::Component::Law', order_key: :weight
 
             def empty?
               snippets.empty?
             end
-            
+
             def ordered_snippets
               snippets.sort_by.with_index do |snippet, index|
                 [snippet.weight, index]

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

@@ -9,7 +9,7 @@ module Ecoportal
             def empty?
               !value
             end
-            
+
             def to_s
               value
             end

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

@@ -7,7 +7,7 @@ module Ecoportal
             passboolean :is_me_button
             passthrough :attach_mode
             passthrough :person_schema_id
-            embeds_many :viewable_fields, klass: "Ecoportal::API::V2::Page::Component::PeopleViewableField"
+            embeds_many :viewable_fields, klass: 'Ecoportal::API::V2::Page::Component::PeopleViewableField'
 
             passboolean :singular
             passthrough :requires_number
@@ -18,7 +18,7 @@ module Ecoportal
             passboolean :attached_people_permissions_enabled, :attached_people_permissions_editable
             passthrough :apply_attached_people_permissions_to
 
-            embeds_one  :attached_people_permissions_flags, klass: "Ecoportal::API::V2::Page::PermissionFlags"
+            embeds_one  :attached_people_permissions_flags, klass: 'Ecoportal::API::V2::Page::PermissionFlags'
 
             def empty?
               people_ids.empty?
@@ -36,7 +36,7 @@ module Ecoportal
 
             # Adds a field to the `viewable_fields`
             def add_viewable(field_id, pos: NOT_USED, before: NOT_USED, after: NOT_USED)
-              viewable_fields.upsert!({"id" => field_id}, pos: pos, before: before, after: after)
+              viewable_fields.upsert!({'id' => field_id}, pos: pos, before: before, after: after)
             end
 
             # Deletes a field from the `viewable_fields`
@@ -66,26 +66,27 @@ module Ecoportal
             #     - `:subscribed`
             #     - `:subscribed_to_tasks`
             #   - `requires: number` to fine the number of required people to be attached
-            def configure(*conf)
+            def configure(*conf) # rubocop:disable Metrics/AbcSize
               conf.each_with_object([]) do |cnf, unused|
                 case cnf
                 when :snapshot
-                  self.attach_mode  = "snapshot"
+                  self.attach_mode  = 'snapshot'
                 when :live
-                  self.attach_mode  = "live"
+                  self.attach_mode  = 'live'
                 when :me_button
                   self.is_me_button = true
                 when :singular
                   self.singular = true
                 when Hash
-                  supported = [:singular, :permits, :requires]
-                  unless (rest = hash_except(cnf.dup, *supported)).empty?
+                  supported = %i[singular permits requires]
+                  unless (rest = hash_except!(cnf.dup, *supported)).empty?
                     unused.push(rest)
                   end
 
-                  if cnf.key?(:singular) then self.singular = !!cnf[:singular] end
+                  self.singular = !!cnf[:singular] if cnf.key?(:singular)
+
                   if cnf.key?(:permits)
-                    if permits = cnf[:permits]
+                    if (permits = cnf[:permits])
                       self.attached_people_permissions_enabled = true
                       configure_permits(*[permits].flatten.compact)
                     else
@@ -94,7 +95,7 @@ module Ecoportal
                   end
                   if cnf.key?(:requires)
                     self.singular = false
-                    if requires = cnf[:requires]
+                    if (requires = cnf[:requires])
                       self.required        = true
                       self.requires_number = requires
                     else
@@ -105,7 +106,7 @@ module Ecoportal
                 else
                   unused.push(cnf)
                 end
-              end.yield_self do |unused|
+              end.then do |unused|
                 super(*unused)
               end
             end
@@ -116,13 +117,13 @@ module Ecoportal
               conf.each_with_object([]) do |cnf, flags|
                 case cnf
                 when :all
-                  self.apply_attached_people_permissions_to = "page"
+                  self.apply_attached_people_permissions_to = 'page'
                 when :stages
-                  self.apply_attached_people_permissions_to = "all_stages"
+                  self.apply_attached_people_permissions_to = 'all_stages'
                 when :page
-                  self.apply_attached_people_permissions_to = "page_only"
+                  self.apply_attached_people_permissions_to = 'page_only'
                 when :stage
-                  self.apply_attached_people_permissions_to = "current_stage"
+                  self.apply_attached_people_permissions_to = 'current_stage'
                 when :can_edit
                   self.attached_people_permissions_editable = true
                 when :can_view
@@ -130,11 +131,10 @@ module Ecoportal
                 else
                   flags.push(cnf)
                 end
-              end.yield_self do |flags|
-                self.attached_people_permissions_flags.configure *flags
+              end.then do |flags|
+                attached_people_permissions_flags.configure(*flags)
               end
             end
-
           end
         end
       end

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

@@ -12,7 +12,7 @@ module Ecoportal
             def empty?
               value.to_s.strip.empty?
             end
-            
+
             def to_s
               value
             end
@@ -33,20 +33,19 @@ module Ecoportal
                 when :exact_index
                   self.exact_index = true
                 when Hash
-                  supported = [:multiline, :max_length]
-                  unless (rest = hash_except(cnf.dup, *supported)).empty?
+                  supported = %i[multiline max_length]
+                  unless (rest = hash_except!(cnf.dup, *supported)).empty?
                     unused.push(rest)
                   end
-                  if cnf.key?(:multiline)  then self.multiline = !!cnf[:multiline] end
-                  if cnf.key?(:max_length) then self.max_length = cnf[:max_length] end
+                  self.multiline  = !!cnf[:multiline] if cnf.key?(:multiline) # rubocop:disable Style/DoubleNegation
+                  self.max_length = cnf[:max_length]  if cnf.key?(:max_length)
                 else
                   unused.push(cnf)
                 end
-              end.yield_self do |unused|
+              end.then do |unused|
                 super(*unused)
               end
             end
-
           end
         end
       end

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

@@ -74,7 +74,7 @@ module Ecoportal
                   self.display_fields_in_lookup = true
                 when Hash
                   supported = %i[create attach metadata]
-                  rest      = hash_except(cnf.dup, *supported)
+                  rest      = hash_except!(cnf.dup, *supported)
 
                   unused.push(rest) unless rest.empty?
 

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

@@ -9,17 +9,17 @@ module Ecoportal
             HTML_TAGS_REX = /<("[^"]*"|'[^']*'|[^'">])*>/
 
             def empty?
-              to_s.to_s.strip.empty?
+              to_s.strip.empty?
             end
 
             def to_s
-              remove_html_tags(content)
+              remove_html_tags(content).to_s
             end
 
             private
 
             def remove_html_tags(str)
-              str = str.gsub(HTML_TAGS_REX, ' ')  if str
+              str = str.gsub(HTML_TAGS_REX, ' ') if str
               str = str.gsub(/[^[:print:]]/, '') if str
               str = str.gsub(":&nbsp;", ' ')     if str
               str = str.gsub("&#34;", '"')       if str