lucabook 0.2.27 → 0.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad4b1eba3419508d64bfeade5f776ed2ca0f32313deab25660864aff47767787
-  data.tar.gz: 57aef956cbc763dbf4d089d5745c9cc4d6a6ed44dd3ff726b9c80fbc6b29629d
+  metadata.gz: 0b2cc0f6aefd92521a518af25010f4fcb125e32aff9b71c9a18304b606451556
+  data.tar.gz: 6689918d842fca5a64060f998ea419aeb2f8db4350c7b0073e39b6a07b0dbb43
 SHA512:
-  metadata.gz: 317b373f1a31c85c107dfa294ec6df0dcc89f13b8ab10277bb004b3bdceaaf0ec58cfa5c2220a088932965b5b156fd71fef1ce67be67c330857bbcea127de365
-  data.tar.gz: e7456d393a4309bafb9a3622c28da10067e1483c80b0bbbd73a05508bb3d9a6742051e2d190870a1f6e39df5ec10b5dd7d1de698faef969a3bc54efa7b46b153
+  metadata.gz: 192298f7a6cd006f5699ec02a109c6f4e10f9240ebc7fc228af277265eab5b467e90bcbd58063f8381b61f258d99732d69155c90af4fac619d9c94da43a2fb27
+  data.tar.gz: 1231261012e602b438469cbcd357dc64a58c14357b8a0c63c4b5fa7dbe398f2b5080a3d53c404c63f543ff87f681f7fc38cb183ea35d5528ccbc905cdcebfaa1

data/exe/luca-book

@@ -19,7 +19,7 @@ class LucaCmd
     end
 
     def self.list(args, params)
-      args = gen_range(params[:n] || 1) if args.empty?
+      args = gen_range(params[:n]) if args.empty?
       if params['code']
         if params['headers']
           render(LucaBook::ListByHeader.term(*args, code: params['code'], header: params['headers']).list_by_code, params)
@@ -78,11 +78,19 @@ class LucaCmd
     end
   end
 
-  def self.gen_range(count)
-    count ||= 3
+  def self.gen_range(count = nil)
     today = Date.today
-    start = today.prev_month(count - 1)
-    [start.year, start.month, today.year, today.month]
+    if count
+      start = today.prev_month(count - 1)
+      [start.year, start.month, today.year, today.month]
+    else
+      start_year = if today.month >= LucaSupport::CONFIG['fy_start'].to_i
+                     today.year
+                   else
+                     today.year - 1
+                   end
+      [start_year, LucaSupport::CONFIG['fy_start'], start_year + 1, LucaSupport::CONFIG['fy_start'].to_i - 1]
+    end
   end
 
   def self.render(dat, params)

data/lib/luca_book.rb

@@ -13,5 +13,6 @@ module LucaBook
   autoload :ListByHeader, 'luca_book/list_by_header'
   autoload :Setup, 'luca_book/setup'
   autoload :State, 'luca_book/state'
+  autoload :Test, 'luca_book/test'
   autoload :Util, 'luca_book/util'
 end

data/lib/luca_book/accumulator.rb

@@ -74,7 +74,7 @@ module LucaBook
 
       # for assert purpose
       #
-      def gross(start_year, start_month, end_year = nil, end_month = nil,  code:  nil, date_range: nil, rows: 4, recursive: false)
+      def gross(start_year, start_month, end_year = nil, end_month = nil, code:  nil, date_range: nil, rows: 4, recursive: false)
         if ! date_range.nil?
           raise if date_range.class != Range
           # TODO: date based range search
@@ -84,7 +84,7 @@ module LucaBook
         end_month ||= start_month
         sum = { debit: {}, credit: {}, debit_count: {}, credit_count: {} }
         idx_memo = []
-        term(start_year, start_month, end_year, end_month, code) do |f, _path|
+        term(start_year, start_month, end_year, end_month, code, 'journals') do |f, _path|
           CSV.new(f, headers: false, col_sep: "\t", encoding: 'UTF-8')
             .each_with_index do |row, i|
             break if i >= rows
@@ -130,20 +130,20 @@ module LucaBook
                 else
                   Array(code)
                 end
