onoma 0.4.0 → 0.5.2

data/config/locales/por.yml

@@ -701,22 +701,6 @@ por:
       name: "Estados vida animal"
     cation_exchange_capacity_analysis_methods:
       name: "Métodos de análise de capacidade de troca catiônica"
-    certification_labels:
-      items:
-        bio: "Bio"
-      name: "As etiquetas de certificação"
-    certifications:
-      items:
-        bordeaux_claret: "Bordeaux clarete"
-        bordeaux_haut_benauge_avec_sucres: "Bordeaux Haut-Benauge sucres avec"
-        bordeaux_rose: "Bordeaux Rose"
-        bordeaux_superieur_blanc: "Bordeaux blanc supérieur"
-        bordeaux_superieur_rouge: "Bordeaux Supérieur rouge"
-        cognac: "Conhaque"
-        eau_de_vie_des_charentes: "Eau de vie des Charentes"
-      name: "Certificações"
-      property_natures:
-        land: "Terra"
     chemical_classifications:
       items:
         dsd_corrosive: "Corrosivo"
@@ -2187,11 +2171,6 @@ por:
         cause: "Causa"
         target: "Alvo"
         treatments: "Tratamentos"
-    lands:
-      items:
-        bordeaux_haut_benauge: "Bordeaux Benauge haut"
-        bordeaux_superieur: "Bordeaux Superieur"
-        cognac: "Conhaque"
     languages:
       items:
         afr: "Afrikaans"

data/config/locales/spa.yml

@@ -697,29 +697,6 @@ spa:
       name: "Estados vida animal"
     cation_exchange_capacity_analysis_methods:
       name: "Métodos de análisis de capacidad de intercambio catiónico"
-    certification_labels:
-      items:
-        ig: "YO G"
-      name: "Las etiquetas de certificación"
-    certifications:
-      items:
-        bordeaux_blanc: "Blanc Burdeos"
-        bordeaux_blanc_avec_sucres: "Burdeos blanc avec sucres"
-        bordeaux_clairet: "Clairet Burdeos"
-        bordeaux_claret: "Claret Burdeos"
-        bordeaux_haut_benauge: "Burdeos Haut-Benauge"
-        bordeaux_haut_benauge_avec_sucres: "Burdeos Haut-Benauge sucres avec"
-        bordeaux_rose: "Rosa Burdeos"
-        bordeaux_rouge: "Rouge Burdeos"
-        bordeaux_superieur_blanc: "Burdeos blanc Superior"
-        bordeaux_superieur_rouge: "Burdeos rouge Superior"
-        cognac: "Coñac"
-        eau_de_vie_de_cognac: "Eau de vie de coñac"
-        eau_de_vie_des_charentes: "Eau de vie des Charentes"
-      name: "Certificaciones"
-      property_natures:
-        labels: "Etiquetas"
-        land: "Tierra"
     chemical_classifications:
       items:
         dsd_corrosive: "Corrosivo"
@@ -2349,13 +2326,6 @@ spa:
         cause: "Porque"
         target: "Objetivo"
         treatments: "Tratos"
-    lands:
-      items:
-        bordeaux: "Burdeos"
-        bordeaux_haut_benauge: "Burdeos Benauge haut"
-        bordeaux_superieur: "Superieur Burdeos"
-        cognac: "Coñac"
-      name: "Tierras"
     languages:
       items:
         afr: "Afrikaans"

data/lib/onoma.rb

@@ -12,7 +12,7 @@ require 'yaml'
 require 'zeitwerk'
 
 loader = Zeitwerk::Loader.for_gem
-loader.collapse('lib/onoma/models')
+loader.collapse("#{__dir__}/onoma/models")
 loader.setup
 
 module Onoma
@@ -62,6 +62,7 @@ module Onoma
     # Returns version of DB
     def reference_version
       return 0 unless reference_path.exist?
+
       reference_document.root['version'].to_i
     end
 
