tax_jp 1.1.6 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16fa069e5fd7bbb50c521b0366430aa83a0a7a0f2c8eb1bc91b691dfcf34bd72
-  data.tar.gz: f53602c28ca0e9bda338f359bd7ea63e5f90ab0d3e8dd6e6059051a9d7aefe54
+  metadata.gz: 91b3e81185d352f8074e37587f4d614d4212d02ec3a0b8841beda2ac7648ba55
+  data.tar.gz: 7cffccbde3108a384809f05e016098d24ca86343fb0c73a80c22d608857e5891
 SHA512:
-  metadata.gz: b938a93996c29d76ce332a13ad9481686ab96dabc72fc3445dc379409fa5fa70771b0eb9578707619a7d45e2d32c6946915532b0d8c42cf7d9a05f59d673f89e
-  data.tar.gz: 6dcb93eca7a1f92c3151dacd5df4ed77346f35057bb10c46d5d0bab98dc6dfc0f0468f00a85354b91678d0b66a07d4ee82befa7bc070995f98735118796efbf4
+  metadata.gz: c387eb573c8ee59d230cdc8c4ced099b9efa02972bafb96249738043cec7bbd2bf5050d83bf39ffaa997f2a2004afacb024cc438dd8396df615da6ee5330243d
+  data.tar.gz: 6f80fc2378b4ad9f79f94d3c4818f4fe609cb9bde2887f9b9889ca1b041a23c3f2855106b207a3ce3563df5214032b406a190dc772e26fb8d76ca09736acf240

data/app/views/tax_jp/social_insurances/index.html.erb

@@ -48,7 +48,12 @@
       <tbody>
         <% @social_insurances.each do |si| %>
           <tr>
-            <td class="text-center"><%= si.grade.grade %><%= "(#{si.grade.pension_grade})" if si.welfare_pension.general_amount > 0 %></td>
+            <% if [0, TaxJp::INTEGER_MAX].exclude?(si.grade.pension_grade) %>
+              <td class="text-center"><%= si.grade.grade %>(<%= si.grade.pension_grade %>)</td>
+            <% else %>
+              <td class="text-center"><%= si.grade.grade %></td>
+            <% end %>
+
             <td class="text-right"><%= si.grade.monthly_standard.to_s(:delimited) %></td>
             <td class="text-right"><%= si.grade.daily_standard.to_s(:delimited) %></td>
             <td class="text-right"><%= si.grade.salary_from.to_s(:delimited) %></td>
@@ -57,10 +62,18 @@
             <td class="text-right"><%= si.health_insurance.general_amount_half.to_s(:delimited) %></td>
             <td class="text-right"><%= si.health_insurance.general_amount_care.to_s(:delimited) %></td>
             <td class="text-right"><%= si.health_insurance.general_amount_care_half.to_s(:delimited) %></td>
-            <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount, unit: '', precision: 2) if si.welfare_pension.general_amount > 0 %></td>
-            <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount_half, unit: '', precision: 2) if si.welfare_pension.general_amount_half > 0 %></td>
-            <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount, unit: '', precision: 2) if si.welfare_pension.particular_amount > 0 %></td>
-            <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount_half, unit: '', precision: 2) if si.welfare_pension.particular_amount_half > 0 %></td>
+
+            <% if [0, TaxJp::INTEGER_MAX].exclude?(si.grade.pension_grade) %>
+              <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount, unit: '', precision: 2) if si.welfare_pension.general_amount > 0 %></td>
+              <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount_half, unit: '', precision: 2) if si.welfare_pension.general_amount_half > 0 %></td>
+              <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount, unit: '', precision: 2) if si.welfare_pension.particular_amount > 0 %></td>
+              <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount_half, unit: '', precision: 2) if si.welfare_pension.particular_amount_half > 0 %></td>
+            <% else %>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            <% end %>
           </tr>
         <% end %>
       </tbody>  

data/data//347/244/276/344/274/232/344/277/235/351/231/272/346/226/231//345/201/245/345/272/267/344/277/235/351/231/272-20210301-20220228.tsv

