lucarecord 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 217630d4010c2341954f05600982cf641470b244440849c7816873ed8d10e8d2
-  data.tar.gz: f535546634069491d64b3e0359fc9a40f10059cd08d216f8a947c28d717d1c6c
+  metadata.gz: a408c56d2c0f47238bc8c17e4135867e1be31b9897f940370a9bc8e87f8d014e
+  data.tar.gz: 66fead2c3441f8b019f8d805fe564dbf9a9121abec424ea5d5482277d7bcc3ad
 SHA512:
-  metadata.gz: 9e69a01066562a854ebe78128ead7c7d87be1227cfbce7453edf5510fa03f7b2acfbea5b334837b1c80e49e71a8a858d2d273277769e096baf29e4c90977816b
-  data.tar.gz: c7caf90c504940b0533441f19cde460fbb680f69937412659ac04670f009b74ed84c5a2aa120f2554a7e4cfab8d4eba62309cd5c0ace1e057fc09400fdc05cee
+  metadata.gz: a6f3d2e4773bc6c29c657a7fbe5864893efa39ec739ae1df4eece68fa82907bf99feb72f5a43888b59e39bc9f9a93f023fa4c0243e2429d3c04ba2c2f09d2e20
+  data.tar.gz: 7fd98c339f4b81430dc961b009233e6de65228f6df83d361b81f4040857045740f0d2d18363e29bd2579be6b3d19a5a09cca37f9e39cfc1a8703212c32ba4e78

data/CHANGELOG.md

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

data/lib/luca_record/dict.rb

@@ -6,7 +6,6 @@ require 'yaml'
 require 'pathname'
 require 'luca_support'
 
-#
 # Low level API
 #
 module LucaRecord
@@ -14,66 +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.gsub(/[[:space:]]/, ''))
-      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'] 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
+      [obj[main_key], options.compact]
     end
 
     #
@@ -122,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
@@ -140,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/version.rb

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

data/lib/luca_support.rb

@@ -6,15 +6,4 @@ module LucaSupport
   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

@@ -101,7 +101,7 @@ module LucaSupport
       (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}]"
+        g1 == g2 ? "#{y}#{g1}" : "#{y}[#{g1}-#{g2}]"
       end
     end
 
@@ -114,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'

metadata

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