lucabook 0.2.12 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b58568499ebfa245c9f86863537eb2a9b26e563ac20a09583a3b12e29bc713a2
-  data.tar.gz: 77a382f306e0c269182caca7d48bb6fd8d4f6513664d8cef36a28356cacd8998
+  metadata.gz: db7564331de8046e8a6507c2ccf7dc099382ff3fc1c6a603f9ecc290755398ba
+  data.tar.gz: 5fb64e6fbccc5a5e693211ae89d8bad6560593add1f26261879b2ae4bc67fa00
 SHA512:
-  metadata.gz: 1526e2b525c357dc06f87253095a8e8434bacc03994432f90dec6571f4bde9fe24b9d1a81ab3b9747a3d45be767022bb9bf64f1a0b88b298e6997bbb95ca4fd2
-  data.tar.gz: 111d7eff70797d30bc2df769cbd3d1c8c8b83d92ef5bba8ffa74b60bc06fa9f0754fd54d507f556f7c9831c87a418113ecc797755436f84926e8df88cf117622
+  metadata.gz: 4cee8065abe4d479dc909e2e9f12f0fdb942e7b3c51b2f5f5e993598080db28411625d990c7f7a7ec85ebc96686a4dcf6d0173e8fed58fd3a3261731ea3da831
+  data.tar.gz: 1cd81e73a4dfcf3eef52a8105b7e1dc921f9d79d8b9945bf2b9e74d80134d2ca157346d69d98a26037d0f087fa4475e05938ae0044a7b1fcb3120b744f3a9ba8

data/exe/luca-book

@@ -2,71 +2,87 @@
 
 require 'optparse'
 require 'luca_book'
-require 'luca_book/console'
 
-def import(args, params)
-  if params['config']
-    LucaBook::Import.new(args[0], params['config']).import_csv
-  else
-    puts 'Usage: luca-book import -c import_config'
-  end
+module LucaCmd
+  class Journal
+    def self.import(args, params)
+      if params['config']
+        LucaBook::Import.new(args[0], params['config']).import_csv
+      elsif params['json']
+        LucaBook::Import.import_json(STDIN.read)
+      else
+        puts 'Usage: luca-book import -c import_config'
+      end
+    end
 
-def list(args, params)
-  if params['c'] or params['code']
-    code = params['c'] || params['code']
-    LucaBookConsole.new.by_code(code, args.dig(0), args.dig(1))
-  elsif args.length > 0
-    LucaBookConsole.new.by_month(args[0], args.dig(1))
-  else
-    LucaBookConsole.new.all
+    def self.list(args, params)
+      if params['code']
+        LucaBook::List.term(*args, code: params['code']).flat_list.to_yaml
+      elsif args.length > 0
+        LucaBook::List.term(*args).flat_list.to_yaml
+      else
+        # TODO: define default function
+      end
+    end
   end
-end
 
-def report(args, params)
-  if params['bs']
-    LucaBook::State.term(*args).bs.to_yaml
-  elsif params['pl']
-    LucaBook::State.term(*args).pl.to_yaml
-  else
-    LucaBook::State.term(*args).to_yaml
+  class Report
+    def self.balancesheet(args, params)
+      LucaBook::State.term(*args).bs.to_yaml
+    end
+
+    def self.profitloss(args, params)
+      LucaBook::State.term(*args).pl.to_yaml
+    end
   end
 end
 
+
 LucaRecord::Base.valid_project?
 cmd = ARGV.shift
+params = {}
 
 case cmd
-when 'import'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca import filepath'
-    opt.on('-c', '--config VAL', 'import definition'){|v| params["config"] = v }
-    args = opt.parse!(ARGV)
-    import(args, params)
-  end
-when 'list'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca list [year month]'
-    opt.on('-c', '--code VAL', 'search with code'){|v| params["code"] = v }
-    opt.on_tail('List records. If you specify code and/or month, search on each criteria.')
-    args = opt.parse!(ARGV)
-    list(args, params)
+when /journals?/, 'j'
+  subcmd = ARGV.shift
+  case subcmd
+  when 'import'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca import filepath'
+      opt.on('-c', '--config VAL', 'import definition'){|v| params['config'] = v }
+      opt.on('-j', '--json', 'import via json format'){|_v| params['json'] = true }
+      args = opt.parse!(ARGV)
+      LucaCmd::Journal.import(args, params)
+    end
+  when 'list'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca list [year month]'
+      opt.on('-c', '--code VAL', 'search with code') { |v| params['code'] = 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)
+    end
   end
-when 'report'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-book report'
-    opt.on('--bs', 'show Balance sheet'){|v| params["bs"] = v }
-    opt.on('--pl', 'show Income statement'){|v| params["pl"] = v }
-    args = opt.parse!(ARGV)
-    report(args, params)
+when /reports?/, 'r'
+  subcmd = ARGV.shift
+  case subcmd
+  when 'bs'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-book reports bs'
+      args = opt.parse!(ARGV)
+      LucaCmd::Report.balancesheet(args, params)
+    end
+  when 'pl'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-book reports pl'
+      args = opt.parse!(ARGV)
+      LucaCmd::Report.profitloss(args, params)
+    end
   end
 when '--help'
   puts 'Usage: luca-book subcommand'
