lucabook 0.2.19 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28e5bc747a4ba316a5badc9f7845637f4b27350cb199911c1cafc8771dc0925b
-  data.tar.gz: db3d419a9a20643d2235305a6c7d0ab6f776826cd062751878b3710772b03428
+  metadata.gz: 82bb098ac3acfbb37c600908b75174c34a665f4d7c9003d9956738783bb9a617
+  data.tar.gz: b963a24873e226c898c7b14dba4cf21edaacf4cfdc9f7e6eeab0d04959fa788b
 SHA512:
-  metadata.gz: b0a7ecb865541848cd4a0bcbeb7cb6e590bdba4b084a62ae656a2df7303580b7294bcc728991e41c7d2d6ef00cc068c0a6c140858126c9b2ba5d0afef4d5d68b
-  data.tar.gz: 1fe4d3b9ce540f6424792771ed1ed9b7e40f991a281258e1b4ba415ffbab328fa148c0db917047ca5d06437c9a3126b61db2a7099bdf99b45050adda7cfa0deb
+  metadata.gz: b56ef4dd42ee782bf488cd50e6992415d878f388663ed0fb4f983f7353310ea53a2a0a4e1d94be5f06b51102eb73f7e9d0a7404a05cdccf6487248a1041196d3
+  data.tar.gz: 12cfe5f1194d34236ebe69541a9d4b0adf3333a39c1e73024ce0d3ad43639e4147ab48c19c5fc52e08bcbe6473821c850189c0b81e252101456ce70eea80a3c4

data/exe/luca-book

@@ -40,8 +40,9 @@ module LucaCmd
     end
 
     def self.profitloss(args, params)
+      level = params[:level] || 2
       args = LucaCmd.gen_range(params[:n]) if args.empty?
-      LucaBook::State.term(*args).pl.to_yaml
+      LucaBook::State.term(*args).pl(level).to_yaml
     end
   end
 
@@ -121,6 +122,7 @@ when /reports?/, 'r'
   when 'pl'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-book reports pl [options] [YYYY M YYYY M]'
+      opt.on('-l', '--level VAL', 'account level') { |v| params[:level] = v.to_i }
       opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
       args = opt.parse!(ARGV)
       LucaCmd::Report.profitloss(args, params)

data/lib/luca_book/state.rb

@@ -81,7 +81,7 @@ module LucaBook
     end
 
     def to_yaml
-      YAML.dump(code2label).tap { |data| puts data }
+      YAML.dump(readable(code2label)).tap { |data| puts data }
     end
 
     def code2label
@@ -137,7 +137,7 @@ module LucaBook
           end
         end
       end
-      puts YAML.dump(@statement)
+      puts YAML.dump(readable(@statement))
       self
     end
 
@@ -159,13 +159,25 @@ module LucaBook
       end
     end
 
-    def pl
-      @statement = @data.map { |data| data.select { |k, _v| /^[A-H_].+/.match(k) } }
-      term = @statement.each_with_object({}) { |item, h| item.each { |k, v| h[k].nil? ? h[k] = v : h[k] += v } }
+    def pl(level = 2)
+      term_keys = @data.inject([]) { |a, data| a + data.keys }
+                    .compact.select { |k| /^[A-H_].+/.match(k) }
       fy = @start_balance.select { |k, _v| /^[A-H].+/.match(k) }
+      keys = (term_keys + fy.keys).uniq.sort
+      keys.select! { |k| k.length <= level }
+      @statement = @data.map do |data|
+        {}.tap do |h|
+          keys.each { |k| h[k] = data[k] || BigDecimal('0') }
+        end
+      end
+      term = @statement.each_with_object({}) do |item, h|
+        item.each do |k, v|
+          h[k] = h[k].nil? ? v : h[k] + v if /^[^_]/.match(k)
+        end
+      end
       fy = {}.tap do |h|
-        (term.keys + fy.keys).uniq.each do |k|
-          h[k] = (fy[k] || 0).to_i + (term[k] || 0).to_i
+        keys.each do |k|
+          h[k] = BigDecimal(fy[k] || '0') + BigDecimal(term[k] || '0')
         end
       end
       @statement << term.tap { |h| h['_d'] = 'Period Total' }
@@ -214,7 +226,7 @@ module LucaBook
         res['H0'] = sum_matched(report, /^[H][0-9][0-9A-Z]{1,}/)
         res['HA'] = res['GA'] - res['H0']
 
