tax_jp 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c9e2cab9304a1a1473c7f935bb22bd3161a2786614d02e9182892a8caa561f2
-  data.tar.gz: 1e80555ca7fb62868bc442416431a52e73ee87703c27230bd8e1ade3637fd237
+  metadata.gz: 7c8e52e6f79044209616f7921a3db5250a8f8f4224e2fd587fbddad30f7fa42d
+  data.tar.gz: 7adf190fa90f122387c5c9ede46bafd619a2f58f8e88027a009790778be73d18
 SHA512:
-  metadata.gz: 6947dad826bcf7d274906b320c220627358058f1ab62dc0bd566b40caf12cbbc46ba119f015a83e21a39e3e7257e4967dffe694279c1a2d07c5e6e1216eec556
-  data.tar.gz: 457dc98a3f9676a12f9a5d082e0d733588e992efff487fe3caf5b490a57dc51956aa380e619222f59f4e82b9d8c3926d96cda104195a1e49f7177b9ad466cc3c
+  metadata.gz: edcd1ffb0bab205a6d892329488e438054177c446be121cbabbb1a4dcdf1c9d02400dd143ce23fb357f8e18661c9161f007cf6feac8e5f8cb7f0f5db3e677076
+  data.tar.gz: 72f22efea37271474f920a4ff4db992546cd82cc89e757676cd63bc77fd80656b5fda1088a1c040a5df8ba0a6746535d1754204d99ce23ed672475c60efdda04

data/lib/tax_jp/social_insurance.rb

@@ -66,7 +66,7 @@ module TaxJp
       date = TaxJp::Utils.convert_to_date(date)
       prefecture_code = convert_to_prefecture_code(prefecture)
 
-      with_database do |db|
+      TaxJp::Utils.with_database(DB_PATH) do |db|
         sql, params = base_query(date, prefecture_code)
 
         sql << 'where g.valid_from <= ? and g.valid_until >= ? '
@@ -87,7 +87,7 @@ module TaxJp
 
       ret = nil
 
-      with_database do |db|
+      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 > ? '
@@ -105,7 +105,7 @@ module TaxJp
       date = TaxJp::Utils.convert_to_date(date)
       prefecture_code = convert_to_prefecture_code(prefecture)
 
-      with_database do |db|
+      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.pension_grade = ? '
@@ -119,6 +119,41 @@ module TaxJp
       end
     end
 
+    def self.find_health_insurance_by_date_and_prefecture_and_salary(date, prefecture, salary)
+      date = TaxJp::Utils.convert_to_date(date)
+      prefecture_code = convert_to_prefecture_code(prefecture)
+
+      TaxJp::Utils.with_database(DB_PATH) do |db|
+        sql =  'select * from health_insurances '
+        sql << 'where valid_from <= ? and valid_until >= ? and (prefecture_code = ? or prefecture_code is null) ' 
+        params = [date, date, prefecture_code]
+
+        ret = nil
+        db.execute(sql, params) do |row|
+          ret = TaxJp::SocialInsurances::HealthInsurance.new(row)
+          ret.salary = salary
+        end
+        ret
+      end
+    end
+
+    def self.find_welfare_pension_by_date_and_salary(date, salary)
+      date = TaxJp::Utils.convert_to_date(date)
+
+      TaxJp::Utils.with_database(DB_PATH) do |db|
+        sql =  'select * from welfare_pensions '
+        sql << 'where valid_from <= ? and valid_until >= ? ' 
+        params = [date, date]
+
+        ret = nil
+        db.execute(sql, params) do |row|
+          ret = TaxJp::SocialInsurances::WelfarePension.new(row)
+          ret.salary = salary
+        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)) '
@@ -130,16 +165,6 @@ module TaxJp
     end
     private_class_method :base_query
 
-    def self.with_database
-      db = SQLite3::Database.new(DB_PATH)
-      begin
-        yield db
-      ensure
-        db.close
-      end
-    end
-    private_class_method :with_database
-
   end
 
 end

data/lib/tax_jp/social_insurances/health_insurance.rb

@@ -5,20 +5,32 @@ class TaxJp::SocialInsurances::HealthInsurance
   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]
+  
+  attr_accessor :salary
+
+  def initialize(attrs)
+    if attrs.is_a?(Hash)
+      @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]
+    elsif attrs.is_a?(Array)
+      @valid_from = attrs[0]
+      @valid_until = attrs[1]
+      @prefecture = attrs[2]
+      @general= attrs[3]
+      @care = attrs[4]
+      @particular= attrs[5]
+      @basic = attrs[6]
+    end
   end
 
   def general_amount
-    (monthly_standard * general).round(1)
+    (salary * general).round(1)
   end
 
   def general_amount_half
@@ -26,16 +38,21 @@ class TaxJp::SocialInsurances::HealthInsurance
   end
 
   def general_amount_care
-    (monthly_standard * (general + care)).round(1) 
+    (salary * (general + care)).round(1) 
   end
 
   def general_amount_care_half
     floor_amount(general_amount_care / 2) 
   end
 
+  def salary
+    @salary || monthly_standard
+  end
+
   private
 
   def monthly_standard
+    raise '等級が指定されていません' unless grade
     grade.grade > 0 ? grade.monthly_standard : 0
   end
 

data/lib/tax_jp/social_insurances/welfare_pension.rb

@@ -5,17 +5,27 @@ class TaxJp::SocialInsurances::WelfarePension
   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]
+  attr_accessor :salary
+
+  def initialize(attrs)
+    if attrs.is_a?(Hash)
+      @grade = attrs[:grade]
+      @valid_from = attrs[:valid_from]
+      @valid_until = attrs[:valid_until]
+      @general= attrs[:general]
+      @particular= attrs[:particular]
+      @child_support = attrs[:child_support]
+    elsif attrs.is_a?(Array)
+      @valid_from = attrs[0]
+      @valid_until = attrs[1]
+      @general= attrs[2]
+      @particular= attrs[3]
+      @child_support = attrs[4]
+    end
   end
 
   def general_amount
-    (monthly_standard * general).round(2) 
+    (salary * general).round(2) 
   end
 
   def general_amount_half
@@ -23,22 +33,28 @@ class TaxJp::SocialInsurances::WelfarePension
   end
 
   def particular_amount
-    (monthly_standard * particular).round(2) 
+    (salary * particular).round(2) 
   end
 
   def particular_amount_half
     floor_amount(particular_amount / 2) 
   end
+  
+  def salary
+    @salary || monthly_standard
+  end
 
   private
 
   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

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/tax_jp/withheld_taxes/bonus.rb

@@ -58,14 +58,14 @@ module TaxJp
         end
       end
 
-      def self.find_by_date_and_dependent_and_salary(date, dependent, salary)
+      def self.find_by_date_and_salary_and_dependant(date, salary, dependent)
         date = date.strftime('%Y-%m-%d') if date.is_a?(Date)
         dependent = dependent.to_i
 
         TaxJp::Utils.with_database(DB_PATH) do |db|
           sql = "select * from bonus_withheld_taxes "
           sql << "where valid_from <= ? and valid_until >= ? "
-          sql << "  and dependent_#{dependent}_salary_from >= ? and dependent_#{dependent}_salary_to < ?"
+          sql << "  and dependent_#{dependent}_salary_from <= ? and dependent_#{dependent}_salary_to > ?"
           
           ret = nil
           db.execute(sql, [date, date, salary, salary]) do |row|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-02 00:00:00.000000000 Z
+date: 2018-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap