income-tax 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 718d9ae66f9ea72ad57e8bbe963587fbb056b6eb
-  data.tar.gz: 6a77baa4ff918dc60e318951fb0137805b1278da
+  metadata.gz: ca8c930d2bfb251a1e03a6f51920008f6952bcd6
+  data.tar.gz: b8c9ee09d3564038a777e45deb5890b1dcbed778
 SHA512:
-  metadata.gz: 49eccb866d3732ae54f5814ede21fcf0568319c57958e9638ae27b287e3286700796f94489313137487998c13dd5f8e736934816e561ceb95ed57dd07f26f6ce
-  data.tar.gz: 6909cd075ae35332f3670864f955a9fddf8897df2b51c61496d06577e91bc733dcef04c7be3ce4e54405257afaffbdaf58d9c046340017df08887351cf687db1
+  metadata.gz: c6c87405c8526020703d49855875f29f6ee786c7cbf344b4dc2fd41f1644b38adcc34ebceb35bb5ec4ff372d437110d22126d80caf4e0d49bbb7ce82bb03fd47
+  data.tar.gz: 5456b7c26fbf3f3ef1e1371dd108091fdb6c3a29658b4e7bfc69e3f0a6b7d5610b57d91684924b19acd5c2c556cbe326e2459168beabe25e068e2c88203e8e14

data/lib/income_tax/countries/germany.rb

@@ -18,9 +18,11 @@ module IncomeTax
       SOLIDARITY = Rate("5.5%")
 
       def net_taxes(income, lower, upper, lower_taxes, lower_rate, upper_rate, upper_taxes)
-        step   = (upper_rate - lower_rate) / (upper_taxes - lower_taxes + 1)
-        steps  = income - lower_taxes
-        rate   = lower_rate + Rate(step * steps)
+        lower_income = lower - lower_taxes
+        upper_income = upper - upper_taxes
+        step         = (upper_rate - lower_rate) / (upper_income - lower_income)
+        steps        = income - lower_income
+        rate         = lower_rate + Rate(step * steps)
         rate.net_taxes(steps).to_i + lower_taxes
       end
 

data/lib/income_tax/version.rb

@@ -1,3 +1,3 @@
 module IncomeTax
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/readme.md

@@ -54,7 +54,7 @@ Things not considered separate countries:
 
 * Sovereign entities without any actual territory (The Holy See, Sovereign Military Order of Malta).
 * States with very limited recognition (like Northern Cyprus, South Ossetia).
-* Scotland, Wales, England and Northern Island (they are collectively treated as one country).
+* Scotland, Wales, England and Northern Ireland (they are collectively treated as one country).
 * Unclaimed or heavily disputed territories.
 * Antartica.
 

data/spec/income_tax/countries/germany_spec.rb

@@ -63,27 +63,27 @@ describe IncomeTax::Countries::Germany do
   describe "from net income of 10000" do
     let(:type)         { :net                                      }
     let(:income)       { 10000                                     }
-    its(:rate)         { should be == Rational(96, 143)            }
-    its(:gross_income) { should be == "30425.010582010582".to_d    }
+    its(:rate)         { should be == Rational(69, 862)            }
+    its(:gross_income) { should be == "10870.010582010582".to_d    }
     its(:net_income)   { should be == 10000                        }
-    its(:taxes)        { should be == "20425.010582010582".to_d    }
+    its(:taxes)        { should be == "870.010582010582".to_d      }
   end
 
   describe "from net income of 100000" do
     let(:type)         { :net                                      }
     let(:income)       { 100000                                    }
-    its(:rate)         { should be == Rational(142, 315)           }
-    its(:gross_income) { should be == "182081.10582010582".to_d    }
+    its(:rate)         { should be == Rational(199, 510)           }
+    its(:gross_income) { should be == "163989.10582010582".to_d    }
     its(:net_income)   { should be == 100000                       }
-    its(:taxes)        { should be == "82081.10582010582".to_d     }
+    its(:taxes)        { should be == "63989.10582010582".to_d     }
   end
 
   describe "from net income of 100000000" do
     let(:type)         { :net                                      }
     let(:income)       { 100000000                                 }
-    its(:rate)         { should be == Rational(71, 152)            }
-    its(:gross_income) { should be == "187655931.82010582".to_d    }
+    its(:rate)         { should be == Rational(99, 212)            }
+    its(:gross_income) { should be == "187609588.82010582".to_d    }
     its(:net_income)   { should be == 100000000                    }
-    its(:taxes)        { should be == "87655931.82010582".to_d     }
+    its(:taxes)        { should be == "87609588.82010582".to_d     }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: income-tax
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies: []
 description: Estimate Income Tax for different Countries
 email: income-tax-gem@rkh.im