ecoportal-api-v2 2.0.16 → 3.1.1

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

@@ -11,14 +11,14 @@ module Ecoportal
           passthrough :status
           passboolean :complete, :lock_after_completion
 
-          embeds_many :permits, klass: "Ecoportal::API::V2::Page::Permit"
+          embeds_many :permits, klass: 'Ecoportal::API::V2::Page::Permit'
           passboolean :disable_direct_permissions
           passboolean :creator_enabled, :creator_editable
-          embeds_one  :creator_flags, klass: "Ecoportal::API::V2::Page::PermissionFlags"
+          embeds_one  :creator_flags, klass: 'Ecoportal::API::V2::Page::PermissionFlags'
           passthrough :can
 
           def ooze
-            self._parent.ooze
+            _parent.ooze
           end
 
           def components
@@ -31,7 +31,8 @@ module Ecoportal
           def sections
             sec_ids = section_ids.to_a
             root.sections.values_at(*sec_ids).select.with_index do |sec, i|
-              puts "Warning: section #{id} points to missing section #{sec_ids[i]}" if !sec
+              puts "Warning: section #{id} points to missing section #{sec_ids[i]}" unless sec
+
               sec && (!block_given? || yield(sec))
             end.sort_by.with_index {|sec, index| [sec.weight, index]}
           end
@@ -45,9 +46,9 @@ module Ecoportal
             when Ecoportal::API::V2::Page::Section
               section?(sec_or_id.id)
             when String
-              self.section_ids.include?(sec_or_id)
+              section_ids.include?(sec_or_id)
             else
-              raise ArgumentError.new("sec_or_id must be either a Section or a String. Given: #{sec_or_id.class}")
+              raise ArgumentError, "sec_or_id must be either a Section or a String. Given: #{sec_or_id.class}"
             end
           end
 
@@ -59,15 +60,18 @@ module Ecoportal
             secs.each do |sec|
               unless sec.is_a?(Ecoportal::API::V2::Page::Section)
                 msg = "Expected Ecoportal::API::V2::Page::Section. Given: #{sec.class}"
-                raise ArgumentError.new(msg)
+                raise ArgumentError, msg
               end
+
               unless ooze.sections.include?(sec)
                 msg  = "The section '#{sec.heading}' (#{sec.id}) is not present in ooze.sections.\n"
-                msg += "Review your script (i.e. @var where you store previous ooze runs)."
+                msg << 'Review your script (i.e. @var where you store previous ooze runs).'
                 raise msg
               end
+
               section_ids.insert_one(sec.id)
             end
+
             self
           end
 
@@ -78,20 +82,23 @@ module Ecoportal
           #   or the actual Hash model with String keys person `user_id`, `user_name`, `user_email`
           # @yieldparam section [Ecoportal::API::V2::Page::Permit] the created permit
           def add_permit(value, &block)
-            props = ["user_id", "user_name", "user_email"]
-            hash_props  = case value
-                          when Ecoportal::API::Internal::Person
-                            return false unless account = value.account
-                            props.zip([account.user_id, value.name, value.email]).to_h
-                          when Hash
-                            value.slice(*props)
-                          else
-                            raise ArgumentError.new("Expected Ecoportal::API::Internal::Person or Hash. Given: #{value.class}")
-                          end
+            props = %w[user_id user_name user_email]
+            hash_props  =
+              case value
+              when Ecoportal::API::Internal::Person
+                return false unless account = value.account
+                props.zip([account.user_id, value.name, value.email]).to_h
+              when Hash
+                value.slice(*props)
+              else
+                raise ArgumentError, "Expected Ecoportal::API::Internal::Person or Hash. Given: #{value.class}"
+              end
+
             hash_doc  = Ecoportal::API::V2::Page::Permit.new_doc.merge(hash_props)
-            exists    = self.permits.any? {|permit| permit.user_id == hash_doc["user_id"]}
+            exists    = permits.any? {|permit| permit.user_id == hash_doc['user_id']}
             return false if exists