@@ -0,0 +1,48 @@
+都道府県	一般保険料率（％）	介護保険料率（％）	特定保険料率（％）	基本保険料率（％）
+北海道	10.45	1.8	3.53	6.92
+青森県	9.96	1.8	3.53	6.43
+岩手県	9.74	1.8	3.53	6.21
+宮城県	10.01	1.8	3.53	6.48
+秋田県	10.16	1.8	3.53	6.63
+山形県	10.03	1.8	3.53	6.5
+福島県	9.64	1.8	3.53	6.11
+茨城県	9.74	1.8	3.53	6.21
+栃木県	9.87	1.8	3.53	6.34
+群馬県	9.66	1.8	3.53	6.13
+埼玉県	9.8	1.8	3.53	6.27
+千葉県	9.79	1.8	3.53	6.26
+東京都	9.84	1.8	3.53	6.31
+神奈川県	9.99	1.8	3.53	6.46
+新潟県	9.5	1.8	3.53	5.97
+富山県	9.59	1.8	3.53	6.06
+石川県	10.11	1.8	3.53	6.58
+福井県	9.98	1.8	3.53	6.45
+山梨県	9.79	1.8	3.53	6.26
+長野県	9.71	1.8	3.53	6.18
+岐阜県	9.83	1.8	3.53	6.3
+静岡県	9.72	1.8	3.53	6.19
+愛知県	9.91	1.8	3.53	6.38
+三重県	9.81	1.8	3.53	6.28
+滋賀県	9.78	1.8	3.53	6.25
+京都府	10.06	1.8	3.53	6.53
+大阪府	10.29	1.8	3.53	6.76
+兵庫県	10.24	1.8	3.53	6.71
+奈良県	10	1.8	3.53	6.47
+和歌山県	10.11	1.8	3.53	6.58
+鳥取県	9.97	1.8	3.53	6.44
+島根県	10.03	1.8	3.53	6.5
+岡山県	10.18	1.8	3.53	6.65
+広島県	10.04	1.8	3.53	6.51
+山口県	10.22	1.8	3.53	6.69
+徳島県	10.29	1.8	3.53	6.76
+香川県	10.28	1.8	3.53	6.75
+愛媛県	10.22	1.8	3.53	6.69
+高知県	10.17	1.8	3.53	6.64
+福岡県	10.22	1.8	3.53	6.69
+佐賀県	10.68	1.8	3.53	7.15
+長崎県	10.26	1.8	3.53	6.73
+熊本県	10.29	1.8	3.53	6.76
+大分県	10.3	1.8	3.53	6.77
+宮崎県	9.83	1.8	3.53	6.3
+鹿児島県	10.36	1.8	3.53	6.83
+沖縄県	9.95	1.8	3.53	6.42

data/data//347/244/276/344/274/232/344/277/235/351/231/272/346/226/231//347/255/211/347/264/232-20200901-20991231.tsv

@@ -0,0 +1,51 @@
+等級（健康保険）	等級（厚生年金）	標準報酬月額	標準報酬日額	報酬月額（以上）	報酬月額（未満）
+1	0	58000	1930	0	63000
+2	0	68000	2270	63000	73000
+3	0	78000	2600	73000	83000
+4	1	88000	2930	83000	93000
+5	2	98000	3270	93000	101000
+6	3	104000	3470	101000	107000
+7	4	110000	3670	107000	114000
+8	5	118000	3930	114000	122000
+9	6	126000	4200	122000	130000
+10	7	134000	4470	130000	138000
+11	8	142000	4730	138000	146000
+12	9	150000	5000	146000	155000
+13	10	160000	5330	155000	165000
+14	11	170000	5670	165000	175000
+15	12	180000	6000	175000	185000
+16	13	190000	6330	185000	195000
+17	14	200000	6670	195000	210000
+18	15	220000	7330	210000	230000
+19	16	240000	8000	230000	250000
+20	17	260000	8670	250000	270000
+21	18	280000	9330	270000	290000
+22	19	300000	10000	290000	310000
+23	20	320000	10670	310000	330000
+24	21	340000	11330	330000	350000
+25	22	360000	12000	350000	370000
+26	23	380000	12670	370000	395000
+27	24	410000	13670	395000	425000
+28	25	440000	14670	425000	455000
+29	26	470000	15670	455000	485000
+30	27	500000	16670	485000	515000
+31	28	530000	17670	515000	545000
+32	29	560000	18670	545000	575000
+33	30	590000	19670	575000	605000
+34	31	620000	20670	605000	635000
+35	32	650000	21670	635000	665000
+36	-	680000	22670	665000	695000
+37	-	710000	23670	695000	730000
+38	-	750000	25000	730000	770000
+39	-	790000	26330	770000	810000
+40	-	830000	27670	810000	855000
+41	-	880000	29330	855000	905000
+42	-	930000	31000	905000	955000
+43	-	980000	32670	955000	1005000
+44	-	1030000	34330	1005000	1055000
+45	-	1090000	36330	1055000	1115000
+46	-	1150000	38330	1115000	1175000
+47	-	1210000	40330	1175000	1235000
+48	-	1270000	42330	1235000	1295000
+49	-	1330000	44330	1295000	1355000
+50	-	1390000	46330	1355000	-

