lucarecord 0.2.16 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 222229f2cc5299302f8ff1df81a92ce9a507101e6035765cdaa1408ad8e93365
-  data.tar.gz: 30102479db3e25fca972cf723d8f679891a179ed0b9ceb79cb03d2b22f25743b
+  metadata.gz: 94f10c954f77059dc814f1aac38335ca0e1597d0db8e7e754a93f6a67714cce1
+  data.tar.gz: fd0e684124f7683e49192b231fd8f245e09c1fdd281f88fac7dcc309f92713bf
 SHA512:
-  metadata.gz: 4be9918878c1d9204ccbaac61cfefac3872b028d192e8013d177fda369092dcd1ff2884e7e0e53a1384e3e9b21f57cbca903b6f448bddb39ec2199dd4aefdf46
-  data.tar.gz: b5730ce678fc0259a4550f14fddce5655509d07653c0fd8d405d9d1f0f3e48572cad1818790e29ead2d23144be95a3b9229aaf424bca4b71b61c12603b16c0fc
+  metadata.gz: bfd7fdcc8f63dc889fcd51ae8e6e9d8a842a2b87ac5e7c7235e6c1ca9aa5f3886d86f8af71de0bf5e379a428b4c9fa15a2f300118427849da46124fcf4ee7532
+  data.tar.gz: 7e39c7ada92fbc48aad6492362d9f22f8cfa2c3fa109183410d5de9f64641b8d566c206d165026a92f48dd2aa6b2aa310f69a1ff1d7fefc43f48226b5d2065e5

data/CHANGELOG.md

@@ -0,0 +1,21 @@
+## LucaRecord 0.2.21
+
+* Enhance `LucaSupport::Code.delimit_num()`. Handle with BigDecimal, decimal length & delmiter customization.
+
+## LucaRecord 0.2.20
+
+* UUID completion framework on prefix match
+
+## LucaRecord 0.2.19
+
+* `LucaSupport::Code.decode_id()`
+* `LucaSupport::Code.encode_term()` for multiple months search. Old `scan_term()` removed.
+
+## LucaRecord 0.2.18
+
+* `find()`, `create()`, `save()` now supports both of uuid / historical records. If specified `date:` keyword option to `create()`, then generate historical record. `find()`, `save()` identifies with 'id' attribute.
+
+## LucaRecord 0.2.17
+
+* Change internal number format to BigDecimal.
+* Number of Decimal is configurable through `decimal_number` in config.yml(default = 2). `country` setting can also affect.

data/lib/luca_record/dict.rb

@@ -20,7 +20,7 @@ module LucaRecord
     end
 
     def search(word, default_word = nil)
-      res = max_score_code(word)
+      res = max_score_code(word.gsub(/[[:space:]]/, ''))
       if res[1] > 0.4
         res[0]
       else
@@ -65,12 +65,14 @@ module LucaRecord
         config[:type] ||= 'invalid'
         config[:debit_value] = @config['debit_value'].to_i if @config.dig('debit_value')
         config[:credit_value] = @config['credit_value'].to_i if @config.dig('credit_value')
-        config[:note] = @config['note'].to_i if @config.dig('note')
+        config[:note] = @config['note'] if @config.dig('note')
         config[:encoding] = @config['encoding'] if @config.dig('encoding')
 
         config[:year] = @config['year'] if @config.dig('year')
         config[:month] = @config['month'] if @config.dig('month')
         config[:day] = @config['day'] if @config.dig('day')
+        config[:default_debit] = @config['default_debit'] if @config.dig('default_debit')
+        config[:default_credit] = @config['default_credit'] if @config.dig('default_credit')
       end
     end
 

data/lib/luca_record/io.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'bigdecimal'
 require 'csv'
 require 'date'
 require 'fileutils'
@@ -35,9 +36,9 @@ module LucaRecord # :nodoc:
           open_hashed(basedir, id) do |f|
             yield load_data(f)
           end
-        elsif id.length >= 9
-          # TODO: need regexp match for more flexible coding(after AD9999)
-          open_records(basedir, id[0, 5], id[5, 6]) do |f, path|
+        elsif id.length >= 7
+          parts = id.split('/')
+          open_records(basedir, parts[0], parts[1]) do |f, path|
             yield load_data(f, path)
           end
         else
@@ -53,8 +54,22 @@ module LucaRecord # :nodoc:
       def asof(year, month = nil, day = nil, basedir = @dirname)
         return enum_for(:search, year, month, day, nil, basedir) unless block_given?
 
