formulas 0.1.1.1 → 0.1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05cc76051c2d5ff9889d39b8448fe5b1b5fabdb60703b9b4c1afd9a58aa72a87
-  data.tar.gz: 01213c4a728219396108c266d8b4398d28829140957c4fb7e957ee401e20fd51
+  metadata.gz: 36695f1d8737ac436e8dec2608a6f420cac392360bfd7b45fe95fcb1363aefe0
+  data.tar.gz: d1e786d718f025ed8e424e454f25ba9dda392c25d8500a6b0d3a67ec7506ffcc
 SHA512:
-  metadata.gz: 948b740e1a3e8965ab9991fdcf448081dfe896ff71fbd2f4f7fda2a98c356f37d2c741ef14ca19330168d5d93d211383659f1551fe0cc50b7bac74e5d5fde8bd
-  data.tar.gz: 8bc92d9ea8b509ce304afaeabfdf4db5d443d4a0a542ca8e4ffb34f71652fdec9f79941a3028df5096647a93c57c6c7937e6ea5d953fae82bb4fb8fe3e5e673a
+  metadata.gz: b51a1482c97eaab4ee7eddd9d386e3e5f3eae378b1b4dc340af7cd8697eaa72a6175b26dd80c8c2e95c62e61421a2ee262ad6e5fb0ea3ec01bdfb6be77c77260
+  data.tar.gz: 80776734b000a0972c8272f58698f6a5130edd96c1596146753e8f40fd094312631a25aafbb7d7f23b84720c984ffa1bdb1552326550dc9cbdc25248fecec6aa

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.2'
   s.summary     = "formulas"
   s.description = "Home loan formulas"
   s.authors     = ["formulas"]

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

data/lib/formulas/paye.rb

@@ -26,5 +26,9 @@ module Formulas
     def tax(request_frequency: Formulas::WEEKLY)
       calculate_tax(request_frequency)
     end
+
+    def levy
+      0.0139
+    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.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/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/withholding_tax.rb

@@ -4,18 +4,32 @@ module Formulas
   class WithholdingTax
     include FrequencyConversions
 
+    attr_reader :origin_frequency
+
     def initialize(gross_pay, origin_frequency, tax_rate)
       @gross_pay = gross_pay
       @origin_frequency = origin_frequency
       @tax_rate = tax_rate
     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 - (annual_gross_pay * 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
 
     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
@@ -27,7 +41,7 @@ module Formulas
 
       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]
+          l = (index == gross_pay_tax_index) ? annual_gross_pay : current[0][1]
           annual_result += ((l - current[0][0]) * (current[1].to_f / 100))
         end
       end
@@ -35,7 +49,7 @@ module Formulas
     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
 

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.2
 platform: ruby
 authors:
 - formulas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest