lucarecord 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0aa1cebca92730baae88aed3eae85d0d2c2d78c546a77fed3f1c938f17d9bebd
-  data.tar.gz: dfba788f46016596ae050dc2c742428ee676fead174c3825841381c03b24e62f
+  metadata.gz: 75aa7ba67a42741a9b533dcdbd83a52a3a9d4d113b8bdb558d894d39cdab453b
+  data.tar.gz: 1f80272124518bfdf0f8f2461e8e5f24a2d60ca5bffa1c4f06e386b5f5b966d3
 SHA512:
-  metadata.gz: c63971e223278d08e688f96d791b517a84f8119ca1e0556a9a09685e28e821649aebbc62ab910db30060b2f13592a6f54de234aeea068d8b807fea9d6d1da29a
-  data.tar.gz: bf4dee90d7003d74af59a34620456c00213e51d11b9d0317468adc706bae4ed3957c0291643fcbdc87c26bb9cf867a05b5f467ecff1935ab63c1e9cda1cb0fac
+  metadata.gz: b18fe1bb5b4094d76330adb36445c673941f4b75987657029c72fb987bbc1b64dd405623bb6b4a1636288c7f3054bf02cdb0e77a1161b761d6b7e5e4510e8663
+  data.tar.gz: 0eb7fda772606eec3019b08fcaccc89c99b17fb9d52169c7c31b529ac70fbd16c18a6b305dc95acc29dfee04f22f14381ee8302b081c4e26d4f3c352c45df87e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## LucaRecord 0.7.1
+
+* `LucaRecord::IO.load_project()` supports optional `ext_conf:` keyword for an extra config file.
+
+## LucaRecord 0.7.0
+
+Reworked global constants to be singleton Class instance:
+
+* Breaking change: LucaSupport::CONFIG is now LucaSupport::CONST.config
+* Breaking change: LucaSupport::PJDIR is now LucaSupport::CONST.pjdir
+* Removed bundler from test suite avoiding casual native build
+
 ## LucaRecord 0.5.6
 
 * add Nushell render mode: expand(default) | collapse | explore(`less` like)

data/lib/luca_cmd.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+require 'luca_record'
+
+class LucaCmd
+  def self.check_dir(target)
+    unless Dir.exist?('data')
+      Dir.glob('*').reject { |f| File.symlink?(f) }
+        .find { |f| File.directory?("#{f}/data/#{target}") }.tap do |d|
+          abort "No valid data directory, exit..." if d.nil?
+
+          Dir.chdir(d)
+        end
+    end
+    LucaRecord::Base.load_project(Dir.pwd)
+    LucaRecord::Base.valid_project?
+    yield
+  end
+end

data/lib/luca_record/base.rb

@@ -6,8 +6,6 @@ require 'luca_support'
 
 module LucaRecord
   class Base
-    CONFIG = LucaSupport::CONFIG
-    PJDIR = LucaSupport::PJDIR
     include LucaRecord::IO
     include LucaSupport::View
   end

data/lib/luca_record/dict.rb

@@ -126,7 +126,7 @@ module LucaRecord
     end
 
     def self.dict_path(filename)
-      Pathname(LucaSupport::PJDIR) / 'dict' / filename
+      Pathname(CONST.pjdir) / 'dict' / filename
     end
 
     def self.reverse(dict)

data/lib/luca_record/io.rb

@@ -8,7 +8,7 @@ require 'json'
 require 'yaml'
 require 'pathname'
 require 'luca_support/code'
-require 'luca_support/config'
+require 'luca_support/const'
 
 module LucaRecord # :nodoc:
   # == IO
@@ -292,8 +292,29 @@ module LucaRecord # :nodoc:
         end
       end
 
+      def load_project(path, ext_conf: nil)
+        CONST.set_pjdir(path)
+        begin
+          config = {
+            'decimal_separator' => '.',
+            'thousands_separator' => ','
+          }.merge(YAML.safe_load(
+              File.read(Pathname(CONST.pjdir) / 'config.yml'),
+              permitted_classes: [Date]
+            ))
+          config['decimal_num'] ||= config['country'] == 'jp' ? 0 : 2
+          if ext_conf
+            config.merge(YAML.safe_load(
+              File.read(Pathname(CONST.pjdir) / ext_conf),
+              permitted_classes: [Date]
+            ))
+          end
+          CONST.set_config(config)
+        end
+      end
+
       # test if having required dirs/files under exec path
-      def valid_project?(path = LucaSupport::PJDIR)
+      def valid_project?(path = CONST.pjdir)
         project_dir = Pathname(path)
         FileTest.file?((project_dir + 'config.yml').to_s) and FileTest.directory?( (project_dir + 'data').to_s)
       end
@@ -452,7 +473,7 @@ module LucaRecord # :nodoc:
 
       # TODO: replace with data_dir method
       def abs_path(base_dir)
-        Pathname(LucaSupport::PJDIR) / 'data' / base_dir
+        Pathname(CONST.pjdir) / 'data' / base_dir
       end
 
       # True when file doesn't have record on code.

data/lib/luca_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaRecord
-  VERSION = '0.6.0'
+  VERSION = '0.7.1'
 end

data/lib/luca_record.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require 'luca_support'
-require 'luca_support/config'
+require 'luca_support/const'
 require 'luca_record/version'
 
 module LucaRecord
+  CONST = LucaSupport::CONST
+
   autoload :Base, 'luca_record/base'
   autoload :Dict, 'luca_record/dict'
 end

data/lib/luca_support/code.rb

