singapore_cpf_calculator 1.2.0 → 1.3.4

data/spec/singapore_cpf_calculator/year_2016/spr_2_gg/age_60_to_65_contribution_calculator_spec.rb

@@ -20,42 +20,42 @@ describe SingaporeCPFCalculator::Year2016::SPR2GG::Age60To65ContributionCalculat
 
     context "when the total wages amounts to 50.00" do
       let(:ordinary_wages) { 50.00 }
-      it { expect(result).to equal_cpf total: 0.00, employee: 0.00, employer: 0.00 }
+      it { expect(result).to equal_cpf total: 0.00, employee: 0.00, employer: 0.00, ow: 50 }
     end
 
     context "when the total wages amounts to 50.01" do
       let(:ordinary_wages) { 50.01 }
-      it { expect(result).to equal_cpf total: 2.00, employee: 0.00, employer: 2.00 }
+      it { expect(result).to equal_cpf total: 2.00, employee: 0.00, employer: 2.00, ow: 50.01 }
     end
 
     context "when the total wages amounts to 500.00" do
       let(:ordinary_wages) { 500.00 }
-      it { expect(result).to equal_cpf total: 18.00, employee: 0.00, employer: 18.00 }
+      it { expect(result).to equal_cpf total: 18.00, employee: 0.00, employer: 18.00, ow: 500 }
     end
 
     context "when the total wages amounts to 500.01" do
       let(:ordinary_wages) { 500.01 }
-      it { expect(result).to equal_cpf total: 18.00, employee: 0.00, employer: 18.00 }
+      it { expect(result).to equal_cpf total: 18.00, employee: 0.00, employer: 18.00, ow: 500.01 }
     end
 
     context "when the total wages amounts to 749.99" do
       let(:ordinary_wages) { 749.99 }
-      it { expect(result).to equal_cpf total: 82.00, employee: 56.00, employer: 26.00 }
+      it { expect(result).to equal_cpf total: 82.00, employee: 56.00, employer: 26.00, ow: 749.99 }
     end
 
     context "when the total wages amounts to 750.00" do
       let(:ordinary_wages) { 750.00 }
-      it { expect(result).to equal_cpf total: 83.00, employee: 56.00, employer: 27.00 }
+      it { expect(result).to equal_cpf total: 83.00, employee: 56.00, employer: 27.00, ow: 750.0 }
     end
 
     context "when the total wages amounts to 5,000.00" do
       let(:ordinary_wages) { 5_000.00 }
-      it { expect(result).to equal_cpf total: 550.00, employee: 375.00, employer: 175.00 }
+      it { expect(result).to equal_cpf total: 550.00, employee: 375.00, employer: 175.00, ow: 5_000 }
     end
 
     context "when the total wages amounts to 10,000.00" do
       let(:ordinary_wages) { 10_000.00 }
-      it { expect(result).to equal_cpf total: 660.00, employee: 450.00, employer: 210.00 }
+      it { expect(result).to equal_cpf total: 660.00, employee: 450.00, employer: 210.00, ow: 6_000 }
     end
 
   end

data/spec/singapore_cpf_calculator/year_2016/spr_2_gg/age_65_up_contribution_calculator_spec.rb

@@ -20,42 +20,42 @@ describe SingaporeCPFCalculator::Year2016::SPR2GG::Age65UpContributionCalculator
 
     context "when the total wages amounts to 50.00" do
       let(:ordinary_wages) { 50.00 }
-      it { expect(result).to equal_cpf total: 0.00, employee: 0.00, employer: 0.00 }
+      it { expect(result).to equal_cpf total: 0.00, employee: 0.00, employer: 0.00, ow: 50 }
     end
 
     context "when the total wages amounts to 50.01" do
       let(:ordinary_wages) { 50.01 }
-      it { expect(result).to equal_cpf total: 2.00, employee: 0.00, employer: 2.00 }
+      it { expect(result).to equal_cpf total: 2.00, employee: 0.00, employer: 2.00, ow: 50.01 }
     end
 
     context "when the total wages amounts to 500.00" do
       let(:ordinary_wages) { 500.00 }
-      it { expect(result).to equal_cpf total: 18.00, employee: 0.00, employer: 18.00 }
+      it { expect(result).to equal_cpf total: 18.00, employee: 0.00, employer: 18.00, ow: 500 }
     end
 
     context "when the total wages amounts to 500.01" do
       let(:ordinary_wages) { 500.01 }
-      it { expect(result).to equal_cpf total: 18.00, employee: 0.00, employer: 18.00 }
+      it { expect(result).to equal_cpf total: 18.00, employee: 0.00, employer: 18.00, ow: 500.01 }
     end
 
     context "when the total wages amounts to 749.99" do
       let(:ordinary_wages) { 749.99 }
