ecoportal-api-v2 0.8.8 → 0.8.9

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

@@ -7,26 +7,84 @@ module Ecoportal
 
           self.klass = :section_class
 
+          # Creates a new `section`
           def add(name: nil, split: false, pos: NOT_USED, before: NOT_USED, after: NOT_USED)
             sec_doc = section_class.new_doc(split: split)
-            upsert!(sec_doc, pos: pos, before: before, after: after) do |section|
+            upsert!(sec_doc) do |section| #, pos: pos, before: before, after: after) do |section|
               section.heading  = name
-              if prev = previous_section(section)
-                section.weight = prev.weight
+              if weight = scope_weight(pos: pos, before: before, after: after)
+                section.weight = weight
               end
+              fix_weights!
               yield(section) if block_given?
-              #fix_weights! # a server bug prevents to set the weight of existing sections
             end
           end
 
+          def get_by_type(type)
+            ordered.select do |sec|
+              sec.type == type
+            end
+          end
+
+          def get_by_heading(heading)
+            ordered.select do |sec|
+              value = heading == :unnamed ? nil : heading
+              same_string?(sec.heading, value)
+            end
+          end
+
+          # Gets all the sections between `sec1` and `sec2`
+          def between(sec1, sec2, included: false)
+            sorted_secs = ordered
+            pos1 = (sec1 = to_section(sec1)) && sorted_secs.index(sec1)
+            pos2 = (sec2 = to_section(sec2)) && sorted_secs.index(sec2)
+            if included
+              pos1 = pos1 ? pos1 : 0
+              pos2 = pos2 ? pos2 : -1
+            else
+              pos1 = pos1 ? (pos1 + 1) : 0
+              pos2 = pos2 ? (pos2 - 1) : -1
+            end
+            sorted_secs[pos1..pos2]
+          end
+
+          # Gets the sections ordered by `weight` (as they appear in the page)
           def ordered
-            each_with_index.sort_by do |section, index|
+            self.sort_by.with_index do |section, index|
               (section.weight >= 9999) ? [index, index] : [section.weight, index]
-            end.map(&:first)
+            end
           end
 
           private
 
+          def scope_weight(pos: NOT_USED, before: NOT_USED, after: NOT_USED)
+            case
+            when used_param?(pos)
+              if pos    = to_section(pos)
+                pos.weight - 1
+              end
+            when used_param?(before)
+              if before = to_section(before)
+                before.weight - 1
+              end
+            when used_param?(after)
+              if after  = to_section(after)
+                after.weight
+              end
+            end
+          end
+
+          def to_section(value)
+            case value
+            when Ecoportal::API::V2::Page::Section
+              value
+            when Numeric
+              ordered[value]
+            else
+              get_by_heading(value).first
+            end
+          end
+
           def fix_weights!
             ordered.each_with_index do |section, index|
               section.weight = index

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

@@ -5,13 +5,16 @@ module Ecoportal
         class Stage < Common::Content::DoubleModel
           passkey     :id
           passthrough :patch_ver
-          passthrough :namem, :ordering
+          passthrough :name, :ordering
           passarray   :subtags, order_matters: false
           passarray   :section_ids
-          passthrough :complete, :status, :lock_after_completion
+          passthrough :status
+          passboolean :complete, :lock_after_completion
+
           embeds_many :permits, klass: "Ecoportal::API::V2::Page::Permit"
-          passthrough :disable_direct_permissions
-          passthrough :creator_enabled, :creator_editable, :creator_flags
+          passboolean :disable_direct_permissions
+          passboolean :creator_enabled, :creator_editable
+          embeds_one  :creator_flags, klass: "Ecoportal::API::V2::Page::PermissionFlags"
           passthrough :can
 
           def sections
@@ -22,8 +25,9 @@ module Ecoportal
             end.sort_by {|sec| sec.weight}
           end
 
-          def attach_section(section)
-            section_ids.insert_one(section.id)
+          def add_section(*secs)
+            secs.each {|sec| section_ids.insert_one(sec.id)}
+            self
           end
 
         end

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

@@ -8,8 +8,8 @@ module Ecoportal
           self.klass = :stage_class
 
           def get_by_name(name)
-            find do |stage|
-              stage.name.strip.downcase == name.to_s.strip.downcase
+            self.find do |stage|
+              same_string?(stage.name, name)
             end
           end
 

data/lib/ecoportal/api/v2/pages/page_stage.rb

@@ -9,7 +9,6 @@ module Ecoportal
 
           embeds_many :permits, klass: "Ecoportal::API::V2::Page::Permit"
           passarray   :force_errors, :subtags, order_matters: false
-          #passthrough :evolution
         end
       end
     end

data/lib/ecoportal/api/v2_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GEM2_VERSION = "0.8.8"
+    GEM2_VERSION = "0.8.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-v2
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Oscar Segura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -176,6 +176,7 @@ files:
 - lib/ecoportal/api/common/content/doc_helpers.rb
 - lib/ecoportal/api/common/content/double_model.rb
 - lib/ecoportal/api/common/content/hash_diff_patch.rb
+- lib/ecoportal/api/common/content/model_helpers.rb
 - lib/ecoportal/api/common/content/string_digest.rb
 - lib/ecoportal/api/common/content/wrapped_response.rb
 - lib/ecoportal/api/v2.rb
@@ -185,6 +186,7 @@ files:
 - lib/ecoportal/api/v2/page/component/action_field.rb
 - lib/ecoportal/api/v2/page/component/chart_field.rb
 - lib/ecoportal/api/v2/page/component/chart_field/benchmark.rb
+- lib/ecoportal/api/v2/page/component/chart_field/config.rb
 - lib/ecoportal/api/v2/page/component/chart_field/frequency.rb
 - lib/ecoportal/api/v2/page/component/chart_field/heatmap.rb
 - lib/ecoportal/api/v2/page/component/chart_field/indicator.rb
@@ -200,6 +202,7 @@ files:
 - lib/ecoportal/api/v2/page/component/files_field.rb
 - lib/ecoportal/api/v2/page/component/gauge_field.rb
 - lib/ecoportal/api/v2/page/component/gauge_stop.rb
+- lib/ecoportal/api/v2/page/component/geo_coordinates.rb
 - lib/ecoportal/api/v2/page/component/geo_field.rb
 - lib/ecoportal/api/v2/page/component/image.rb
 - lib/ecoportal/api/v2/page/component/images_field.rb
@@ -214,6 +217,7 @@ files:
 - lib/ecoportal/api/v2/page/component/signature_field.rb
 - lib/ecoportal/api/v2/page/component/tag_field.rb
 - lib/ecoportal/api/v2/page/components.rb
+- lib/ecoportal/api/v2/page/permission_flags.rb
 - lib/ecoportal/api/v2/page/permit.rb
 - lib/ecoportal/api/v2/page/section.rb
 - lib/ecoportal/api/v2/page/sections.rb