ecoportal-api-v2 0.8.16 → 0.8.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4655b94325aaad222aabf7ec6376aa4e0be39f03db94338ceab8fcd77dca229b
-  data.tar.gz: af7d89a41346d634dce2acea3c689e0f823b9ec85f68d662807939c2222e843d
+  metadata.gz: dcd685a294969e210f94f8b8728fec32a94372d349064e14f9a59e24429b7753
+  data.tar.gz: d1c8b4ddf1bcd9b3ac2203c6f1bb293aafcfc6de1d58dde79c7b425c87fe444b
 SHA512:
-  metadata.gz: a749ce7f98f2765c133d662c4257ba7f3bac24fb2b35a369f8e060dc97ff5ccd13a5c91be65fb004f3de31c98b3559eb4f91fdf6fb15e71d178004e66c407ac8
-  data.tar.gz: 454fc8004933d15357f0e4dc0e5d7e923b42876bb049cad72ea58a8b32a0b3246a3316c8fad05df22d16fa4c87296a9e8bdbda0932a73f7cad8e16ae4b386a41
+  metadata.gz: 145593ad0fe8adf038c9565bafdeee1497e13ed165c45f8a40572463ff9fffb2bcb3eec8834595eab7b89efc6274ca9c1352ff7dd043ec6c632bdff8a01a2793
+  data.tar.gz: 7b8bbb9a4ef83eb033005f5898254f4d67d1fd5e095453f111a4fe350e9ff30236bf0effc4a79c36edf72519a305f1f9596a5ac61dc99a0bdc06a2b5f74b7e1b

data/CHANGELOG.md

@@ -1,12 +1,39 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [0.8.16] - 2021-09-xx
+## [0.8.20] - 2021-10-xx
 
 ### Added
 ### Changed
+  - `Ecoportal::API::V2::Pages::PageStage#permits` removed
+    - The reason is that it should be changed using the `Stage#permits` instead
+  - Upgraded `ecoportal-api` gem dependency
+  
 ### Fixed
+  - `Ecoportal::API::V2::Page::Stage#sections` typo
 
+## [0.8.19] - 2021-09-29
+
+### Changed
+  - Moved validation of components multi-section from `PageStage` to `Page`
+  - Removed validation from `PageStage#as_update`
+    - This means that the validation will not run natively, but in the client lib
+
+### Fixed
+  - `Ecoportal::V2::Page::Stage#section?` fixed typo
+  - `Ecoportal::V2::Page::Stage`
+    - `#attached?` added missing code
+    - `#component?` fixed typo
+
+## [0.8.18] - 2021-09-29
+
+### Fixed
+  - typo in `PageStage#validate`
+
+## [0.8.17] - 2021-09-29
+
+### Fixed
+  - Typo in `Section#attached?`
 
 ## [0.8.15] - 2021-09-29
 

data/ecoportal-api-v2.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "redcarpet", ">= 3.5.1",  "< 3.6"
   spec.add_development_dependency "pry"      , ">= 0.14"
 
-  spec.add_dependency 'ecoportal-api', '>= 0.8.3', '< 0.9'
+  spec.add_dependency 'ecoportal-api', '>= 0.8.4', '< 0.9'
 end

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

@@ -110,7 +110,7 @@ module Ecoportal
           # Looks up the section that this component belongs to.
           # @return [Ecoportal::API::V2::Page::Section, nil] the section where this field is attached to.
           def section
-            root.sections.find {|sec| sec.component?(id)}
+            ooze.sections.find {|sec| sec.component?(id)}
           end
 
           # @return [Boolean] whether or not this field is attached to any section.

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

@@ -45,7 +45,7 @@ module Ecoportal
 
           # @return [Boolean] whether or not the section appears in an ooze instance
           def attached?
-            !ooze.stages? || stages.any?
+            !ooze.stages? || stages.any? {|stg| stg.section?(self)}
           end
 
           # @return [Boolean] whether or not this section is a split section
