singapore_cpf_calculator 1.3.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0d8aa374278f946ccb6f54e778961317d15d455a0f0eeae1eb4bd4af7b251a
-  data.tar.gz: a711ea455d39a43a8d3dc2b598c02db1a35e8e95b15121139a53b4dbb6640255
+  metadata.gz: 2b85cdba0115d5685010383b5b5772ff9f6ef4ba72e04b30f33cbfb9e3b62985
+  data.tar.gz: e388948f1433617bcfd6d3a6f9bf840a7c44ce5d6571281d42554903303aa29e
 SHA512:
-  metadata.gz: bb687c0f164156933033b3b2a8a2a00231d62c761e0c10aa8ee4d4569c98addf63d2cf9e6a30fcb8beaa4070a33e7e58defeae7fe1ea5127f11c7efb0f376e29
-  data.tar.gz: 6969152787d83f823a60087d293b9eeea8267ae5e871ea7b3a0d9cb8712a4dc91e74e89a7b2f0d089dad70a41ce9e9abeb4ecdf2a47fba2ea370d1cd2b2346a7
+  metadata.gz: ec11e37d2f9f5b22edfac103eaf3bf033049d08af50de054d56ba62b7b03a4becb27c226eb18b3a5ab08f38e12d8db1e2712cd788e46370b211c42949a1bbd84
+  data.tar.gz: a389646868afe3c426e6d47044d87f4985841033efe7bb1b3dad0e3aee81f39c7361b55eb38b07e384e95cd342b9bd3be13adf7576ba98ec19145861cfd67c13

data/.github/workflows/build.yml

@@ -0,0 +1,37 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 3.2
+          - 3.1
+          - '3.0'
+          - 2.7
+          - 2.6
+          - 2.5
+          - jruby-9.2.17.0
+          - jruby-9.3.3.0
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: RSpec Test suite
+      run: bundle exec rspec
+    - name: Rubocop Linter
+      run: bundle exec rubocop

data/.rubocop.yml

@@ -0,0 +1,81 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  NewCops: enable
+
+Style/StringLiterals:
+  Enabled: false
+Layout/SpaceInsideParens:
+  Enabled: false
+Layout/SpaceInsideStringInterpolation:
+  Enabled: false
+Layout/EmptyLinesAroundBlockBody:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
+Layout/SpaceInsideBlockBraces:
+  Enabled: false
+Metrics/BlockLength:
+  IgnoredMethods:
+    - describe
+    - context
+    - foreach # CSV parsing
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+  Enabled: true
+
+Layout/LineLength:
+  Max: 120
+
+Metrics/AbcSize:
+  Max: 15
+  IgnoredMethods:
+    - is_cpf_equal?
+    - calculated_employee_contribution
+    - calculated_total_contribution
+    - age_grouping_for_2022_and_later
+    - age_grouping_for_2015_and_earlier
+
+Metrics/ClassLength:
+  Max: 40
+  Exclude:
+    - lib/singapore_cpf_calculator/age_group.rb
+    - lib/singapore_cpf_calculator/base_calculator.rb
+
+Metrics/CyclomaticComplexity:
+  Max: 6
+  IgnoredMethods:
+    - is_cpf_equal?
+    - age_grouping_for_2015_and_earlier
+    - age_grouping_for_2015_and_later
+    - age_grouping_for_2022_and_later
+    - validate_params
+
+## Configuration parameters: CountComments, CountAsOne, ExcludedMethods, .
+Metrics/MethodLength:
+  Max: 7
+  IgnoredMethods:
+    - is_cpf_equal?
+    - age_grouping_for_2015_and_earlier
+    - age_grouping_for_2016_and_later
+    - age_grouping_for_2022_and_later
+    - calculated_employee_contribution
+    - calculated_total_contribution
+    - calculate
+    - residency_modules
+    - validate_params
+
+Metrics/ParameterLists:
+  Max: 5
+  Exclude:
+    - lib/singapore_cpf_calculator.rb
+
+Metrics/PerceivedComplexity:
+  Max: 7
+  IgnoredMethods:
+    - is_cpf_equal?
+    - age_grouping_for_2015_and_earlier
+    - age_grouping_for_2015_and_later
+    - age_grouping_for_2022_and_later
+    - validate_params

