tax_jp 1.8.3 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72fc45a2a224e99f88a6dc59c98effa95eceb9c97a4dc8981aec32c058af71c8
-  data.tar.gz: 11877406d3cd4badbe9eeb77fc06bc668857fd5144da029d2b4b91cb984a0ced
+  metadata.gz: 25e29bba13829686dc4da5a5a422ed82438a38e203ee22f93642f9bd2facabcf
+  data.tar.gz: 351e969326a36f9f41afbd46e626309dd86cfcdaab872dd405dd098904397e76
 SHA512:
-  metadata.gz: 747d67fc5180990721a19107ada934cfb7f06832f31a9dec82066d38197fa2fa91226e574d7b79faa3a78720846d259675b347bac1bf290ba1ff62dd472b1a92
-  data.tar.gz: 1ee20839ea6ba385b099d60d6fa69a26e897e7e1a9839385f5a6326d3e28484214c742f5adefb1ffdf0cd73ac6c37c3aa1e763184f2f55a6664686b0b68d6c70
+  metadata.gz: 17add79329ce4f5acb07f5c6a9ce01bf43be5e96df7725d917bb11c46e40e42298ba0b1b94e2c7345094198fd51466b404145d5d30f1d66679dbfa9f9d64bb37
+  data.tar.gz: 51fcb4c96422e6942aeb9135db917f8f21a927ddaebc323c71ce0acf16390585e55b8fd923460dae6edd2040d5a161622c58fb47318618c9d16c421b3afc3876

data/data//347/244/276/344/274/232/344/277/235/351/231/272/346/226/231//345/216/232/347/224/237/345/271/264/351/207/221.tsv

@@ -1,4 +1,4 @@
-適用開始日     	適用終了日     	一般の被保険者（％）	坑内員・船員（％）	こども・子育て拠出金（％）	子ども・子育て支援金（％）
+適用開始日     	適用終了日     	一般の被保険者（％）	坑内員・船員（％）	子ども・子育て拠出金（％）	子ども・子育て支援金（％）
 2006-09-01	2007-08-31	14.642	14.642	0.09	0
 2007-09-01	2008-08-31	14.996	14.996	0.13	0
 2008-09-01	2009-08-31	15.35 	15.35 	0.13	0

data/lib/tax_jp/corporate_taxes/db_builder.rb

@@ -12,7 +12,7 @@ class TaxJp::CorporateTaxes::DbBuilder
       Dir.glob(File.join(TaxJp::Utils.data_dir, '法人税', '区分番号-*.tsv')).each do |filename|
         valid_from, valid_until = TaxJp::Utils.filename_to_date(filename)
 
-        CSV.foreach(filename, :col_sep => "\t", :headers => true) do |row|
+        CSV.foreach(filename, col_sep: "\t", headers: true) do |row|
           next if row[0].to_s.strip.empty?
 
           values = []

data/lib/tax_jp/depreciation_rates/db_builder.rb

@@ -11,7 +11,7 @@ class TaxJp::DepreciationRates::DbBuilder
       Dir.glob(File.join(TaxJp::Utils.data_dir, '減価償却率', '減価償却率-*.tsv')).each do |filename|
         valid_from, valid_until = TaxJp::Utils.filename_to_date(filename)
 
-        CSV.foreach(filename, :col_sep => "\t") do |row|
+        CSV.foreach(filename, col_sep: "\t") do |row|
           next if row[0].to_i == 0
           db.execute(insert_sql, [valid_from, valid_until] + row)
         end

data/lib/tax_jp/social_insurance.rb

@@ -21,24 +21,24 @@ module TaxJp
 
     def initialize(row)
       @grade = TaxJp::SocialInsurances::Grade.new(
-        :valid_from => row[0], :valid_until => row[1],
-        :grade => row[2], :pension_grade => row[3],
-        :monthly_standard => row[4], :daily_standard => row[5],
-        :salary_from => row[6], :salary_to => row[7])
+        valid_from: row[0], valid_until: row[1],
+        grade: row[2], pension_grade: row[3],
+        monthly_standard: row[4], daily_standard: row[5],
+        salary_from: row[6], salary_to: row[7])
 
       @health_insurance = TaxJp::SocialInsurances::HealthInsurance.new(
-        :grade => @grade,
-        :valid_from => row[8], :valid_until => row[9],
-        :prefecture => Prefecture.find_by_code(row[10]),
-        :general => row[11], :care => row[12],
-        :particular => row[13], :basic => row[14])
+        grade: @grade,
+        valid_from: row[8], valid_until: row[9],
+        prefecture: Prefecture.find_by_code(row[10]),
+        general: row[11], care: row[12],
+        particular: row[13], basic: row[14],
+        child_and_childcare_support: row[20])
 
       @welfare_pension = TaxJp::SocialInsurances::WelfarePension.new(
-        :grade => @grade,
-        :valid_from => row[15], :valid_until => row[16],
-        :general => row[17], :particular => row[18],
-        :child_support => row[19],
-        :child_and_childcare_support => row[20])
+        grade: @grade,
+        valid_from: row[15], valid_until: row[16],
+        general: row[17], particular: row[18],
+        child_support: row[19])
     end
 
     def valid_from
@@ -126,9 +126,10 @@ module TaxJp
       prefecture_code = convert_to_prefecture_code(prefecture)
 
       TaxJp::Utils.with_database(DB_PATH) do |db|
-        sql =  String.new('select * from health_insurances ')
-        sql << 'where valid_from <= ? and valid_until >= ? and (prefecture_code = ? or prefecture_code is null) ' 
-        params = [date, date, prefecture_code]
+        sql =  String.new('select hi.*, wp.child_and_childcare_support from health_insurances hi ')
+        sql << 'inner join welfare_pensions wp on (wp.valid_from <= ? and wp.valid_until >= ?) '
+        sql << 'where hi.valid_from <= ? and hi.valid_until >= ? and (hi.prefecture_code = ? or hi.prefecture_code is null) '
+        params = [date, date, date, date, prefecture_code]
 
         ret = nil
         db.execute(sql, params) do |row|

data/lib/tax_jp/social_insurances/db_builder.rb

@@ -12,14 +12,14 @@ class TaxJp::SocialInsurances::DbBuilder < TaxJp::DbBuilder
       Dir.glob(File.join(TaxJp::Utils.data_dir, '社会保険料', '等級-*.tsv')).each do |filename|
         valid_from, valid_until = filename_to_date(filename)
 
-        CSV.foreach(filename, :col_sep => "\t") do |row|
+        CSV.foreach(filename, col_sep: "\t") do |row|
           next if row[0].to_i == 0 and row[1].to_i == 0
           db.execute(insert_sql_grade, [valid_from, valid_until] + row.map{|col| TaxJp::Utils.normalize_amount(col)})
         end
       end
 
       Dir.glob(File.join(TaxJp::Utils.data_dir, '社会保険料', '旧健康保険.tsv')).each do |filename|
-        CSV.foreach(filename, :col_sep => "\t") do |row|
+        CSV.foreach(filename, col_sep: "\t") do |row|
           next unless row[2].to_f > 0
           values = []
           values << row[0]
@@ -36,7 +36,7 @@ class TaxJp::SocialInsurances::DbBuilder < TaxJp::DbBuilder
       Dir.glob(File.join(TaxJp::Utils.data_dir, '社会保険料', '健康保険-*.tsv')).each do |filename|
         valid_from, valid_until = filename_to_date(filename)
 
-        CSV.foreach(filename, :col_sep => "\t") do |row|
+        CSV.foreach(filename, col_sep: "\t") do |row|
           next unless row[1].to_f > 0
           values = []
           values << valid_from
@@ -51,7 +51,7 @@ class TaxJp::SocialInsurances::DbBuilder < TaxJp::DbBuilder
       end
 
       Dir.glob(File.join(TaxJp::Utils.data_dir, '社会保険料', '厚生年金.tsv')).each do |filename|
-        CSV.foreach(filename, :col_sep => "\t") do |row|
+        CSV.foreach(filename, col_sep: "\t") do |row|
           next unless row[2].to_f > 0
           values = []
           values << row.shift

data/lib/tax_jp/social_insurances/health_insurance.rb

@@ -5,6 +5,8 @@ class TaxJp::SocialInsurances::HealthInsurance
   attr_reader :prefecture
   attr_reader :general, :care
   attr_reader :particular, :basic
+  # 子ども・子育て支援金
+  attr_reader :child_and_childcare_support
   
   attr_writer :salary
 
@@ -20,6 +22,7 @@ class TaxJp::SocialInsurances::HealthInsurance
       @care = attrs[:care]
       @particular= attrs[:particular]
       @basic = attrs[:basic]
+      @child_and_childcare_support = attrs[:child_and_childcare_support]
     elsif attrs.is_a?(Array)
       @valid_from = attrs[0]
       @valid_until = attrs[1]
@@ -28,6 +31,7 @@ class TaxJp::SocialInsurances::HealthInsurance
       @care = attrs[4]
       @particular= attrs[5]
       @basic = attrs[6]
+      @child_and_childcare_support = attrs[7]
     end
   end
 
@@ -47,6 +51,14 @@ class TaxJp::SocialInsurances::HealthInsurance
     (general_amount_care / 2).floor(1) 
   end
 
+  def child_and_childcare_support_amount
+    (salary * child_and_childcare_support).round(1)
+  end
+
+  def child_and_childcare_support_amount_half
+    (child_and_childcare_support_amount / 2).floor(1)
+  end
+
   def salary
     @salary || monthly_standard
   end

data/lib/tax_jp/social_insurances/welfare_pension.rb

@@ -3,7 +3,6 @@ class TaxJp::SocialInsurances::WelfarePension
   attr_reader :valid_from, :valid_until
   attr_reader :general, :particular
   attr_reader :child_support
-  attr_reader :child_and_childcare_support
 
   attr_accessor :grade
   attr_writer :salary
@@ -18,14 +17,12 @@ class TaxJp::SocialInsurances::WelfarePension
       @general= attrs[:general]
       @particular= attrs[:particular]
       @child_support = attrs[:child_support]
-      @child_and_childcare_support = attrs[:child_and_childcare_support]
     elsif attrs.is_a?(Array)
       @valid_from = attrs[0]
       @valid_until = attrs[1]
       @general= attrs[2]
       @particular= attrs[3]
       @child_support = attrs[4]
-      @child_and_childcare_support = attrs[5]
     end
   end
 

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '1.8.3'
+  VERSION = '1.8.5'
 end

data/lib/tax_jp/withheld_taxes/monthly_db_builder.rb

@@ -12,7 +12,7 @@ class TaxJp::WithheldTaxes::MonthlyDbBuilder < TaxJp::DbBuilder
       Dir.glob(File.join(TaxJp::Utils.data_dir, '源泉徴収税', '源泉徴収税月額-*.tsv')).each do |filename|
         valid_from, valid_until = TaxJp::Utils.filename_to_date(filename)
   
-        CSV.foreach(filename, :col_sep => "\t") do |row|
+        CSV.foreach(filename, col_sep: "\t") do |row|
           next if row[0].to_i == 0 and row[1].to_i == 0
           values = row.map{|col| TaxJp::Utils.normalize_amount(col)}
           db.execute(insert_sql, [valid_from.to_s, valid_until.to_s] + values)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: ruby
 authors:
 - ichylinux
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: 税金計算ライブラリ
 test_files: []