ecoportal-api-v2 0.8.4 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d37cfa2d9b609207eb06ce65d9b2c5184296ce33b4fab2b9a38ca91fa94a90
-  data.tar.gz: 8e5db3051d415f7e70a27a5f4c93bf87c03febb6660c7da7a323e84dfb539b83
+  metadata.gz: 2d7fd0373344854c22b4397e7e2d2645dd799695424f3fa30d006fca2081676d
+  data.tar.gz: 2d839f8ecb67512c2c5d00a2bd6832e53d304334f2c5a6bbc291958661e21130
 SHA512:
-  metadata.gz: de42e53ed858e09838f63e8dad3735b276bcea93d076530f7b899779d36293568c26f1e1ce7e236d5d182f7c548ac887d209161bd8ee959bebd652b5519c16a0
-  data.tar.gz: 8991b881e1cbeec44def7408184c8cd6e8170d2bbaaa8ef0f1483497338b80461f14a7a34b281186a976f7116579def4a70ebf7a2b4bedf5fdde95765bd7c5b2
+  metadata.gz: 27425f592041428b0d07f9593c78f2a80095311e4890a3569ce212e37f067a3b36f2a3b147459e7dca368f7a737671ac9325df6ed40cec3d4a18f75d0ea18d28
+  data.tar.gz: c4cee01feb2c89179da4eda1d3699e5900812b52fb7d198a1447935ac4e89c347bee56ba69c5f6d1a407f968da21112cf0a490855811ddfd5048caace430c422

data/CHANGELOG.md

@@ -1,17 +1,44 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [0.8.4] - 2021-02-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
-  - roll back `ecoportal-api` dependency
+  - Removed `Stages.ordered_stages`: detected bug with Enumerable iteration
   
 ### Fixed
 
-## [0.8.3] - 2021-02-22
+## [0.8.7] - 2021-05-25
+
+### Changed
+  - Upgrade `ecoportal-api` gem
+
+### Fixed
+  - Requiring `api/common` from 2 different ends
+
+## [0.8.6] - 2021-02-23
 
 ### Added
+  - `Ecoportal::API::V2::Page::Component::SelectionField` added methods `#numeric!` `#text!`
+
+## [0.8.5] - 2021-02-22
+
+### Changed
+  - upgrade
+
+
+## [0.8.4] - 2021-02-22
+
+### Changed
+  - roll back `ecoportal-api` dependency
+
+## [0.8.3] - 2021-02-22
+
 ### Changed
   - updated `rspec` for expected patch data on `delete` operation.
 
@@ -20,23 +47,16 @@ All notable changes to this project will be documented in this file.
 
 ## [0.8.2] - 2021-02-21
 
-### Added
 ### Changed
   - some necessary changes for the new gem to be active
 
-### Fixed
-
 ## [0.8.1] - 2021-02-21
 
-### Added
 ### Changed
   - renamed parameters (backwards incompatible change):
     - `Ecoportal::API::V2::Pages::Stages` methods `#get` and `#update`
       - updated `Ecoportal::API::V2::Pages#` accordingly
 
-### Fixed
-
-
 ## MOVED TO GEM `ecoportal-api-v2` ##
 
 ## [0.7.5] - 2021-02-21
@@ -130,42 +150,29 @@ All notable changes to this project will be documented in this file.
   - automatic key builder
     - helper: `Ecoportal::API::V2::v2key` method
     - `user_key:` and `org_key:` as constructor methods for `Ecoportal::API::V2`
-### Changed
-### Fixed
 
 ## [0.7.1] - 2020-10-07
 
-### Added
 ### Changed
   - updated dependencies
-### Fixed
-
 
 ## [0.7.0] - 2020-09-10
 
-### Added
 ### Changed
   - updated dependencies
-### Fixed
 
 ## [0.6.1] - 2020-07-11
 
 ### Added
   - `Ecoportal::API::Common::Content::DoubleModel#pretty_print`
-### Changed
-### Fixed
 
 ## [0.6.0] - 2020-07-11
 
-### Added
 ### Changed
   - upgraded `ecoportal-api` gem
-### Fixed
 
 ## [0.5.9] - 2020-07-02
 
 ### Added
   - helper `Ecoportal::API::Common::Content::StringDigest#indexable_label`: to see the part of a label that gets indexed
   - this `CHANGELOG.md` file
-### Changed
-### Fixed

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "ecoportal/api"
+require "ecoportal/api-v2"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/ecoportal-api-v2.gemspec

@@ -1,11 +1,11 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "ecoportal/api/v2/version"
+require "ecoportal/api/v2_version"
 
 Gem::Specification.new do |spec|
   spec.name          = "ecoportal-api-v2"
-  spec.version       = Ecoportal::API::V2::GEM_VERSION
+  spec.version       = Ecoportal::API::GEM2_VERSION
   spec.authors       = ["Oscar Segura"]
   spec.email         = ["rien@ecoportal.co.nz", "oscar@ecoportal.co.nz", "bozydar@ecoportal.co.nz"]
 
@@ -22,13 +22,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler",   ">= 2.2.11",  "< 2.3"
+  spec.add_development_dependency "bundler",   ">= 2.2.17", "< 2.3"
   spec.add_development_dependency "rspec",     ">= 3.10.0", "< 3.11"
   spec.add_development_dependency "rake",      ">= 13.0.3", "< 13.1"
   spec.add_development_dependency "yard",      ">= 0.9.26", "< 0.10"
   spec.add_development_dependency "redcarpet", ">= 3.5.1",  "< 3.6"
