onoma 0.1.1 → 0.3.3

data/lib/onoma.rb

@@ -43,21 +43,6 @@ module Onoma
       database_path.join('reference.xml')
     end
 
-    # # Returns version of DB
-    # def reference_version
-    #   return 0 unless reference_path.exist?
-    #   reference_document.root['version'].to_i
-    # end
-
-    # def reference_document
-    #   f = File.open(reference_path, 'rb')
-    #   document = Nokogiri::XML(f) do |config|
-    #     config.strict.nonet.noblanks.noent
-    #   end
-    #   f.close
-    #   document
-    # end
-
     def connection
       load_database unless database_loaded?
       @@set
@@ -68,16 +53,13 @@ module Onoma
       set.nomenclature_names
     end
 
-    def all
-      set.nomenclatures
-    end
-
     # Give access to named nomenclatures
-    delegate :[], to: :set
+    delegate :[], :nomenclatures, to: :set
+    alias all nomenclatures
 
     # Give access to named nomenclatures
     def find(*args)
-      options = args.extract_options!
+      args.extract_options!
       name = args.shift
       if args.empty?
         return set[name]
@@ -87,17 +69,18 @@ module Onoma
       nil
     end
 
-    def find_or_initialize(name)
-      set[name] || set.load_data_from_xml(name)
-    end
-
     # Browse all nomenclatures
     def each(&block)
       set.each(&block)
     end
 
     def set
-      @@set ||= Database.new(database_path)
+      @@set ||= Database.open(reference_path)
+    end
+
+    def load_locales
+      I18n.load_path.concat(Dir.glob(root.join('config', 'locales', '**', '*.yml')))
     end
   end
 end
+

data/lib/onoma/database.rb

@@ -155,7 +155,7 @@ module Onoma
     end
 
     def remove_nomenclature(nomenclature_name)
-      nomenclature = find!(nomenclature_name)
+      find!(nomenclature_name)
       @nomenclatures.delete(nomenclature_name)
     end
 

data/lib/onoma/item.rb

@@ -11,6 +11,8 @@ module Onoma
       @name = name.to_s
       @left, @right = @nomenclature.new_boundaries
       @depth = 0
+      @parent = nil
+      @parent_name = nil
       parent = options.delete(:parent)
       if parent.is_a?(Symbol) || parent.is_a?(String)
         @parent_name = parent.to_s
@@ -176,7 +178,7 @@ module Onoma
 
     # Return human name of item
     def human_name(options = {})
-      "nomenclatures.#{nomenclature.name}.items.#{name}".t(options.merge(default: ["items.#{name}".to_sym, "enumerize.#{nomenclature.name}.#{name}".to_sym, "labels.#{name}".to_sym, name.humanize]))
+      I18n.translate("nomenclatures.#{nomenclature.name}.items.#{name}", options.merge(default: ["items.#{name}".to_sym, "enumerize.#{nomenclature.name}.#{name}".to_sym, "labels.#{name}".to_sym, name.humanize]))
     end
     alias humanize human_name
     alias localize human_name

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

@@ -31,7 +31,7 @@ module Onoma
           @options.each do |k, v|
             updates << "#{v} as #{k}"
           end
-          sentence = "Create item #{@nomenclature}##{@name} with " + updates.to_sentence
+          "Create item #{@nomenclature}##{@name} with " + updates.to_sentence
         end
       end
     end

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

@@ -35,7 +35,7 @@ module Onoma
           @options.each do |k, v|
             updates << "#{v} as #{k}"
           end
-          sentence = "Create property #{@nomenclature}.#{@name} with " + updates.to_sentence
+          "Create property #{@nomenclature}.#{@name} with " + updates.to_sentence
         end
       end
     end

data/lib/onoma/nomenclature.rb

@@ -4,8 +4,8 @@ require 'bigdecimal/util'
 module Onoma
   # This class represents a nomenclature
   class Nomenclature
-    attr_reader :properties, :items, :name, :roots
-    attr_accessor :name, :notions, :translateable, :forest_right
+    attr_reader :properties, :items, :name
+    attr_accessor :notions, :translateable, :forest_right
     alias property_natures properties
 
     # Instanciate a new nomenclature
@@ -225,7 +225,7 @@ module Onoma
     end
 
     def remove_item(name)
-      i = find!(name)
+      find!(name)
       @items.delete(name)
     end
 
@@ -292,12 +292,7 @@ module Onoma
 
     # Returns hash with items in tree: {a => nil, b => {c => nil}}
     def tree
-      x = @roots.collect(&:tree).join
-      return x
-      i.attributes.merge(parent: i.parent_name, name: i.name, left: i.left, right: i.right, depth: i.depth).deep_stringify_keys
-      return x
-      @roots.map do |_i|
-      end
+      @roots.collect(&:tree).join
     end
 
     def translateable?
@@ -306,7 +301,8 @@ module Onoma
 
     # Return human name
     def human_name(options = {})
-      "nomenclatures.#{name}.name".t(options.merge(default: ["labels.#{name}".to_sym, name.to_s.humanize]))
+      I18n.translate("nomenclatures.#{name}.name",
+                     options.merge(default: ["labels.#{name}".to_sym, name.to_s.humanize]))
     end
     alias humanize human_name
 
@@ -495,7 +491,7 @@ module Onoma
 
     def cast_options(options)
       return {} if options.nil?
-      hash = options.each_with_object({}) do |(k, v), h|
+      options.each_with_object({}) do |(k, v), h|
         h[k.to_sym] = if properties[k]
                         cast_property(k, v.to_s)
                       else

data/lib/onoma/version.rb

@@ -1,3 +1,3 @@
 module Onoma
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.3.3'.freeze
 end

data/onoma.gemspec

@@ -1,4 +1,4 @@
-# coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'onoma/version'
@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'bundler', '> 1.15'
   spec.add_development_dependency 'colored'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '> 12.0'
   spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'i18n-tasks'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'nokogiri'
+  spec.add_dependency 'nokogiri', '>= 1.10.4'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: onoma
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Brice TEXIER
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n-tasks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.4
 description: Actual support Open-Nomenclature data and gem for use
 email:
 - brice@ekylibre.com
@@ -304,6 +318,49 @@ files:
 - db/migrate/20170627081533_add_pending_deposit_payments_account_number_for_pt_accounting_system.xml
 - db/migrate/20170718131724_add_issue_natures.xml
 - db/migrate/20170803164344_add_procedure_nature_and_category.xml
+- db/migrate/20170904223101_add_cultivable_zone_registry.xml
+- db/migrate/20170914083358_add_new_product_nature_variants.xml
+- db/migrate/20170927144852_add_kiwi_varieties.xml
+- db/migrate/20171106085357_update_account_numbers.xml
+- db/migrate/20171212081801_add_fiscal_positions.xml
+- db/migrate/20180408190101_add_new_plant_variants.xml
+- db/migrate/20180409130101_add_common_crop.xml
+- db/migrate/20180418085027_add-hour-counter-indicator.xml
+- db/migrate/20180709134310_add_centralizing_field_to_accounts.xml
+- db/migrate/20180711093131_review_all_accounts_number_and_fallbacks.xml
+- db/migrate/20180806080646_edit_centralizing_field_accounts.xml
+- db/migrate/20180814184001_add_missing_categories.xml
+- db/migrate/20180907160001_edit_accounts_to_unlock_first_run.xml
+- db/migrate/20181004220301_add_journal_ledger.xml
+- db/migrate/20181205162401_add_intra_vat.xml
+- db/migrate/20181213153405_fix_accounting_systems.xml
+- db/migrate/20181217155149_fiscal_position_refers_to_accounting_system.xml
+- db/migrate/20181217173101_fiscal_position_reference_typo.xml
+- db/migrate/20190315154040_add_suspense_account.xml
+- db/migrate/20190326110849_add_asset_fixable_to_product_nature_categories.xml
+- db/migrate/20190326135443_change_product_nature_category_cultivable_zone_into_land.xml
+- db/migrate/20190329133808_change_land_fixed_assets_account_usage.xml
+- db/migrate/20190405120711_delete_land_sales_account_and_assign_land_parcels_sell_revenues_to_land.xml
+- db/migrate/20190412071057_add_new_fixed_assets_andn_depreciable_accounts.xml
+- db/migrate/20190509092804_add_account_exceptional_depreciations_imputations_expenses_for_fixed_assets.xml
+- db/migrate/20190514084753_add_approved_input_volume.xml
+- db/migrate/20190520072403_add_new_accounts.xml
+- db/migrate/20190521170601_add_missing_taxes.xml
+- db/migrate/20190611101014_change_deductible_vat_account.xml
+- db/migrate/20190620092151_fix_conflicts_in_new_accounts.xml
+- db/migrate/20190625152636_change_mixture_seed_product_nature_variant.xml
+- db/migrate/20190718130243_remove_services_expenses.xml
+- db/migrate/20190801142431_remove_accounts_from_pcg82.xml
+- db/migrate/20190823091727_fix-cubic-meter-per-hectare-symbol.xml
+- db/migrate/20190917161215_add_missing_mass_area_density_units.xml
+- db/migrate/20190917161216_update_quintal_symbol.xml
+- db/migrate/20190917161217_adds_more_info_to_units.xml
+- db/migrate/20190918074757_add_new_accounts.xml
+- db/migrate/20191001122750_add_accounts_fixed_assets_related.xml
+- db/migrate/20191028175001_add_short_balance_sheet.xml
+- db/migrate/20191029131921_add_vine_equipments.xml
+- db/migrate/20191112132413_remove_roller_from_product_natures.xml
+- db/migrate/20200305160358_add_varieties_for_phytosanitary.xml
 - db/reference.xml
 - lib/onoma.rb
 - lib/onoma/database.rb
@@ -330,7 +387,7 @@ homepage: https://github.com/ekylibre/onoma
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -345,9 +402,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Provides open nomenclature data in a gem
 test_files: []