data/.rubocop_todo.yml

@@ -0,0 +1,326 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2022-03-16 01:46:16 UTC using RuboCop version 1.26.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'singapore_cpf_calculator.gemspec'
+
+# Offense count: 3
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: with_first_argument, with_fixed_indentation
+Layout/ArgumentAlignment:
+  Exclude:
+    - 'spec/singapore_cpf_calculator_spec.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyleAlignWith.
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
+  Exclude:
+    - 'spec/singapore_cpf_calculator/year_2014/citizen_or_spr_3_spec.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+Layout/ClosingParenthesisIndentation:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/citizen_or_spr_3_common.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyleAlignWith, Severity.
+# SupportedStylesAlignWith: start_of_line, def
+Layout/DefEndAlignment:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/year_2022.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'lib/singapore_cpf_calculator.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'singapore_cpf_calculator.gemspec'
+
+# Offense count: 21
+# This cop supports safe auto-correction (--auto-correct).
+Layout/EmptyLines:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/year_2014/citizen_or_spr_3/age_50_to_55_contribution_calculator.rb'
+    - 'lib/singapore_cpf_calculator/year_2014/spr_1_fg/age_50_below_contribution_calculator.rb'
+    - 'lib/singapore_cpf_calculator/year_2015/spr_1_fg.rb'
+    - 'lib/singapore_cpf_calculator/year_2016/spr_1_fg.rb'
+    - 'spec/singapore_cpf_calculator/year_2014_spec.rb'
+    - 'spec/singapore_cpf_calculator/year_2015_spec.rb'
+    - 'spec/singapore_cpf_calculator/year_2016_spec.rb'
+    - 'spec/singapore_cpf_calculator/year_2022_spec.rb'
+
+# Offense count: 230
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
+Layout/EmptyLinesAroundClassBody:
+  Enabled: false
+
+# Offense count: 327
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
+Layout/EmptyLinesAroundModuleBody:
+  Enabled: false
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowForAlignment, AllowBeforeTrailingComments, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/year_2016/citizen_or_spr_3/age_55_to_60_contribution_calculator.rb'
+    - 'lib/singapore_cpf_calculator/year_2022/citizen_or_spr_3/age_55_to_60_contribution_calculator.rb'
+
+# Offense count: 3
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'spec/singapore_cpf_calculator_spec.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: normal, indented_internal_methods
+Layout/IndentationConsistency:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/year_2022.rb'
+    - 'spec/singapore_cpf_calculator/year_2014/citizen_or_spr_3_spec.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: Width, IgnoredPatterns.
+Layout/IndentationWidth:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/year_2022.rb'
+
+# Offense count: 4
+# This cop supports safe auto-correction (--auto-correct).
+Layout/LeadingEmptyLines:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/spr_1_fg_common.rb'
+    - 'lib/singapore_cpf_calculator/spr_1_gg_common.rb'
+    - 'lib/singapore_cpf_calculator/spr_2_fg_common.rb'
+    - 'lib/singapore_cpf_calculator/spr_2_gg_common.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
+# SupportedStylesForExponentOperator: space, no_space
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/year_2016/citizen_or_spr_3/age_55_to_60_contribution_calculator.rb'
+    - 'lib/singapore_cpf_calculator/year_2022/citizen_or_spr_3/age_55_to_60_contribution_calculator.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+Layout/SpaceBeforeComma:
+  Exclude:
+    - 'spec/singapore_cpf_calculator/year_2016/spr_2_gg/age_55_to_60_contribution_calculator_spec.rb'
+    - 'spec/singapore_cpf_calculator/year_2022/spr_2_gg/age_55_to_60_contribution_calculator_spec.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyleForEmptyBraces.
+# SupportedStyles: space, no_space, compact
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: final_newline, final_blank_line
+Layout/TrailingEmptyLines:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/singapore_cpf_calculator/requirements.rb'
+
+# Offense count: 2
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/before_spr.rb'
+
+# Offense count: 152
+# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers.
+# SupportedStyles: snake_case, normalcase, non_integer
+Naming/VariableNumber:
+  Enabled: false
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Style/BlockComments:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 127
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Enabled: false
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: is_a?, kind_of?
+Style/ClassCheck:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/cpf_contribution.rb'
+
+# Offense count: 14
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/singapore_cpf_calculator.rb'
+    - 'lib/singapore_cpf_calculator/requirements.rb'
+    - 'lib/singapore_cpf_calculator/requirements/group_50_years_and_below.rb'
+    - 'lib/singapore_cpf_calculator/requirements/group_55_years_and_below.rb'
+    - 'lib/singapore_cpf_calculator/requirements/group_above_50_to_55_years.rb'
+    - 'lib/singapore_cpf_calculator/requirements/group_above_55_to_60_years.rb'
+    - 'lib/singapore_cpf_calculator/requirements/group_above_60_to_65_years.rb'
+    - 'lib/singapore_cpf_calculator/requirements/group_above_65_to_70_years.rb'
+    - 'lib/singapore_cpf_calculator/requirements/group_above_65_years.rb'
+    - 'lib/singapore_cpf_calculator/requirements/group_above_70_years.rb'
+    - 'lib/singapore_cpf_calculator/residency_module_common.rb'
+    - 'lib/singapore_cpf_calculator/spr_status.rb'
+    - 'lib/singapore_cpf_calculator/year_2012_to_2015_aw_ceiling_module.rb'
+    - 'lib/singapore_cpf_calculator/year_common.rb'
+
+# Offense count: 6
+# This cop supports safe auto-correction (--auto-correct).
+Style/EmptyCaseCondition:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/age_group.rb'
+    - 'lib/singapore_cpf_calculator/base_calculator.rb'
+    - 'lib/singapore_cpf_calculator/spr_status.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: empty, nil, both
+Style/EmptyElse:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/spr_status.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Style/Encoding:
+  Exclude:
+    - 'singapore_cpf_calculator.gemspec'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Style/ExpandPathArguments:
+  Exclude:
+    - 'singapore_cpf_calculator.gemspec'
+
+# Offense count: 2
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/singapore_cpf_calculator.rb'
+    - 'lib/singapore_cpf_calculator/base_calculator.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Style/KeywordParametersOrder:
+  Exclude:
+    - 'lib/singapore_cpf_calculator.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+Style/LineEndConcatenation:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: IgnoredMethods.
+Style/MethodCallWithoutArgsParentheses:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/base_calculator.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/version.rb'
+
+# Offense count: 12
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: be, be_a, be_an, be_between, be_falsey, be_kind_of, be_instance_of, be_truthy, be_within, eq, eql, end_with, include, match, raise_error, respond_to, start_with
+Style/NestedParenthesizedCalls:
+  Exclude:
+    - 'spec/singapore_cpf_calculator/year_2014_spec.rb'
+    - 'spec/singapore_cpf_calculator/year_2015_spec.rb'
+    - 'spec/singapore_cpf_calculator/year_2016_spec.rb'
+    - 'spec/singapore_cpf_calculator/year_2022_spec.rb'
+
+# Offense count: 24
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: MinSize, WordRegex.
+# SupportedStyles: percent, brackets
+Style/WordArray:
+  EnforcedStyle: brackets
+
+# Offense count: 8
+# This cop supports unsafe auto-correction (--auto-correct-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: forbid_for_all_comparison_operators, forbid_for_equality_operators_only, require_for_all_comparison_operators, require_for_equality_operators_only
+Style/YodaCondition:
+  Exclude:
+    - 'lib/singapore_cpf_calculator/age_group.rb'
+
+# Offense count: 1
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+

