ooze-parser 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1883bd7308b1e95264ee71c5600508957c1599cdee0c3876170d357bbe6a27f5
-  data.tar.gz: 207722da6b7f6dbaa9439dfbb0681c5b6ca6598517f85a13bbb4ed06ad9b2067
+  metadata.gz: 231f1190c7c78c3bc1f82fa9f96c664ac8f7397cbd1635590fd7cbba2b00c733
+  data.tar.gz: 8ee25227d7dfae4464be9ada380f1ce05314a466a7660467d538a16c6b4adb4d
 SHA512:
-  metadata.gz: 4cbdb49a3044b071ccd5b651c6ab9ba4df5c269be139764ce7d6e8b3578eb130c12871a7894eec5181494c2afd74fbf90675d217abfae3507e7ecbb3337842e4
-  data.tar.gz: f250a71fdd094f1413a0bcc6a70f9c7a30e29bd321b0b02939b8361b8532cde455442cb6dfe77f29d499b6b78b041665b98ab206b45b8cab8dc6acdfe38a6c03
+  metadata.gz: 2675f5fca5402a9e47e09c9306cdfaaa2a66cfb54908d044222ddfe9bf907de05d4c8cc64ea84643c2cc990da20a50f91a6ce83563069953fda34f49965cb7cb
+  data.tar.gz: 61d278211c225b19fb9d10072afd9f1498f4c3a20e18869c595ff138b747a12138ceb75f4f4b5825b49c2152dadcffd314746d548009b0a1ad97883ba17c936e

data/lib/ooz/base/field/select.rb

@@ -13,6 +13,38 @@ module Ooz
   module Base
     class Field
       class Select
+        class << self
+          # Merges options in `more` into `master` options
+          # @param master [Ooz::Model::Field::Select]
+          # @param more [Ooz::Model::Field::Select, Array<Hash>]
+          # @note it prevents douplicated values
+          def merge_options(master, more, silent: false)
+            if !master.is_a?(Ooz::Model::Field::Select)
+              raise ArgumentError.new("Expecting 'master' to be Ooz::Model::Field::Select. Given: #{master.class}")
+            elsif !more.is_a?(Ooz::Model::Field::Select) && !more.is_a?(Array)
+              raise ArgumentError.new("Expecting 'more' to be Ooz::Model::Field::Select or Array<Hash>. Given: #{more.class}")
+            end
+            opts1 = master.doc["options"]
+            opts2 = more.is_a?(Array)? more : more.doc["options"]
+
+            to_add = opts2.reject do |opt|
+              opts1.any? {|o| o["value"] == opt["value"]}
+            end
+
+            # Some feedback
+            if !silent && more.is_a?(Ooz::Model::Field::Select) && !to_add.empty?
+              puts "Merging more options to the field '#{more.label}':\n"
+              str_opts = to_add.map do |opt|
+                "'#{opt["value"]}' => '#{opt["name"]}'"
+              end.join("\n  • ")
+
+              puts "  • " + str_opts + "\n"
+            end
+
+            opts1.push(*to_add)
+          end
+        end
+        
         overridable_const :select_option, Base::Field::Select::Option
         passthrough :multiple, :flat, :data_type, :other, :other_desc, to: :doc
         passthrough_arr :options, to: :doc, klass: :select_option

data/lib/ooz/model/ooze.rb

@@ -40,8 +40,26 @@ module Ooz
         membranes
       end
 
-      def fields_hash(key: "_id")
-        to_hash(fields, key: key)
+      def fields_hash(key: "_id", silent: true)
+        fields.group_by do |fld|
+          fld.send(key)
+        end.transform_values do |flds|
+          if flds.length == 1
+            flds.first
+          else
+            master = flds.first
+            next master unless master.is_a?(Ooz::Model::Field::Select)
+            rest   = flds[1..-1]
+            rest.each do |fld|
+              if fld.is_a?(Ooz::Model::Field::Select)
+                master.other    ||= fld.other
+                master.multiple ||= fld.multiple
+                Ooz::Base::Field::Select.merge_options(master, fld, silent: silent)
+              end
+            end
+            master
+          end
+        end
       end
 
       def sections

data/lib/ooz/version.rb

@@ -1,3 +1,3 @@
 module Ooz
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooze-parser
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Oscar Segura
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ooze-parser to boost data integration and treatment