-  puts '  import: import records'
-  puts '  list: list records'
-  puts '  report: show reports'
+  puts '  journals: operate journal records'
+  puts '  reports: show reports'
 else
   puts 'Invalid subcommand'
 end

data/lib/luca_book.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require 'csv'
 require 'luca_record'
 require 'luca_book/version'
 
 module LucaBook
   autoload :Import, 'luca_book/import'
   autoload :Journal, 'luca_book/journal'
+  autoload :List, 'luca_book/list'
   autoload :Setup, 'luca_book/setup'
   autoload :State, 'luca_book/state'
 end

data/lib/luca_book/console.rb

@@ -1,25 +1,15 @@
 require 'luca_book'
 
+# This class will be deleted
+#
 class LucaBookConsole
 
   def initialize(dir_path=nil)
-    @report = LucaBookReport.new(dir_path)
+    @report = LucaBook::State.new(dir_path)
   end
 
-  def all
-    array = @report.scan_terms(@report.book.pjdir).map{|y,m| y}.uniq.map{|year|
-      @report.book.search(year)
-    }.flatten
-    show_records(array)
-  end
-
-  def by_code(code, year=nil, month=nil)
-    array = @report.by_code(code, year, month)
-    show_records(array)
-  end
-
-  def by_month(year, month)
-    array = @report.book.search(year, month)
+  def by_term(year, month, end_year = year, end_month = month)
+    array = @report.book.class.term(year, month, end_year, end_month)
     show_records(array)
   end
 

data/lib/luca_book/import.rb

@@ -19,36 +19,39 @@ module LucaBook
       # TODO: yaml need to be configurable
       @dict = LucaRecord::Dict.new("import-#{dict}.yaml")
       @code_map = LucaRecord::Dict.reverse(LucaRecord::Dict.load('base.tsv'))
-      @config = @dict.csv_config
+      @config = @dict.csv_config if dict
     end
 
     # === JSON Format:
-    #   {
-    #     "date": "2020-05-04",
-    #     "debit" : [
-    #       {
-    #         "label": "savings accounts",
-    #         "value": 20000
-    #       }
-    #     ],
-    #     "credit" : [
-    #       {
-    #         "label": "trade notes receivable",
-    #         "value": 20000
-    #       }
-    #     ],
-    #     "note": "settlement for the last month trade"
-    #   }
+    #   [
+    #     {
+    #       "date": "2020-05-04",
+    #       "debit" : [
+    #         {
+    #           "label": "savings accounts",
+    #           "value": 20000
+    #         }
+    #       ],
+    #       "credit" : [
+    #         {
+    #           "label": "trade notes receivable",
+    #           "value": 20000
+    #         }
+    #       ],
+    #       "note": "settlement for the last month trade"
+    #     }
+    #   ]
     #
-    def import_json(io)
-      d = JSON.parse(io)
-      validate(d)
+    def self.import_json(io)
+      JSON.parse(io).each do |d|
+        validate(d)
 
-      # dict = LucaBook::Dict.reverse_dict(LucaBook::Dict::Data)
-      d['debit'].each { |h| h['code'] = @dict.search(h['label'], DEBIT_DEFAULT) }
-      d['credit'].each { |h| h['code'] = @dict.search(h['label'], CREDIT_DEFAULT) }
+        code_map = LucaRecord::Dict.reverse(LucaRecord::Dict.load('base.tsv'))
+        d['debit'].each { |h| h['code'] = code_map.dig(h['label']) || DEBIT_DEFAULT }
+        d['credit'].each { |h| h['code'] = code_map.dig(h['label']) || CREDIT_DEFAULT }
 
-      LucaBook.new.create(d)
+        LucaBook::Journal.create(d)
+      end
     end
 
     def import_csv
@@ -63,6 +66,16 @@ module LucaBook
       end
     end
 
+    def self.validate(obj)
+      raise 'NoDateKey' unless obj.key?('date')
+      raise 'NoDebitKey' unless obj.key?('debit')
+      raise 'NoDebitValue' if obj['debit'].empty?
+      raise 'NoCreditKey' unless obj.key?('credit')
+      raise 'NoCreditValue' if obj['credit'].empty?
+    end
+
+    private
+
     #
     # convert single entry data
     #
@@ -87,7 +100,7 @@ module LucaBook
         end
         d['debit'][0]['value'] = value
         d['credit'][0]['value'] = value
-        d['note'] = row[@config[:note]]
+        d['note'] = Array(@config[:note]).map{ |col| row[col] }.join(' ')
       end
     end
 
@@ -105,7 +118,7 @@ module LucaBook
           'code' => search_code(row[@config[:credit_label]], CREDIT_DEFAULT),
           'value' => row.dig(@config[:credit_value])
         }
-        d['note'] = row[@config[:note]]
+        d['note'] = Array(@config[:note]).map{ |col| row[col] }.join(' ')
       end
     end
 
