lucabook 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e668b84de17897d833b8cdc2af8a8cc6086485c1369116136d4d1eee68c3b32
-  data.tar.gz: 0c088d2d8e39c9e99332888d0dbeed1fe076a1dc789d901b18912acbeedea4ef
+  metadata.gz: b58568499ebfa245c9f86863537eb2a9b26e563ac20a09583a3b12e29bc713a2
+  data.tar.gz: 77a382f306e0c269182caca7d48bb6fd8d4f6513664d8cef36a28356cacd8998
 SHA512:
-  metadata.gz: cd69cd58f5e5c76e958a18d49b5458b85ed72293afeffca8da0c0df5a454cc34703d294c9de163a4d0a44318bd203467f41ab94e0820c0728b13fac6dcbd1586
-  data.tar.gz: d962339bee1cf14732d0e90422915d571a951d9cfd50d5d17998f9d6dc83036ebb9d4e69c1ca6fcd6963f49474ef551d4b408d61dbea8cd9afc12496f4e755a9
+  metadata.gz: 1526e2b525c357dc06f87253095a8e8434bacc03994432f90dec6571f4bde9fe24b9d1a81ab3b9747a3d45be767022bb9bf64f1a0b88b298e6997bbb95ca4fd2
+  data.tar.gz: 111d7eff70797d30bc2df769cbd3d1c8c8b83d92ef5bba8ffa74b60bc06fa9f0754fd54d507f556f7c9831c87a418113ecc797755436f84926e8df88cf117622

data/lib/luca_book/import.rb

@@ -48,13 +48,13 @@ module LucaBook
       d['debit'].each { |h| h['code'] = @dict.search(h['label'], DEBIT_DEFAULT) }
       d['credit'].each { |h| h['code'] = @dict.search(h['label'], CREDIT_DEFAULT) }
 
-      LucaBook.new.create!(d)
+      LucaBook.new.create(d)
     end
 
     def import_csv
       @dict.load_csv(@target_file) do |row|
         if @config[:type] == 'single'
-          LucaBook::Journal.create!(parse_single(row))
+          LucaBook::Journal.create(parse_single(row))
         elsif @config[:type] == 'double'
           p parse_double(row)
         else
@@ -68,7 +68,7 @@ module LucaBook
     #
     def parse_single(row)
       value = row.dig(@config[:credit_value])&.empty? ? row[@config[:debit_value]] : row[@config[:credit_value]]
-      {}.tap do |d| 
+      {}.tap do |d|
         d['date'] = parse_date(row)
         if row.dig(@config[:credit_value])&.empty?
           d['debit'] = [

data/lib/luca_book/journal.rb

@@ -12,28 +12,36 @@ module LucaBook
 
     # create journal from hash
     #
-    def self.create!(d)
+    def self.create(d)
       date = Date.parse(d['date'])
 
-      debit_amount = serialize_on_key(d['debit'], 'value')
-      credit_amount = serialize_on_key(d['credit'], 'value')
+      debit_amount = LucaSupport::Code.decimalize(serialize_on_key(d['debit'], 'value'))
+      credit_amount = LucaSupport::Code.decimalize(serialize_on_key(d['credit'], 'value'))
       raise 'BalanceUnmatch' if debit_amount.inject(:+) != credit_amount.inject(:+)
 
       debit_code = serialize_on_key(d['debit'], 'code')
       credit_code = serialize_on_key(d['credit'], 'code')
 
-      # TODO: limit code length for filename
-      codes = (debit_code + credit_code).uniq
+      # TODO: need to sync filename & content. Limit code length for filename
+      # codes = (debit_code + credit_code).uniq
+      codes = nil
       create_record!(date, codes) do |f|
         f << debit_code
-        f << debit_amount
+        f << LucaSupport::Code.readable(debit_amount)
         f << credit_code
-        f << credit_amount
+        f << LucaSupport::Code.readable(credit_amount)
         f << []
         f << [d.dig('note')]
       end
     end
 
+    def self.update_codes(obj)
+      debit_code = serialize_on_key(obj[:debit], :code)
+      credit_code = serialize_on_key(obj[:credit], :code)
+      codes = (debit_code + credit_code).uniq.sort.compact
+      change_codes(obj[:id], codes)
+    end
+
     # define new transaction ID & write data at once
     def self.create_record!(date_obj, codes = nil)
       create_record(nil, date_obj, codes) do |f|
@@ -52,29 +60,25 @@ module LucaBook
     def self.load_data(io, path)
       {}.tap do |record|
         body = false
-        record[:id] = path[0] + path[1]
+        record[:id] = "#{path[0]}/#{path[1]}"
         CSV.new(io, headers: false, col_sep: "\t", encoding: 'UTF-8')
           .each.with_index(0) do |line, i|
           case i
           when 0
             record[:debit] = line.map { |row| { code: row } }
           when 1
-            line.each_with_index do |amount, i|
-              record[:debit][i][:amount] = amount.to_i # TODO: bigdecimal support
-            end
+            line.each_with_index { |amount, j| record[:debit][j][:amount] = BigDecimal(amount.to_s) }
           when 2
             record[:credit] = line.map { |row| { code: row } }
           when 3
-            line.each_with_index do |amount, i|
-              record[:credit][i][:amount] = amount.to_i # TODO: bigdecimal support
-            end
+            line.each_with_index { |amount, j| record[:credit][j][:amount] = BigDecimal(amount.to_s) }
           else
-            if line.empty?
+            if body == false && line.empty?
               record[:note] ||= []
               body = true
-              next
+            else
+              record[:note] << line.join(' ') if body
             end
-            record[:note] << line.join(' ') if body
           end
           record[:note]&.join('\n')
         end

data/lib/luca_book/setup.rb

@@ -6,13 +6,18 @@ require 'fileutils'
 module LucaBook
   class Setup
     # create project skeleton under specified directory
-    def self.create_project(dir = LucaSupport::Config::Pjdir)
+    def self.create_project(country = nil, dir = LucaSupport::Config::Pjdir)
       FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
       Dir.chdir(dir) do
         %w[data/journals dict].each do |subdir|
           FileUtils.mkdir_p(subdir) unless Dir.exist?(subdir)
         end
-        FileUtils.cp("#{__dir__}/templates/dict-en.tsv", 'dict/base.tsv') unless File.exist?('config.yml')
+        dict = if File.exist?("#{__dir__}/templates/dict-#{country}.tsv")
+                 "dict-#{country}.tsv"
+               else
+                 'dict-en.tsv'
+               end
+        FileUtils.cp("#{__dir__}/templates/#{dict}", 'dict/base.tsv') unless File.exist?('dict/base.tsv')
       end
     end
   end

data/lib/luca_book/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaBook
-  VERSION = '0.2.11'
+  VERSION = '0.2.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucabook
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -87,7 +87,7 @@ files:
 - lib/luca_book/setup.rb
 - lib/luca_book/state.rb
 - lib/luca_book/templates/dict-en.tsv
-- lib/luca_book/templates/dict-ja.tsv
+- lib/luca_book/templates/dict-jp.tsv
 - lib/luca_book/version.rb
 homepage: https://github.com/chumaltd/luca/tree/master/lucabook
 licenses: