lucasalary 0.1.14 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50c263cca4e4786fc11301bdbbab093e69dfd94be7b6f1237c570d2fe6ee6928
-  data.tar.gz: 49569d2fb2145e028a40817e464812ac7ff1e4499b4c49b96509548320924c92
+  metadata.gz: dacc04e5464dfd8f7d38db60b2053af1fe609bc4d71d65bdd7fb83c5d460618a
+  data.tar.gz: 800e13698b5e92482085abd8b0928e9aed42fa23c24f5a046b2e06b4cea15889
 SHA512:
-  metadata.gz: b401890cb3dfa6b822461269750bea5821ee9ebcc55a8094596abff5cc20bd8285d2b37ce7d4354920b89266fee641861fd46bf52fb2c32b0a8e2cec2231eb60
-  data.tar.gz: af95b05c547430062bc0a1fa3242974ed37c899fe8be4607b2c8fcb54fc28f3c1a76a5730852882a8ffea56b14a3590824079559d11ed20658b68fe964639c57
+  metadata.gz: 99bf549286ee85d693afcbb0fd9774fc833316fb34c6ebb14edcbd31264948c0393d9561ff262a345dedad75a9e3b6ae93cf325730b5106e89c9a02e201ffc97
+  data.tar.gz: dbac5444029228f95b84cf173431f65f657f49a5cfbb7d17b161765d09528a8933680a5d74fe490c11c788f68264abb51ab717c1c13d894db58554c780b0c448

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+## LucaSalary 0.1.20
+
+* Implement `year_total`
+
+## LucaSalary 0.1.19
+
+* Support `payment_term` on config.yml for accounting export.
+
+## LucaSalary 0.1.18
+
+* Add summary to payslip. Refactor monthly payment.
+
+## LucaSalary 0.1.17
+
+* Breaking change: restructure CLI in sub-sub command format.
+* Add 'x-editor' on export to LucaBook

data/README.md

@@ -1,2 +1,5 @@
 # Luca Salary
