ecoportal-api-v2 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a332d0750443bc0d8be5b549032b9f62c493cbff07905dc353f0949248c5120a
-  data.tar.gz: d89435fd4cebfef7662148f5fc335cc792353666c80e1f5ab07c6dc0a8f73744
+  metadata.gz: 2d7fd0373344854c22b4397e7e2d2645dd799695424f3fa30d006fca2081676d
+  data.tar.gz: 2d839f8ecb67512c2c5d00a2bd6832e53d304334f2c5a6bbc291958661e21130
 SHA512:
-  metadata.gz: 611c6b781a09105bb22a24b85e3b9046513505691bef6256774837fa14a7e1c9ca6061795fe35068b5c5340e82f07d2281682ad2d05b06673495285fabcf1dfb
-  data.tar.gz: 3b9f347aac2994262df8dd864b564010a37ec01a5d7ed2da4ecdc69bb49fff2ff85d8f858cb1761baa770e352131f9ee444fcacd765888ef7b3a338902b567e6
+  metadata.gz: 27425f592041428b0d07f9593c78f2a80095311e4890a3569ce212e37f067a3b36f2a3b147459e7dca368f7a737671ac9325df6ed40cec3d4a18f75d0ea18d28
+  data.tar.gz: c4cee01feb2c89179da4eda1d3699e5900812b52fb7d198a1447935ac4e89c347bee56ba69c5f6d1a407f968da21112cf0a490855811ddfd5048caace430c422

data/CHANGELOG.md

@@ -1,9 +1,20 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [0.8.7] - 2021-05-xx
+## [0.8.8] - 2021-06-xx
 
 ### Added
+  - `Ecoportal::API::V2::Page::Component::ChartField::Benchmark`
+  - Support to convert selection options between numeric and text type.
+  - Add `Permit` object to `Page` and `Stage`
+
+### Changed
+  - Removed `Stages.ordered_stages`: detected bug with Enumerable iteration
+  
+### Fixed
+
+## [0.8.7] - 2021-05-25
+
 ### Changed
   - Upgrade `ecoportal-api` gem
 

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

@@ -34,6 +34,7 @@ module Ecoportal
   end
 end
 
+require 'ecoportal/api/v2/page/permit'
 require 'ecoportal/api/v2/page/component'
 require 'ecoportal/api/v2/page/components'
 require 'ecoportal/api/v2/page/section'

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

@@ -16,6 +16,7 @@ module Ecoportal
             embeds_one :sankey_config, klass: "Ecoportal::API::V2::Page::Component::ChartField::Sankey"
             embeds_one :indicator_config, klass: "Ecoportal::API::V2::Page::Component::ChartField::Indicator"
             embeds_one :faceted_series_config, klass: "Ecoportal::API::V2::Page::Component::ChartField::Multiseries"
+            embeds_one :benchmark_config, klass: "Ecoportal::API::V2::Page::Component::ChartField::Benchmark"
 
             embeds_many :series, klass: "Ecoportal::API::V2::Page::Component::ChartField::Serie"
 
@@ -35,6 +36,8 @@ module Ecoportal
                 indicator_config
               when "faceted_series"
                 faceted_series_config
+              when "benchmark"
+                benchmark_config
               end
             end
 
@@ -52,3 +55,4 @@ require 'ecoportal/api/v2/page/component/chart_field/heatmap'
 require 'ecoportal/api/v2/page/component/chart_field/sankey'
 require 'ecoportal/api/v2/page/component/chart_field/indicator'
 require 'ecoportal/api/v2/page/component/chart_field/multiseries'
+require 'ecoportal/api/v2/page/component/chart_field/benchmark'

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

