tax_jp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42dfc90929fc52513a1204a6c156c4c17572af18
-  data.tar.gz: 698bb64ef722b8cd87ba41e7993291c36e1fc970
+  metadata.gz: 20c4fc811b03ea6e993392e85a7697e024b31488
+  data.tar.gz: 2d962416d82390e47bb01bb90f1405d4e34cb7b1
 SHA512:
-  metadata.gz: 30388638485057e038c1b38a1d8e6896f3ee6e418ad19c78879d13fc087da60d941a8a5fd1e8758ff95c1d56b76f6e7ad4c6171a75371c30ad10b8a119a63d11
-  data.tar.gz: 75198197dc5e0a765c72c30e454221222b957da55b56aa585c52b9a980887792f2bdafb00615271c8fe60c4d54692bc9c7443c5795b7e1808442ec4bb15c4344
+  metadata.gz: 2f25dd1ddfc27988e198b01963fe73eb34d6ba2cef2d5eb1781e247734ce23142099ff3473b3356f871d65bfde0e64a0a76e4659c54bf9c0e09f1afd91376ffb
+  data.tar.gz: 6a5d179a84f33c75ecc105a374805286a0c7fec5f1fa889d1cab101791d7b65bb870b441610e46585f7b65142905600bdb2efc0e351f5d97b6f8a9da0bf99a80

data/HISTORY.md

@@ -1,4 +1,11 @@
-# 開発中
+# バージョン 0.3.1
+
+### 追加
+* 厚生年金の日額の計算
+* 厚生年金の等級30以上の計算
+
+### 修正
+* 2016年3月の健康保険料の間違いを修正
 
 # バージョン 0.3.0
 リリース日: 2016-05-12

data/data//347/244/276/344/274/232/344/277/235/351/231/272/346/226/231//347/255/211/347/264/{232-20080901-20991231.tsv → 232-20080901-20160331.tsv}

@@ -33,16 +33,16 @@
 32	28	560000	18670	545000	575000
 33	29	590000	19670	575000	605000
 34	30	620000	20670	605000	635000
-35	31	650000	21670	635000	665000
-36	31	680000	22670	665000	695000
-37	31	710000	23670	695000	730000
-38	31	750000	25000	730000	770000
-39	31	790000	26330	770000	810000
-40	31	830000	27670	810000	855000
-41	31	880000	29330	855000	905000
-42	31	930000	31000	905000	955000
-43	31	980000	32670	955000	1005000
-44	31	1030000	34330	1005000	1055000
-45	31	1090000	36330	1055000	1115000
-46	31	1150000	38330	1115000	1175000
-47	31	1210000	40330	1175000	-
+35	-	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	-

data/data//347/244/276/344/274/232/344/277/235/351/231/272/346/226/231//347/255/211/347/264/232-20160401-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	0	88000	2930	83000	93000
+5	1	98000	3270	93000	101000
+6	2	104000	3470	101000	107000
+7	3	110000	3670	107000	114000
+8	4	118000	3930	114000	122000
+9	5	126000	4200	122000	130000
+10	6	134000	4470	130000	138000
+11	7	142000	4730	138000	146000
+12	8	150000	5000	146000	155000
+13	9	160000	5330	155000	165000
+14	10	170000	5670	165000	175000
+15	11	180000	6000	175000	185000
+16	12	190000	6330	185000	195000
+17	13	200000	6670	195000	210000
+18	14	220000	7330	210000	230000
+19	15	240000	8000	230000	250000
+20	16	260000	8670	250000	270000
+21	17	280000	9330	270000	290000
+22	18	300000	10000	290000	310000
+23	19	320000	10670	310000	330000
+24	20	340000	11330	330000	350000
+25	21	360000	12000	350000	370000
+26	22	380000	12670	370000	395000
+27	23	410000	13670	395000	425000
+28	24	440000	14670	425000	455000
+29	25	470000	15670	455000	485000
+30	26	500000	16670	485000	515000
+31	27	530000	17670	515000	545000
+32	28	560000	18670	545000	575000
+33	29	590000	19670	575000	605000
+34	30	620000	20670	605000	635000
+35	-	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

@@ -67,13 +67,13 @@ module TaxJp
       prefecture_code = convert_to_prefecture_code(prefecture)
 
       with_database do |db|
