lucabook 0.2.10 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52bbc28428badf8b379f7a2f3e8ebf9a9a6f5bf0a496b433964af96fd644945f
-  data.tar.gz: 8a321eceda532d2484c622fc6ace820ba44a5ec6715727fe406b8e68fe9284a7
+  metadata.gz: d25b3a6c62980682db52a5553ce26cafdcb36e80e9657a302a8413e1e92b565b
+  data.tar.gz: e82a86c04d13aa6addef398afd85755a7a54ce437d1e9415ce3f98bf1b28f914
 SHA512:
-  metadata.gz: 30fbac4fe640155e20314cdb55058e5ef0bcfad21d4d1f94f082f8123a8ff0b9211a02c6285a6d4fb1c630a615d83df6062afde4560aa419bf49e41c93967021
-  data.tar.gz: 9d117b4365d2c0efaade185af52e647a521fcd1fce540abd22480c7935476646a9a9e6bf17ff81633b0bec2d36ffdae3b6193c9c66de9ab851d8cde4195339b1
+  metadata.gz: 652c00f982977bbb619bfc834c312dbbb06f2ada524e1824869c04ef4ed09e3fadd5aee2b082fc3944cda4eaf7bfd18fd041a80582fe57f67cc88d13197b60a6
+  data.tar.gz: 422dedf33b9a9bd53ac8502613ae4a27c3c10730e2ac65841fddd9e424d9435a2cb92118700f9571dceea09b54b1f9a1538b9c76facfed87542832e2ce4ba939

data/exe/luca-book

@@ -2,71 +2,142 @@
 
 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'
+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'
+        exit 1
+      end
+    end
+
+    def self.list(args, params)
+      args = LucaCmd.gen_range(params[:n] || 1) if args.empty?
+      if params['code']
+        LucaBook::List.term(*args, code: params['code']).list_on_code.to_yaml
+      else
+        LucaBook::List.term(*args).list_journals.to_yaml
+      end
+    end
+
+    def self.stats(args, params)
+      args = LucaCmd.gen_range(params[:n]) if args.empty?
+      LucaBook::State.term(*args).stats(params[:level])
+    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
+  class Report
+    def self.balancesheet(args, params)
+      level = params[:level] || 2
+      legal = params[:legal] || false
+      args = LucaCmd.gen_range(params[:n] || 1) if args.empty?
+      LucaBook::State.term(*args).bs(level, legal: legal)
+    end
+
+    def self.profitloss(args, params)
+      args = LucaCmd.gen_range(params[:n]) if args.empty?
+      LucaBook::State.term(*args).pl.to_yaml
+    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
+  module_function
+
+  def gen_range(count)
+    count ||= 3
+    today = Date.today
+    start = today.prev_month(count - 1)
+    [start.year, start.month, today.year, today.month]
   end
 end
 
+def new_pj(args = nil, params = {})
+  LucaBook::Setup.create_project params['country'], args[0]
+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)
+when /journals?/, 'j'
+  subcmd = ARGV.shift
+  case subcmd
+  when 'import'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-book journals import [options] 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-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_tail('List records. If you specify code and/or month, search on each criteria.')
+      args = opt.parse!(ARGV)
+      LucaCmd::Journal.list(args, params)
+    end
+  when 'stats'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-book journals stats [options] [YYYY M]'
+      opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
+      args = opt.parse!(ARGV)
+      LucaCmd::Journal.stats(args, params)
+    end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-book (j|journal[s]) subcommand [options] [YYYY M YYYY M]'
+    puts '  import: import journals from JSON/TSV'
+    puts '  list: list journals'
+    puts '  stats: list account statistics'
+    exit 1
   end
-when 'list'
-  params = {}
+when 'new'
   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)
+    opt.banner = 'Usage: luca-book new [options] Dir'
+    opt.on('-c', '--country VAL', 'specify country code') { |v| params['coountry'] = v }
+    args = opt.parse(ARGV)
+    new_pj(args, params)
   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 [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 }
+      args = opt.parse!(ARGV)
+      LucaCmd::Report.balancesheet(args, params)
+    end
+  when 'pl'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-book reports pl [options] [YYYY M YYYY M]'
+      opt.on('-n VAL', 'report count') { |v| params[:n] = v.to_i }
+      args = opt.parse!(ARGV)
+      LucaCmd::Report.profitloss(args, params)
+    end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-book (r|report[s]) (bs|pl) [options] YYYY M'
+    puts '  bs: show balance sheet'
+    puts '  pl: show statement of income'
+    exit 1
   end
