onoma 0.7.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 19a7cd8318c90bfdb53f6bbd5fb73d88de2c0532
-  data.tar.gz: 375a7d995be1f542159b52f965b37401ff35d6b2
+SHA256:
+  metadata.gz: c96d95f1db7adabc563cbde0eea01989e9412b82d9d839e5ba03888c6195966f
+  data.tar.gz: 13979413ece73ecc8a89a242fc86f3cee50db574366fd7f3f950a2902387fc30
 SHA512:
-  metadata.gz: fd6121f1ef02e4d74693083c97a405d5e0d4bace8acff8ea93605b82178f387f841050cc666b17e9a42b027a251654f98e0a1ab2adb91db8f750b9d3d16029ff
-  data.tar.gz: dddf37403ee890d1d9e3578e29d620b6a393f1415a18c0ab7e929e49914543d7ffb37a4393efb68674deaa0336005ea91b8cbe42f43203bf2077f96414579894
+  metadata.gz: 7ccd446988f5855a27f1f28e4ddffdf5f9baec7e6376bbb354d9b206f4300ef9753780166124ee2229f5567f2bb28e1e1c65e6ab23667fa9b62f7e2e05d66be1
+  data.tar.gz: 9a0eb46edeca459558c148f5a45c91d712e7dfe618f29a0ef79ee663f07d4d9318b9248aeb0417d7088520e98ca4c9598b656b1ccdb1483ac217da4dfe101a2a

data/config/locales/eng.yml

@@ -1876,6 +1876,7 @@ eng:
         surface_area_flow: "Surface area flow"
         temperature: "Temperature"
         time: "Time"
+        unity_flow: "Unity flow"
         volume: "Volume"
         volume_area_density: "Volume area density"
         volume_concentration: "Volume concentration"
@@ -1946,6 +1947,7 @@ eng:
         phytosanitary_applicator_sheet: "Applicator sheet"
         phytosanitary_certification: "Phytosanitary certification"
         phytosanitary_register: "Phytosanitary register"
+        planned_budget_sheet: "Planned budget sheet"
         prescription: "Prescription"
         products_sheet: "Products sheet"
         provisional_manure_management_plan: "Provisional manure management plan"
@@ -4707,6 +4709,7 @@ eng:
         parts_per_million: "Parts per million"
         pascal: "Pascal"
         percent: "Percent"
+        plant_per_hour: "Plant per hour"
         quintal: "Quintal"
         quintal_per_hectare: "Quintal per hectare"
         radian: "Radian"
@@ -4726,6 +4729,7 @@ eng:
         ton_per_hectare: "Ton per hectare"
         unity: "Unity"
         unity_per_hectare: "Unity per hectare"
+        unity_per_hour: "Unity per hour"
         unity_per_kilogram: "Unity per kilogram"
         unity_per_liter: "Unity per liter"
         unity_per_square_meter: "Unity per square meter"
@@ -7580,4 +7584,4 @@ eng:
         wine_transformers: "Wine transformers"
       name: "Working sets"
       property_natures:
-        expression: "Expression"
+        expression: "Expression"

data/config/locales/fra.yml

@@ -1948,6 +1948,7 @@ fra:
         surface_area_flow: "Débit surfacique"
         temperature: "Température"
         time: "Temps"
+        unity_flow: "Débit unitaire"
         volume: "Volume"
         volume_area_density: "Volume par surface"
         volume_concentration: "Concentration volumique"
@@ -2020,6 +2021,7 @@ fra:
         phytosanitary_applicator_sheet: "Fiche applicateur"
         phytosanitary_certification: "Certi-Phyto"
         phytosanitary_register: "Registre phytosanitaire"
+        planned_budget_sheet: "Budget prévisionnel"
         prescription: "Prescription vétérinaire"
         products_sheet: "Fiche des produits"
         provisional_manure_management_plan: "Plan prévisionnel de fumure (PPF)"
@@ -4958,6 +4960,7 @@ fra:
         parts_per_million: "Partie par millions (ppm)"
         pascal: "Pascal"
         percent: "Pourcent"
+        plant_per_hour: "Plante/Pied par heure"
         quintal: "Quintal"
         quintal_per_hectare: "Quintal par hectare"
         radian: "Radian"
@@ -4977,6 +4980,7 @@ fra:
         ton_per_hectare: "Tonne par hectare"
         unity: "Unité"
         unity_per_hectare: "Unité par hectare"
+        unity_per_hour: "Unité par heure"
         unity_per_kilogram: "Unité par kilogramme"
         unity_per_liter: "Unité par litre"
         unity_per_square_meter: "Unité par mètre carré"
