lucabook 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82bb098ac3acfbb37c600908b75174c34a665f4d7c9003d9956738783bb9a617
-  data.tar.gz: b963a24873e226c898c7b14dba4cf21edaacf4cfdc9f7e6eeab0d04959fa788b
+  metadata.gz: 3f7366698bee6b770fbae39f8fe650e1f460b04dec25c8036c84013f970adaa3
+  data.tar.gz: 8ecbf412b31f001f0cfa2de27ceb879463d17f28e3db552770866b44c0b73114
 SHA512:
-  metadata.gz: b56ef4dd42ee782bf488cd50e6992415d878f388663ed0fb4f983f7353310ea53a2a0a4e1d94be5f06b51102eb73f7e9d0a7404a05cdccf6487248a1041196d3
-  data.tar.gz: 12cfe5f1194d34236ebe69541a9d4b0adf3333a39c1e73024ce0d3ad43639e4147ab48c19c5fc52e08bcbe6473821c850189c0b81e252101456ce70eea80a3c4
+  metadata.gz: e30fabd50119ad470c90512bcf066b3992b5df2d67139f437a5f4336d73c843fb65dab2a70b5914c190155de68f82ec722840e0f056079061634f77bb5da4964
+  data.tar.gz: 3e8775200e05f8bfe0923b53690fa5245441ea4d71768246a7309ee503294d847a466e82da85568d3071f47eccd4f9783a79199b4d4eb630c961de84488a31ed

data/exe/luca-book

@@ -1,10 +1,11 @@
 #!/usr/bin/ruby
 
+require 'json'
 require 'optparse'
 require 'luca_book'
 
-module LucaCmd
-  class Journal
+class LucaCmd
+  class Journal < LucaCmd
     def self.import(args, params)
       if params['config']
         LucaBook::Import.new(args[0], params['config']).import_csv
@@ -17,43 +18,56 @@ module LucaCmd
     end
 
     def self.list(args, params)
-      args = LucaCmd.gen_range(params[:n] || 1) if args.empty?
+      args = gen_range(params[:n] || 1) if args.empty?
       if params['code']
-        LucaBook::List.term(*args, code: params['code']).list_on_code.to_yaml
+        render(LucaBook::List.term(*args, code: params['code']).list_on_code, params)
       else
-        LucaBook::List.term(*args).list_journals.to_yaml
+        render(LucaBook::List.term(*args).list_journals, params)
       end
     end
 
     def self.stats(args, params)
-      args = LucaCmd.gen_range(params[:n]) if args.empty?
-      LucaBook::State.term(*args).stats(params[:level])
+      args = gen_range(params[:n]) if args.empty?
+      if params['code']
+        render(LucaBook::State.by_code(params['code'], *args), params)
+      else
+        render(LucaBook::State.term(*args).stats(params[:level]), params)
+      end
     end
   end
 
-  class Report
+  class Report < LucaCmd
     def self.balancesheet(args, params)
       level = params[:level] || 3
       legal = params[:legal] || false
-      args = LucaCmd.gen_range(params[:n] || 1) if args.empty?
-      LucaBook::State.term(*args).bs(level, legal: legal)
+      args = gen_range(params[:n] || 1) if args.empty?
+      render(LucaBook::State.term(*args).bs(level, legal: legal), params)
     end
 
     def self.profitloss(args, params)
       level = params[:level] || 2
-      args = LucaCmd.gen_range(params[:n]) if args.empty?
-      LucaBook::State.term(*args).pl(level).to_yaml
+      args = gen_range(params[:n]) if args.empty?
+      render(LucaBook::State.term(*args).pl(level), params)
     end
   end
 
-  module_function
-
-  def gen_range(count)
+  def self.gen_range(count)
     count ||= 3
     today = Date.today
     start = today.prev_month(count - 1)
     [start.year, start.month, today.year, today.month]
   end
+
+  def self.render(dat, params)
+    case params[:output]
+    when 'json'
+      puts JSON.dump(dat)
+    when 'nu'
+      LucaSupport::View.nushell(YAML.dump(dat))
+    else
+      puts YAML.dump(dat)
+    end
+  end
 end
 
 def new_pj(args = nil, params = {})
@@ -81,6 +95,8 @@ when /journals?/, 'j'
       opt.banner = 'Usage: luca-book journals list [options] [YYYY M]'
       opt.on('-c', '--code VAL', 'search with code') { |v| params['code'] = v }
       opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       opt.on_tail('List records. If you specify code and/or month, search on each criteria.')
       args = opt.parse!(ARGV)
       LucaCmd::Journal.list(args, params)
@@ -88,7 +104,10 @@ when /journals?/, 'j'
   when 'stats'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-book journals stats [options] [YYYY M]'
+      opt.on('-c', '--code VAL', 'search with code') { |v| params['code'] = v }
       opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse!(ARGV)
       LucaCmd::Journal.stats(args, params)
     end
@@ -116,6 +135,8 @@ when /reports?/, 'r'
       opt.banner = 'Usage: luca-book reports bs [options] [YYYY M]'
       opt.on('-l', '--level VAL', 'account level') { |v| params[:level] = v.to_i }
       opt.on('--legal', 'show legal mandatory account') { |_v| params[:legal] = true }
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse!(ARGV)
       LucaCmd::Report.balancesheet(args, params)
     end
@@ -124,6 +145,8 @@ when /reports?/, 'r'
       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 }
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse!(ARGV)
       LucaCmd::Report.profitloss(args, params)
     end