-when '--help'
-  puts 'Usage: luca-book subcommand'
-  puts '  import: import records'
-  puts '  list: list records'
-  puts '  report: show reports'
 else
-  puts 'Invalid subcommand'
+  puts 'Proper subcommand needed.'
+  puts
+  puts 'Usage: luca-book (j[ournals]|r[eports]) subcommand'
+  puts '  journals: operate journal records'
+  puts '  reports: show reports'
+  exit 1
 end

data/lib/luca_book.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
+require 'csv'
 require 'luca_record'
 require 'luca_book/version'
 
 module LucaBook
+  autoload :Dict, 'luca_book/dict'
   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'
+  autoload :Util, 'luca_book/util'
 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
 
@@ -39,6 +29,7 @@ class LucaBookConsole
     end
   end
 
+  # TODO: deprecated. accumulate_all() already removed.
   def bs
     target = []
     report = []
@@ -66,6 +57,7 @@ class LucaBookConsole
     puts "----  ----"
   end
 
+  # TODO: deprecated. accumulate_all() already removed.
   def pl
     target = []
     report = []

data/lib/luca_book/dict.rb

@@ -2,12 +2,19 @@
 
 require 'luca_support/config'
 require 'luca_record/dict'
+require 'date'
+require 'pathname'
 
 module LucaBook
   class Dict < LucaRecord::Dict
+    def self.latest_balance
+      dict_dir = Pathname(LucaSupport::Config::Pjdir) / 'data' / 'balance'
+      # TODO: search latest balance dictionary
+      load_tsv_dict(dict_dir / 'start.tsv')
+    end
 
-    @filename = 'dict.tsv'
-
-    Data = load
+    def self.issue_date(obj)
+      Date.parse(obj.dig('_date', :label))
+    end
   end
 end

data/lib/luca_book/import.rb

@@ -9,70 +9,84 @@ require 'luca_record'
 
 module LucaBook
   class Import
-    DEBIT_DEFAULT = '仮払金'
-    CREDIT_DEFAULT = '仮受金'
+    DEBIT_DEFAULT = '10XX'
+    CREDIT_DEFAULT = '50XX'
 
     def initialize(path, dict)
       raise 'no such file' unless FileTest.file?(path)
 
       @target_file = path
       # TODO: yaml need to be configurable
+      @dict_name = dict
       @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
       @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)
+          p parse_double(row) # TODO: Not implemented yet
         else
           p row
         end
       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
     #
     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'] = [
-            { 'code' => search_code(row[@config[:label]], DEBIT_DEFAULT) }
+            { 'code' => search_code(row[@config[:label]], @config.dig(:default_debit)) || DEBIT_DEFAULT }
           ]
           d['credit'] = [
             { 'code' => @code_map.dig(@config[:counter_label]) }
@@ -82,12 +96,13 @@ module LucaBook
             { 'code' => @code_map.dig(@config[:counter_label]) }
           ]
           d['credit'] = [
-            { 'code' => search_code(row[@config[:label]], CREDIT_DEFAULT) }
+            { 'code' => search_code(row[@config[:label]], @config.dig(:default_credit)) || CREDIT_DEFAULT }
           ]
         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(' ')
+        d['x-editor'] = "LucaBook::Import/#{@dict_name}"
       end
     end
 
@@ -98,14 +113,15 @@ module LucaBook
       {}.tap do |d|
         d['date'] = parse_date(row)
         d['debit'] = {
-          'code' => search_code(row[@config[:debit_label]], DEBIT_DEFAULT),
+          'code' => search_code(row[@config[:label]], @config.dig(:default_debit)) || DEBIT_DEFAULT,
           'value' => row.dig(@config[:debit_value])
         }
         d['credit'] = {
-          'code' => search_code(row[@config[:credit_label]], CREDIT_DEFAULT),
+          'code' => search_code(row[@config[:label]], @config.dig(:default_credit)) || CREDIT_DEFAULT,
           'value' => row.dig(@config[:credit_value])
         }
-        d['note'] = row[@config[:note]]
+        d['note'] = Array(@config[:note]).map{ |col| row[col] }.join(' ')
+        d['x-editor'] = "LucaBook::Import/#{@dict_name}"
       end
     end
 
@@ -118,13 +134,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