@@ -3,7 +3,7 @@
 require 'date'
 require 'securerandom'
 require 'digest/sha1'
-require 'luca_support/config'
+require 'luca_support/const'
 
 module LucaSupport # :nodoc:
   # implement Luca IDs convention
@@ -55,8 +55,8 @@ module LucaSupport # :nodoc:
     def delimit_num(num, decimal: nil, delimiter: nil)
       return nil if num.nil?
 
-      decimal ||= LucaSupport::CONFIG['decimal_num']
-      delimiter ||= LucaSupport::CONFIG['thousands_separator']
+      decimal ||= CONST.config['decimal_num']
+      delimiter ||= CONST.config['thousands_separator']
       case num
       when BigDecimal
         if decimal == 0
@@ -67,7 +67,7 @@ module LucaSupport # :nodoc:
           fragments[0].reverse!.gsub!(/(\d{3})(?=\d)/, '\1 ')
           fragments[0].reverse!.gsub!(/\s/, delimiter)
           fragments[1].gsub!(/(\d{3})(?=\d)/, '\1 ')
-          fragments.join(LucaSupport::CONFIG['decimal_separator'])
+          fragments.join(CONST.config['decimal_separator'])
         end
       else
         num.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\1 ').reverse!
@@ -162,7 +162,7 @@ module LucaSupport # :nodoc:
       end
     end
 
-    def readable(obj, len = LucaSupport::CONFIG['decimal_num'])
+    def readable(obj, len = CONST.config['decimal_num'])
       case obj
       when Array
         obj.map { |i| readable(i) }

data/lib/luca_support/const.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'singleton'
+
+module LucaSupport
+  class ConstantHolder
+    include Singleton
+    attr_reader :config, :pjdir
+
+    def initialize
+      @pjdir = ENV['LUCA_TEST_DIR']
+      @config = {
+        'decimal_separator' => '.',
+        'decimal_num' => 2,
+        'thousands_separator' => ','
+      }
+    end
+
+    def set_pjdir(path)
+      @pjdir ||= path
+    end
+
+    def set_config(config)
+      @config = config
+    end
+  end
+
+  CONST = ConstantHolder.instance
+end

data/lib/luca_support/enc.rb

@@ -13,7 +13,7 @@ module LucaSupport # :nodoc:
     # TODO: check space in dir string
     # TODO: check if origin exists
     def encrypt(dir, iter: 10000, cleanup: false)
-      Dir.chdir(Pathname(PJDIR) / 'data') do
+      Dir.chdir(Pathname(CONST.pjdir) / 'data') do
         system "tar -czf - #{dir} | openssl enc -e -aes256 -iter #{iter} -out #{dir}.tar.gz"
         return if ! cleanup
 
@@ -23,7 +23,7 @@ module LucaSupport # :nodoc:
 
     # TODO: check space in dir string
     def decrypt(dir, iter: 10000)
-      Dir.chdir(Pathname(PJDIR) / 'data') do
+      Dir.chdir(Pathname(CONST.pjdir) / 'data') do
         system "openssl enc -d -aes256 -iter #{iter} -in #{dir}.tar.gz | tar xz"
       end
     end

data/lib/luca_support/view.rb

@@ -41,7 +41,7 @@ module LucaSupport
     #
     def search_template(file, dir = 'templates')
       # TODO: load config
-      [LucaSupport::PJDIR, lib_path].each do |base|
+      [CONST.pjdir, lib_path].each do |base|
         path = (Pathname(base) / dir / file)
         return path.to_path if path.file?
       end

data/lib/luca_support.rb

@@ -3,8 +3,6 @@
 module LucaSupport
   autoload :Code, 'luca_support/code'
   autoload :Enc, 'luca_support/enc'
-  autoload :CONFIG, 'luca_support/config'
-  autoload :Config, 'luca_support/config'
   autoload :Mail, 'luca_support/mail'
   autoload :View, 'luca_support/view'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucarecord
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE
+- lib/luca_cmd.rb
 - lib/luca_record.rb
 - lib/luca_record/base.rb
 - lib/luca_record/dict.rb
@@ -70,7 +71,7 @@ files:
 - lib/luca_record/version.rb
 - lib/luca_support.rb
 - lib/luca_support/code.rb
-- lib/luca_support/config.rb
+- lib/luca_support/const.rb
 - lib/luca_support/enc.rb
 - lib/luca_support/mail.rb
 - lib/luca_support/range.rb
@@ -82,7 +83,7 @@ metadata:
   homepage_uri: https://github.com/chumaltd/luca/tree/master/lucarecord
   source_code_uri: https://github.com/chumaltd/luca/tree/master/lucarecord
   changelog_uri: https://github.com/chumaltd/luca/tree/master/lucarecord/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: ERP File operation framework
 test_files: []

data/lib/luca_support/config.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-require 'date'
-require 'pathname'
-require 'yaml'
-
-# startup config
-#
-module LucaSupport
-  PJDIR = ENV['LUCA_TEST_DIR'] || Dir.pwd.freeze
-  CONFIG = begin
-             {
-               'decimal_separator' => '.',
-               'thousands_separator' => ','
-             }.merge(YAML.safe_load(File.read(Pathname(PJDIR) / 'config.yml'), permitted_classes: [Date]))
-           rescue Errno::ENOENT
-             {
-               'decimal_separator' => '.',
-               'thousands_separator' => ','
-             }
-           end
-  CONFIG['decimal_num'] ||= CONFIG['country'] == 'jp' ? 0 : 2
-end