@@ -116,6 +117,7 @@ module Onoma
       elsif args.size == 1
         return nomenclature.find(args.shift) if nomenclature
       end
+
       nil
     end
 

data/lib/onoma/item.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/MissingRespondToMissing
 require 'set'
 
 module Onoma
@@ -48,6 +49,7 @@ module Onoma
         if item.parents.any? { |p| self == p } || self == item
           raise 'Circular dependency. Item can be parent of itself.'
         end
+
         @parent = item
         @parent_name = @parent.name.to_s
       end
@@ -78,10 +80,12 @@ module Onoma
 
     def parent
       return @parent if @parent
+
       @parent = find_parent
       @parent.add_child(self) if @parent
       @parent
     end
+
     alias fetch_parent parent
 
     def find_parent
@@ -93,9 +97,11 @@ module Onoma
       a = self_and_parents.reverse
       b = other_item.self_and_parents.reverse
       return nil if a.first != b.first
+
       common_lineage = 0
       a.size.times do |index|
         break if a[index].nil? || b[index].nil? || a[index] != b[index]
+
         common_lineage += 1
       end
       a.size + b.size - 2 * common_lineage
@@ -103,6 +109,7 @@ module Onoma
 
     def original_nomenclature_name
       return parent.name.to_sym unless root?
+
       nil
     end
 
@@ -118,16 +125,14 @@ module Onoma
             list
           end
         end
+      elsif options[:recursively].is_a?(FalseClass)
+        nomenclature.list.select do |item|
+          @left < item.left && item.right < @right && item.depth == @depth + 1
+        end
       else
-        if options[:recursively].is_a?(FalseClass)
-          nomenclature.list.select do |item|
-            @left < item.left && item.right < @right && item.depth == @depth + 1
-          end
-        else
-          # @children ||=
-          nomenclature.list.select do |item|
-            @left < item.left && item.right < @right
-          end
+        # @children ||=
+        nomenclature.list.select do |item|
+          @left < item.left && item.right < @right
         end
       end
     end
@@ -152,6 +157,7 @@ module Onoma
     def rise(&block)
       result = yield(self)
       return result if result
+
       parent ? parent.rise(&block) : nil
     end
 
@@ -196,6 +202,7 @@ module Onoma
       end
       I18n.t(root, options.merge(default: [*defaults.map(&:to_sym), "items.#{Onoma.escape_key(name)}".to_sym, "enumerize.#{Onoma.escape_key(nomenclature.name)}.#{Onoma.escape_key(name)}".to_sym, "labels.#{Onoma.escape_key(name)}".to_sym, name.humanize]))
     end
+
     alias humanize human_name
     alias localize human_name
     alias l localize
@@ -266,6 +273,7 @@ module Onoma
     # Returns property value
     def property(name)
       return @name.to_sym if name == :name
+
       property = @nomenclature.properties[name]
       value = @attributes[name]
       if property
@@ -291,11 +299,12 @@ module Onoma
         unless target_nomenclature
           raise "Cannot find nomenclature: for #{property(name).inspect}"
         end
+
         return target_nomenclature.list.collect do |i|
           [i.human_name, i.name]
         end
       else
-        raise StandardError, 'Cannot call selection for a non-list property'
+        raise StandardError.new('Cannot call selection for a non-list property')
       end
     end
 
@@ -307,11 +316,13 @@ module Onoma
     # Returns property descriptor
     def method_missing(method_name, *args)
       return property(method_name) if has_property?(method_name)
+
       super
     end
 
     def set(name, value)
       raise "Invalid property: #{name.inspect}" if %i[name parent].include?(name.to_sym)
+
       # # TODO: check format
       # if property = nomenclature.properties[name]
       #   value ||= [] if property.list?
@@ -325,16 +336,18 @@ module Onoma
 
     private
 
-    def cast_property(name, value)
-      @nomenclature.cast_property(name, value)
-    end
+      def cast_property(name, value)
+        @nomenclature.cast_property(name, value)
+      end
 