-  spec.add_development_dependency "pry"      , "~> 0.14"
+  spec.add_development_dependency "pry"      , ">= 0.14"
 
-  #spec.add_dependency 'ecoportal-api', '>= 0.8.1', '< 0.9'
-  spec.add_dependency 'ecoportal-api', '>= 0.7.5', '< 0.8'
+  spec.add_dependency 'ecoportal-api', '>= 0.8.3', '< 0.9'
 end

data/lib/ecoportal/api-v2.rb

@@ -1,10 +1,10 @@
 require "ecoportal/api"
-require "ecoportal/api/v2/version"
+require "ecoportal/api/v2_version"
 
 module Ecoportal
   module API
   end
 end
 
-require_relative "api/common"
+require_relative "api/common.v2"
 require_relative "api/v2"

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

@@ -0,0 +1,8 @@
+module Ecoportal
+  module API
+    module Common
+    end
+  end
+end
+
+require 'ecoportal/api/common/content'

data/lib/ecoportal/api/common/content/double_model.rb

@@ -151,7 +151,7 @@ module Ecoportal
               else
                 raise "You should either specify the 'klass' of the elements or the 'enum_class'"
               end
-              embed(method, key: key, multiple: true, klass: eclass)              
+              embed(method, key: key, multiple: true, klass: eclass)
             end
 
             private
@@ -258,10 +258,10 @@ module Ecoportal
 
           def reset!(key = nil)
             if key
-              keys    = [].push(key).compact
+              keys    = [key].flatten.compact
               odoc    = original_doc.dig(*keys)
-              dig_set(doc, key, odoc && JSON.parse(odoc.to_json))
-
+              odoc    = odoc && JSON.parse(odoc.to_json)
+              dig_set(doc, keys, odoc)
             else
               replace_doc(JSON.parse(original_doc.to_json))
             end

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/people_field.rb

@@ -13,8 +13,8 @@ module Ecoportal
             passthrough :attached_people_permissions_enabled, :apply_attached_people_permissions_to
             passthrough :attached_people_permissions_editable, :attached_people_permissions_flags
 
-            def add(id)
-              people_ids << id
+            def add(*ids)
+              people_ids << ids
             end
 
           end

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

@@ -6,9 +6,20 @@ module Ecoportal
           class SelectionField < Page::Component
             passthrough :multiple, :flat
             passthrough :other, :other_desc
+            passthrough :data_type
 
             embeds_many :options, klass: "Ecoportal::API::V2::Page::Component::SelectionOption", order_key: :weight
 
+            def numeric!(&block)
+              ordered_options.each {|opt| opt.numeric!(&block)}
+              self.data_type = "num"
+            end
+
+            def text!(&block)
+              ordered_options.each {|opt| opt.text!(&block)}
+              self.data_type = "str"
+            end
+
             def select(value)
               opt = options.find {|opt| opt.value == value}
               sel = selected
@@ -34,7 +45,7 @@ module Ecoportal
             end
 
             def add_option(name:, value:, pos: NOT_USED, before: NOT_USED, after: NOT_USED)
-              opt_doc = options.items_class.new_doc              
+              opt_doc = options.items_class.new_doc
               options.upsert!(opt_doc, pos: pos, before: before, after: after) do |option|
                 option.name  = name
                 option.value = 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

@@ -0,0 +1,5 @@
+module Ecoportal
+  module API
+    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.4
+  version: 0.8.8
 platform: ruby
 authors:
 - Oscar Segura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-21 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.2.17
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.3'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.2.17
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.3'
@@ -114,14 +114,14 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
 - !ruby/object:Gem::Dependency
@@ -130,20 +130,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 description: 
 email:
 - rien@ecoportal.co.nz
@@ -167,7 +167,7 @@ files:
 - bin/setup
 - ecoportal-api-v2.gemspec
 - lib/ecoportal/api-v2.rb
-- lib/ecoportal/api/common.rb
+- lib/ecoportal/api/common.v2.rb
 - lib/ecoportal/api/common/content.rb
 - lib/ecoportal/api/common/content/array_model.rb
 - lib/ecoportal/api/common/content/class_helpers.rb
@@ -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
@@ -227,7 +229,7 @@ files:
 - lib/ecoportal/api/v2/registers/stage_result.rb
 - lib/ecoportal/api/v2/registers/stages_result.rb
 - lib/ecoportal/api/v2/registers/template.rb
-- lib/ecoportal/api/v2/version.rb
+- lib/ecoportal/api/v2_version.rb
 homepage: https://www.ecoportal.com
 licenses:
 - MIT

data/lib/ecoportal/api/common.rb

@@ -1,18 +0,0 @@
-module Ecoportal
-  module API
-    module Common
-    end
-  end
-end
-
-require 'ecoportal/api/common/base_class'
-require 'ecoportal/api/common/hash_diff'
-require 'ecoportal/api/common/base_model'
-require 'ecoportal/api/common/doc_helpers'
-require 'ecoportal/api/common/logging'
-require 'ecoportal/api/common/client'
-require 'ecoportal/api/common/response'
-require 'ecoportal/api/common/wrapped_response'
-require 'ecoportal/api/common/batch_response'
-require 'ecoportal/api/common/batch_operation'
-require 'ecoportal/api/common/content'

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

@@ -1,7 +0,0 @@
-module Ecoportal
-  module API
-    class V2
-      GEM_VERSION = "0.8.4"
-    end
-  end
-end