@@ -0,0 +1,28 @@
+module Ecoportal
+  module API
+    class V2
+      class Page
+        class Component
+          class ChartField
+            class Benchmark < Common::Content::DoubleModel
+              passkey     :id
+              passthrough :patch_ver
+
+              passthrough :register_id
+              passthrough :source_type
+              passthrough :benchmark_field, :benchmark_label
+              passthrough :across, :across_field
+              passthrough :against_field, :against_label
+              passthrough :grouped, :group_field
+
+              passthrough :calculation_mode
+              passthrough :min, :max
+
+              passthrough :filters
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,12 +10,14 @@ module Ecoportal
 
             embeds_many :options, klass: "Ecoportal::API::V2::Page::Component::SelectionOption", order_key: :weight
 
-            def numeric!
-              data_type = "num"
+            def numeric!(&block)
+              ordered_options.each {|opt| opt.numeric!(&block)}
+              self.data_type = "num"
             end
 
-            def text!
-              data_type = "str"
+            def text!(&block)
+              ordered_options.each {|opt| opt.text!(&block)}
+              self.data_type = "str"
             end
 
             def select(value)

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

@@ -4,7 +4,7 @@ module Ecoportal
       class Page
         class Component
           class SelectionOption < Common::Content::DoubleModel
-            
+
             class << self
               def new_doc
                 {
@@ -17,6 +17,15 @@ module Ecoportal
             passkey     :id
             passthrough :patch_ver, :name, :value
             passthrough :weight, :selected
+
+            def numeric!
+              self.value = block_given?? yield(value) : value.to_i
+            end
+
+            def text!
+              self.value = block_given?? yield(value) : value.to_s
+            end
+
           end
         end
       end

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

@@ -0,0 +1,14 @@
+module Ecoportal
+  module API
+    class V2
+      class Page
+        class Permit < Common::Content::DoubleModel
+          passkey     :id
+          passthrough :patch_ver
+          passthrough :user_id, :user_name
+          passthrough :editable, :flags
+        end
+      end
+    end
+  end
+end

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

@@ -5,9 +5,13 @@ module Ecoportal
         class Stage < Common::Content::DoubleModel
           passkey     :id
           passthrough :patch_ver
-          passthrough :name
+          passthrough :namem, :ordering
           passarray   :subtags, order_matters: false
           passarray   :section_ids
+          passthrough :complete, :status, :lock_after_completion
+          embeds_many :permits, klass: "Ecoportal::API::V2::Page::Permit"
+          passthrough :disable_direct_permissions
+          passthrough :creator_enabled, :creator_editable, :creator_flags
           passthrough :can
 
           def sections

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

@@ -13,11 +13,11 @@ module Ecoportal
             end
           end
 
-          def ordered_stages
-            stages.each_with_index.sort_by do |stage, index|
-              (stage.ordering >= 9999) ? [index, index] : [stage.ordering, index]
-            end.map(&:first)
-          end
+          #def ordered
+          #  self.each_with_index.sort_by do |stage, index|
+          #    (stage.ordering >= 9999) ? [index, index] : [stage.ordering, index]
+          #  end.map(&:first)
+          #end
 
         end
       end

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

@@ -4,11 +4,12 @@ module Ecoportal
       class Pages
         class PageStage < V2::Page
           passthrough :mould_counter, :archive
-          passthrough :task_priority, :state
+          passthrough :task_priority, :state, :status
           passthrough :votes_enabled, :upvotes, :downvotes
 
-          passarray   :force_errors, :subtags, :permits, order_matters: false
-          passthrough :evolution
+          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.7"
+    GEM2_VERSION = "0.8.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-v2
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Oscar Segura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -184,6 +184,7 @@ files:
 - lib/ecoportal/api/v2/page/component/action.rb
 - 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/frequency.rb
 - lib/ecoportal/api/v2/page/component/chart_field/heatmap.rb
 - lib/ecoportal/api/v2/page/component/chart_field/indicator.rb
@@ -213,6 +214,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/permit.rb
 - lib/ecoportal/api/v2/page/section.rb
 - lib/ecoportal/api/v2/page/sections.rb
 - lib/ecoportal/api/v2/page/stage.rb