lucarecord 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a408c56d2c0f47238bc8c17e4135867e1be31b9897f940370a9bc8e87f8d014e
-  data.tar.gz: 66fead2c3441f8b019f8d805fe564dbf9a9121abec424ea5d5482277d7bcc3ad
+  metadata.gz: 88e839f7ee18513f3798a568e65bd067eb16b87209f895f1b13a0deb43433837
+  data.tar.gz: 9292a2d9a8e53cab0b5d4aabcea77f5a9a45f8fb504e048ac081a22e86b2ae28
 SHA512:
-  metadata.gz: a6f3d2e4773bc6c29c657a7fbe5864893efa39ec739ae1df4eece68fa82907bf99feb72f5a43888b59e39bc9f9a93f023fa4c0243e2429d3c04ba2c2f09d2e20
-  data.tar.gz: 7fd98c339f4b81430dc961b009233e6de65228f6df83d361b81f4040857045740f0d2d18363e29bd2579be6b3d19a5a09cca37f9e39cfc1a8703212c32ba4e78
+  metadata.gz: b6d39c80ffea32406bd009cbd1c3393a8c02c52128ac6365f395ff68af2f1b8964aa1bdd2b7f951dab00aad00a3659bff2883dd839e3179bd013b8e1026185d5
+  data.tar.gz: 8577ad3aee104dc8341b20ec04aae3f18a0145ca826165696f726cce4a2f25661c1205fb79ce2e43d5d361f7c89a449607f8854349c7ea0c6a6a987da1c3aaee

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## LucaRecord 0.2.24
+
+* Digit delimiter for `delimit_num` can be customized through `thousands_separator` and `decimal_separator` in config.yml.
+* Const `CONFIG` and `PJDIR` is defined at `LucaRecord::Base`.
+* add `LucaSupport::Code.keys_stringify()`
+
 ## LucaRecord 0.2.23
 
 * Enhance Dictionary, supporting extensible options.

data/lib/luca_record/base.rb

@@ -6,6 +6,8 @@ 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

@@ -115,7 +115,7 @@ module LucaRecord
     end
 
     def self.dict_path(filename)
-      Pathname(LucaSupport::Config::Pjdir) / 'dict' / filename
+      Pathname(LucaSupport::PJDIR) / 'dict' / filename
     end
 
     def self.reverse(dict)

data/lib/luca_record/io.rb

@@ -243,7 +243,7 @@ module LucaRecord # :nodoc:
       end
 
       # test if having required dirs/files under exec path
-      def valid_project?(path = LucaSupport::Config::Pjdir)
+      def valid_project?(path = LucaSupport::PJDIR)
         project_dir = Pathname(path)
         FileTest.file?((project_dir + 'config.yml').to_s) and FileTest.directory?( (project_dir + 'data').to_s)
       end
@@ -362,7 +362,7 @@ module LucaRecord # :nodoc:
 
       # TODO: replace with data_dir method
       def abs_path(base_dir)
-        Pathname(LucaSupport::Config::Pjdir) / 'data' / base_dir
+        Pathname(LucaSupport::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.2.23'
+  VERSION = '0.2.24'
 end

data/lib/luca_support/code.rb

@@ -54,21 +54,24 @@ module LucaSupport
     def delimit_num(num, decimal: nil, delimiter: nil)
       return nil if num.nil?
 
-      decimal ||= LucaSupport::Config::DECIMAL_NUM
-      str = case num
-            when BigDecimal
-              if decimal == 0
-                num.floor.to_s.reverse.gsub!(/(\d{3})(?=\d)/, '\1 ').reverse!
-              else
-                fragments = num.floor(decimal).to_s('F').split('.')
-                fragments[0].reverse!.gsub!(/(\d{3})(?=\d)/, '\1 ').reverse!
-                fragments[1].gsub!(/(\d{3})(?=\d)/, '\1 ')
-                fragments.join('.')
-              end
-            else
-              num.to_s.reverse.gsub!(/(\d{3})(?=\d)/, '\1 ').reverse!
-            end
-      delimiter.nil? ? str : str.gsub!(/\s/, delimiter)
+      decimal ||= LucaSupport::CONFIG['decimal_num']
+      delimiter ||= LucaSupport::CONFIG['thousands_separator']
+      case num
+      when BigDecimal
+        if decimal == 0
+          num.floor.to_s.reverse.gsub!(/(\d{3})(?=\d)/, '\1 ').reverse!
+            .gsub!(/\s/, delimiter)
+        else
+          fragments = num.floor(decimal).to_s('F').split('.')
+          fragments[0].reverse!.gsub!(/(\d{3})(?=\d)/, '\1 ').reverse!
+            .gsub!(/\s/, delimiter)
+          fragments[1].gsub!(/(\d{3})(?=\d)/, '\1 ')
+          fragments.join(LucaSupport::CONFIG['decimal_separator'])
+        end
+      else
+        num.to_s.reverse.gsub!(/(\d{3})(?=\d)/, '\1 ').reverse!
+          .gsub!(/\s/, delimiter)
+      end
     end
 
     # encode directory name from year and month.
@@ -114,6 +117,20 @@ module LucaSupport
       Digest::SHA1.hexdigest(SecureRandom.uuid)
     end
 
+    # Convert Hash keys to string recursively.
+    # Required for YAML compatibility.
+    #
+    def keys_stringify(dat)
+      case dat
+      when Array
+        dat.map { |d| keys_stringify(d) }
+      when Hash
+        dat.map { |k, v| [k.to_s, keys_stringify(v)] }.to_h
+      else
+        dat
+      end
+    end
+
     def match_score(a, b, n = 2)
       v_a = to_ngram(a, n)
       v_b = to_ngram(b, n)
@@ -142,7 +159,7 @@ module LucaSupport
       end
     end
 
-    def readable(obj, len = LucaSupport::Config::DECIMAL_NUM)
+    def readable(obj, len = LucaSupport::CONFIG['decimal_num'])
       case obj
       when Array
         obj.map { |i| readable(i) }

data/lib/luca_support/config.rb

@@ -8,19 +8,15 @@ require 'yaml'
 module LucaSupport
   PJDIR = ENV['LUCA_TEST_DIR'] || Dir.pwd.freeze
   CONFIG = begin
-             YAML.load_file(Pathname(PJDIR) / 'config.yml', **{})
+             {
+               'decimal_separator' => '.',
+               'thousands_separator' => ','
+             }.merge(YAML.load_file(Pathname(PJDIR) / 'config.yml'))
            rescue Errno::ENOENT
-             {}
+             {
+               'decimal_separator' => '.',
+               'thousands_separator' => ','
+             }
            end
-
-  module Config
-    # Project top directory.
-    Pjdir = ENV['LUCA_TEST_DIR'] || Dir.pwd.freeze
-    if File.exist?(Pathname(Pjdir) / 'config.yml')
-      # DECIMAL_NUM = YAML.load_file(Pathname(Pjdir) / 'config.yml', **{})['decimal_number']
-      COUNTRY = YAML.load_file(Pathname(Pjdir) / 'config.yml', **{})['country']
-      DECIMAL_NUM ||= 0 if COUNTRY == 'jp'
-    end
-    DECIMAL_NUM ||= 2
-  end
+  CONFIG['decimal_num'] ||= CONFIG['country'] == 'jp' ? 0 : 2
 end

data/lib/luca_support/view.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucarecord
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2020-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail