formulas 0.1.1.1 → 0.1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05cc76051c2d5ff9889d39b8448fe5b1b5fabdb60703b9b4c1afd9a58aa72a87
-  data.tar.gz: 01213c4a728219396108c266d8b4398d28829140957c4fb7e957ee401e20fd51
+  metadata.gz: 83d6fc2b5bb6cca7fd953251292a8c7a6ca875d9863baca8172e3a28b3adb9d4
+  data.tar.gz: 7ccc7609cf9eeb47e90997c9a119801c04a573c8ae7501726a4f9b56f6d0367f
 SHA512:
-  metadata.gz: 948b740e1a3e8965ab9991fdcf448081dfe896ff71fbd2f4f7fda2a98c356f37d2c741ef14ca19330168d5d93d211383659f1551fe0cc50b7bac74e5d5fde8bd
-  data.tar.gz: 8bc92d9ea8b509ce304afaeabfdf4db5d443d4a0a542ca8e4ffb34f71652fdec9f79941a3028df5096647a93c57c6c7937e6ea5d953fae82bb4fb8fe3e5e673a
+  metadata.gz: 5ee13fdf52c560cda1700fb92e14c84759444bb2550504cdf2066a92fa273b6ee61ad701a3b3589d2a577b32274db66a9cefa0b57f4c64ba4ea74082d9028792
+  data.tar.gz: 3391896c0adc427c1edb1a568c8a4578df8ee339831fc4245ac45acb37b99a8b88fd7d76a1bc0e54c53446fa8aa3e4fbfea25ca3e4ec62616f4b07407451f724

data/formulas.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'formulas'
-  s.version     = '0.1.1.1'
+  s.version     = '0.1.1.5'
   s.summary     = "formulas"
   s.description = "Home loan formulas"
   s.authors     = ["formulas"]

data/lib/formulas/paye.rb

@@ -19,6 +19,8 @@ module Formulas
       [[180_000], 39]
     ]
 
+    MAX_ACC_LEVY_PAYABLE = 130_911
+
     def initialize(gross_pay:, frequency: Formulas::MONTHLY)
       super(gross_pay, frequency, TAX_RATES)
     end
@@ -26,5 +28,13 @@ module Formulas
     def tax(request_frequency: Formulas::WEEKLY)
       calculate_tax(request_frequency)
     end
+
+    def levy
+      0.0139
+    end
+
+    def acc_payable
+      annual_gross_pay > MAX_ACC_LEVY_PAYABLE ? MAX_ACC_LEVY_PAYABLE : annual_gross_pay
+    end
   end
 end

data/lib/formulas/salary.rb

@@ -16,11 +16,11 @@ module Formulas
     attr_reader :frequency
 
     def initialize(pay:, frequency:)
-      invalid_frequency unless FREQUENCIES.include?(frequency)
-      raise ArgumentError, 'Gross pay must be numeric' unless Numeric === pay
-
       @pay = pay
-      @frequency = frequency
+      @frequency = frequency.to_sym
+
+      invalid_frequency unless FREQUENCIES.include?(@frequency)
+      raise ArgumentError, 'Gross pay must be numeric' unless Numeric === pay
     end
 
     def pay(request_frequency: @frequency)

data/lib/formulas/student_loan_repayment/fix_repayment_per_period.rb

@@ -12,11 +12,11 @@ module Formulas
       FIX_RATE = 0.12
 
       DEFAULT_THRESHOLD = {
-          weekly: [390, 52],
-          fortnightly: [780, 26],
-          four_weeks: [1560, 13],
-          monthly: [1690, 12],
-          annually: [20280, 1],
+        weekly: [390, 52],
+        fortnightly: [780, 26],
+        four_weeks: [1560, 13],
+        monthly: [1690, 12],
+        annually: [20280, 1],
       }
 
       def repayment

data/lib/formulas/student_loan_repayment.rb

@@ -15,9 +15,9 @@ module Formulas
   #
   #
   module StudentLoanRepayment
-    autoload :RepaymentBase, './lib/formulas/student_loan_repayment/repayment_base'
-    autoload :FixRepaymentPerPeriod, './lib/formulas/student_loan_repayment/fix_repayment_per_period'
-    autoload :PercentRepaymentPerThreshold, './lib/formulas/student_loan_repayment/percent_repayment_per_threshold'
+    autoload :RepaymentBase, 'formulas/student_loan_repayment/repayment_base'
+    autoload :FixRepaymentPerPeriod, 'formulas/student_loan_repayment/fix_repayment_per_period'
+    autoload :PercentRepaymentPerThreshold, 'formulas/student_loan_repayment/percent_repayment_per_threshold'
     attr_reader :repayment
 
     def initialize(income_strategy: , repayment_strategy:, rates:)

data/lib/formulas/withholding_tax.rb

@@ -4,10 +4,25 @@ module Formulas
   class WithholdingTax
     include FrequencyConversions
 
-    def initialize(gross_pay, origin_frequency, tax_rate)
+    attr_reader :origin_frequency
+
+    def initialize(gross_pay, origin_frequency, tax_rate, options: {})
       @gross_pay = gross_pay
       @origin_frequency = origin_frequency
       @tax_rate = tax_rate
+      @options = options
+    end
+
+    def net_pay(request_frequency:)
+      annual_pay_after_tax = annual_gross_pay - calculate_tax(Formulas::ANNUALLY)
+
+      if respond_to?(:levy)
+        net_pay = annual_pay_after_tax - (acc_payable * send(:levy))
+      end
+
+      return net_pay if request_frequency.to_s == Formulas::ANNUALLY.to_s
+
+      send("convert_annually_to_#{request_frequency}", net_pay).round(2)
     end
 
     protected
@@ -15,7 +30,7 @@ module Formulas
     def calculate_tax(request_frequency)
       @request_frequency = request_frequency
 
-      return annual_tax if request_frequency == Formulas::ANNUALLY
+      return annual_tax if request_frequency.to_s == Formulas::ANNUALLY.to_s
 
       send("convert_annually_to_#{request_frequency}", annual_tax).round(2)
     end
@@ -25,22 +40,24 @@ module Formulas
     def annual_tax
       annual_result = 0
 
-      if gross_pay_tax_index > 0
-        @tax_rate[0..gross_pay_tax_index].each_with_index do |current, index|
-          l = (index == gross_pay_tax_index) ? @gross_pay : current[0][1]
-          annual_result += ((l - current[0][0]) * (current[1].to_f / 100))
-        end
+      @tax_rate[0..gross_pay_tax_index].each_with_index do |current, index|
+        l = (index == gross_pay_tax_index) ? annual_gross_pay : current[0][1]
+        annual_result += ((l - current[0][0]) * (current[1].to_f / 100))
       end
+
       annual_result
     end
 
     def annual_gross_pay
-      return @gross_pay if @origin_frequency == Formulas::ANNUALLY
+      return @gross_pay if @origin_frequency.to_s == Formulas::ANNUALLY.to_s
       send("convert_#{@origin_frequency}_to_annually", @gross_pay)
     end
 
     def gross_pay_tax_index
-      @tax_rate.index { |current| current[0][0] <= annual_gross_pay && current[0][1] >= annual_gross_pay }
+      @tax_rate.index do |current|
+        (current[0][0] <= annual_gross_pay && current[0][1].nil?) ||
+          (current[0][0] <= annual_gross_pay && current[0][1] >= annual_gross_pay)
+      end
     end
   end
 end

data/lib/formulas.rb

@@ -25,6 +25,13 @@ module Formulas
   FREQUENCIES = [ANNUALLY, WEEKLY, FORTNIGHTLY, MONTHLY]
 
   module FrequencyConversions
+    def convert_annually_to_annually(number)
+      number
+    end
+    alias :convert_weekly_to_weekly convert_annually_to_annually
+    alias :convert_fortnightly_to_fortnightly convert_annually_to_annually
+    alias :convert_monthly_to_monthly convert_annually_to_annually
+
     def convert_annually_to_weekly(number)
       number.to_f / 52
     end
@@ -60,5 +67,17 @@ module Formulas
     def convert_monthly_to_fortnightly(number)
       number.to_f * 12 / 26
     end
+
+    def convert_fortnightly_to_annually(number)
+      number.to_f * 26
+    end
+
+    def convert_fortnightly_to_weekly(number)
+      number.to_f / 2
+    end
+
+    def convert_fortnightly_to_monthly(number)
+      (number.to_f * 26) / 12
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formulas
 version: !ruby/object:Gem::Version
-  version: 0.1.1.1
+  version: 0.1.1.5
 platform: ruby
 authors:
 - formulas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: formulas