-            self.permits.upsert!(hash_doc, &block)
+
+            permits.upsert!(hash_doc, &block)
           end
         end
       end

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

@@ -3,7 +3,7 @@ module Ecoportal
     class V2
       class Page
         class Stages < Ecoportal::API::Common::Content::CollectionModel
-          class_resolver :stage_class, "Ecoportal::API::V2::Page::Stage"
+          class_resolver :stage_class, 'Ecoportal::API::V2::Page::Stage'
 
           self.klass     = :stage_class
           self.order_key = :ordering

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

@@ -34,7 +34,8 @@ module Ecoportal
         embeds_many :forces,     enum_class: :forces_class
 
         def initialize(doc = [], parent: self, key: nil)
-          super(_doc_bug_fix(doc), parent: parent, key: key)
+          doc = _doc_bug_fix(doc)
+          super
         end
 
         def ooze
@@ -105,14 +106,14 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/v2/page/mould_counter'
-require 'ecoportal/api/v2/page/permission_flags'
-require 'ecoportal/api/v2/page/permit'
-require 'ecoportal/api/v2/page/component'
-require 'ecoportal/api/v2/page/components'
-require 'ecoportal/api/v2/page/section'
-require 'ecoportal/api/v2/page/sections'
-require 'ecoportal/api/v2/page/stage'
-require 'ecoportal/api/v2/page/stages'
-require 'ecoportal/api/v2/page/force'
-require 'ecoportal/api/v2/page/forces'
+require_relative 'page/mould_counter'
+require_relative 'page/permission_flags'
+require_relative 'page/permit'
+require_relative 'page/component'
+require_relative 'page/components'
+require_relative 'page/section'
+require_relative 'page/sections'
+require_relative 'page/stage'
+require_relative 'page/stages'
+require_relative 'page/force'
+require_relative 'page/forces'

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

@@ -85,5 +85,5 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/v2/pages/page_stage/task'
-require 'ecoportal/api/v2/pages/page_stage/tasks'
+require_relative 'page_stage/task'
+require_relative 'page_stage/tasks'

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

@@ -125,5 +125,5 @@ module Ecoportal
 end
 
 require 'ecoportal/api/v2/page'
-require 'ecoportal/api/v2/pages/stages'
-require 'ecoportal/api/v2/pages/page_create_response'
+require_relative 'pages/stages'
+require_relative 'pages/page_create_response'

data/lib/ecoportal/api/v2/registers/page_result.rb

@@ -11,10 +11,10 @@ module Ecoportal
           passarray   :tags, order_matters: false
           passthrough :mould_counter
 
-          class_resolver :stages_class, "Ecoportal::API::V2::Registers::StagesResult"
+          class_resolver :stages_class, 'Ecoportal::API::V2::Registers::StagesResult'
           embeds_many    :stages, enum_class: :stages_class, read_only: true
 
-          class_resolver :mem_droplet, "Ecoportal::API::V2::Registers::PageResult::MembraneDroplet"
+          class_resolver :mem_droplet, 'Ecoportal::API::V2::Registers::PageResult::MembraneDroplet'
           embeds_many    :membranes, klass: :mem_droplet, read_only: true
         end
       end
@@ -22,4 +22,4 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/v2/registers/page_result/membrane_droplet'
+require_relative 'page_result/membrane_droplet'

data/lib/ecoportal/api/v2/registers/register.rb

@@ -6,7 +6,7 @@ module Ecoportal
           passkey     :id
           passthrough :name
 
-          class_resolver :template_class, "Ecoportal::API::V2::Registers::Template"
+          class_resolver :template_class, 'Ecoportal::API::V2::Registers::Template'
 
           def templates_by_id
             @templates_by_id or index_templates
@@ -22,15 +22,14 @@ module Ecoportal
           end
 
           def index_templates
