lucarecord 0.2.18 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63ac71426bdf4eb871884b8b28c5aa363db9d51ef3ca0d84ab92a3fcf127ecde
-  data.tar.gz: 2bc0d6ecde974a2f9ca9c901af5ac714c909f40dd84986746948065a4efb4ed7
+  metadata.gz: a408c56d2c0f47238bc8c17e4135867e1be31b9897f940370a9bc8e87f8d014e
+  data.tar.gz: 66fead2c3441f8b019f8d805fe564dbf9a9121abec424ea5d5482277d7bcc3ad
 SHA512:
-  metadata.gz: 1f9cf84bfb09080f6f3e8cf15c8fb3cea0d6eca9d69acc10c23cd9b6a681daae9ab641181a928f438c870a438a0c4525c61bfad6a1832a2d148b7a3d37b3d6d3
-  data.tar.gz: be35bd6b0a993b5fde415ba5e1a7b59228106c443594b164fa5df26f1eb284ae0556277b99b25f7697283ac194f6c25ffa7d7d8d3e1bfe2e22b128130f3f9cec
+  metadata.gz: a6f3d2e4773bc6c29c657a7fbe5864893efa39ec739ae1df4eece68fa82907bf99feb72f5a43888b59e39bc9f9a93f023fa4c0243e2429d3c04ba2c2f09d2e20
+  data.tar.gz: 7fd98c339f4b81430dc961b009233e6de65228f6df83d361b81f4040857045740f0d2d18363e29bd2579be6b3d19a5a09cca37f9e39cfc1a8703212c32ba4e78

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## LucaRecord 0.2.23
+
+* Enhance Dictionary, supporting extensible options.
+
+## LucaRecord 0.2.22
+
+* add `LucaSupport::View.nushell()`, render nushell table directly.
+
+## 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.

data/lib/luca_record/dict.rb

@@ -6,7 +6,6 @@ require 'yaml'
 require 'pathname'
 require 'luca_support'
 
-#
 # Low level API
 #
 module LucaRecord
@@ -14,64 +13,40 @@ module LucaRecord
     include LucaSupport::Code
 
     def initialize(file = @filename)
-      #@path = file
       @path = self.class.dict_path(file)
       set_driver
     end
 
-    def search(word, default_word = nil)
-      res = max_score_code(word)
-      if res[1] > 0.4
-        res[0]
+    # Search word with n-gram.
+    # If dictionary has Hash or Array, it returns [label, options].
+    #
+    def search(word, default_word = nil, main_key: 'label', options: nil)
+      res, score = max_score_code(word.gsub(/[[:space:]]/, ''))
+      return default_word if score < 0.4
+
+      case res
+      when Hash
+        hash2multiassign(res, main_key, options: options)
+      when Array
+        res.map { |item| hash2multiassign(item, main_key, options: options) }
       else
-        default_word
+        res
       end
     end
 
+    # Separate main item from other options.
+    # If options specified as Array of string, it works as safe list filter.
     #
-    # Column number settings for CSV/TSV convert
-    #
-    # :label
-    #   for double entry data
-    # :counter_label
-    #   must be specified with label
-    # :debit_label
-    #   for double entry data
-    # * debit_value
-    # :credit_label
-    #   for double entry data
-    # * credit_value
-    # :note
-    #   can be the same column as another label
-    #
-    # :encoding
-    #   file encoding
-    #
-    def csv_config
-      {}.tap do |config|
-        if @config.dig('label')
-          config[:label] = @config['label'].to_i
-          if @config.dig('counter_label')
-            config[:counter_label] = @config['counter_label']
-            config[:type] = 'single'
-          end
-        elsif @config.dig('debit_label')
-          config[:debit_label] = @config['debit_label'].to_i
-          if @config.dig('credit_label')
-            config[:credit_label] = @config['credit_label'].to_i
-            config[:type] = 'double'
-          end
+    def hash2multiassign(obj, main_key = 'label', options: nil)
+      options = {}.tap do |opt|
+        obj.map do |k, v|
+          next if k == main_key
+          next if !options.nil? && !options.include?(k)
+
+          opt[k.to_sym] = v
         end