data/lib/tax_jp/social_insurance.rb

@@ -85,18 +85,19 @@ module TaxJp
       prefecture_code = convert_to_prefecture_code(prefecture)
       salary = salary.to_i
 
-      ret = nil
-
       TaxJp::Utils.with_database(DB_PATH) do |db|
         sql, params = base_query(date, prefecture_code)
 
         sql << 'where g.valid_from <= ? and g.valid_until >= ? and g.salary_from <= ? and g.salary_to > ? '
         params += [date, date, salary, salary]
 
-        ret = nil
-        db.execute(sql, params) do |row|
-          ret = TaxJp::SocialInsurance.new(row)
+        row = db.execute(sql, params).first
+        ret = TaxJp::SocialInsurance.new(row)
+
+        if ret.welfare_pension.grade.pension_grade == TaxJp::INTEGER_MAX
+          ret.welfare_pension.grade = find_max_pension_grade_by_date(date)
         end
+
         ret
       end
     end
@@ -137,6 +138,22 @@ module TaxJp
       end
     end
 
+    def self.find_max_pension_grade_by_date(date)
+      date = TaxJp::Utils.convert_to_date(date)
+
+      TaxJp::Utils.with_database(DB_PATH, results_as_hash: true) do |db|
+        sql =  'select * from grades '
+        sql << 'where valid_from <= ? and valid_until >= ? and pension_grade = ( '
+        sql << '  select max(pension_grade) from grades '
+        sql << '  where valid_from <= ? and valid_until >= ? and pension_grade < ? ' 
+        sql << ') '
+        params = [date, date, date, date, TaxJp::INTEGER_MAX]
+
+        row = db.execute(sql, params).first.with_indifferent_access
+        TaxJp::SocialInsurances::Grade.new(row)
+      end
+    end
+
     def self.find_welfare_pension_by_date_and_salary(date, salary)
       date = TaxJp::Utils.convert_to_date(date)
 

data/lib/tax_jp/social_insurances/db_builder.rb

@@ -14,7 +14,7 @@ class TaxJp::SocialInsurances::DbBuilder < TaxJp::DbBuilder
 
         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| normalize_amount(col)})
+          db.execute(insert_sql_grade, [valid_from, valid_until] + row.map{|col| TaxJp::Utils.normalize_amount(col)})
         end
       end
 
@@ -105,14 +105,6 @@ class TaxJp::SocialInsurances::DbBuilder < TaxJp::DbBuilder
     ret
   end
 
-  def normalize_amount(amount, options = {})
-    if amount.to_s == '-'
-      ret = 2147483647
-    else
-      ret = amount.to_s.gsub(',', '').to_i
-    end
-  end
-
   def filename_to_date(filename)
     title, valid_from, valid_until = File.basename(filename).split('.').first.split('-')
     valid_from = Date.strptime(valid_from, '%Y%m%d')

data/lib/tax_jp/social_insurances/health_insurance.rb

@@ -6,9 +6,11 @@ class TaxJp::SocialInsurances::HealthInsurance
   attr_reader :general, :care
   attr_reader :particular, :basic
   
-  attr_accessor :salary
+  attr_writer :salary
 
   def initialize(attrs)
