ooze-parser 0.1.7 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f3d6d9f5b2a81fc071bed9f32d21c65d07554beb
-  data.tar.gz: 1ca9904ce21f3396a00ac70f290218ef9171d1c1
+SHA256:
+  metadata.gz: ac6c74a6c7335e7c002ef332684e510c03c569fdc254cdd5f334668513e67548
+  data.tar.gz: d63bc4cdf6bfb2dc97825b9446b31f2f862c04a4771de62d40b5556095b1237a
 SHA512:
-  metadata.gz: 1ee713e3cf2718b338ca141c5f400f1931ea97c06914fd23f0d376131fdb32300b1f54e049bbf53a7697c7fe111b70b946f98e74e3fae250c3f046c0d5085258
-  data.tar.gz: dab2f8146b6a16a3096e1423b907aac2d863a18f8671e03ba6869681b9fe3e8bc2333a686e4a6f2b0ad9754a4112a3335a846e82112ed9ee4442e1df51e23563
+  metadata.gz: cdd17d4a7b2f0fbe0fe0e10b71f0aff505ff63993e10b2ff72d0d4a3a66d051d6112fc441b513e47478b015fee5d5dc5b3547f4656157bf45cd53509f2ddc096
+  data.tar.gz: 69a53428143cb56b7f5be3be74f8f45040fa3e495a42d550ab18098ab312c2d9455ff237a8ecf5f9dc7328d4095c88cee8cb5beeafd2d735747aaf2e859019df

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/base/model.rb

@@ -15,10 +15,10 @@ module Ooz
 
       private
 
-      def to_hash(arr)
+      def to_hash(arr, key: "_id")
         raise "Sorry, expected Array, given: #{arr.class.name}" if !arr.is_a?(Array)
         arr.map do |e|
-          [e._id, e]
+          [e.send(key), e]
         end.to_h
       end
 

data/lib/ooz/model/ooze.rb

@@ -6,6 +6,11 @@ module Ooz
       overridable_const :field_factory_class, Model::FieldFactory
       overridable_const :force_class, Model::Force
 
+      def tagged?(tag, search_on: :tags)
+        haystack = self.send(search_on)
+        haystack.include?(tag)
+      end
+
       def stages?
         evolution && evolution.stages&.length > 0
       end
@@ -35,8 +40,26 @@ module Ooz
         membranes
       end
 
-      def fields_hash
-        to_hash(fields)
+      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.7"
+  VERSION = "0.1.10"
 end

metadata

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