tax_jp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6f8c11097e0817501265e5e009bce48b5a8ed49
-  data.tar.gz: 7cd8e916740f035ee74633865997ee5c494cbfb0
+  metadata.gz: 81bebb050011c3c2ca6a48a11e6b7d828bdaf320
+  data.tar.gz: 5f7693a7ca21766f944746a8ee177a336b30ba63
 SHA512:
-  metadata.gz: 03b3795c246247e44320ef59a82a3288bea9444b9ab37092011ad448d811e70970528668b47fa8b8eed084d169aef87cb97b20bf070f978ba3abf3d1249f2aeb
-  data.tar.gz: a7d4c85c307c343f3a74288bc84c027a0105c89aa9070c999dd07eef133e74754eac818b4396c312512b419e2e2d61b0abc92c93ce5ccd614a10b4349a481010
+  metadata.gz: ef311f32d6add769d48920cf3a87184b78d8cf417d581e9fabaf538dc46a42461d444098eef926dc1498001316b3c2290d4444b735f9a6234b5ae90d10e5e465
+  data.tar.gz: 8e9222d3314e41e8f6e7e49d2cecf71e9c1dee8a1be91af19880f1602f3d974edfc7c04b10bbe0ed5e34dd04c57316bdccaff7342f8501900088850e1e40f5a3

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

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

data/lib/tax_jp/social_insurance.rb

@@ -1,11 +1,11 @@
 require 'sqlite3'
-require_relative 'grade'
-require_relative 'health_insurance'
-require_relative 'welfare_pension'
 
 module TaxJp
   module SocialInsurances
     require_relative 'social_insurances/utils'
+    require_relative 'social_insurances/grade'
+    require_relative 'social_insurances/health_insurance'
+    require_relative 'social_insurances/welfare_pension'
   end
 
   # 社会保険
@@ -22,22 +22,22 @@ module TaxJp
     attr_reader :welfare_pension
 
     def initialize(row)
-      @grade = TaxJp::Grade.new(
+      @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])
 
