lucasalary 0.1.20 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c27c381516005d8ae6962c4d0a44ff0a351f9fd097da547f6dfdcb88d7a6b0d
-  data.tar.gz: 1b116229596958583c4c06b9fef3675cd53a1c7e70e04ef80fdc3733f6417b36
+  metadata.gz: 49f2002c8bc5ec17d605422ee282c0b7cb6053f88aa2fa3dce308e9dbbbdc5c5
+  data.tar.gz: e993bd468b91510ad9dc68e55b58c54be562b0dcb76f9a757d4f88b6392d860d
 SHA512:
-  metadata.gz: 970e6cacf4d6b781831b53b714c7c4a7ec01de8c58fcc6ae59f396b52875d1024c36008276ed13caefc9a9809bfa363428e7c4884240e7f3f055434fdf76dfb4
-  data.tar.gz: a1658dfc041cb48eb30f7eca5c762b2f4940f0ffd1dc7d1e03fe16e25075c650d0a0a1f6752ebab387b83f01a047c720aafebf6f6b1b56d1c68b62e35a0feeca
+  metadata.gz: 3847524b19036ca598ae119613fd49a9983ce54cdcd37f233b02fead3c636de0f4dfb2c5f80c459c1bc9d8eda82aa8ac22ddc12326fbbcb3cc13e21f9b159804
+  data.tar.gz: 15758df4fb112cf71614d11315a6477ebc5506a9176c4c29867dfc7776ea549d7a15ffe38ca1b3edab2c7993c09ae3d89ef82ef0fea01fde89538854ae4a984c

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## LucaSalary 0.1.24
+
+* Fix: remove null record from `luca-salary export` JSON
+
+## LucaSalary 0.1.23
+
+* Breaking change: move sum_code() to Class method
+
+## LucaSalary 0.1.22
+
+* Add `luca-salary payments total` command for year total
+* Fix: call localcode with calculation date
+
 ## LucaSalary 0.1.20
 
 * Implement `year_total`

data/README.md

@@ -1,6 +1,8 @@
 # Luca Salary
 
 [![Gem Version](https://badge.fury.io/rb/lucasalary.svg)](https://badge.fury.io/rb/lucasalary)
+[![doc](https://img.shields.io/badge/doc-rubydoc-green.svg)](https://www.rubydoc.info/gems/lucasalary/index)
+![license](https://img.shields.io/github/license/chumaltd/luca)
 
 LucaSalary is Abstraction framework coworking with each country module. As income tax differs in each county, most of implementation need to be developed separately.  
 At this time, [Japan module](https://github.com/chumaltd/luca-salary-jp) is under development as a practical reference.

data/exe/luca-salary

@@ -39,6 +39,10 @@ module LucaCmd
         LucaSalary::Monthly.new.report(params.dig('mode'))
       end
     end
+
+    def self.total(args = nil, _params = nil)
+      LucaSalary::Payment.year_total(args.first.to_i)
+    end
   end
 end
 
@@ -80,6 +84,12 @@ when /payments?/
       args = opt.parse(ARGV)
       LucaCmd::Payment.list(args, params)
     end
+  when 'total'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-salary payments total year'
+      args = opt.parse(ARGV)
+      LucaCmd::Payment.total(args)
+    end
   else
     puts 'Proper subcommand needed.'
     puts

data/lib/luca_salary/base.rb

@@ -37,13 +37,13 @@ module LucaSalary
       {}.tap do |h|
         (1..4).each do |n|
           code = n.to_s
-          h[code] = sum_code(obj, code)
+          h[code] = self.class.sum_code(obj, code)
         end
         h['5'] = h['1'] - h['2'] - h['3'] + h['4']
       end
     end
 
-    def sum_code(obj, code, exclude = nil)
+    def self.sum_code(obj, code, exclude = nil)
       target = obj.select { |k, _v| /^#{code}[0-9A-Fa-f]{,3}$/.match(k) }
       target = target.reject { |k, _v| exclude.include?(k) } if exclude
       target.values.inject(:+) || 0
@@ -59,7 +59,7 @@ module LucaSalary
       code = CONFIG['country']
       if code
         require "luca_salary/#{code.downcase}"
-        Kernel.const_get "LucaSalary::#{code.capitalise}"
+        Kernel.const_get "LucaSalary::#{code.capitalize}"
       else
         nil
       end

data/lib/luca_salary/payment.rb

@@ -62,18 +62,19 @@ module LucaSalary
             end
           end
         end
-        payment = local_convert(payment)
-        create(payment, date: Date.new(year, 12, 31), codes: [id], basedir: 'payments/total')
+        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)
+    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)
-    rescue
+      klass.year_total(payment, date)
+    rescue NameError
       return payment
     end
 
@@ -99,8 +100,8 @@ module LucaSalary
       [].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, 'amount' => v } }
-          item['credit'] = h[:credit].map { |k, v| { 'label' => k, 'amount' => v } }
+          item['debit'] = h[:debit].reject { |_k, v| v.nil? }.map { |k, v| { 'label' => k, 'amount' => v } }
+          item['credit'] = h[:credit].reject { |_k, v| v.nil? }.map { |k, v| { 'label' => k, 'amount' => v } }
           item['x-editor'] = 'LucaSalary'
           res << item
         end

data/lib/luca_salary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucasalary
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.24
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -68,7 +68,7 @@ dependencies:
         version: 12.3.3
 description: 'Salary calculation framework
 
-'
+  '
 email:
 - co.chuma@gmail.com
 executables:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Salary calculation framework