-    def item_for_comparison(other)
-      item = nomenclature[other.is_a?(Item) ? other.name : other]
-      unless item
-        raise StandardError, "Invalid operand to compare: #{other.inspect} not in #{nomenclature.name}"
+      def item_for_comparison(other)
+        item = nomenclature[other.is_a?(Item) ? other.name : other]
+        unless item
+          raise StandardError.new("Invalid operand to compare: #{other.inspect} not in #{nomenclature.name}")
+        end
+
+        item
       end
-      item
-    end
   end
 end
+# rubocop:enable Style/MissingRespondToMissing

data/lib/onoma/migration/actions/item_change.rb

@@ -7,11 +7,11 @@ module Onoma
           name = element['item'].split('#')
           @nomenclature = name.first
           @name = name.second
-          @changes = element.attributes.delete_if do |k, _v|
-            %w[item].include?(k)
-          end.each_with_object({}) do |(k, v), h|
-            h[k.to_sym] = (v.to_s.blank? ? nil : v.to_s)
-          end
+          @changes = element.attributes
+                            .delete_if { |k, _v| %w[item].include?(k) }
+                            .each_with_object({}) do |(k, v), h|
+                              h[k.to_sym] = (v.to_s.blank? ? nil : v.to_s)
+                            end
         end
 
         def new_name?

data/lib/onoma/migration/actions/item_creation.rb

@@ -5,14 +5,13 @@ module Onoma
         attr_reader :nomenclature, :name, :options
         def initialize(element)
           raise 'Need item attribute' unless element['item']
+
           name = element['item'].split('#')
           @nomenclature = name.first
           @name = name.second
-          @options = element.attributes.delete_if do |k, _v|
-            k =~ /name(:[a-z]{3})?/ || %w[item parent nomenclature].include?(k)
-          end.each_with_object({}) do |(k, v), h|
-            h[k.to_sym] = v.to_s
-          end
+          @options = element.attributes
+                            .delete_if { |k, _v| k =~ /name(:[a-z]{3})?/ || %w[item parent nomenclature].include?(k) }
+                            .each_with_object({}) { |(k, v), h| h[k.to_sym] = v.to_s }
           @options[:parent] = element['parent'].to_sym if element.key?('parent')
         end
 

data/lib/onoma/migration/actions/nomenclature_change.rb

@@ -6,6 +6,7 @@ module Onoma
 
         def initialize(element)
           raise 'No given name' unless element.key?('nomenclature')
+
           @nomenclature = element['nomenclature'].to_s
           @changes = {}
           @changes[:name] = element['name'].to_s if element.key?('name')

data/lib/onoma/migration/actions/nomenclature_creation.rb

@@ -5,8 +5,15 @@ module Onoma
         attr_reader :nomenclature, :options
 
         def initialize(element)
-          @nomenclature = element.key?('nomenclature') ? element['nomenclature'].to_s : element.key?('name') ? element['name'].to_s : nil
+          @nomenclature = if element.key?('nomenclature')
+                            element['nomenclature'].to_s
+                          elsif element.key?('name')
+                            element['name'].to_s
+                          else
+                            nil
+                          end
           raise 'No given name' unless @nomenclature
+
           @options = {}
           notions = element.attr('notions').to_s.split(/\s*\,\s*/).map(&:to_sym)
           @options[:notions] = notions if notions.any?

data/lib/onoma/migration/actions/property_creation.rb

@@ -9,8 +9,9 @@ module Onoma
           @name = name.second
           @type = element['type'].to_sym
           unless Onoma::PROPERTY_TYPES.include?(@type)
-            raise ArgumentError, "Property #{name} type is unknown: #{@type.inspect}"
+            raise ArgumentError.new("Property #{name} type is unknown: #{@type.inspect}")
           end
+
           @options = {}
           if element.has_attribute?('fallbacks')
             @options[:fallbacks] = element.attr('fallbacks').to_s.strip.split(/[[:space:]]*\,[[:space:]]*/).map(&:to_sym)

data/lib/onoma/migration/base.rb