data/README.md

@@ -11,6 +11,8 @@ Central Provident Fund (CPF) contributions.
 
 ## Support
 
+  * [Year 2023](https://www.cpf.gov.sg/content/dam/web/employer/employer-obligations/documents/CPF%20con%20rates%20from%201%20January%202023.pdf)
+  * [Year 2022](https://www.cpf.gov.sg/content/dam/web/employer/employer-obligations/documents/CPFContributionRatesTable_1Jan2022.pdf)
   * [Year 2015](http://mycpf.cpf.gov.sg/NR/rdonlyres/9F38419D-1342-4426-820E-32BA8FDE5C6D/0/CPFContributionandAllocationRatesfrom1January2015.pdf)
     * Singapore Citizens or Singapore Permanent Residents (3rd Year Onwards)
     * Singapore Permanent Residents (SPRs) during 1st Year of SPR Status

data/lib/singapore_cpf_calculator/age_group.rb

@@ -16,16 +16,19 @@ module SingaporeCPFCalculator
       #   - :group_above_55_to_60_years
       #   - :group_above_60_to_65_years
       #   - :group_above_65_years
-      def get(current_date, birthdate:)
-        new(current_date, birthdate: birthdate).get
+      #   - :group_above_65_to_70_years
+      #   - :group_above_70_years
+      def get(current_date, birthdate:, has_70_up: false)
+        new(current_date, birthdate: birthdate, has_70_up: has_70_up).get
       end
     end
 
     # @param [Date] current_date
     # @param [Date] birthdate:
-    def initialize(current_date, birthdate:)
+    def initialize(current_date, birthdate:, has_70_up:)
       @current_date = current_date
       @birthdate = birthdate
+      @has_70_up = has_70_up
     end
 
     # @return [Symbol] the symbol representation of the age group
@@ -35,17 +38,21 @@ module SingaporeCPFCalculator
     #   - :group_above_55_to_60_years
     #   - :group_above_60_to_65_years
     #   - :group_above_65_years
+    #   - :group_above_65_to_70_years
+    #   - :group_above_70_years
     def get
       if current_date.year <= 2015
         age_grouping_for_2015_and_earlier
-      else
+      elsif current_date.year <= 2021 || !has_70_up
         age_grouping_for_2016_and_later
+      else
+        age_grouping_for_2022_and_later
       end
     end
 
     private
 
-    attr_reader :current_date, :birthdate
+    attr_reader :current_date, :birthdate, :has_70_up
 
     def age
       @age ||= effective_age
@@ -89,6 +96,21 @@ module SingaporeCPFCalculator
       end
     end
 
+    def age_grouping_for_2022_and_later
+      case
+      when age < 55
+        :group_55_years_and_below
+      when 55 <= age && age < 60
+        :group_above_55_to_60_years
+      when 60 <= age && age < 65
+        :group_above_60_to_65_years
+      when 65 <= age && age < 70
+        :group_above_65_to_70_years
+      else # 70 <= age
+        :group_above_70_years
+      end
+    end
+
   end
 
 end

data/lib/singapore_cpf_calculator/base_calculator.rb

@@ -5,8 +5,8 @@ module SingaporeCPFCalculator
     class << self
       # @param [Fixnum] age
       # @return [true, false] returns true if the calculator applies to the employee's age.
-      def applies_to?(date, birthdate:)
-        AgeGroup.get(date, birthdate: birthdate) == required_age_group
+      def applies_to?(date, birthdate:, has_70_up:)
+        AgeGroup.get(date, birthdate: birthdate, has_70_up: has_70_up) == required_age_group
       end
 
       # @param [BigDecimal] ordinary_wages:
@@ -31,7 +31,9 @@ module SingaporeCPFCalculator
       private
 
       def required_age_group
+        # :nocov:
         raise NotImplementedError, "sub classes needs to implement .required_age_group"
+        # :nocov:
       end
     end
 
@@ -126,23 +128,33 @@ module SingaporeCPFCalculator
 
     # TC Rate 1 is
     def tc_rate_1
+      # :nocov:
       raise NotImplementedError, "sub classes needs to implement #tc_rate_1"
+      # :nocov:
     end
 
     def tc_rate_2
+      # :nocov:
       raise NotImplementedError, "sub classes needs to implement #tc_rate_2"
+      # :nocov:
     end
 
     def ec_rate
+      # :nocov:
       raise NotImplementedError, "sub classes needs to implement #ec_rate"
+      # :nocov:
     end
 
     def adjustment_rate
+      # :nocov:
       raise NotImplementedError, "sub classes needs to implement #adjustment_rate"
+      # :nocov:
     end
 
     def capped_ordinary_wages
+      # :nocov:
       raise NotImplementedError, "sub classes needs to implement #capped_ordinary_wages"
+      # :nocov:
     end
 
     # precision helper

data/lib/singapore_cpf_calculator/requirements/group_above_65_to_70_years.rb

@@ -0,0 +1,13 @@
+module SingaporeCPFCalculator
+  module Requirements
+    module GroupAbove65To70Years
+
+      private
+
+      def required_age_group
+        :group_above_65_to_70_years
+      end
+
+    end
+  end
+end

data/lib/singapore_cpf_calculator/requirements/group_above_70_years.rb

@@ -0,0 +1,13 @@
+module SingaporeCPFCalculator
+  module Requirements
+    module GroupAbove70Years
+
+      private
+
+      def required_age_group
+        :group_above_70_years
+      end
+
+    end
+  end
+end

data/lib/singapore_cpf_calculator/requirements.rb

@@ -8,4 +8,7 @@ require_relative "requirements/group_55_years_and_below"
 require_relative "requirements/group_above_50_to_55_years"
 require_relative "requirements/group_above_55_to_60_years"
 require_relative "requirements/group_above_60_to_65_years"
+require_relative "requirements/group_above_65_to_70_years"
 require_relative "requirements/group_above_65_years"
+require_relative "requirements/group_above_70_years"
+

data/lib/singapore_cpf_calculator/residency_module_common.rb

@@ -5,7 +5,11 @@ module SingaporeCPFCalculator
     # @param [Date] birthdate
     # @return [#calculator] returns the CPF calculator that matches the age.
     def calculator_for(date, birthdate:)
-      calculators.find { |calculator| calculator.applies_to? date, birthdate: birthdate }
+      calculators.find { |calculator| calculator.applies_to? date, birthdate: birthdate, has_70_up: has_70_up }
+    end
+
+    def has_70_up
+      false
     end
 
   end

data/lib/singapore_cpf_calculator/version.rb

@@ -1,3 +1,3 @@
 module SingaporeCPFCalculator
-  VERSION = "1.3.4"
+  VERSION = "1.5.0"
 end

data/lib/singapore_cpf_calculator/year_2016.rb

@@ -14,9 +14,9 @@ module SingaporeCPFCalculator
       include YearCommon
 
       # @param [Date] date when the CPF contribution is to be calculated for.
-      # @return [true, false] true when the date's year is 2015
+      # @return [true, false] true when the date's year is within 2016~2022
       def applies_to?(date)
-        date.year >= 2016
+        date.year >= 2016 && date.year < 2022
       end
 
       private

data/lib/singapore_cpf_calculator/year_2022/citizen_or_spr_3/age_55_below_contribution_calculator.rb

@@ -0,0 +1,8 @@
+module SingaporeCPFCalculator
+  module Year2022
+    module CitizenOrSPR3
+      class Age55BelowContributionCalculator < Year2016::CitizenOrSPR3::Age55BelowContributionCalculator
+      end
+    end
+  end
+end