-        res = { debit: 0, credit: 0, debit_count: 0, credit_count: 0 }
-        codes.each do |code|
-          res[:debit] += sum[:debit][code] || BigDecimal('0')
-          res[:credit] += sum[:credit][code] || BigDecimal('0')
-          res[:debit_count] += sum[:debit_count][code] || 0
-          res[:credit_count] += sum[:credit_count][code] || 0
+        res = { debit: { code => 0 }, credit: { code => 0 }, debit_count: { code => 0 }, credit_count: { code => 0 } }
+        codes.each do |cd|
+          res[:debit][code] += sum[:debit][cd] || BigDecimal('0')
+          res[:credit][code] += sum[:credit][cd] || BigDecimal('0')
+          res[:debit_count][code] += sum[:debit_count][cd] || 0
+          res[:credit_count][code] += sum[:credit_count][cd] || 0
         end
         res
       end
 
       # netting vouchers in specified term
       #
-      def net(start_year, start_month, end_year = nil, end_month = nil, code: nil, date_range: nil)
-        g = gross(start_year, start_month, end_year, end_month, code: code, date_range: date_range)
+      def net(start_year, start_month, end_year = nil, end_month = nil, code: nil, date_range: nil, recursive: false)
+        g = gross(start_year, start_month, end_year, end_month, code: code, date_range: date_range, recursive: recursive)
         idx = (g[:debit].keys + g[:credit].keys).uniq.sort
         count = {}
         diff = {}.tap do |sum|
@@ -155,6 +155,58 @@ module LucaBook
         end
         [diff, count]
       end
+
+      # Override LucaRecord::IO.load_data
+      #
+      def load_data(io, path = nil)
+        io
+      end
+    end
+
+    def net_amount(code, start_year = nil, start_month = nil, end_year = nil, end_month = nil, recursive: true)
+      start_year ||= @cursor_start&.year || @start_date.year
+      start_month ||= @cursor_start&.month || @start_date.month
+      end_year ||= @cursor_end&.year || @end_date.year
+      end_month ||= @cursor_end&.month || @end_date.month
+      self.class.net(start_year, start_month, end_year, end_month, code: code, recursive: recursive)[0][code]
+    end
+
+    def debit_amount(code, start_year = nil, start_month = nil, end_year = nil, end_month = nil, recursive: true)
+      gross_amount(code, start_year, start_month, end_year, end_month, recursive: recursive)[0]
+    end
+
+    def credit_amount(code, start_year = nil, start_month = nil, end_year = nil, end_month = nil, recursive: true)
+      gross_amount(code, start_year, start_month, end_year, end_month, recursive: recursive)[1]
+    end
+
+    def gross_amount(code, start_year = nil, start_month = nil, end_year = nil, end_month = nil, recursive: true)
+      start_year ||= @cursor_start&.year || @start_date.year
+      start_month ||= @cursor_start&.month || @start_date.month
+      end_year ||= @cursor_end&.year || @end_date.year
+      end_month ||= @cursor_end&.month || @end_date.month
+      g = self.class.gross(start_year, start_month, end_year, end_month, code: code, recursive: recursive)
+      [g[:debit][code], g[:credit][code]]
+    end
+
+    def debit_count(code, start_year = nil, start_month = nil, end_year = nil, end_month = nil, recursive: true)
+      gross_count(code, start_year, start_month, end_year, end_month, recursive: recursive)[0]
+    end
+
+    def credit_count(code, start_year = nil, start_month = nil, end_year = nil, end_month = nil, recursive: true)
+      gross_count(code, start_year, start_month, end_year, end_month, recursive: recursive)[1]
+    end
+
+    def gross_count(code, start_year = nil, start_month = nil, end_year = nil, end_month = nil, recursive: true)
+      start_year ||= @cursor_start&.year || @start_date.year
+      start_month ||= @cursor_start&.month || @start_date.month
+      end_year ||= @cursor_end&.year || @end_date.year
+      end_month ||= @cursor_end&.month || @end_date.month
+      g = self.class.gross(start_year, start_month, end_year, end_month, code: code, recursive: recursive)
+      [g[:debit_count][code], g[:credit_count][code]]
+    end
+
+    def each_month
+      yield
     end
   end
 end

data/lib/luca_book/dict.rb

@@ -2,6 +2,7 @@
 
 require 'luca_support/code'
 require 'luca_support/config'
+require 'luca_support/range'
 require 'luca_record/dict'
 require 'luca_record/io'
 require 'luca_book'
@@ -10,11 +11,12 @@ require 'pathname'
 
 module LucaBook
   class Dict < LucaRecord::Dict
-    include Accumulator
+    include LucaSupport::Range
+    include LucaBook::Util
     include LucaRecord::IO
+    include Accumulator
 
     @dirname = 'journals'
-    @record_type = 'raw'
     # Column number settings for CSV/TSV convert
     #
     # :label
@@ -170,15 +172,5 @@ module LucaBook
       digest = `git rev-parse HEAD`
       $?.exitstatus == 0 ? digest.strip : nil
     end
-
-    def self.term_by_month(start_date, end_date)
-      Enumerator.new do |yielder|
-        each_month = start_date
-        while each_month <= end_date
-          yielder << each_month
-          each_month = each_month.next_month
-        end
-      end
-    end
   end
 end

data/lib/luca_book/list.rb

@@ -106,11 +106,11 @@ module LucaBook #:nodoc:
     def set_balance(recursive = false)
       return BigDecimal('0') if @code.nil? || /^[A-H]/.match(@code)
 
-      LucaBook::State.start_balance(@start.year, @start.month, recursive: recursive)
+      LucaBook::State.start_balance(@start.year, @start.month, recursive: recursive)[@code] || BigDecimal('0')
     end
 
     def calc_code(recursive: false)
-      @balance = set_balance(recursive)[@code] || BigDecimal('0')
+      @balance = set_balance(recursive)
       if @code
         balance = @balance
         @data.each do |dat|

data/lib/luca_book/state.rb

@@ -17,7 +17,6 @@ module LucaBook
     include Accumulator
 
     @dirname = 'journals'
-    @record_type = 'raw'
     @@dict = LucaRecord::Dict.new('base.tsv')
 
     attr_reader :statement, :pl_data, :bs_data, :start_balance
@@ -62,15 +61,15 @@ module LucaBook
         while date <= last_date do
           diff = {}.tap do |h|
             g = gross(date.year, date.month, code: code, recursive: recursive)
-            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)
+            sum = g.dig(:debit, code).nil? ? BigDecimal('0') : Util.calc_diff(g[:debit][code], code)
+            sum -= g.dig(:credit, code).nil? ? BigDecimal('0') : Util.calc_diff(g[:credit][code], code)
             balance += sum
             h['code'] = code
             h['label'] = @@dict.dig(code, :label)
-            h['debit_amount'] = g[:debit]
-            h['debit_count'] = g[:debit_count]
-            h['credit_amount'] = g[:credit]
-            h['credit_count'] = g[:credit_count]
+            h['debit_amount'] = g.dig(:debit, code)
+            h['debit_count'] = g.dig(:debit_count, code)
+            h['credit_amount'] = g.dig(:credit, code)
+            h['credit_count'] = g.dig(:credit_count, code)
             h['net'] = sum
             h['balance'] = balance
             h['_d'] = date.to_s

data/lib/luca_book/test.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'minitest/autorun'
+require 'luca_book'
+require 'luca_record/io'
+require 'luca_support/range'
+
+module LucaBook # :nodoc:
+  # Provide data testing framework utilizing minitest.
+  #
+  class Test < MiniTest::Test
+    include LucaSupport::Range
+    include LucaRecord::IO
+    include LucaBook::Accumulator
+    include LucaBook::Util
+  end
+end

data/lib/luca_book/util.rb

@@ -42,5 +42,15 @@ module LucaBook
         nil
       end
     end
+
+    def current_fy(date = nil, to: nil)
+      date ||= Date.today
+      start_month = LucaSupport::CONFIG['fy_start']
+      start_year = date.month >= start_month ? date.year : date.year - 1
+      @start_date = Date.new(start_year, start_month, 1)
+      @end_date = Date.new(start_year + 1, start_month - 1, -1)
+      @end_date = [to, @end_date].min if to
+      [@start_date, @end_date]
+    end
   end
 end

data/lib/luca_book/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucabook
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.28
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -96,6 +96,7 @@ files:
 - lib/luca_book/templates/dict-jp-edinet.tsv
 - lib/luca_book/templates/dict-jp.tsv
 - lib/luca_book/templates/monthly-report.html.erb
+- lib/luca_book/test.rb
 - lib/luca_book/util.rb
 - lib/luca_book/version.rb
 homepage: https://github.com/chumaltd/luca/tree/master/lucabook