-        search(year, month, day, nil, basedir) do |data, path|
-          yield data, path
+        search(year, month, day, nil, basedir) { |data, path| yield data, path }
+      end
+
+      # scan ranging data on multiple months
+      #
+      def term(start_year, start_month, end_year, end_month, code = nil, basedir = @dirname)
+        return enum_for(:term, start_year, start_month, end_year, end_month, code, basedir) unless block_given?
+
+        LucaSupport::Code.encode_term(start_year, start_month, end_year, end_month).each do |subdir| 
+          open_records(basedir, subdir, nil, code) do |f, path|
+            if @record_type == 'raw'
+              yield f, path
+            else
+              yield load_data(f, path)
+            end
+          end
         end
       end
 
@@ -89,26 +104,48 @@ module LucaRecord # :nodoc:
       # of each concrete class.
       # ----------------------------------------------------------------
 
-      # create hash based record
-      def create(obj, basedir = @dirname)
+      # create record both of uuid/date identified.
+      #
+      def create(obj, date: nil, codes: nil, basedir: @dirname)
         validate_keys(obj)
-        id = LucaSupport::Code.issue_random_id
-        obj['id'] = id
-        open_hashed(basedir, id, 'w') do |f|
-          f.write(YAML.dump(obj.sort.to_h))
+        if date
+          create_record(obj, date, codes, basedir)
+        else
+          obj['id'] = LucaSupport::Code.issue_random_id
+          open_hashed(basedir, obj['id'], 'w') do |f|
+            f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+          end
+          obj['id']
         end
-        id
       end
 
-      # define new transaction ID & write data at once
-      def create_record!(obj, date_obj, codes = nil, basedir = @dirname)
-        gen_record_file!(basedir, date_obj, codes) do |f|
-          f.write(YAML.dump(obj.sort.to_h))
+      # If multiple ID matched, return short ID and human readable label.
+      #
+      def id_completion(phrase, label: 'name', basedir: @dirname)
+        list = prefix_search(phrase, basedir: basedir)
+        case list.length
+        when 1
+          list
+        when 0
+          raise 'No match on specified phrase'
+        else
+          (3..list[0].length).each do |l|
+            if list.map { |id| id[0, l] }.uniq.length == list.length
+              return list.map { |id| { id: id[0, l], label: find(id).dig(label) } }
+            end
+          end
+        end
+      end
+
+      def prefix_search(phrase, basedir: @dirname)
+        glob_str = phrase.length <= 3 ? "#{phrase}*/*" : "#{id2path(phrase)}*"
+        Dir.chdir(abs_path(basedir)) do
+          Dir.glob(glob_str).to_a.map! { |path| path.gsub!('/', '') }
         end
       end
 
       def prepare_dir!(basedir, date_obj)
-        dir_name = (Pathname(basedir) + encode_dirname(date_obj)).to_s
+        dir_name = (Pathname(basedir) + LucaSupport::Code.encode_dirname(date_obj)).to_s
         FileUtils.mkdir_p(dir_name) unless Dir.exist?(dir_name)
         dir_name
       end
@@ -128,8 +165,17 @@ module LucaRecord # :nodoc:
           create(obj, basedir)
         else
           validate_keys(obj)
-          open_hashed(basedir, obj['id'], 'w') do |f|
-            f.write(YAML.dump(obj.sort.to_h))
+          if obj['id'].length < 40
+            parts = obj['id'].split('/')
+            raise 'invalid ID' if parts.length != 2
+
+            open_records(basedir, parts[0], parts[1], nil, 'w') do |f, path|
+              f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+            end
+          else
+            open_hashed(basedir, obj['id'], 'w') do |f|
+              f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+            end
           end
         end
         obj['id']
@@ -141,6 +187,21 @@ module LucaRecord # :nodoc:
         id
       end
 
+      # change filename with new code set
+      #
+      def change_codes(id, new_codes, basedir = @dirname)
+        raise 'invalid id' if id.split('/').length != 2
+
+        newfile = new_codes.empty? ? id : id + '-' + new_codes.join('-')
+        Dir.chdir(abs_path(basedir)) do
+          origin = Dir.glob("#{id}*")
+          raise 'duplicated files' if origin.length != 1
+
+          File.rename(origin.first, newfile)
+        end
+        newfile
+      end
+
       # ----------------------------------------------------------------
       # :section: Path Utilities
       # ----------------------------------------------------------------
@@ -181,10 +242,6 @@ module LucaRecord # :nodoc:
         end
       end
 
-      def encode_dirname(date_obj)
-        date_obj.year.to_s + LucaSupport::Code.encode_month(date_obj)
-      end
-
       # test if having required dirs/files under exec path
       def valid_project?(path = LucaSupport::Config::Pjdir)
         project_dir = Pathname(path)