@@ -21,6 +21,7 @@ module Onoma
         if element
           element.children.each do |child|
             next unless child.is_a? Nokogiri::XML::Element
+
             @actions << "Onoma::Migration::Actions::#{child.name.underscore.classify}".constantize.new(child)
           end
         end

data/lib/onoma/migrator/translation.rb

@@ -38,6 +38,7 @@ module Onoma
           def hash_to_yaml(hash, depth = nil)
             code = hash.sort_by { |a| a[0].to_s.tr('_', ' ').strip }.map do |k, v|
               next unless v
+
               pair_to_yaml(k, v)
             end.join("\n")
             code = "\n" + code.indent(depth).gsub(/^\s+$/, '') unless depth.nil?
@@ -54,7 +55,7 @@ module Onoma
             elsif value.is_a?(Numeric)
               value.to_s
             else
-              v = value.to_s.gsub("\\u00A0", '\\_')
+              v = value.to_s.gsub('\\u00A0', '\\_')
               value =~ /\n/ ? "|\n" + v.strip.indent : '"' + v + '"'
             end
           end

data/lib/onoma/nomenclature.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/MissingRespondToMissing
 module Onoma
   # This class represents a nomenclature
   class Nomenclature
@@ -67,7 +68,18 @@ module Onoma
       properties = @properties.values
       CSV.open(file, 'wb') do |csv|
         csv << [:name] + properties.map do |p|
-          suffix = (p.decimal? ? ' D' : p.integer? ? ' I' : p.boolean? ? ' B' : p.item? ? " R(#{p.choices_nomenclature})" : '')
+          suffix = if p.decimal?
+                     ' D'
+                   elsif p.integer?
+                     ' I'
+                   elsif p.boolean?
+                     ' B'
+                   elsif p.item?
+                     " R(#{p.choices_nomenclature})"
+                   else
+                     ''
+                   end
+
           "#{p.name}#{suffix}"
         end
         @items.values.each do |i|
@@ -95,6 +107,7 @@ module Onoma
       parent = attributes[:parent] || (element.key?('parent') ? element['parent'] : nil)
       attributes = element.attributes.each_with_object(HashWithIndifferentAccess.new) do |(k, v), h|
         next if %w[name parent].include?(k)
+
         h[k] = cast_property(k, v.to_s)
       end
       attributes[:parent] = parent if parent
@@ -132,12 +145,13 @@ module Onoma
         elsif element.has_attribute?('nomenclature')
           options[:choices] = element.attr('nomenclature').to_s.strip.to_sym
         else
-          raise MissingChoices, "[#{@name}] Property #{name} must have nomenclature as choices"
+          raise MissingChoices.new("[#{@name}] Property #{name} must have nomenclature as choices")
         end
       end
       unless Onoma::PROPERTY_TYPES.include?(type)
-        raise ArgumentError, "Property #{name} type is unknown: #{type.inspect}"
+        raise ArgumentError.new("Property #{name} type is unknown: #{type.inspect}")
       end
+
       add_property(name, type, options)
     end
 
@@ -147,6 +161,7 @@ module Onoma
       if @items[i.name]
         raise "Item #{i.name} is already defined in nomenclature #{@name}"
       end
+
       @items[i.name] = i
       @roots << i unless i.parent?
       i.rebuild_tree! unless options[:rebuild].is_a?(FalseClass)
@@ -161,6 +176,7 @@ module Onoma
       new_name = changes[:name]
       changes.each do |k, v|
         next if %i[parent name].include? k
+
         i.set(k, v)
       end
       if has_parent
@@ -176,6 +192,7 @@ module Onoma
       if @items[new_name]
         raise "Item #{new_name} is already defined in nomenclature #{@name}. Use merging instead."
       end
+
       i = find!(name)
       i.children.each do |child|
         child.parent_name = new_name
@@ -191,6 +208,7 @@ module Onoma
     def cascade_item_renaming(name, new_name)
       @set.references.each do |reference|
         next unless reference.foreign_nomenclature == self