@@ -67,7 +67,7 @@ module Ecoportal
             when Ecoportal::API::V2::Page::Component
               component?(com_or_id.id)
             when String
-              all_component_ids.include?(id)
+              all_component_ids.include?(com_or_id)
             else
               msg = "Missuse: com_or_id should be a Component or a String. Given: #{com_or_id.class}"
               raise ArgumentError.new(msg)

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

@@ -28,7 +28,7 @@ module Ecoportal
             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
-              fld && (!block_given? || yield(sec))
+              sec && (!block_given? || yield(sec))
             end.sort_by.with_index {|sec, index| [sec.weight, index]}
           end
 
@@ -41,7 +41,7 @@ module Ecoportal
             when Ecoportal::API::V2::Page::Section
               section?(sec_or_id.id)
             when String
-              self.section_ids.include?(id)
+              self.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}")
             end

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

@@ -54,6 +54,20 @@ module Ecoportal
           self.stages.count > 0
         end
 
+        # @return [String] with feedback, if for this page instance, there are any of:
+        #   1. components multi-section (fields belonging to more than one section)
+        def validate
+          msg = ""
+          if (multi = components.multi_section).length > 0
+            msg += "There are fields attached to more than one section:\n  • "
+            msg += multi.map do |fld|
+              fld.label
+            end.join("\n  • ") + "\n"
+          end
+
+          msg.empty?? true : msg
+        end
+
         private
 
         def _doc_bug_fix(hash)

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

@@ -7,7 +7,7 @@ module Ecoportal
           passthrough :task_priority, :state, :status
           passthrough :votes_enabled, :upvotes, :downvotes
 
-          embeds_many :permits, klass: "Ecoportal::API::V2::Page::Permit"
+          #embeds_many :permits, klass: "Ecoportal::API::V2::Page::Permit"
           passarray   :force_errors, :subtags, order_matters: false
 
           # @return [String] `id` of the stage we got the data of.
@@ -22,39 +22,25 @@ module Ecoportal
             end
           end
 
-          # @raise [Exception] if for this page instance, there are any of:
+          # @return [String] with feedback, if for this page instance, there are any of:
           #   1. orphaned components (fields not belonging to any section)
-          #   2. components multi-section (fields belonging to more than one section)
-          #   3. orphaned sections (sections not belonging to any stage)
-          def as_update(*args, **kargs)
-            validate.tap do |validation|
-              raise validation if validation.is_a?(String)
-            end
-            super(*args, **kargs)
-          end
-
-          private
-
+          #   2. orphaned sections (sections not belonging to any stage)
           def validate
-            msg   = ""
-            if (orphans = components.unattached).length > 0
-              msg += "There are fields not attached to any sections:"
-              msg += orphans.map do |fld|
-                fld.label
-              end.join("\n  • ") + "\n"
-            end
+            msg  = super
+            msg  = "" unless msg.is_a?(String)
 
-            if (multi = components.multi_section).length > 0
-              msg += "There are fields attached to more than one section:"
+            orphans = components.unattached.select {|comp| comp.global_binding.to_s.strip.empty?}
+            if orphans.length > 0
+              msg += "There are fields not attached to any sections:\n  • "
               msg += orphans.map do |fld|
                 fld.label
               end.join("\n  • ") + "\n"
             end
 
             if (orphans = sections.unattached).length > 0
-              msg += "There are sections not attached to any stage:"
+              msg += "There are sections not attached to any stage:\n  • "
               msg += orphans.map do |sec|
-                "'#{sec.header}' (#{sec.id})"
+                "'#{sec.heading}' (#{sec.id})"
               end.join("\n  • ") + "\n"
             end
             msg.empty?? true : msg

data/lib/ecoportal/api/v2_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GEM2_VERSION = "0.8.16"
+    GEM2_VERSION = "0.8.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-v2
 version: !ruby/object:Gem::Version
-  version: 0.8.16
+  version: 0.8.20
 platform: ruby
 authors:
 - Oscar Segura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'