@@ -197,6 +254,29 @@ module LucaRecord # :nodoc:
 
       private
 
+      # define new transaction ID & write data at once
+      # ID format is like '2020H/A001', which means record no.1 of 2020/10/10.
+      # Any data format can be written with block.
+      #
+      def create_record(obj, date_obj, codes = nil, basedir = @dirname)
+        FileUtils.mkdir_p(abs_path(basedir)) unless Dir.exist?(abs_path(basedir))
+        subdir = "#{date_obj.year}#{LucaSupport::Code.encode_month(date_obj)}"
+        filename = LucaSupport::Code.encode_date(date_obj) + new_record_id(basedir, date_obj)
+        obj['id'] = "#{subdir}/#{filename}" if obj.is_a? Hash
+        filename += '-' + codes.join('-') if codes
+        Dir.chdir(abs_path(basedir)) do
+          FileUtils.mkdir_p(subdir) unless Dir.exist?(subdir)
+            File.open(Pathname(subdir) / filename, 'w') do |f|
+              if block_given?
+                yield(f)
+              else
+                f.write(YAML.dump(LucaSupport::Code.readable(obj.sort.to_h)))
+              end
+            end
+        end
+        "#{subdir}/#{filename}"
+      end
+
       # open records with 'basedir/month/date-code' path structure.
       # Glob pattern can be specified like folloing examples.
       #
@@ -212,6 +292,7 @@ module LucaRecord # :nodoc:
 
         file_pattern = filename.nil? ? '*' : "#{filename}*"
         Dir.chdir(abs_path(basedir)) do
+          FileUtils.mkdir_p(subdir) if mode == 'w' && !Dir.exist?(subdir)
           Dir.glob("#{subdir}*/#{file_pattern}").sort.each do |subpath|
             next if skip_on_unmatch_code(subpath, code)
 
@@ -243,6 +324,17 @@ module LucaRecord # :nodoc:
         end
       end
 
+      # parse data dir and respond existing months
+      #
+      def scan_terms(query = nil, base_dir = @dirname)
+        pattern = query.nil? ? "*" : "#{query}*"
+        Dir.chdir(abs_path(base_dir)) do
+          Dir.glob(pattern).select { |dir|
+            FileTest.directory?(dir) && /^[0-9]/.match(dir)
+          }.sort.map { |str| decode_term(str) }
+        end
+      end
+
       # Decode basic format.
       # If specific decode is needed, override this method in each class.
       #
@@ -254,7 +346,7 @@ module LucaRecord # :nodoc:
         when 'json'
         # TODO: implement JSON parse
         else
-          YAML.load(io.read).tap { |obj| validate_keys(obj) }
+          LucaSupport::Code.decimalize(YAML.load(io.read)).tap { |obj| validate_keys(obj) }
         end
       end
 
@@ -268,16 +360,6 @@ module LucaRecord # :nodoc:
         end
       end
 
-      def gen_record_file!(basedir, date_obj, codes = nil)
-        d = prepare_dir!(abs_path(basedir), date_obj)
-        filename = LucaSupport::Code.encode_date(date_obj) + new_record_id(abs_path(basedir), date_obj)
-        if codes
-          filename += codes.inject('') { |fragment, code| "#{fragment}-#{code}" }
-        end
-        path = Pathname(d) + filename
-        File.open(path.to_s, 'w') { |f| yield(f) }
-      end
-
       # TODO: replace with data_dir method
       def abs_path(base_dir)
         Pathname(LucaSupport::Config::Pjdir) / 'data' / base_dir
@@ -295,8 +377,10 @@ module LucaRecord # :nodoc:
 
       # AUTO INCREMENT
       def new_record_no(basedir, date_obj)
-        dir_name = (Pathname(basedir) + encode_dirname(date_obj)).to_s
-        raise 'No target dir exists.' unless Dir.exist?(dir_name)
+        raise 'No target dir exists.' unless Dir.exist?(abs_path(basedir))
+
+        dir_name = (Pathname(abs_path(basedir)) / LucaSupport::Code.encode_dirname(date_obj)).to_s
+        return 1 unless Dir.exist?(dir_name)
 
         Dir.chdir(dir_name) do
           last_file = Dir.glob("#{LucaSupport::Code.encode_date(date_obj)}*").max
@@ -328,17 +412,6 @@ module LucaRecord # :nodoc:
       end
     end
 