+
         p = reference.property
         if p.list?
           reference.nomenclature.find_each do |item|
@@ -232,6 +250,7 @@ module Onoma
       if @properties[p.name]
         raise "Property #{p.name} is already defined in nomenclature #{@name}"
       end
+
       @properties[p.name] = p
       @references = nil
       p
@@ -245,11 +264,11 @@ module Onoma
       # Check properties
       @properties.values.each do |property|
         if property.choices_nomenclature && !property.inline_choices? && !Onoma[property.choices_nomenclature.to_s]
-          raise InvalidPropertyNature, "[#{name}] #{property.name} nomenclature property must refer to an existing nomenclature. Got #{property.choices_nomenclature.inspect}. Expecting: #{Onoma.names.inspect}"
+          raise InvalidPropertyNature.new("[#{name}] #{property.name} nomenclature property must refer to an existing nomenclature. Got #{property.choices_nomenclature.inspect}. Expecting: #{Onoma.names.inspect}")
         end
         next unless property.type == :choice && property.default
         unless property.choices.include?(property.default)
-          raise InvalidPropertyNature, "The default choice #{property.default.inspect} is invalid (in #{name}##{property.name}). Pick one from #{property.choices.sort.inspect}."
+          raise InvalidPropertyNature.new("The default choice #{property.default.inspect} is invalid (in #{name}##{property.name}). Pick one from #{property.choices.sort.inspect}.")
         end
       end
 
@@ -261,16 +280,16 @@ module Onoma
             # Cleans for parametric reference
             name = item.property(property.name).to_s.split(/\(/).first.to_sym
             unless choices.include?(name)
-              raise InvalidProperty, "The given choice #{name.inspect} is invalid (in #{self.name}##{item.name}). Pick one from #{choices.sort.inspect}."
+              raise InvalidProperty.new("The given choice #{name.inspect} is invalid (in #{self.name}##{item.name}). Pick one from #{choices.sort.inspect}.")
             end
           elsif item.property(property.name) && property.type == :list && property.choices_nomenclature
-            for name in item.property(property.name) || []
+            (item.property(property.name) || []).each { |name|
               # Cleans for parametric reference
               name = name.to_s.split(/\(/).first.to_sym
               unless choices.include?(name)
-                raise InvalidProperty, "The given choice #{name.inspect} is invalid (in #{self.name}##{item.name}). Pick one from #{choices.sort.inspect}."
+                raise InvalidProperty.new("The given choice #{name.inspect} is invalid (in #{self.name}##{item.name}). Pick one from #{choices.sort.inspect}.")
               end
-            end
+            }
           end
         end
       end
@@ -300,6 +319,7 @@ module Onoma
     def human_name(options = {})
       I18n.t("nomenclatures.#{Onoma.escape_key(name)}.name", options.merge(default: ["labels.#{Onoma.escape_key(name)}".to_sym, name.to_s.humanize]))
     end
+
     alias humanize human_name
 
     def new_boundaries(count = 2)
@@ -328,6 +348,7 @@ module Onoma
         @items.keys.sort
       end
     end
+
     alias all to_a
 
     def <=>(other)
@@ -349,24 +370,21 @@ module Onoma
     # Returns a list for select as an array of pair (array)
     def selection(item_name = nil)
       items = (item_name ? find!(item_name).self_and_children : @items.values)
-      items.collect do |item|
-        [item.human_name, item.name.to_s]
-      end.sort do |a, b|
-        a.first.lower_ascii <=> b.first.lower_ascii
-      end
+      items.map { |item| [item.human_name, item.name.to_s] }
+           .sort { |a, b| a.first.lower_ascii <=> b.first.lower_ascii }
     end
 
     # Returns a list for select as an array of pair (hash)
     def selection_hash(item_name = nil)
       items = (item_name ? find!(item_name).self_and_children : @items.values)
-      items.collect do |item|
-        { label: item.human_name, value: item.name }
-      end.sort { |a, b| a[:label].lower_ascii <=> b[:label].lower_ascii }
+      items.map { |item| { label: item.human_name, value: item.name } }
+           .sort { |a, b| a[:label].lower_ascii <=> b[:label].lower_ascii }
     end
 
     # Returns a list for select, without specified items
     def select_without(already_imported)
       ActiveSupport::Deprecation.warn 'Onoma::Nomenclature#select_without method is deprecated. Please use Onoma::Nomenclature#without method instead.'
+
       select_options = @items.values.collect do |item|
         [item.human_name, item.name.to_s] unless already_imported[item.name.to_s]
       end
@@ -395,13 +413,15 @@ module Onoma
     def find(item_name)
       @items[item_name]
     end
+
     alias item find
 
     # Return the Item for the given name. Raises Onoma::ItemNotFound if no item
     # found in nomenclature
     def find!(item_name)
       i = find(item_name)
-      raise ItemNotFound, "Cannot find item #{item_name.inspect} in #{name}" unless i
+      raise ItemNotFound.new("Cannot find item #{item_name.inspect} in #{name}") unless i
+
       i
     end
 
@@ -412,6 +432,7 @@ module Onoma
     def exists?(item)
       @items[item.respond_to?(:name) ? item.name : item].present?
     end
+
     alias include? exists?
 
     def property(property_name)
@@ -439,8 +460,8 @@ module Onoma
             value.each do |val|
               if val.is_a?(Onoma::Item)
                 one_found = true if item_value == val.name.to_sym
-              else
-                one_found = true if item_value == val
+              elsif item_value == val
+                one_found = true
               end
             end
             valid = false unless one_found
@@ -464,6 +485,7 @@ module Onoma
     def find_by(properties)
       items = where(properties)
       return nil unless items.any?
+
       items.first
     end
 
@@ -475,6 +497,7 @@ module Onoma
           items << item if item.property(property_name) == searched_item.name
         end
         break if items.any?
+
         searched_item = searched_item.parent
       end while searched_item
       items
@@ -487,6 +510,7 @@ module Onoma
 
     def cast_options(options)
       return {} if options.nil?
+
       options.each_with_object({}) do |(k, v), h|
         h[k.to_sym] = if properties[k]
                         cast_property(k, v.to_s)
@@ -501,13 +525,20 @@ module Onoma
       if property = properties[name]
         if property.type == :choice || property.type == :item
           if value =~ /\,/
-            raise InvalidPropertyNature, 'A property nature of choice type cannot contain commas'
+            raise InvalidPropertyNature.new('A property nature of choice type cannot contain commas')
           end
+
           value = value.strip.to_sym
         elsif property.list?
           value = value.strip.split(/[[:space:]]*\,[[:space:]]*/).map(&:to_sym)
         elsif property.type == :boolean
-          value = (value == 'true' ? true : value == 'false' ? false : nil)
+          value = if value == 'true'
+                    true
+                  elsif value == 'false'
+                    false
+                  else
+                    nil
+                  end
         elsif property.type == :decimal
           value = BigDecimal(value)
         elsif property.type == :integer
@@ -516,14 +547,16 @@ module Onoma
           value = (value.blank? ? nil : Date.parse(value))
         elsif property.type == :symbol
           unless value =~ /\A\w+\z/
-            raise InvalidPropertyNature, "A property '#{name}' must contains a symbol. /[a-z0-9_]/ accepted. No spaces. Got #{value.inspect}"
+            raise InvalidPropertyNature.new("A property '#{name}' must contains a symbol. /[a-z0-9_]/ accepted. No spaces. Got #{value.inspect}")
           end
+
           value = value.to_sym
         end
       elsif !%w[name parent aliases].include?(name.to_s)
-        raise ArgumentError, "Undefined property '#{name}' in #{@name}"
+        raise ArgumentError.new("Undefined property '#{name}' in #{@name}")
       end
       value
     end
   end
 end
+# rubocop:enable Style/MissingRespondToMissing