Revert "Add corrency methods to Fixnum as well"

Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
+source :rubygems
 
 gemspec

lib/core_ext/big_decimal.rb

@@ -1,9 +1,36 @@
-require 'corrency/corrency_mixin'
+require 'bigdecimal'
+require 'bigdecimal/util'
 
 class BigDecimal
-  include CorrencyMixin
 
-  def to_s(s = "%.2f")
-    sprintf(s, self)
+  def inc_vat
+    (self * vat_rate).to_d
   end
+
+  def ex_vat
+    (self / vat_rate).to_d
+  end
+
+  def next_ninety_nine
+    self.ceil - BigDecimal.new("0.01")
+  end
+
+  def add_margin(margin)
+    ((self / (100 - margin)) * 100).to_d.round(2)
+  end
+
+  def margin(cost)
+    ((self - BigDecimal.new(cost)) / self) * 100
+  end
+
+  old_to_s = instance_method :to_s
+
+  define_method :to_s do |*param|
+    "%.2f" % self.round(2)
+  end
+
+  protected
+    def vat_rate
+      1 + (Corrency::Config.vat_rate.to_f / 100)
+    end
 end

lib/corrency.rb

@@ -1,3 +1,2 @@
 require 'corrency/config'
-require 'core_ext/big_decimal'
-require 'core_ext/fixnum'
+require 'core_ext/big_decimal'

test/big_decimal_test.rb

@@ -8,17 +8,13 @@
       @bd = BigDecimal.new('100.3799')
       assert_equal("100.38", BigDecimal.new("100.38000123").to_s)
     end
-
+    
     it "should round to two decimal places if 0" do
       assert_equal "0.00", BigDecimal.new("0").to_s
     end
-
+    
     it "should round to two decimal places if 1.20" do
       assert_equal "1.20", BigDecimal.new("1.2").to_s
     end
-
-    it "should accept a format override" do
-      assert_equal '31.4159', BigDecimal.new('31.4159265358979').to_s('%.4f')
-    end
   end
 end