ecoportal-api-v2 0.8.18 → 0.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 752926633d87b225938d5dc32b89e1250d2931a615875df1896052afbabd17de
-  data.tar.gz: c3b5522c590eb27125783b31b20f8864d24aef43bd07d72f258ed02548d73581
+  metadata.gz: 11e7f2b8bb7544cb9d99ad0660b3a52ec388725f2fe76018f3b0bc2f8e122c04
+  data.tar.gz: 31e3858fa5c4d3c632f5d3e04a51a3bc75b64cd719f646f22b5a6e24e42a1a95
 SHA512:
-  metadata.gz: 2a714d48b68220f8deefed8437772a61830146e6b68453a58f13817a50b1cc746ce7098a131b7919d161b46b850c73a35abb1bc8d414bc0f3c59579c7f25be0a
-  data.tar.gz: c919b046a896afb11f8540288d374e8f1c0e5b5d9970793caaaa3814b9b12a9cb3587abf9e0e81f7230d97a72ed34d71f22e319086c637b8bcc02cc338eb3d9c
+  metadata.gz: 4b4eda0998b1f122c2df6480ba283200bd9df1c985fa761f514231e6f6dddd89beff13d2c4bfa52e7e3d8ca39644efef57508caa369eca2b2b13478ac1faea5f
+  data.tar.gz: 31ab53da2363812cb340c41233eae35efe2c3e4024f77d670c6ffd2fb33f1697eabfacafc6bb85f895e4ef8faeed7b8d65858905fb967330bd181c4061198442

data/CHANGELOG.md

@@ -1,11 +1,24 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [0.8.18] - 2021-09-xx
+## [0.8.19] - 2021-09-29
 
 ### Added
 ### 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
 

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

@@ -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

@@ -21,38 +21,24 @@ module Ecoportal
               stages[stage_id]
             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.heading}' (#{sec.id})"
               end.join("\n  • ") + "\n"

data/lib/ecoportal/api/v2_version.rb

@@ -1,5 +1,5 @@
 module Ecoportal
   module API
-    GEM2_VERSION = "0.8.18"
+    GEM2_VERSION = "0.8.19"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecoportal-api-v2
 version: !ruby/object:Gem::Version
-  version: 0.8.18
+  version: 0.8.19
 platform: ruby
 authors:
 - Oscar Segura