+
+[![Gem Version](https://badge.fury.io/rb/lucasalary.svg)](https://badge.fury.io/rb/lucasalary)
+
 Salary calculation framework

data/exe/luca-salary

@@ -5,60 +5,93 @@ require 'optparse'
 require 'luca_salary'
 require 'luca_salary/monthly'
 
-def export(args = nil, _params = nil)
-  if args
-    args << 28 if args.length == 2 # specify safe last day
-    LucaSalary::Monthly.new(args.join('-')).export_json
-  else
-    LucaSalary::Monthly.new.export_json
+module LucaCmd
+  class Profile
+    def self.create(args = nil, _params = nil)
+      LucaSalary::Profile.gen_profile!(args.first)
+    end
   end
-end
 
-def payment(args = nil, _params = nil)
-  if args
-    args << 28 if args.length == 2 # specify safe last day
-    LucaSalary::Base.new(args.join('-')).calc
-  else
-    LucaSalary::Base.new.calc
-  end
-end
+  class Payment
+    def self.create(args = nil, _params = nil)
+      if args
+        args << 28 if args.length == 2 # specify safe last day
+        LucaSalary::Monthly.new(args.join('-')).calc
+      else
+        LucaSalary::Monthly.new.calc
+      end
+    end
 
-def report(args = nil, params = nil)
-  if args
-    args << 28 if args.length == 2 # specify safe last day
-    LucaSalary::Monthly.new(args.join('-')).report(params.dig('mode'))
-  else
-    LucaSalary::Monthly.new.report(params.dig('mode'))
-  end
-end
+    def self.export(args = nil, _params = nil)
+      if args
+        args << 28 if args.length == 2 # specify safe last day
+        LucaSalary::Payment.new(args.join('-')).export_json
+      else
+        LucaSalary::Payment.new.export_json
+      end
+    end
 
-def add_person(args = nil, _params = nil)
-  LucaSalary::Profile.gen_profile!(args.first)
+    def self.list(args = nil, params = nil)
+      if args
+        args << 28 if args.length == 2 # specify safe last day
+        LucaSalary::Monthly.new(args.join('-')).report(params.dig('mode'))
+      else
+        LucaSalary::Monthly.new.report(params.dig('mode'))
+      end
+    end
+  end
 end
 
+LucaRecord::Base.valid_project?
 cmd = ARGV.shift
+params = {}
 
 case cmd
-when 'add'
-  add_person(ARGV)
-when 'export'
-  export(ARGV)
-when 'report'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-salary report [--mail] year month [date]'
-    opt.on('--mail', 'send to managers') { |_v| params['mode'] = 'mail' }
-    args = opt.parse(ARGV)
-    report(args, params)
+when /profiles?/
+  subcmd = ARGV.shift
+  case subcmd
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-salary profiles create Name'
+      args = opt.parse(ARGV)
+      LucaCmd::Profile.create(args)
+    end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-salary profile[s] create Name'
+    exit 1
   end
-when 'payment'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-salary payment [--mail] year month [date]'
-    opt.on('--mail', 'send to managers') { |_v| params['mode'] = 'mail' }
-    args = opt.parse(ARGV)
-    payment(args)
+when 'export'
+  LucaCmd::Payment.export(ARGV)
+when /payments?/
+  subcmd = ARGV.shift
+  case subcmd
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-salary payments create year month [date]'
+      args = opt.parse(ARGV)
+      LucaCmd::Payment.create(args)
+    end
+  when 'list'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-salary payments list [--mail] year month [date]'
+      opt.on('--mail', 'send to managers') { |_v| params['mode'] = 'mail' }
+      args = opt.parse(ARGV)
+      LucaCmd::Payment.list(args, params)
+    end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-salary payment[s] (create|list) [--help|options]'
+    exit 1
   end
 else
-  puts 'Invalid subcommand'
+  puts 'Proper subcommand needed.'
+  puts
+  puts 'Usage: luca-salary subcommand [options]'
+  puts '        profiles'
+  puts '        payments'
+  puts '        export: puts payment data for LucaBook import'
+  exit 1
 end

data/lib/luca_salary.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'luca_record'
 require 'luca_salary/version'
 
 module LucaSalary

data/lib/luca_salary/base.rb

@@ -9,58 +9,18 @@ require 'luca_record'
 
 module LucaSalary
   class Base < LucaRecord::Base
-    attr_reader :driver, :dict, :config, :pjdir
+    attr_reader :dict, :config, :pjdir
     @dirname = 'payments'
 
     def initialize(date = nil)
       @date = date.nil? ? Date.today : Date.parse(date)
-      @pjdir = Pathname(LucaSupport::Config::Pjdir)
-      @config = load_config(@pjdir / 'config.yml')
-      @driver = set_driver
       @dict = load_dict
     end
 
-    #
-    # call country specific calculation
-    #
-    def calc
-      self.class.prepare_dir!(datadir / 'payments', @date)
-      country = @driver.new(@pjdir, @config, @date)
-      LucaSalary::Profile.all do |profile|
-        current_profile = parse_current(profile)
-        h = country.calc_payment(current_profile)
-        LucaSalary::Payment.new(@date.to_s).create(current_profile, h)
-      end
-    end
-
-    def gen_aggregation!
-      LucaSalary::Profile.all do |profile|
-        id = profile.dig('id')
-        payment = {}
-        targetdir = @date.year.to_s + 'Z'
-        past_data = LucaRecord::Base.find(id, "payments/#{targetdir}").first
-        (1..12).map do |month|
-          origin_dir = @date.year.to_s + [nil, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L'][month]
-          origin = LucaRecord::Base.find(id, "payments/#{origin_dir}").first
-          # TODO: to be updated null check
-          if origin == {}
-            month
-          else
-            origin.select { |k, _v| /^[1-4][0-9A-Fa-f]{,3}$/.match(k) }.each do |k, v|
-              payment[k] = payment[k] ? payment[k] + v : v
-            end
-            nil
-          end
-        end
-        self.class.create(past_data.merge!(payment), "payments/#{targetdir}")
-      end
-    end
-
     def select_code(dat, code)
       dat.filter { |k, _v| /^#{code}[0-9A-Fa-f]{,3}$/.match(k.to_s) }
     end
 
-    #
     # Subtotal each items.
     # 1::
     #    Base salary or wages.
@@ -91,19 +51,15 @@ module LucaSalary
 
     private
 
-    def datadir
-      @pjdir / 'data'
-    end
-
     def load_dict
-      LucaRecord::Dict.load_tsv_dict(@pjdir / 'dict' / 'code.tsv')
+      LucaRecord::Dict.load_tsv_dict(Pathname(PJDIR) / 'dict' / 'code.tsv')
     end
 
     def set_driver
-      code = @config['countryCode']
+      code = CONFIG['country']
       if code
         require "luca_salary/#{code.downcase}"
-        Kernel.const_get "LucaSalary::#{code.upcase}"
+        Kernel.const_get "LucaSalary::#{code.capitalise}"
       else
         nil
       end

data/lib/luca_salary/monthly.rb

@@ -9,26 +9,46 @@ require 'luca_salary'
 require 'luca_record'
 
 module LucaSalary
-  class Monthly < LucaRecord::Base
+  class Monthly < LucaSalary::Base
+    @dirname = 'payments'
+
     def initialize(date = nil)
-      @date = parse_date(date)
-      @pjdir = Pathname(LucaSupport::Config::Pjdir)
+      @date = date.nil? ? Date.today : Date.parse(date)
+      @pjdir = Pathname(LucaSupport::PJDIR)
       @config = load_config(@pjdir + 'config.yml')
+      @driver = set_driver
     end
 
+    # call country specific calculation
     #
+    def calc
+      country = @driver.new(@pjdir, @config, @date)
+      # TODO: handle retirement
+      LucaSalary::Profile.all do |profile|
+        current_profile = parse_current(profile)
+        if self.class.search(@date.year, @date.month, @date.day, current_profile['id']).count > 0
+          puts "payment record already exists: #{current_profile['id']}"
+          return nil
+        end
+        h = country.calc_payment(current_profile)
+        h['profile_id'] = current_profile['id']
+        self.class.create(h, date: @date, codes: Array(current_profile['id']))
+      end
+    end
+
     # output payslips via mail or console
     #
     def report(mode = nil)
+      data = LucaSalary::Payment.new(@date.to_s).payslip
       if mode == 'mail'
         mail = Mail.new do
           subject '[luca salary] Monthly Payment'
         end
         mail.to = @config.dig('mail', 'report_mail')
-        mail.text_part = YAML.dump(LucaSalary::Payment.new(@date.to_s).payslip)
+        mail.text_part = YAML.dump(LucaSupport::Code.readable(data))
         LucaSupport::Mail.new(mail, @pjdir).deliver
       else
-        puts YAML.dump(LucaSalary::Payment.new(@date.to_s).payslip)
+        puts YAML.dump(LucaSupport::Code.readable(data))
       end
     end
 

data/lib/luca_salary/payment.rb

@@ -13,47 +13,82 @@ module LucaSalary
 
     def initialize(date = nil)
       @date = Date.parse(date)
-      @pjdir = Pathname(LucaSupport::Config::Pjdir)
+      @pjdir = Pathname(LucaSupport::PJDIR)
       @dict = LucaRecord::Dict.load_tsv_dict(@pjdir / 'dict' / 'code.tsv')
     end
 
-    #
-    # create record with LucaSalary::Profile instance and apyment data
-    #
-    def create(profile, payment)
-      id = profile.dig('id')
-      if self.class.search(@date.year, @date.month, @date.day, id).first
-        puts "payment record already exists: #{id}"
-        return nil
-      end
-
-      self.class.gen_record_file!('payments', @date, Array(id)) do |f|
-        f.write(YAML.dump(payment.sort.to_h))
-      end
-    end
-
     def payslip
       {}.tap do |report|
         report['asof'] = "#{@date.year}/#{@date.month}"
+        report['payments'] = []
         report['records'] = []
 
         self.class.asof(@date.year, @date.month) do |payment|
+          profile = LucaSalary::Profile.find(payment['profile_id'])
+          summary = {
+            'name' => profile['name'],
+            "#{@dict.dig('5', :label) || '5'}" => payment['5']
+          }
+
           slip = {}.tap do |line|
+            line['name'] = profile['name']
             payment.each do |k, v|
               next if k == 'id'
 
               line["#{@dict.dig(k, :label) || k}"] = v
             end
           end
+          report['payments'] << summary
           report['records'] << slip
         end
       end
     end
 
+    def self.year_total(year)
+      Profile.all do |profile|
+        id = profile.dig('id')
+        payment = { 'profile_id' => id }
+        # payment = {}
+        (1..12).each do |month|
+          search(year, month, nil, id).each do |origin|
+            # TODO: to be updated null check
+            if origin == {}
+              month
+            else
+              origin.select { |k, _v| /^[1-4][0-9A-Fa-f]{,3}$/.match(k) }.each do |k, v|
+                payment[k] = payment[k] ? payment[k] + v : v
+              end
+              nil
+            end
+          end
+        end
+        payment = local_convert(payment)
+        create(payment, date: Date.new(year, 12, 31), codes: [id], basedir: 'payments/total')
+      end
+    end
+
+    def self.local_convert(payment)
+      return payment if CONFIG['country'].nil?
+
+      require "luca_salary/#{CONFIG['country'].downcase}"
+      klass = Kernel.const_get("LucaSalary::#{CONFIG['country'].capitalize}")
+      klass.year_total(payment)
+    rescue
+      return payment
+    end
+
+    # Export json for LucaBook.
+    # Accrual_date can be change with `payment_term` on config.yml. Default value is 0.
+    # `payment_term: 1` means payment on the next month of calculation target.
+    #
     def export_json
-      h = {}
-      h[:debit] = {}
-      h[:credit] = {}
+      accrual_date = if LucaSupport::CONFIG['payment_term']
+                       pt = LucaSupport::CONFIG['payment_term']
+                       Date.new(@date.prev_month(pt).year, @date.prev_month(pt).month, -1)
+                     else
+                       Date.new(@date.year, @date.month, -1)
+                     end
+      h = { debit: {}, credit: {} }
       accumulate.each do |k, v|
         next if @dict.dig(k, :acct_label).nil?
 
@@ -61,11 +96,16 @@ module LucaSalary
         acct_label = @dict[k][:acct_label]
         h[pos][acct_label] = h[pos].key?(acct_label) ? h[pos][acct_label] + v : v
       end
-      res = {}
-      res['date'] = "#{@date.year}-#{@date.month}-#{@date.day}"
-      res['debit'] = h[:debit].map { |k, v| { 'label' => k, 'value' => v } }
-      res['credit'] = h[:credit].map { |k, v| { 'label' => k, 'value' => v } }
-      puts JSON.dump(res)
+      [].tap do |res|
+        {}.tap do |item|
+          item['date'] = "#{accrual_date.year}-#{accrual_date.month}-#{accrual_date.day}"
+          item['debit'] = h[:debit].map { |k, v| { 'label' => k, 'value' => v } }
+          item['credit'] = h[:credit].map { |k, v| { 'label' => k, 'value' => v } }
+          item['x-editor'] = 'LucaSalary'
+          res << item
+        end
+        puts JSON.dump(readable(res))
+      end
     end
 
     private

data/lib/luca_salary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaSalary
-  VERSION = '0.1.14'
+  VERSION = '0.1.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucasalary
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.19
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -28,44 +28,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 12.3.3
 description: 'Salary calculation framework
 
 '