-      @health_insurance = TaxJp::HealthInsurance.new(
+      @health_insurance = TaxJp::SocialInsurances::HealthInsurance.new(
+        :grade => @grade,
         :valid_from => row[8], :valid_until => row[9],
-        :monthly_standard => row[4],
         :prefecture => Prefecture.find_by_code(row[10]),
         :general => row[11], :care => row[12],
         :particular => row[13], :basic => row[14])
 
-      @welfare_pension = TaxJp::WelfarePension.new(
+      @welfare_pension = TaxJp::SocialInsurances::WelfarePension.new(
+        :grade => @grade,
         :valid_from => row[15], :valid_until => row[16],
-        :monthly_standard => row[4],
         :general => row[17], :particular => row[18],
         :child_support => row[19])
     end

data/lib/tax_jp/social_insurances/grade.rb

@@ -0,0 +1,20 @@
+# 等級
+class TaxJp::SocialInsurances::Grade
+
+  attr_reader :valid_from, :valid_until
+  attr_reader :grade, :pension_grade
+  attr_reader :monthly_standard, :daily_standard
+  attr_reader :salary_from, :salary_to
+
+  def initialize(attrs = {})
+    @valid_from = attrs[:valid_from]
+    @valid_until = attrs[:valid_until]
+    @grade = attrs[:grade]
+    @pension_grade = attrs[:pension_grade]
+    @monthly_standard = attrs[:monthly_standard]
+    @daily_standard = attrs[:daily_standard]
+    @salary_from = attrs[:salary_from]
+    @salary_to = attrs[:salary_to]
+  end
+
+end

data/lib/tax_jp/social_insurances/health_insurance.rb

@@ -0,0 +1,46 @@
+# 健康年金
+class TaxJp::SocialInsurances::HealthInsurance
+  attr_reader :grade
+  attr_reader :valid_from, :valid_until
+  attr_reader :prefecture
+  attr_reader :general, :care
+  attr_reader :particular, :basic
+
+  def initialize(attrs = {})
+    @grade = attrs[:grade]
+    @valid_from = attrs[:valid_from]
+    @valid_until = attrs[:valid_until]
+    @prefecture = attrs[:prefecture]
+    @general= attrs[:general]
+    @care = attrs[:care]
+    @particular= attrs[:particular]
+    @basic = attrs[:basic]
+  end
+
+  def general_amount
+    floor_amount(monthly_standard * general) 
+  end
+
+  def general_amount_half
+    floor_amount(monthly_standard * general / 2) 
+  end
+
+  def general_amount_care
+    floor_amount(monthly_standard * (general + care)) 
+  end
+
+  def general_amount_care_half
+    floor_amount(monthly_standard * (general + care) / 2) 
+  end
+
+  private
+
+  def monthly_standard
+    grade.grade > 0 ? grade.monthly_standard : 0
+  end
+
+  def floor_amount(amount)
+    (amount * 10).floor * 0.1
+  end
+
+end

data/lib/tax_jp/social_insurances/welfare_pension.rb

@@ -0,0 +1,44 @@
+# 厚生年金
+class TaxJp::SocialInsurances::WelfarePension
+  attr_reader :grade
+  attr_reader :valid_from, :valid_until
+  attr_reader :general, :particular
+  attr_reader :child_support
+
+  def initialize(attrs = {})
+    @grade = attrs[:grade]
+    @valid_from = attrs[:valid_from]
+    @valid_until = attrs[:valid_until]
+    @general= attrs[:general]
+    @particular= attrs[:particular]
+    @child_support = attrs[:child_support]
+  end
+
+  def general_amount
+    floor_amount(monthly_standard * general) 
+  end
+
+  def general_amount_half
+    floor_amount(monthly_standard * general / 2)
+  end
+
+  def particular_amount
+    floor_amount(monthly_standard * particular) 
+  end
+
+  def particular_amount_half
+    floor_amount(monthly_standard * particular / 2) 
+  end
+
+  private
+
+  def monthly_standard
+    return 0 unless grade.pension_grade >= 1 and grade.pension_grade <= 30
+    grade.monthly_standard
+  end
+
+  def floor_amount(amount)
+    (amount * 100).floor * 0.01
+  end
+
+end

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -134,17 +134,17 @@ files:
 - lib/tax_jp.rb
 - lib/tax_jp/const.rb
 - lib/tax_jp/consumption_tax.rb
-- lib/tax_jp/grade.rb
-- lib/tax_jp/health_insurance.rb
 - lib/tax_jp/prefecture.rb
 - lib/tax_jp/rails/engine.rb
 - lib/tax_jp/rails/railtie.rb
 - lib/tax_jp/social_insurance.rb
 - lib/tax_jp/social_insurances/db_builder.rb
+- lib/tax_jp/social_insurances/grade.rb
+- lib/tax_jp/social_insurances/health_insurance.rb
 - lib/tax_jp/social_insurances/utils.rb
+- lib/tax_jp/social_insurances/welfare_pension.rb
 - lib/tax_jp/utils.rb
 - lib/tax_jp/version.rb
-- lib/tax_jp/welfare_pension.rb
 - lib/tax_jp/withheld_tax.rb
 - lib/tax_jp/withheld_taxes/db_builder.rb
 - tax_jp.gemspec

data/lib/tax_jp/grade.rb

@@ -1,22 +0,0 @@
-module TaxJp
-
-  # 等級
-  class Grade
-    attr_reader :valid_from, :valid_until
-    attr_reader :grade, :pension_grade
-    attr_reader :monthly_standard, :daily_standard
-    attr_reader :salary_from, :salary_to
-
-    def initialize(attrs = {})
-      @valid_from = attrs[:valid_from]
-      @valid_until = attrs[:valid_until]
-      @grade = attrs[:grade]
-      @pension_grade = attrs[:pension_grade]
-      @monthly_standard = attrs[:monthly_standard]
-      @daily_standard = attrs[:daily_standard]
-      @salary_from = attrs[:salary_from]
-      @salary_to = attrs[:salary_to]
-    end
-
-  end
-end

data/lib/tax_jp/health_insurance.rb

@@ -1,46 +0,0 @@
-module TaxJp
-
-  # 健康年金
-  class HealthInsurance
-    attr_reader :valid_from, :valid_until
-    attr_reader :monthly_standard
-    attr_reader :prefecture
-    attr_reader :general, :care
-    attr_reader :particular, :basic
-
-    def initialize(attrs = {})
-      @valid_from = attrs[:valid_from]
-      @valid_until = attrs[:valid_until]
-      @monthly_standard = attrs[:monthly_standard]
-      @prefecture = attrs[:prefecture]
-      @general= attrs[:general]
-      @care = attrs[:care]
-      @particular= attrs[:particular]
-      @basic = attrs[:basic]
-    end
-
-    def general_amount
-      floor_amount(monthly_standard * general) 
-    end
-
-    def general_amount_half
-      floor_amount(monthly_standard * general / 2) 
-    end
-
-    def general_amount_care
-      floor_amount(monthly_standard * (general + care)) 
-    end
-
-    def general_amount_care_half
-      floor_amount(monthly_standard * (general + care) / 2) 
-    end
-
-    private
-
-    def floor_amount(amount)
-      (amount * 10).floor * 0.1
-    end
-
-  end
-
-end

data/lib/tax_jp/welfare_pension.rb

@@ -1,43 +0,0 @@
-module TaxJp
-
-  # 厚生年金
-  class WelfarePension
-    attr_reader :valid_from, :valid_until
-    attr_reader :monthly_standard
-    attr_reader :general, :particular
-    attr_reader :child_support
-
-    def initialize(attrs = {})
-      @valid_from = attrs[:valid_from]
-      @valid_until = attrs[:valid_until]
-      @monthly_standard = attrs[:monthly_standard]
-      @general= attrs[:general]
-      @particular= attrs[:particular]
-      @child_support = attrs[:child_support]
-    end
-
-    def general_amount
-      floor_amount(monthly_standard * general) 
-    end
-
-    def general_amount_half
-      floor_amount(monthly_standard * general / 2) 
-    end
-
-    def particular_amount
-      floor_amount(monthly_standard * particular) 
-    end
-
-    def particular_amount_half
-      floor_amount(monthly_standard * particular / 2) 
-    end
-
-    private
-
-    def floor_amount(amount)
-      (amount * 100).floor * 0.01
-    end
-
-  end
-
-end