-        sql =  'select g.*, hi.*, wp.* from grades g '
-        sql << 'inner join health_insurances hi on (hi.valid_from <= ? and hi.valid_until >= ? and (hi.prefecture_code = ? or hi.prefecture_code is null)) '
-        sql << 'inner join welfare_pensions wp on (wp.valid_from <= ? and wp.valid_until >= ?) '
+        sql, params = base_query(date, prefecture_code)
+
         sql << 'where g.valid_from <= ? and g.valid_until >= ? '
+        params += [date, date]
 
         ret = []
-        db.execute(sql, [date, date, prefecture_code, date, date, date, date]) do |row|
+        db.execute(sql, params) do |row|
           ret << TaxJp::SocialInsurance.new(row)
         end
         ret
@@ -85,20 +85,51 @@ module TaxJp
       prefecture_code = convert_to_prefecture_code(prefecture)
       salary = salary.to_i
 
+      ret = nil
+
       with_database do |db|
-        sql =  'select g.*, hi.*, wp.* from grades g '
-        sql << 'inner join health_insurances hi on (hi.valid_from <= ? and hi.valid_until >= ? and (hi.prefecture_code = ? or hi.prefecture_code is null)) '
-        sql << 'inner join welfare_pensions wp on (wp.valid_from <= ? and wp.valid_until >= ?) '
+        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, [date, date, prefecture_code, date, date, date, date, salary, salary]) do |row|
+        db.execute(sql, params) do |row|
           ret = TaxJp::SocialInsurance.new(row)
         end
         ret
       end
     end
 
+    def self.find_by_date_and_prefecture_and_pension_grade(date, prefecture, pension_grade)
+      date = TaxJp::Utils.convert_to_date(date)
+      prefecture_code = convert_to_prefecture_code(prefecture)
+
+      with_database do |db|
+        sql, params = base_query(date, prefecture_code)
+
+        sql << 'where g.valid_from <= ? and g.valid_until >= ? and g.pension_grade = ? '
+        params += [date, date, pension_grade]
+
+        ret = nil
+        db.execute(sql, params) do |row|
+          ret = TaxJp::SocialInsurance.new(row)
+        end
+        ret
+      end
+    end
+
+    def self.base_query(date, prefecture_code)
+      sql =  'select g.*, hi.*, wp.* from grades g '
+      sql << 'inner join health_insurances hi on (hi.valid_from <= ? and hi.valid_until >= ? and (hi.prefecture_code = ? or hi.prefecture_code is null)) '
+      sql << 'inner join welfare_pensions wp on (wp.valid_from <= ? and wp.valid_until >= ?) '
+
+      params = [date, date, prefecture_code, date, date]
+
+      return sql, params
+    end
+    private_class_method :base_query
+
     def self.with_database
       db = SQLite3::Database.new(DB_PATH)
       begin
@@ -107,6 +138,8 @@ module TaxJp
         db.close
       end
     end
+    private_class_method :with_database
+
   end
 
 end

data/lib/tax_jp/social_insurances/welfare_pension.rb

@@ -33,10 +33,17 @@ class TaxJp::SocialInsurances::WelfarePension
   private
 
   def monthly_standard
-    return 0 unless grade.pension_grade >= 1 and grade.pension_grade <= 30
+    return 0 if grade.pension_grade == 0
+    return 0 if grade.pension_grade > 30
     grade.monthly_standard
   end
 
+  def daily_standard
+    return 0 if grade.pension_grade == 0
+    return 0 if grade.pension_grade > 30
+    grade.daily_standard
+  end
+
   def floor_amount(amount)
     (amount * 100).floor * 0.01
   end

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -127,11 +127,12 @@ files:
 - data/社会保険料/健康保険-20120301-20130228.tsv
 - data/社会保険料/健康保険-20130301-20140228.tsv
 - data/社会保険料/健康保険-20140301-20150331.tsv
-- data/社会保険料/健康保険-20150401-20160331.tsv
-- data/社会保険料/健康保険-20160401-20170331.tsv
+- data/社会保険料/健康保険-20150401-20160229.tsv
+- data/社会保険料/健康保険-20160301-20170228.tsv
 - data/社会保険料/厚生年金.tsv
 - data/社会保険料/旧健康保険.tsv
-- data/社会保険料/等級-20080901-20991231.tsv
+- data/社会保険料/等級-20080901-20160331.tsv
+- data/社会保険料/等級-20160401-20991231.tsv
 - data/都道府県.yml
 - features/.gitignore
 - features/01.都道府県.feature