-            @templates_by_id   = {}
-            doc["templates"].each do |template_doc|
+            @templates_by_id = {}
+
+            doc['templates'].each do |template_doc|
               template = template_class.new(template_doc)
               @templates_by_id[template.id] = template
             end
           end
-
         end
-
       end
     end
   end

data/lib/ecoportal/api/v2/registers/search_results.rb

@@ -5,7 +5,7 @@ module Ecoportal
         class SearchResults < Ecoportal::API::Common::Content::DoubleModel
           passthrough :total, :total_before_filtering
           passarray   :tags, order_matters: false
-          embeds_many :results, klass: "Ecoportal::API::V2::Registers::PageResult"
+          embeds_many :results, klass: 'Ecoportal::API::V2::Registers::PageResult'
         end
       end
     end

data/lib/ecoportal/api/v2/registers/stages_result.rb

@@ -3,7 +3,7 @@ module Ecoportal
     class V2
       class Registers
         class StagesResult < V2::Page::Stages
-          class_resolver :stage_class, "Ecoportal::API::V2::Registers::StageResult"
+          class_resolver :stage_class, 'Ecoportal::API::V2::Registers::StageResult'
 
           self.klass = :stage_class
         end

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

@@ -143,9 +143,9 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/v2/registers/template'
-require 'ecoportal/api/v2/registers/register'
-require 'ecoportal/api/v2/registers/stage_result'
-require 'ecoportal/api/v2/registers/stages_result'
-require 'ecoportal/api/v2/registers/page_result'
-require 'ecoportal/api/v2/registers/search_results'
+require_relative 'registers/template'
+require_relative 'registers/register'
+require_relative 'registers/stage_result'
+require_relative 'registers/stages_result'
+require_relative 'registers/page_result'
+require_relative 'registers/search_results'

data/lib/ecoportal/api/v2/s3/files/batch_upload.rb

@@ -26,6 +26,7 @@ module Ecoportal
 
               def container_id
                 return unless success?
+
                 poll.container_id
               end
             end

data/lib/ecoportal/api/v2/s3/files.rb

@@ -128,6 +128,6 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/v2/s3/files/poll'
-require 'ecoportal/api/v2/s3/files/poll_status'
-require 'ecoportal/api/v2/s3/files/batch_upload'
+require_relative 'files/poll'
+require_relative 'files/poll_status'
+require_relative 'files/batch_upload'

data/lib/ecoportal/api/v2.rb

@@ -98,7 +98,7 @@ module Ecoportal
   end
 end
 
-require 'ecoportal/api/v2/people'
-require 'ecoportal/api/v2/pages'
-require 'ecoportal/api/v2/registers'
-require 'ecoportal/api/v2/s3'
+require_relative 'v2/people'
+require_relative 'v2/pages'
+require_relative 'v2/registers'
+require_relative 'v2/s3'

data/lib/ecoportal/api/v2_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GEM2_VERSION = '2.0.16'.freeze
+    GEM2_VERSION = '3.1.1'.freeze
   end
 end

data/lib/ecoportal/api-v2.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-v2
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 3.1.1
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-14 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -135,7 +135,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -145,7 +145,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.8
+        version: 0.10.10
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +231,8 @@ files:
 - lib/ecoportal/api/common/content/double_model/attributable/passthrough.rb
 - lib/ecoportal/api/common/content/double_model/attributable/simple.rb
 - lib/ecoportal/api/common/content/double_model/base.rb
-- lib/ecoportal/api/common/content/double_model/diffable_model.rb
+- lib/ecoportal/api/common/content/double_model/diffable.rb
+- lib/ecoportal/api/common/content/double_model/diffable/diff_service.rb
 - lib/ecoportal/api/common/content/double_model/double_doc.rb
 - lib/ecoportal/api/common/content/double_model/double_doc/base.rb
 - lib/ecoportal/api/common/content/double_model/double_doc/linkable_doc.rb