lucasalary 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21cf8c51a5487b6c97376fe3ce9093dca20a7dc00943101f023ddf883bb20bf3
-  data.tar.gz: 427756bed92e1878f48763decf1924a475e3f70163f0a68fd48efd767c224a8b
+  metadata.gz: 13c3b82fd0dbc0628ded542e7e41034b61c72b70d2b95c6db395e802a5d1a868
+  data.tar.gz: 2c9867511fc9db6f1f1855bac932eed3ea52b89f5a64646200348b05139f01a8
 SHA512:
-  metadata.gz: 12943976db746cb20edb83d007efdd94a4ed69f11f05dd5fc3970e778955c199a1c713223e16106df5e58deea659e91630525144d40215f9aa731750147bd4c5
-  data.tar.gz: de251e1584866528cecde0dc2c76fd5da91c344622cb63f3d281fb9516a75958d2d5d1ab2ee7770c97452572c6847c1064cc5febc0be7f81f7dc55691fac72b8
+  metadata.gz: 0ff1f112099e366cb6b6950a37eaed47d632d338cd3c497fd293b4a8ca2bba50c734032208ef4e7f43c963a990b63d890dc9cc34fc458ae5efc414db6146088b
+  data.tar.gz: 73b50ab1845ed285aaf131056de8c05a0d3e6f4c0ca293b542675418fda8ec3a904216ff116ad920cbca6b77e9b7503d891692a31d7cf368973dfac924cf2b1a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## LucaSalary 0.1.28
+
+* BREAKING: `luca-salary payments total` directory structure changed. Upsert 1 record per 1 profile.
+* move yearly totale methods to LucaSalary::Total
+* add `luca-salary pay[ments]` short hand.
+* add `luca-salary payments list --nu`.
+
 ## LucaSalary 0.1.27
 
 * Implement LucaSalary::Total for Year totaling.

data/exe/luca-salary

@@ -5,6 +5,7 @@ require 'json'
 require 'optparse'
 require 'luca_salary'
 require 'luca_salary/monthly'
+require 'luca_support' #TODO: test use only
 
 module LucaCmd
   class Profile
@@ -35,9 +36,9 @@ module LucaCmd
     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'))
+        render(LucaSalary::Monthly.new(args.join('-')).report(params.dig('mode')), params)
       else
-        LucaSalary::Monthly.new.report(params.dig('mode'))
+        render(LucaSalary::Monthly.new.report(params.dig('mode')), params)
       end
     end
 
@@ -47,9 +48,9 @@ module LucaCmd
 
     def self.total(args = nil, params = nil)
       if params['mode'] == 'adjust'
-        LucaSalary::Payment.year_adjust(args[0].to_i, args[1].to_i)
+        LucaSalary::Total.year_adjust(args[0].to_i, args[1].to_i)
       else
-        LucaSalary::Payment.year_total(args.first.to_i)
+        LucaSalary::Total.accumulator(args.first.to_i)
       end
     end
 
@@ -58,7 +59,7 @@ module LucaCmd
       when 'json'
         puts JSON.dump(dat)
       when 'nu'
-        LucaSupport::View.nushell(YAML.dump(dat))
+        LucaSupport::View.nushell(dat)
       else
         puts YAML.dump(dat)
       end
@@ -86,9 +87,23 @@ when /profiles?/
     puts 'Usage: luca-salary profile[s] create Name'
     exit 1
   end
+when 'enc', 'encrypt'
+  # TODO: proxy encrypt/decrypt
+  OptionParser.new do |opt|
+    opt.banner = 'Usage: luca-salary enc|encrypt'
+    opt.on('--clean', 'remove plain directory') { |_v| params[:clean] = true }
+    args = opt.parse(ARGV)
+    LucaSupport::Enc.encrypt("s_profiles", cleanup: params[:clean])
+  end
+when 'dec', 'decrypt'
+  OptionParser.new do |opt|
+    opt.banner = 'Usage: luca-salary dec|decrypt'
+    args = opt.parse(ARGV)
+    LucaSupport::Enc.decrypt("s_profiles")
+  end
 when 'export'
   LucaCmd::Payment.export(ARGV)
-when /payments?/
+when 'pay', /payments?/
   subcmd = ARGV.shift
   case subcmd
   when 'create'
@@ -99,8 +114,9 @@ when /payments?/
     end
   when 'list'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-salary payments list [--mail] year month [date]'
+      opt.banner = 'Usage: luca-salary payments list [--mail|--nu] year month [date]'
       opt.on('--mail', 'send to managers') { |_v| params['mode'] = 'mail' }
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
       args = opt.parse(ARGV)
       LucaCmd::Payment.list(args, params)
     end
@@ -131,5 +147,7 @@ else
   puts '        profiles'
   puts '        payments'
   puts '        export: puts payment data for LucaBook import'
+  puts '        encrypt: encrypt secure profiles'
+  puts '        decrypt: decrypt secure profiles'
   exit 1
 end

data/lib/luca_salary/monthly.rb

@@ -48,7 +48,7 @@ module LucaSalary
         mail.text_part = YAML.dump(LucaSupport::Code.readable(data))
         LucaSupport::Mail.new(mail, @pjdir).deliver
       else