data/lib/luca_book/list.rb

@@ -47,7 +47,7 @@ module LucaBook
           res['note'] = dat[:note]
         end
       end
-      self
+      readable(@data)
     end
 
     def list_journals
@@ -65,7 +65,7 @@ module LucaBook
           res['note'] = dat[:note]
         end
       end
-      self
+      readable(@data)
     end
 
     def accumulate_code

data/lib/luca_book/state.rb

@@ -56,21 +56,33 @@ module LucaBook
       new(reports, counts, date: Date.new(from_year.to_i, from_month.to_i, -1))
     end
 
-    def by_code(code, year=nil, month=nil)
-      raise 'not supported year range yet' if ! year.nil? && month.nil?
-
-      balance = @book.load_start.dig(code) || 0
-      full_term = self.class.scan_terms
-      if ! month.nil?
-        pre_term = full_term.select { |y, m| y <= year.to_i && m < month.to_i }
-        balance += pre_term.map { |y, m| self.class.net(y, m)}.inject(0){|sum, h| sum + h[code] }
-        [{ code: code, balance: balance, note: "#{code} #{@dict.dig(code, :label)}" }] + records_with_balance(year, month, code, balance)
-      else
-        start = { code: code, balance: balance, note: "#{code} #{@dict.dig(code, :label)}" }
-        full_term.map { |y, m| y }.uniq.map { |y|
-          records_with_balance(y, nil, code, balance)
-        }.flatten.prepend(start)
+    def self.by_code(code, from_year, from_month, to_year = from_year, to_month = from_month)
+      date = Date.new(from_year.to_i, from_month.to_i, -1)
+      last_date = Date.new(to_year.to_i, to_month.to_i, -1)
+      raise 'invalid term specified' if date > last_date
+
+      reports = [].tap do |r|
+        while date <= last_date do
+          diff = {}.tap do |h|
+            g = gross(date.year, date.month, code)
+            sum = g.dig(:debit).nil? ? BigDecimal('0') : Util.calc_diff(g[:debit], code)
+            sum -= g.dig(:credit).nil? ? BigDecimal('0') : Util.calc_diff(g[:credit], code)
+            h['code'] = code
+            h['label'] = LucaRecord::Dict.load('base.tsv').dig(code, :label)
+            h['net'] = sum
+            h['debit_amount'] = g[:debit]
+            h['debit_count'] = g[:debit_count]
+            h['credit_amount'] = g[:credit]
+            h['credit_count'] = g[:credit_count]
+            h['_d'] = date.to_s
+          end
+          r << diff
+          date = Date.new(date.next_month.year, date.next_month.month, -1)
+        end
       end
+      #YAML.dump(LucaSupport::Code.readable(reports)) #.tap{ |data| puts data }
+      #new(reports, counts, date: Date.new(from_year.to_i, from_month.to_i, -1))
+      LucaSupport::Code.readable(reports)
     end
 
     def records_with_balance(year, month, code, balance)
@@ -114,7 +126,6 @@ module LucaBook
       end
       keys.map! { |k| k[0, level] }.uniq.select! { |k| k.length <= level } if level
       @count.prepend({}.tap { |header| keys.each { |k| header[k] = @dict.dig(k, :label) }})
-      puts YAML.dump(@count)
       @count
     end
 
@@ -137,8 +148,7 @@ module LucaBook
           end
         end
       end
-      puts YAML.dump(readable(@statement))
-      self
+      readable(@statement)
     end
 
     def accumulate_balance(monthly_diffs)
@@ -182,7 +192,7 @@ module LucaBook
       end
       @statement << term.tap { |h| h['_d'] = 'Period Total' }
       @statement << fy.tap { |h| h['_d'] = 'FY Total' }
-      self
+      readable(code2label)
     end
 
     def self.accumulate_term(start_year, start_month, end_year, end_month)
@@ -297,7 +307,7 @@ module LucaBook
 
       sum = { debit: {}, credit: {}, debit_count: {}, credit_count: {} }
       idx_memo = []
-      asof(year, month) do |f, _path|
+      search(year, month, nil, code) do |f, _path|
         CSV.new(f, headers: false, col_sep: "\t", encoding: 'UTF-8')
           .each_with_index do |row, i|
           break if i >= rows
@@ -305,17 +315,23 @@ module LucaBook
           case i
           when 0
             idx_memo = row.map(&:to_s)
+            next if code && !idx_memo.include?(code)
+
             idx_memo.each do |r|
               sum[:debit][r] ||= BigDecimal('0')
               sum[:debit_count][r] ||= 0
             end
           when 1
+            next if code && !idx_memo.include?(code)
+
             row.each_with_index do |r, j|
               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)
+            break if code && !idx_memo.include?(code)
+
             idx_memo.each do |r|
               sum[:credit][r] ||= BigDecimal('0')
               sum[:credit_count][r] ||= 0
@@ -330,6 +346,12 @@ module LucaBook
           end
         end
       end
+      if code
+        sum[:debit] = sum[:debit][code] || BigDecimal('0')
+        sum[:credit] = sum[:credit][code] || BigDecimal('0')
+        sum[:debit_count] = sum[:debit_count][code] || 0
+        sum[:credit_count] = sum[:credit_count][code] || 0
+      end
       sum
     end
 

data/lib/luca_book/version.rb

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

metadata

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