-      it { expect(result).to equal_cpf total: 64.00, employee: 37.00, employer: 27.00 }
+      it { expect(result).to equal_cpf total: 64.00, employee: 37.00, employer: 27.00, ow: 749.99 }
     end
 
     context "when the total wages amounts to 750.00" do
       let(:ordinary_wages) { 750.00 }
-      it { expect(result).to equal_cpf total: 64.00, employee: 37.00, employer: 27.00 }
+      it { expect(result).to equal_cpf total: 64.00, employee: 37.00, employer: 27.00, ow: 750 }
     end
 
     context "when the total wages amounts to 5,000.00" do
       let(:ordinary_wages) { 5_000.00 }
-      it { expect(result).to equal_cpf total: 425.00, employee: 250.00, employer: 175.00 }
+      it { expect(result).to equal_cpf total: 425.00, employee: 250.00, employer: 175.00, ow: 5_000 }
     end
 
     context "when the total wages amounts to 10,000.00" do
       let(:ordinary_wages) { 10_000.00 }
-      it { expect(result).to equal_cpf total: 510.00, employee: 300.00, employer: 210.00 }
+      it { expect(result).to equal_cpf total: 510.00, employee: 300.00, employer: 210.00, ow: 6_000 }
     end
 
   end

data/spec/singapore_cpf_calculator_spec.rb

@@ -6,6 +6,10 @@ describe SingaporeCPFCalculator do
 
   describe "#calculate" do
 
+    let(:ytd_ow_subject_to_cpf) { 0.0 }
+    let(:ytd_additional_wages) { 0.0 }
+    let(:estimated_yearly_ow) { 0.0 }
+
     let(:result) {
       calculator.calculate date: date,
                            birthdate: birthdate,
@@ -14,9 +18,53 @@ describe SingaporeCPFCalculator do
                            ordinary_wages: ordinary_wages,
                            additional_wages: additional_wages,
                            employee_contribution_type: employee_contribution_type,
-                           employer_contribution_type: employer_contribution_type
+                           employer_contribution_type: employer_contribution_type,
+      ytd_ow_subject_to_cpf: ytd_ow_subject_to_cpf, # year_total_for("ow_subject_to_cpf"),
+      ytd_additional_wages: ytd_additional_wages,   # year_total_for("aw_subject_to_cpf"),
+      estimated_yearly_ow: estimated_yearly_ow      # estimated_yearly_ordinary_wages
     }
 
+    describe "27 years old permanent resident from 2nd day of payroll" do
+      let(:birthdate) { Date.new(1992, 5, 27) }
+      let(:date) { Date.new(2019, 5, 31) }
+      let(:residency_status) { "permanent_resident" }
+      let(:spr_start_date) { Date.new(2019, 5, 2) }
+      let(:ordinary_wages) { 1652.17 }
+      let(:additional_wages) { 87.69 }
+      let(:employee_contribution_type) { "graduated" }
+      let(:employer_contribution_type) { "graduated" }
+
+      it { expect(result).to equal_cpf total: 157.00, employee: 86.00, employer: 71.00, ow: 1652.17, aw: 87.69 }
+
+      context "ordinary_wages is somehow higher" do
+        let(:ordinary_wages) { 1734.78 }
+        it { expect(result).to equal_cpf total: 164.00, employee: 91.00, employer: 71.00, ow: 1734.78, aw: 87.69 }
+
+        context "may first is not taken into account" do
+          let(:effective_portion) { 0.9565217391304348 }
+          let(:ordinary_wages) { 1734.78 * effective_portion }
+          it { expect(result).to equal_cpf total: 157.00, employee: 87.00, employer: 70.00, ow: 1659.3547826086956, aw: 87.69 }
+        end
+      end
+
+      describe "with year to date data" do
+        let(:ytd_ow_subject_to_cpf) { BigDecimal("1659.3548") }
+        let(:ytd_additional_wages) { BigDecimal("83.8774") }
+        let(:estimated_yearly_ow) { BigDecimal("22800.0") }
+        it { expect(result).to equal_cpf total: 157.00, employee: 86.00, employer: 71.00, ow: 1652.17, aw: 87.69 }
+
+        context "if it had received his PR few days before" do
+          let(:spr_start_date) { Date.new(2019, 4, 25) }
+          it { expect(result).to equal_cpf total: 157.00, employee: 86.00, employer: 71.00, ow: 1652.17, aw: 87.69 }
+        end
+
+        context "if it had received his PR few days after" do
+          let(:spr_start_date) { Date.new(2019, 5, 9) }
+          it { expect(result).to equal_cpf total: 157.00, employee: 86.00, employer: 71.00, ow: 1652.17, aw: 87.69 }
+        end
+      end
+    end
+
     describe "30 years old permanent resident earning $952.00 a month" do
       let(:birthdate) { Date.new(1982, 2, 19) }
       let(:date) { Date.new(2014, 11, 15) }
@@ -27,7 +75,7 @@ describe SingaporeCPFCalculator do
       let(:employee_contribution_type) { nil }
       let(:employer_contribution_type) { nil }
 
