lucasalary 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef7b2ded5f89dc7d34c475b5e57aae90efbac496dc02dba4e5f159636b7d9fa
-  data.tar.gz: 568ffe2f62bf970eb029c4cc890ed459b4bcaa411b92fe29d38229c0df4faa3c
+  metadata.gz: 50c263cca4e4786fc11301bdbbab093e69dfd94be7b6f1237c570d2fe6ee6928
+  data.tar.gz: 49569d2fb2145e028a40817e464812ac7ff1e4499b4c49b96509548320924c92
 SHA512:
-  metadata.gz: 168536d2eb3dc3b5b83fd165961b29f36b266e0b314ad3516e213ac7701c849fc8f1357fb13c8cb3ec7aa2f9b16a9999545113aea11db690bc13bf0338ff1231
-  data.tar.gz: 213d83129344747bf8a3857928f4fbba02495c4c14bebfa24263f77723f12b3b395cd92b4d8505889929833202a72ae9b7850aa77a2b03287c94be0a752d0698
+  metadata.gz: b401890cb3dfa6b822461269750bea5821ee9ebcc55a8094596abff5cc20bd8285d2b37ce7d4354920b89266fee641861fd46bf52fb2c32b0a8e2cec2231eb60
+  data.tar.gz: af95b05c547430062bc0a1fa3242974ed37c899fe8be4607b2c8fcb54fc28f3c1a76a5730852882a8ffea56b14a3590824079559d11ed20658b68fe964639c57

data/lib/luca_salary/base.rb

@@ -15,7 +15,7 @@ module LucaSalary
     def initialize(date = nil)
       @date = date.nil? ? Date.today : Date.parse(date)
       @pjdir = Pathname(LucaSupport::Config::Pjdir)
-      @config = load_config(@pjdir + 'config.yml')
+      @config = load_config(@pjdir / 'config.yml')
       @driver = set_driver
       @dict = load_dict
     end
@@ -60,17 +60,32 @@ module LucaSalary
       dat.filter { |k, _v| /^#{code}[0-9A-Fa-f]{,3}$/.match(k.to_s) }
     end
 
+    #
+    # Subtotal each items.
+    # 1::
+    #    Base salary or wages.
+    # 2::
+    #    Deduction directly related to work payment, including tax, insurance, pension and so on.
+    # 3::
+    #    Deduction for miscellaneous reasons.
+    # 4::
+    #    Addition for miscellaneous reasons.
+    # 5::
+    #    Net payment amount.
+    #
     def amount_by_code(obj)
       {}.tap do |h|
         (1..4).each do |n|
-          h["#{n}00"] = sum_code(obj, n)
+          code = n.to_s
+          h[code] = sum_code(obj, code)
         end
+        h['5'] = h['1'] - h['2'] - h['3'] + h['4']
       end
     end
 
     def 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 = 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
     end
 
@@ -88,7 +103,7 @@ module LucaSalary
       code = @config['countryCode']
       if code
         require "luca_salary/#{code.downcase}"
-        Kernel.const_get "LucaSalary#{code.upcase}"
+        Kernel.const_get "LucaSalary::#{code.upcase}"
       else
         nil
       end

data/lib/luca_salary/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lucasalary
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: lucarecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +87,8 @@ files:
 - lib/luca_salary/profile.rb
 - lib/luca_salary/version.rb
 homepage: https://github.com/chumaltd/luca/tree/master/lucasalary
-licenses: []
+licenses:
+- GPL
 metadata:
   homepage_uri: https://github.com/chumaltd/luca/tree/master/lucasalary
   source_code_uri: https://github.com/chumaltd/luca/tree/master/lucasalary
@@ -86,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="