onoma 0.5.1 → 0.5.2

data/config/locales/eng.yml

@@ -719,6 +719,7 @@ eng:
         silage_analysis: "Silage analysis"
         soil_analysis: "Soil analysis"
         unitary_cow_milk_analysis: "Unitary cow milk analysis"
+        vine_harvesting_analysis: "Vine harvesting analysis"
         water_analysis: "Water analysis"
       name: "Analysis natures"
       property_natures:
@@ -2109,10 +2110,13 @@ eng:
           period: "Period"
       items:
         aluminium_concentration: "Aluminium concentration"
+        amino_nitrogen_concentration: "Amino nitrogen concentration"
+        ammoniacal_nitrogen_concentration: "Ammoniacal nitrogen concentration"
         animal_life_state: "Animal life state"
         application_width: "Application width"
         approved_input_dose: "Approved input dose"
         approved_input_volume: "Approved input volume"
+        assimilated_nitrogen_concentration: "Assimilated nitrogen concentration"
         atmospheric_pressure: "Atmospheric pressure"
         available_water_capacity_per_area: "Available water capacity per area"
         average_atmospheric_pressure: "Average atmospheric pressure"
@@ -2154,6 +2158,8 @@ eng:
         energy: "Energy"
         entry_date: "Entry date"
         entry_reason: "Entry reason"
+        estimated_harvest_alcoholic_volumetric_concentration: "Estimated harvest alcoholic volumetric concentration"
+        estimated_pressed_harvest_alcoholic_volumetric_concentration: "Estimated pressed harvest alcoholic volumetric concentration"
         exit_date: "Exit date"
         exit_reason: "Exit reason"
         fat_matter_concentration_index: "Fat matter concentration index"
@@ -2192,6 +2198,7 @@ eng:
         lipolysis: "Lipolysis"
         livestock_unit: "Livestock unit"
         magnesium_concentration: "Magnesium concentration"
+        malic_acid_concentration: "Malic acid concentration"
         mammalia_birth_condition: "Mammalia parturtion condition"
         mammalia_birth_count: "Mammalia birth count"
         mammalia_reproduction_event_abortion: "Mammalia reproduction event abortion"
@@ -2228,6 +2235,7 @@ eng:
         mother_identification_number: "Mother identification number"
         mother_race_code: "Mother race code"
         motor_power: "Motor power"
+        must_tasting: "Must tasting"
         net_length: "Net length"
         net_mass: "Net mass"
         net_surface_area: "Net surface area"
@@ -2266,6 +2274,7 @@ eng:
         rows_count: "Rows count"
         rows_interval: "Rows interval"
         rows_orientation: "Rows orientation"
+        sanitary_vine_harvesting_state: "Sanitary vine harvesting state"
         seedling_area_density: "Seedling area density"
         seedling_count: "Seedling count"
         sex: "Sex"
@@ -2290,6 +2299,7 @@ eng:
         theoretical_working_speed: "Theoretical working speed"
         thousand_grains_mass: "Thousand grains mass"
         tiller_count: "Tiller count"
+        total_acid_concentration: "Total acid concentration"
         total_bacteria_concentration: "Total bacteria concentration"
         unique_synthesis_index: "Unique synthesis index"
         untreated_zone_length: "Untreated zone length"
@@ -2852,6 +2862,7 @@ eng:
         plants_transformation: "Plants transformation"
         soil_working: "Soil preparation"
         textile_transformation: "Textile transformation"
+        trellising: "Trellising"
         troubleshooting: "Troubleshooting"
         vine_fertilizing: "Vine fertilizing"
         vine_land_maintenance: "Vine land maintenance"
@@ -3580,6 +3591,7 @@ eng:
         gas_engine: "Gas engine"
         gasoline: "Gasoline"
         generic_animal_medicine: "Generic animal medicine"
+        geolocation_box: "Geolocation box"
         goat_herd: "Goat herd"
         goat_milk: "Goat milk"
         gooseberry_crop: "Gooseberry crop"
@@ -4087,6 +4099,7 @@ eng:
         computer: "Computer"
         computer_device: "Computer device"
         congress: "Congress"
+        connected_object: "Connected object"
         construction_material_in_own_outstanding_installation: "Construction material in own outstanding installation"
         consumer_goods_office_item: "Consumer goods office item"
         cork: "Cork"
@@ -4651,6 +4664,7 @@ eng:
         unity_per_kilogram: "Unity per kilogram"
         unity_per_liter: "Unity per liter"
         unity_per_square_meter: "Unity per square meter"
+        volume_percent: "Percentage by volume"
         watt: "Watt"
         watt_per_square_meter: "Watt per square meter"
       name: "Units"
@@ -5165,6 +5179,7 @@ eng:
         coffea_stenophylla: "Coffea stenophylla"
         compost: "Compost"
         concentrated_rectified_must: "Concentrated rectified must"
+        connected_object: "connected object"
         convolvulaceae: "Convolvulaceae"
         coriandrum: "Coriandrum"
         coriandrum_sativum: "Coriander"

data/config/locales/fra.yml

@@ -793,6 +793,7 @@ fra:
         silage_analysis: "Analyse d’ensilage"
         soil_analysis: "Analyse de sol"
         unitary_cow_milk_analysis: "Analyse d’un contrôle laitier"