@@ -7789,4 +7793,4 @@ fra:
         wine_transformers: "Produits œnologiques"
       name: "Ensembles de produits"
       property_natures:
-        expression: "Expression"
+        expression: "Expression"

data/db/reference.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<nomenclatures xmlns="http://www.ekylibre.org/XML/2013/nomenclatures" version="20220504085540">
+<nomenclatures xmlns="http://www.ekylibre.org/XML/2013/nomenclatures" version="20220809095601">
   <nomenclature name="abilities" translateable="true">
     <properties>
       <property name="parameters" type="choice_list" choices="variety, issue_nature"/>
@@ -1719,7 +1719,7 @@
       <property name="countries" type="item_list" choices="countries"/>
       <property name="number" type="string" required="true" default="2"/>
       <property name="precision" type="integer" required="true" default="2"/>
-      <property name="symbol" type="string"/>
+      <property name="symbol" type="string" fallbacks="name"/>
     </properties>
     <items>
       <item name="AED" precision="2" active="true" countries="ae" number="784"/>
@@ -1821,7 +1821,7 @@
       <item name="MNT" precision="2" active="true" countries="mn" number="496"/>
       <item name="MOP" precision="2" active="true" countries="mo" number="446"/>
       <item name="MRO" precision="2" active="true" countries="mr" number="478"/>
-      <item name="MUR" precision="2" active="true" countries="mu" number="480"/>
+      <item name="MUR" precision="2" active="true" countries="mu" number="480" symbol="Rs"/>
       <item name="MVR" precision="2" active="true" countries="mv" number="462"/>
       <item name="MWK" precision="2" active="true" countries="mw" number="454"/>
       <item name="MXN" precision="2" active="true" countries="mx" number="484"/>
@@ -1935,6 +1935,7 @@
       <item name="surface_area_flow" symbol="m&#xB2;/s"/>
       <item name="temperature" symbol="K"/>
       <item name="time" symbol="s"/>
+      <item name="unity_flow" symbol="./s"/>
       <item name="volume" symbol="m&#xB3;"/>
       <item name="volume_area_density" symbol="m&#xB3;/m&#xB2;"/>
       <item name="volume_concentration" symbol="m&#xB3;/m&#xB3;"/>
@@ -2015,6 +2016,7 @@
       <item name="phytosanitary_applicator_sheet" category="management"/>
       <item name="phytosanitary_certification" category="land_parcel_management"/>
       <item name="phytosanitary_register" category="land_parcel_management"/>
+      <item name="planned_budget_sheet" category="management"/>
       <item name="prescription" category="health"/>
       <item name="products_sheet" category="management"/>
       <item name="provisional_manure_management_plan" category="land_parcel_management"/>
@@ -10262,6 +10264,7 @@
       <item name="parts_per_million" dimension="none" symbol="ppm" d="1000000.0" base_unit="parts" base_dimension="" repartition_unit="million" repartition_dimension="none"/>
       <item name="pascal" dimension="pressure" symbol="Pa" base_unit="pascal" base_dimension="pressure"/>
       <item name="percent" dimension="none" symbol="%" d="100.0" base_unit="percent" base_dimension="none"/>
+      <item name="plant_per_hour" dimension="unity_flow" symbol="plant/h" a="1.0" d="3600.0" base_unit="unity" base_dimension="none" repartition_unit="hour" repartition_dimension="time"/>
       <item name="quintal" dimension="mass" symbol="q" a="100.0" base_unit="quintal" base_dimension="mass"/>
       <item name="quintal_per_acre" dimension="mass_area_density" symbol="qt/acre" a="0.024710538146" base_unit="quintal" base_dimension="mass" repartition_unit="acre" repartition_dimension="surface_area"/>
       <item name="quintal_per_are" dimension="mass_area_density" symbol="qt/a" a="1.0" base_unit="quintal" base_dimension="mass" repartition_unit="are" repartition_dimension="surface_area"/>
@@ -10290,6 +10293,7 @@
       <item name="ton_per_square_meter" dimension="mass_area_density" symbol="t/m&#xB2;" a="1000.0" base_unit="ton" base_dimension="mass" repartition_unit="square_meter" repartition_dimension="surface_area"/>
       <item name="unity" dimension="none" symbol="." base_unit="unity" base_dimension="none"/>
       <item name="unity_per_hectare" dimension="surface_area_density" symbol="./ha" d="10000.0" base_unit="unity" base_dimension="none" repartition_unit="hectare" repartition_dimension="surface_area"/>