+    @salary = nil
+
     if attrs.is_a?(Hash)
       @grade = attrs[:grade]
       @valid_from = attrs[:valid_from]

data/lib/tax_jp/social_insurances/welfare_pension.rb

@@ -1,13 +1,15 @@
 # 厚生年金
 class TaxJp::SocialInsurances::WelfarePension
-  attr_reader :grade
   attr_reader :valid_from, :valid_until
   attr_reader :general, :particular
   attr_reader :child_support
 
-  attr_accessor :salary
+  attr_accessor :grade
+  attr_writer :salary
 
   def initialize(attrs)
+    @salary = nil
+
     if attrs.is_a?(Hash)
       @grade = attrs[:grade]
       @valid_from = attrs[:valid_from]
@@ -49,14 +51,12 @@ class TaxJp::SocialInsurances::WelfarePension
   def monthly_standard
     raise '等級が指定されていません' unless grade
     return 0 if grade.pension_grade == 0
-    return 0 if grade.pension_grade > 99
     grade.monthly_standard
   end
 
   def daily_standard
     raise '等級が指定されていません' unless grade
     return 0 if grade.pension_grade == 0
-    return 0 if grade.pension_grade > 99
     grade.daily_standard
   end
 

data/lib/tax_jp/utils.rb

@@ -27,8 +27,10 @@ module TaxJp
         File.write(dest, ERB.new(File.read(src), 0, '-').result)
       end
 
-      def with_database(db_path)
+      def with_database(db_path, results_as_hash: false)
         db = SQLite3::Database.new(db_path)
+        db.results_as_hash = results_as_hash
+
         begin
           yield db
         ensure
@@ -67,7 +69,7 @@ module TaxJp
       end
 
       def filename_to_date(filename)
-        title, valid_from, valid_until = File.basename(filename).split('.').first.split('-')
+        _, valid_from, valid_until = File.basename(filename).split('.').first.split('-')
         valid_from = Date.strptime(valid_from, '%Y%m%d')
         valid_until = Date.strptime(valid_until, '%Y%m%d')
         [valid_from.strftime('%Y-%m-%d'), valid_until.strftime('%Y-%m-%d')]

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '1.1.6'
+  VERSION = '1.1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.11
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-03 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.3
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +93,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
 description: 税金計算ライブラリ
 email:
 - ichylinux@gmail.com
@@ -161,9 +161,9 @@ files:
 - data/源泉徴収税/源泉徴収税月額-20130101-20151231.tsv
 - data/源泉徴収税/源泉徴収税月額-20160101-20161231.tsv
 - data/源泉徴収税/源泉徴収税月額-20170101-20191231.tsv
-- data/源泉徴収税/源泉徴収税月額-20200101-20201231.tsv
+- data/源泉徴収税/源泉徴収税月額-20200101-20211231.tsv
 - data/源泉徴収税/源泉徴収税賞与-20180101-20191231.tsv
-- data/源泉徴収税/源泉徴収税賞与-20200101-20201231.tsv
+- data/源泉徴収税/源泉徴収税賞与-20200101-20211231.tsv
 - data/源泉徴収税月額.db
 - data/源泉徴収税賞与.db
 - data/社会保険料.db
@@ -182,12 +182,14 @@ files:
 - data/社会保険料/健康保険-20180301-20190228.tsv
 - data/社会保険料/健康保険-20190301-20200229.tsv
 - data/社会保険料/健康保険-20200301-20210228.tsv
+- data/社会保険料/健康保険-20210301-20220228.tsv
 - data/社会保険料/厚生年金.tsv
 - data/社会保険料/旧健康保険.tsv
 - data/社会保険料/等級-20001001-20080831.tsv
 - data/社会保険料/等級-20080901-20160331.tsv
 - data/社会保険料/等級-20160401-20160930.tsv
-- data/社会保険料/等級-20161001-20991231.tsv
+- data/社会保険料/等級-20161001-20200831.tsv
+- data/社会保険料/等級-20200901-20991231.tsv
 - data/都道府県.yml
 - data/雇用保険料.db
 - lib/build_tasks/build.rake
@@ -233,14 +235,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: 税金計算ライブラリ