-        report['9142'] = (report['9142'] || 0) + res['HA']
+        report['9142'] = (report['9142'] || BigDecimal('0')) + res['HA']
         res['9142'] = report['9142']
         res['10'] = sum_matched(report, /^[123][0-9A-Z]{2,}/)
         res['40'] = sum_matched(report, /^[4][0-9A-Z]{2,}/)
@@ -260,13 +272,14 @@ module LucaBook
             end
 
       base = Dict.latest_balance.each_with_object({}) do |(k, v), h|
-        h[k] = v[:balance].to_i if v[:balance]
+        h[k] = BigDecimal(v[:balance].to_s) if v[:balance]
       end
       if pre
         idx = (pre.keys + base.keys).uniq
-        base = {}.tap { |h| idx.each { |k| h[k] = (base[k] || 0) + (pre[k] || 0) } }
+        base = {}.tap do |h|
+          idx.each { |k| h[k] = (base[k] || BigDecimal('0')) + (pre[k] || BigDecimal('0')) }
+        end
       end
-      #code_sum(base).merge(self.class.total_subaccount(base))
       self.class.total_subaccount(base)
     end
 
@@ -275,6 +288,7 @@ module LucaBook
     end
 
     # for assert purpose
+    #
     def self.gross(year, month = nil, code = nil, date_range = nil, rows = 4)
       if ! date_range.nil?
         raise if date_range.class != Range
@@ -287,27 +301,28 @@ module LucaBook
         CSV.new(f, headers: false, col_sep: "\t", encoding: 'UTF-8')
           .each_with_index do |row, i|
           break if i >= rows
+
           case i
           when 0
             idx_memo = row.map(&:to_s)
             idx_memo.each do |r|
-              sum[:debit][r] ||= 0
+              sum[:debit][r] ||= BigDecimal('0')
               sum[:debit_count][r] ||= 0
             end
           when 1
             row.each_with_index do |r, j|
-              sum[:debit][idx_memo[j]] += r.to_i # TODO: bigdecimal support
+              sum[:debit][idx_memo[j]] += BigDecimal(r.to_s)
               sum[:debit_count][idx_memo[j]] += 1
             end
           when 2
             idx_memo = row.map(&:to_s)
             idx_memo.each do |r|
-              sum[:credit][r] ||= 0
+              sum[:credit][r] ||= BigDecimal('0')
               sum[:credit_count][r] ||= 0
             end
           when 3
             row.each_with_index do |r, j|
-              sum[:credit][idx_memo[j]] += r.to_i # TODO: bigdecimal support
+              sum[:credit][idx_memo[j]] += BigDecimal(r.to_s)
               sum[:credit_count][idx_memo[j]] += 1
             end
           else
@@ -319,37 +334,29 @@ module LucaBook
     end
 
     # netting vouchers in specified term
+    #
     def self.net(year, month = nil, code = nil, date_range = nil)
       g = gross(year, month, code, date_range)
       idx = (g[:debit].keys + g[:credit].keys).uniq.sort
       count = {}
       diff = {}.tap do |sum|
         idx.each do |code|
-          sum[code] = g.dig(:debit, code).nil? ? 0 : Util.calc_diff(g[:debit][code], code)
-          sum[code] -= g.dig(:credit, code).nil? ? 0 : Util.calc_diff(g[:credit][code], code)
+          sum[code] = g.dig(:debit, code).nil? ? BigDecimal('0') : Util.calc_diff(g[:debit][code], code)
+          sum[code] -= g.dig(:credit, code).nil? ? BigDecimal('0') : Util.calc_diff(g[:credit][code], code)
           count[code] = (g.dig(:debit_count, code) || 0) + (g.dig(:credit_count, code) || 0)
         end
       end
       [diff, count]
     end
 
-    # TODO: replace load_tsv -> generic load_tsv_dict
+    # TODO: obsolete in favor of Dict.latest_balance()
     def load_start
       file = Pathname(LucaSupport::Config::Pjdir) / 'data' / 'balance' / 'start.tsv'
       {}.tap do |dict|
-        load_tsv(file) do |row|
-          dict[row[0]] = row[2].to_i if ! row[2].nil?
-        end
+        LucaRecord::Dict.load_tsv_dict(file).each { |k, v| h[k] = v[:balance] if !v[:balance].nil? }
       end
     end
 
-    def load_tsv(path)
-      return enum_for(:load_tsv, path) unless block_given?
-
-      data = CSV.read(path, headers: true, col_sep: "\t", encoding: 'UTF-8')
-      data.each { |row| yield row }
-    end
-
     private
 
     def legal_items

data/lib/luca_book/version.rb

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

metadata

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