-        puts YAML.dump(LucaSupport::Code.readable(data))
+        LucaSupport::Code.readable(data)
       end
     end
 

data/lib/luca_salary/payment.rb

@@ -46,53 +46,6 @@ module LucaSalary
       end
     end
 
-    def self.year_total(year)
-      Profile.all do |profile|
-        id = profile.dig('id')
-        slips = term(year, 1, year, 12, id)
-        payment, _count = accumulate(slips)
-        payment['profile_id'] = id
-        date = Date.new(year, 12, 31)
-        payment = local_convert(payment, date)
-        create(payment, date: date, codes: [id], basedir: 'payments/total')
-      end
-    end
-
-    def self.local_convert(payment, date)
-      return payment if CONFIG['country'].nil?
-
-      require "luca_salary/#{CONFIG['country'].downcase}"
-      klass = Kernel.const_get("LucaSalary::#{CONFIG['country'].capitalize}")
-      klass.year_total(payment, date)
-    rescue NameError
-      return payment
-    end
-
-    # Apply adjustment for yearly refund.
-    # Search Year Total records 6 months before specified payslip month.
-    #
-    def self.year_adjust(year, month)
-      target_month = Date.new(year, month, 1)
-      total_st = target_month.prev_month(6)
-      search(year, month).each do |slip, path|
-        term(total_st.year, total_st.month, year, month, slip['profile_id'], "#{@dirname}/total/") do |total|
-          slip['3A1'] = total['3A1']
-          slip['4A1'] = total['4A1']
-        end
-        # Recalculate sum
-        ['3', '4'].each do |key|
-          slip[key] = 0
-          slip[key] = LucaSalary::Base.sum_code(slip, key)
-          slip['5'] = slip['1'] - slip['2'] - slip['3'] + slip['4']
-        end
-        update_record(
-          @dirname,
-          path,
-          YAML.dump(LucaSupport::Code.readable(slip.sort.to_h))
-        )
-      end
-    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.

data/lib/luca_salary/total.rb

@@ -4,18 +4,82 @@ require 'luca_support'
 require 'luca_record'
 
 module LucaSalary
+  # == Total
+  # Yearly summary records are stored in 'payments/total' by each profile.
+  #
   class Total < LucaRecord::Base
+    include Accumulator
     @dirname = 'payments/total'
 
     attr_reader :slips
 
     def initialize(year)
       @date = Date.new(year.to_i, 12, -1)
-      @slips = Total.term(year, 1, year, 12).map do |slip, _path|
-        slip['profile'] = parse_current(Profile.find_secure(slip['profile_id']))
+      @slips = Total.search(year, 12).map do |slip|
+        slip['profile'] = parse_current(Profile.find_secure(slip['id']))
         slip
       end
       @dict = LucaRecord::Dict.load_tsv_dict(Pathname(LucaSupport::PJDIR) / 'dict' / 'code.tsv')
     end
+
+    def self.accumulator(year)
+      Profile.all do |profile|
+        id = profile.dig('id')
+        slips = term(year, 1, year, 12, id, 'payments')
+        payment, _count = accumulate(slips)
+        payment['id'] = id
+        date = Date.new(year, 12, 31)
+        payment = local_convert(payment, date)
+        upsert(payment, basedir: "payments/total/#{year}#{LucaSupport::Code.encode_month(12)}")
+      end
+    end
+
+    def self.local_convert(payment, date)
+      return payment if CONFIG['country'].nil?
+
+      require "luca_salary/#{CONFIG['country'].downcase}"
+      klass = Kernel.const_get("LucaSalary::#{CONFIG['country'].capitalize}")
+      klass.year_total(payment, date)
+    rescue NameError
+      return payment
+    end
+
+    # Apply adjustment for yearly refund.
+    # Search Year Total records 6 months before specified payslip month.
+    #
+    def self.year_adjust(year, month)
+      total_dirs = Array(0..6)
+                     .map{ |i| LucaSupport::Code.encode_dirname(Date.new(year, month, 1).prev_month(i)) }
+                     .map do |subdir|
+        search_path = "#{@dirname}/#{subdir}"
+        Dir.exist?(abs_path(search_path)) ? search_path : nil
+      end
+      total_path = total_dirs.compact.first
+      if total_path.nil?
+        puts "No Year total directory exists. exit"
+        exit 1
+      end
+
+      search(year, month, nil, nil, 'payments').each do |slip, path|
+        begin
+          find(slip['profile_id'], total_path) do |total|
+            ['3A1', '4A1'].each { |cd| slip[cd] = total[cd] }
+          end
+        rescue
+          # skip no adjust profile
+        end
+        # Recalculate sum
+        ['3', '4'].each do |key|
+          slip[key] = 0
+          slip[key] = LucaSalary::Base.sum_code(slip, key)
+        end
+        slip['5'] = slip['1'] - slip['2'] - slip['3'] + slip['4']
+        update_record(
+          'payments',
+          path,
+          YAML.dump(LucaSupport::Code.readable(slip.sort.to_h))
+        )
+      end
+    end
   end
 end

data/lib/luca_salary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucasalary
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Salary calculation framework