+        vine_harvesting_analysis: "Analyse de vendange"
         water_analysis: "Analyse d’eau"
       name: "Types d’analyses"
       property_natures:
@@ -2216,10 +2217,13 @@ fra:
           period: "Périodique"
       items:
         aluminium_concentration: "Teneur en aluminium"
+        amino_nitrogen_concentration: "Teneur en azote aminée"
+        ammoniacal_nitrogen_concentration: "Teneur en azote ammoniacal"
         animal_life_state: "Phase du bioprocessus de vie d’un animal"
         application_width: "Largeur de travail"
         approved_input_dose: "Dose autorisée"
         approved_input_volume: "Dose autorisée"
+        assimilated_nitrogen_concentration: "Teneur en azote assimilable"
         atmospheric_pressure: "Pression atmosphérique"
         available_water_capacity_per_area: "Réserve utile d’eau (RU)"
         average_atmospheric_pressure: "Pression atmosphérique moyenne"
@@ -2260,6 +2264,8 @@ fra:
         energy: "Énergie"
         entry_date: "Date d'entrée"
         entry_reason: "Motif d'entrée"
+        estimated_harvest_alcoholic_volumetric_concentration: "TAVP vendange"
+        estimated_pressed_harvest_alcoholic_volumetric_concentration: "TAVP jus de presse"
         exit_date: "Date de sortie"
         exit_reason: "Motif de sortie"
         fat_matter_concentration_index: "Taux butyreux (TB)"
@@ -2298,6 +2304,7 @@ fra:
         lipolysis: "Lipolyse"
         livestock_unit: "Unité de gros bétail (UGB)"
         magnesium_concentration: "Teneur en magnésium"
+        malic_acid_concentration: "Teneur en acide malique"
         mammalia_birth_condition: "Condition de mise bas"
         mammalia_birth_count: "Cycle de naissance"
         mammalia_reproduction_event_abortion: "Avortement"
@@ -2333,6 +2340,7 @@ fra:
         mother_identification_number: "Numéro d'identification de la mère"
         mother_race_code: "Code de la race de la mère"
         motor_power: "Puissance du moteur"
+        must_tasting: "Dégustation des moûts"
         net_length: "Longueur nette"
         net_mass: "Masse nette"
         net_surface_area: "Surface nette"
@@ -2371,6 +2379,7 @@ fra:
         rows_count: "Nombre de rangs"
         rows_interval: "Intervalle inter-rangs"
         rows_orientation: "Orientation des rangs"
+        sanitary_vine_harvesting_state: "Etat sanitaire de la vendange"
         seedling_area_density: "Plants par surface"
         seedling_count: "Nombre de plants"
         sex: "Sexe"
@@ -2395,6 +2404,7 @@ fra:
         theoretical_working_speed: "Vitesse de travail théorique"
         thousand_grains_mass: "Poids de mille grains"
         tiller_count: "Nombre de talles"
+        total_acid_concentration: "Acidité totale"
         total_bacteria_concentration: "Dénombrement des germes totaux"
         unique_synthesis_index: "Index de synthèse unique (ISU)"
         untreated_zone_length: "Zone Non Traitée (ZNT)"
@@ -2957,6 +2967,7 @@ fra:
         plants_transformation: "Transformation produits végétaux"
         soil_working: "Travail du sol"
         textile_transformation: "Transformation produits textiles"
+        trellising: "Palissage"
         troubleshooting: "Dépannage"
         vine_fertilizing: "Fertilisation"
         vine_land_maintenance: "Travaux fonciers / entretiens des installations"
@@ -3699,6 +3710,7 @@ fra:
         gas_engine: "Machine à gaz"
         gasoline: "Essence"
         generic_animal_medicine: "Médicament vétérinaire"
+        geolocation_box: "Boitier de géolocalisation"
         goat_herd: "Troupeau de caprins"
         goat_milk: "Lait de chèvre"
         gooseberry_crop: "Culture de groseillier"
@@ -4210,6 +4222,7 @@ fra:
         computer: "Ordinateur"
         computer_device: "Pièce informatique"
         congress: "Congrès"
+        connected_object: "Objet connecté"
         construction_material_in_own_outstanding_installation: "Matériel de construction sur sol propre"
         consumer_goods_office_item: "Fourniture de bureau (consommable)"
         cooperative_participation: "Titre de participations (cooperative)"
@@ -4900,6 +4913,7 @@ fra:
         unity_per_kilogram: "Unité par kilogramme"
         unity_per_liter: "Unité par litre"
         unity_per_square_meter: "Unité par mètre carré"
+        volume_percent: "Pourcentage volumique"
         watt: "Watt"
         watt_per_square_meter: "Watt par mètre carré"
       name: "Unités de mesure"
@@ -5414,6 +5428,7 @@ fra:
         coffea_stenophylla: "Caféier - Coffea stenophylla"
         compost: "Compost"
         concentrated_rectified_must: "Moût concentré rectifié"
+        connected_object: "Objet connecté"
         convolvulaceae: "Convolvulacée"
         coriandrum: "Coriandrum"
         coriandrum_sativum: "Coriandre"

data/lib/onoma.rb

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