-        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[: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')
       end
+      [obj[main_key], options.compact]
     end
 
     #
@@ -120,6 +95,17 @@ module LucaRecord
       end
     end
 
+    def self.validate(filename, target_key = :label)
+      errors = load(filename).map { |k, v| v[target_key].nil? ? k : nil }.compact
+      if errors.empty?
+        puts 'No error detected.'
+        nil
+      else
+        "Key #{errors.join(', ')} has nil #{target_key}."
+        errors.count
+      end
+    end
+
     private
 
     def set_driver
@@ -138,7 +124,7 @@ module LucaRecord
 
     def max_score_code(str)
       res = @definitions.map do |k, v|
-        [v, LucaSupport.match_score(str, k, 3)]
+        [v, match_score(str, k, 3)]
       end
       res.max { |x, y| x[1] <=> y[1] }
     end

data/lib/luca_record/io.rb

@@ -54,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
 
@@ -105,6 +119,31 @@ module LucaRecord # :nodoc:
         end
       end
 
+      # 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) + LucaSupport::Code.encode_dirname(date_obj)).to_s
         FileUtils.mkdir_p(dir_name) unless Dir.exist?(dir_name)
@@ -148,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
       # ----------------------------------------------------------------
@@ -270,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.
       #
@@ -281,8 +346,7 @@ module LucaRecord # :nodoc:
         when 'json'
         # TODO: implement JSON parse
         else
-          YAML.load(io.read).tap { |obj| validate_keys(obj) }
-            .inject({}) { |h, (k, v)| h[k] = LucaSupport::Code.decimalize(v); h }
+          LucaSupport::Code.decimalize(YAML.load(io.read)).tap { |obj| validate_keys(obj) }
         end
       end
 
@@ -348,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.18'
+  VERSION = '0.2.23'
 end

data/lib/luca_support.rb

@@ -2,18 +2,8 @@
 
 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'
-
-  def self.match_score(a, b, n = 2)
-    v_a = to_ngram(a, n)
-    v_b = to_ngram(b, n)
-
-    v_a.map { |item| v_b.include?(item) ? 1 : 0 }.sum / v_a.length.to_f
-  end
-
-  def self.to_ngram(str, n = 2)
-    str.each_char.each_cons(n).map(&:join)
-  end
 end

data/lib/luca_support/code.rb

@@ -10,6 +10,13 @@ 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
@@ -41,8 +48,27 @@ 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.
@@ -69,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)
+        g1 == g2 ? "#{y}#{g1}" : "#{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])]
@@ -78,6 +114,17 @@ module LucaSupport
       Digest::SHA1.hexdigest(SecureRandom.uuid)
     end
 
+    def match_score(a, b, n = 2)
+      v_a = to_ngram(a, n)
+      v_b = to_ngram(b, n)
+
+      v_a.map { |item| v_b.include?(item) ? 1 : 0 }.sum / v_a.length.to_f
+    end
+
+    def to_ngram(str, n = 2)
+      str.each_char.each_cons(n).map(&:join)
+    end
+
     def decimalize(obj)
       case obj.class.name
       when 'Array'
@@ -96,14 +143,18 @@ module LucaSupport
     end
 
     def readable(obj, len = LucaSupport::Config::DECIMAL_NUM)
-      case obj.class.name
-      when 'Array'
+      case obj
+      when Array
         obj.map { |i| readable(i) }
-      when 'Hash'
+      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]}"
+      when BigDecimal
+        if len == 0
+          obj.round # Integer is precise
+        else
+          parts = obj.round(len).to_s('F').split('.')
+          "#{parts[0]}.#{parts[1][0, len]}"
+        end
       else
         obj
       end

data/lib/luca_support/config.rb

@@ -3,15 +3,21 @@
 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']
+      # 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

data/lib/luca_support/view.rb

@@ -42,5 +42,10 @@ module LucaSupport
       end
       nil
     end
+
+    def nushell(yml)
+      require 'open3'
+      Open3.pipeline_w(%(nu -c 'cat - | from yaml')) { |stdin| stdin.puts yml }
+    end
   end
 end

metadata

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