+      <item name="unity_per_hour" dimension="unity_flow" symbol="./h" a="1.0" d="3600.0" base_unit="unity" base_dimension="none" repartition_unit="hour" repartition_dimension="time"/>
       <item name="unity_per_kilogram" dimension="mass_density" symbol="./kg" base_unit="unity" base_dimension="none" repartition_unit="kilogram" repartition_dimension="mass"/>
       <item name="unity_per_liter" dimension="concentration" symbol="./l" d="0.001" base_unit="unity" base_dimension="none" repartition_unit="liter" repartition_dimension="volume"/>
       <item name="unity_per_square_meter" dimension="surface_area_density" symbol="./m&#xB2;" base_unit="unity" base_dimension="none" repartition_unit="square_meter" repartition_dimension="surface_area"/>

data/lib/onoma/item.rb

@@ -279,6 +279,7 @@ module Onoma
       if property
         if value.nil? && property.fallbacks
           property.fallbacks.each do |fallback|
+            value ||= @name if fallback == :name
             value ||= @attributes[fallback]
             break if value
           end

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

@@ -0,0 +1,36 @@
+module Onoma
+  module Migration
+    module Actions
+      class PropertyChange < Onoma::Migration::Actions::Base
+        attr_reader :nomenclature, :name, :changes
+        def initialize(element)
+          name = element['property'].split('.')
+          @nomenclature = name.first
+          @name = name.second
+
+          @changes = {}
+          if element.has_attribute?('type')
+            changes[:type] = element.attr('type').to_sym
+          end
+          if element.has_attribute?('fallbacks')
+            @changes[:fallbacks] = element.attr('fallbacks').to_s.strip.split(/[[:space:]]*\,[[:space:]]*/).map(&:to_sym)
+          end
+          if element.has_attribute?('default')
+            @changes[:default] = element.attr('default').to_sym
+          end
+          if element.has_attribute?('required')
+            @changes[:required] = element.attr('required').to_s == 'true'
+          end
+          # @changes[:inherit]  = !!(element.attr('inherit').to_s == 'true')
+          if element.has_attribute?('choices')
+            if type == :choice || type == :choice_list
+              @changes[:choices] = element.attr('choices').to_s.strip.split(/[[:space:]]*\,[[:space:]]*/).map(&:to_sym)
+            elsif type == :item || type == :item_list
+              @changes[:choices] = element.attr('choices').to_s.strip.to_sym
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/onoma/migrator/reference.rb

@@ -48,7 +48,7 @@ module Onoma
       end
 
       def property_change(action)
-        @set.add_property(action.nomenclature, action.name, action.changes)
+        @set.change_property(action.nomenclature, action.name, action.changes)
       end
 
       def item_creation(action)

data/lib/onoma/nomenclature.rb

@@ -256,6 +256,22 @@ module Onoma
       p
     end
 
+    def change_property(name, updates = {})
+      property = property_natures[name]
+
+      unless property
+        raise "Property #{p.name} doesn't exist in nomenclature #{@name}"
+      end
+
+      updates.each do |k, v|
+        begin
+          property.send("#{k}=", v)
+        rescue NoMethodError => e
+          "#{k} attribute doesn't exist for property nature"
+        end
+      end
+    end
+
     def sibling(name)
       @set.find(name)
     end

data/lib/onoma/nomenclature_set.rb

@@ -151,8 +151,9 @@ module Onoma
       nomenclature.add_property(property_name, type, options)
     end
 
-    def change_property(_nomenclature_name, _property_name, _updates = {})
-      raise NotImplementedError
+    def change_property(nomenclature_name, property_name, updates = {})
+      nomenclature = find!(nomenclature_name)
+      nomenclature.change_property(property_name, updates)
     end
 
     def remove_property(_nomenclature_name, _property_name, _options = {})

data/lib/onoma/property_nature.rb

@@ -1,6 +1,7 @@
 module Onoma
   class PropertyNature
-    attr_reader :nomenclature, :name, :type, :fallbacks, :default, :source
+    attr_reader :nomenclature
+    attr_accessor :name, :type, :fallbacks, :default, :source
 
     # New item
     def initialize(nomenclature, name, type, options = {})

data/lib/onoma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onoma
-  VERSION = '0.7.0'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onoma
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Ekylibre developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-12 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,6 +153,7 @@ files:
 - lib/onoma/migration/actions/nomenclature_change.rb
 - lib/onoma/migration/actions/nomenclature_creation.rb
 - lib/onoma/migration/actions/nomenclature_removal.rb
+- lib/onoma/migration/actions/property_change.rb
 - lib/onoma/migration/actions/property_creation.rb
 - lib/onoma/migration/base.rb
 - lib/onoma/migrator.rb
@@ -246,8 +247,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: Provides open nomenclature data in a gem