-    # parse data dir and respond existing months
-    #
-    def scan_terms(base_dir, query = nil)
-      pattern = query.nil? ? "*" : "#{query}*"
-      Dir.chdir(base_dir) do
-        Dir.glob(pattern).select { |dir|
-          FileTest.directory?(dir) && /^[0-9]/.match(dir)
-        }.sort.map { |str| decode_term(str) }
-      end
-    end
-
     def load_config(path = nil)
       path = path.to_s
       if File.exist?(path)

data/lib/luca_record/version.rb

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

data/lib/luca_support.rb

@@ -2,6 +2,7 @@
 
 module LucaSupport
   autoload :Code, 'luca_support/code'
+  autoload :CONFIG, 'luca_support/config'
   autoload :Config, 'luca_support/config'
   autoload :Mail, 'luca_support/mail'
   autoload :View, 'luca_support/view'

data/lib/luca_support/code.rb

@@ -3,12 +3,20 @@
 require 'date'
 require 'securerandom'
 require 'digest/sha1'
+require 'luca_support/config'
 
 # implement Luca IDs convention
 module LucaSupport
   module Code
     module_function
 
+    # Parse historical id into Array of date & transaction id.
+    #
+    def decode_id(id_str)
+      m = %r(^(?<year>[0-9]+)(?<month>[A-L])/?(?<day>[0-9A-V])(?<txid>[0-9A-Z]{,3})).match(id_str)
+      ["#{m[:year]}-#{decode_month(m[:month])}-#{decode_date(m[:day])}", decode_txid(m[:txid])]
+    end
+
     def encode_txid(num)
       txmap = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'
       l = txmap.length
@@ -40,11 +48,35 @@ module LucaSupport
       '0123456789ABCDEFGHIJKLMNOPQRSTUV'.index(char)
     end
 
-    def delimit_num(num)
-      num.to_s.reverse.gsub!(/(\d{3})(?=\d)/, '\1,').reverse!
+    # Format number in 3-digit-group.
+    # Long decimal is just ommitted with floor().
+    #
+    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)
     end
 
+    # encode directory name from year and month.
     #
+    def encode_dirname(date_obj)
+      date_obj.year.to_s + encode_month(date_obj)
+    end
+
     # Month to code conversion.
     # Date, DateTime, String, Integer is valid input. If nil, returns empty String for consistency.
     #
@@ -63,6 +95,16 @@ module LucaSupport
       '0ABCDEFGHIJKL'.index(char)
     end
 
+    # Generate globbing phrase like ["2020[C-H]"] for range search.
+    #
+    def encode_term(start_year, start_month, end_year, end_month)
+      (start_year..end_year).to_a.map do |y|
+        g1 = y == start_year ? encode_month(start_month) : encode_month(1)
+        g2 = y == end_year ? encode_month(end_month) : encode_month(12)
+        "#{y}[#{g1}-#{g2}]"
+      end
+    end
+
     def decode_term(char)
       m = /^([0-9]{4})([A-La-l])/.match(char)
       [m[1].to_i, decode_month(m[2])]
@@ -72,6 +114,37 @@ module LucaSupport
       Digest::SHA1.hexdigest(SecureRandom.uuid)
     end
 
+    def decimalize(obj)
+      case obj.class.name
+      when 'Array'
+        obj.map { |i| decimalize(i) }
+      when 'Hash'
+        obj.inject({}) { |h, (k, v)| h[k] = decimalize(v); h }
+      when 'Integer'
+        BigDecimal(obj.to_s)
+      when 'String'
+        /^[0-9\.]+$/.match(obj) ? BigDecimal(obj) : obj
+      when 'Float'
+        raise 'already float'
+      else
+        obj
+      end
+    end
+
+    def readable(obj, len = LucaSupport::Config::DECIMAL_NUM)
+      case obj.class.name
+      when 'Array'
+        obj.map { |i| readable(i) }
+      when 'Hash'
+        obj.inject({}) { |h, (k, v)| h[k] = readable(v); h }
+      when 'BigDecimal'
+        parts = obj.round(len).to_s('F').split('.')
+        len < 1 ? parts.first : "#{parts[0]}.#{parts[1][0, len]}"
+      else
+        obj
+      end
+    end
+
     #
     # convert effective/defunct data into current hash on @date.
     # not parse nested children.

data/lib/luca_support/config.rb

@@ -1,11 +1,26 @@
 # frozen_string_literal: true
 
-#
+require 'pathname'
+require 'yaml'
+
 # startup config
 #
 module LucaSupport
+  PJDIR = ENV['LUCA_TEST_DIR'] || Dir.pwd.freeze
+  CONFIG = begin
+             YAML.load_file(Pathname(PJDIR) / 'config.yml', **{})
+           rescue Errno::ENOENT
+             {}
+           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
 end

metadata

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