@@ -118,13 +131,5 @@ module LucaBook
 
       "#{row.dig(@config[:year])}-#{row.dig(@config[:month])}-#{row.dig(@config[:day])}"
     end
-
-    def validate(obj)
-      raise 'NoDateKey' if ! obj.has_key?('date')
-      raise 'NoDebitKey' if ! obj.has_key?('debit')
-      raise 'NoDebitValue' if obj['debit'].length < 1
-      raise 'NoCreditKey' if ! obj.has_key?('credit')
-      raise 'NoCreditValue' if obj['credit'].length < 1
-    end
   end
 end

data/lib/luca_book/journal.rb

@@ -30,6 +30,9 @@ module LucaBook
         f << LucaSupport::Code.readable(debit_amount)
         f << credit_code
         f << LucaSupport::Code.readable(credit_amount)
+        ['x-customer', 'x-editor'].each do |x_header|
+          f << [x_header, d[x_header]] if d.dig(x_header)
+        end
         f << []
         f << [d.dig('note')]
       end
@@ -80,8 +83,8 @@ module LucaBook
               record[:note] << line.join(' ') if body
             end
           end
-          record[:note]&.join('\n')
         end
+        record[:note] = record[:note]&.join('\n')
       end
     end
   end

data/lib/luca_book/list.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require 'date'
+require 'luca_support'
+require 'luca_record'
+require 'luca_record/dict'
+require 'luca_book'
+
+# Journal List on specified term
+#
+module LucaBook
+  class List < LucaBook::Journal
+    @dirname = 'journals'
+
+    def initialize(data)
+      @data = data
+      @dict = LucaRecord::Dict.load('base.tsv')
+    end
+
+    def self.term(from_year, from_month, to_year = from_year, to_month = from_month, code: nil, basedir: @dirname)
+      data = LucaBook::Journal.term(from_year, from_month, to_year, to_month, code).select do |dat|
+        if code.nil?
+          true
+        else
+          [:debit, :credit].map { |key| serialize_on_key(dat[key], :code) }.flatten.include?(code)
+        end
+      end
+      new data
+    end
+
+    def convert_label
+      @data.each do |dat|
+        dat[:debit].each { |debit| debit[:code] = "#{debit[:code]} #{@dict.dig(debit[:code], :label)}" }
+        dat[:credit].each { |credit| credit[:code] = "#{credit[:code]} #{@dict.dig(credit[:code], :label)}" }
+      end
+      self
+    end
+
+    def flat_list
+      convert_label
+      @data = @data.map do |dat|
+        idx = dat[:debit].length >= dat[:credit].length ? :debit : :credit
+        dat[idx].map.with_index do |_k, i|
+          date, txid = LucaSupport::Code.decode_id(dat[:id])
+          {}.tap do |res|
+            res['date'] = date
+            res['no'] = txid
+            res['id'] = dat[:id]
+            res['debit_code'] = dat[:debit][i][:code] if dat[:debit][i]
+            res['debit_amount'] = dat[:debit][i][:amount] if dat[:debit][i]
+            res['credit_code'] = dat[:credit][i][:code] if dat[:credit][i]
+            res['credit_amount'] = dat[:credit][i][:amount] if dat[:credit][i]
+            res['note'] = dat[:note]
+          end
+        end
+      end.flatten
+      self
+    end
+
+    def to_yaml
+      YAML.dump(LucaSupport::Code.readable(@data)).tap { |data| puts data }
+    end
+
+    def dict
+      LucaBook::Dict::Data
+    end
+  end
+end

data/lib/luca_book/state.rb

@@ -51,18 +51,18 @@ module LucaBook
     end
 
     def by_code(code, year=nil, month=nil)
-      raise "not supported year range yet" if ! year.nil? && month.nil?
+      raise 'not supported year range yet' if ! year.nil? && month.nil?
 
-      bl = @book.load_start.dig(code) || 0
-      full_term = scan_terms(LucaSupport::Config::Pjdir)
+      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 }
-        bl += pre_term.map{|y,m| self.class.net(y, m)}.inject(0){|sum, h| sum + h[code]}
-        [{ code: code, balance: bl, note: "#{code} #{dict.dig(code, :label)}" }] + records_with_balance(year, month, code, bl)
+        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: bl, note: "#{code} #{dict.dig(code, :label)}" }
-        full_term.map {|y, m| y }.uniq.map {|y|
-          records_with_balance(y, nil, code, bl)
+        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)
       end
     end
@@ -81,7 +81,7 @@ module LucaBook
       current = @book.load_start
       target = []
       Dir.chdir(@book.pjdir) do
-        net_records = scan_terms(@book.pjdir).map do |year, month|
+        net_records = self.class.scan_terms.map do |year, month|
           target << [year, month]
           accumulate_month(year, month)
         end

data/lib/luca_book/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucabook
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.15
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -83,6 +83,7 @@ files:
 - lib/luca_book/dict.rb
 - lib/luca_book/import.rb
 - lib/luca_book/journal.rb
+- lib/luca_book/list.rb
 - lib/luca_book/report.rb
 - lib/luca_book/setup.rb
 - lib/luca_book/state.rb