-      it { expect(result).to equal_cpf total: 343.00, employee: 190.00, employer: 153.00 }
+      it { expect(result).to equal_cpf total: 343.00, employee: 190.00, employer: 153.00, ow: 700.0, aw: 252.00 }
     end
 
     describe "30 years old earning $952.00 a month before permanent residency" do

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
 require "csv"
 require "singapore_cpf_calculator"
 
@@ -96,20 +93,25 @@ end
 
 RSpec::Matchers.define :equal_cpf do |expected|
   match do |actual|
-    actual == cpf_contribution_for(expected)
+    is_cpf_equal?(actual)
   end
 
   failure_message do |actual|
-    "expected total: #{ actual.total }, employee: #{ actual.employee }\n" +
-      "to match total: #{ expected.fetch(:total) }, employee: #{ expected.fetch(:employee) }"
+    "expected total: #{ actual.inspect }\n" +
+      "to match total: #{ expected.inspect }"
   end
 
   description do
-    "to equal total: #{ expected.fetch(:total) }, employee: #{ expected.fetch(:employee) }"
+    "equal total: #{ expected.inspect }"
   end
 
-  def cpf_contribution_for(expected)
-    SingaporeCPFCalculator::CPFContribution.new total: expected.fetch(:total),
-                                                employee: expected.fetch(:employee)
+  def is_cpf_equal?(actual)
+    total = expected.fetch(:total)
+    employee = expected.fetch(:employee)
+    ow = expected.fetch(:ow, nil)
+    aw = expected.fetch(:aw, nil)
+    total == actual.total && employee = actual.employee &&
+      (!ow.present? || ow == actual.ow_subject_to_cpf) &&
+      (!aw.present? || aw == actual.aw_subject_to_cpf)
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: singapore_cpf_calculator
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.4
 platform: ruby
 authors:
 - Ronald Maravilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -89,11 +75,11 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- circle.yml
 - lib/singapore_cpf_calculator.rb
 - lib/singapore_cpf_calculator/age_group.rb
 - lib/singapore_cpf_calculator/base_calculator.rb
@@ -115,6 +101,7 @@ files:
 - lib/singapore_cpf_calculator/spr_2_gg_common.rb
 - lib/singapore_cpf_calculator/spr_status.rb
 - lib/singapore_cpf_calculator/version.rb
+- lib/singapore_cpf_calculator/year_2012_to_2015_aw_ceiling_module.rb
 - lib/singapore_cpf_calculator/year_2014.rb
 - lib/singapore_cpf_calculator/year_2014/base.rb
 - lib/singapore_cpf_calculator/year_2014/citizen_or_spr_3.rb
@@ -123,6 +110,7 @@ files:
 - lib/singapore_cpf_calculator/year_2014/citizen_or_spr_3/age_55_to_60_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2014/citizen_or_spr_3/age_60_to_65_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2014/citizen_or_spr_3/age_65_up_contribution_calculator.rb
+- lib/singapore_cpf_calculator/year_2014/citizen_or_spr_3/citzen_or_spr3_base.rb
 - lib/singapore_cpf_calculator/year_2014/spr_1_fg.rb
 - lib/singapore_cpf_calculator/year_2014/spr_1_fg/age_50_below_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2014/spr_1_fg/age_50_to_55_contribution_calculator.rb
@@ -155,6 +143,7 @@ files:
 - lib/singapore_cpf_calculator/year_2015/citizen_or_spr_3/age_55_to_60_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2015/citizen_or_spr_3/age_60_to_65_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2015/citizen_or_spr_3/age_65_up_contribution_calculator.rb
+- lib/singapore_cpf_calculator/year_2015/citizen_or_spr_3/citizen_or_spr3_base.rb
 - lib/singapore_cpf_calculator/year_2015/spr_1_fg.rb
 - lib/singapore_cpf_calculator/year_2015/spr_1_fg/age_50_below_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2015/spr_1_fg/age_50_to_55_contribution_calculator.rb
@@ -186,6 +175,7 @@ files:
 - lib/singapore_cpf_calculator/year_2016/citizen_or_spr_3/age_55_to_60_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2016/citizen_or_spr_3/age_60_to_65_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2016/citizen_or_spr_3/age_65_up_contribution_calculator.rb
+- lib/singapore_cpf_calculator/year_2016/citizen_or_spr_3/citizen_or_spr3_base.rb
 - lib/singapore_cpf_calculator/year_2016/spr_1_fg.rb
 - lib/singapore_cpf_calculator/year_2016/spr_1_fg/age_55_below_contribution_calculator.rb
 - lib/singapore_cpf_calculator/year_2016/spr_1_fg/age_55_to_60_contribution_calculator.rb
@@ -321,8 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A Singapore's Central Provident Fund (CPF) contributions calculator.

data/circle.yml

@@ -1,3 +0,0 @@
-machine:
-  ruby:
-    version: 2.1.2