money_extensions 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4d04889e7bd94edc4a6d9d405d7e9bc0ea76ac42
-  data.tar.gz: b6981f399bab4e9c5678bd70bb2ab439ab451034
+SHA256:
+  metadata.gz: 664c218fac6464fdf5789d5a301bd50d5ab9b4270dc537c199f451a4c1c8da1c
+  data.tar.gz: e824d3b3e10bde7a5c20c26c9668db8ca4b09d2f513adddf82466909d14702c1
 SHA512:
-  metadata.gz: 70ba70b3afa207cdd486dfefe8f8585030fc6eefaa907afbf53f71ec8840d5efbc7de70dcac03413b11d1e58550f7e2112aa4d466d59c09cbe05940039e97c0c
-  data.tar.gz: aef1df6411294b67265c82bd2e294e8e4ce8845a37c69c1e14f06d5a1808e0b3a13e6a593d667130b854d71714e1c64bc14b75c623111a31fd454c4b3327a715
+  metadata.gz: dbd0b0d8a7f25d7601bea3006156e8324b0a211155431ea2bcfa65a3ce62c24efbfee701429ce544765cf80a1f77bd75518fce0e90647a5000be26a4de6b2b0c
+  data.tar.gz: 6828b8a3401ea874852b0804c695b06f97b107830d610c25f0ad99aed9d1b29db7c91b5594fec8782fe3233173e66fbd84377b7b98c398bae5a599a4c220c3c4

data/.gitignore

@@ -2,3 +2,5 @@ pkg
 coverage
 Gemfile.lock
 tmp
+vendor
+.bundle

data/.ruby-version

@@ -0,0 +1 @@
+2.6.3

data/.travis.yml

@@ -1,22 +1,18 @@
 language: ruby
 rvm:
-  - 2.2.2
-  - 2.3.0
   - 2.4
+  - 2.5
+  - 2.6
 matrix:
-  fast_finish: true
   exclude:
     - rvm: 2.4
-      gemfile: gemfiles/rails3.gemfile
+      gemfile: gemfiles/rails6.gemfile
+
+script: "bundle exec rake spec"
 gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
   - gemfiles/rails5.gemfile
-script: "bundle exec rake spec"
-notifications:
-  email:
-    - support@travellink.com.au
-  flowdock:
-    secure: A0Fr9j0kvKPEWuPbJu/DPMYPvx98UI8k43adKN9UjTB6FRVAQM3kXmKJIL3A495scc2Civrg2KHDkbwNwVThY+HdLeU7q71Bm6obP6ZkCe43MIoc9NiVJymCNguku6+tLEyusdWIceFiBW7P5p/sU1QU66GFj1t4wNTpVq9A4Kw=
+  - gemfiles/rails6.gemfile
 sudo: false
 cache: bundler
+before_install:
+  - gem install bundler

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
-## Unreleased
+## 1.0.0
+
+* [TT-5845] Update to support money gems >= 6
 
 ## 0.1.0
 

data/gemfiles/rails5.gemfile

@@ -2,5 +2,6 @@ source 'https://rubygems.org'
 gemspec :path => '../'
 
 group :development, :test do
-  gem 'activerecord', '~> 5.0'
+  gem 'activerecord', '~> 5'
+  gem 'activesupport', '~> 5'
 end

data/gemfiles/{rails4.gemfile → rails6.gemfile}

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 gemspec :path => '../'
 
-gem 'money', '< 5.1', :platform => :ruby_18
-
 group :development, :test do
-  gem 'activerecord', '~> 4.0'
+  gem 'activerecord', '~> 6.0rc2'
+  gem 'activesupport', '~> 6.0rc2'
 end

data/lib/money_extensions.rb

@@ -1,9 +1,9 @@
 module MoneyExtensions
   require 'money'
   require 'money_extensions/array'
-  require 'money_extensions/big_decimal'
   require 'money_extensions/integer'
-  require 'money_extensions/extensions'
+  require 'money_extensions/split_between'
+  require 'money_extensions/html_format'
   require 'money_extensions/money_field'
   require 'money_extensions/numeric'
   require 'money_extensions/string'
@@ -14,4 +14,3 @@ module MoneyExtensions
   end
 
 end
-

data/lib/money_extensions/active_record/extensions.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module ActiveRecord
   module Extensions
-
     def self.included(base)
       base.extend(ClassMethods)
     end
@@ -18,20 +19,14 @@ module ActiveRecord
 
         field_name = "#{attr_name}_iso_code"
 
-        composed_of attr_name, :class_name => "Money::Currency",
-                    :mapping => [field_name, 'iso_code'],
-                    :allow_nil => true,
-                    :constructor => Proc.new{|value| Money::Currency.new(value) unless value.blank?}
+        composed_of attr_name, class_name: 'Money::Currency',
+                               mapping: [field_name, 'iso_code'],
+                               allow_nil: true,
+                               constructor: proc { |value| Money::Currency.new(value) unless value.blank? }
 
-        if Rails.version > '3'
-          scope :for_currency, lambda{ |currency|
-                               where(:currency_iso_code => currency.iso_code)
+        scope :for_currency, lambda { |currency|
+                               where(currency_iso_code: currency.iso_code)
                              }
-        else
-          named_scope :for_currency, lambda{ |currency|
-                                     {:conditions => {:currency_iso_code => currency.iso_code}}
-                                   }
-        end
 
         if options[:default]
           before_validation :set_default_currency
@@ -43,13 +38,9 @@ module ActiveRecord
           METHOD
         end
 
-        if options[:required]
-          validates_presence_of :currency_iso_code
-        end
+        validates_presence_of :currency_iso_code if options[:required]
       end
-
     end
-
   end
 end
 

data/lib/money_extensions/array.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Array
   # Returns sum as a money - and returns 0 for empty arrays
   def total_money
     empty? ? ::Money.new(0) : inject(:+)
   end
-end
+end

data/lib/money_extensions/html_format.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/string/output_safety'
+
+module HtmlFormat
+  def format(**rules)
+    html_wrap = rules.delete(:html_wrap)
+    return html_wrap(super(**rules)) if html_wrap
+
+    super(**rules)
+  end
+
+  def as_html(**rules)
+    rules[:html_wrap] = true
+    format(**rules).html_safe
+  end
+
+  private
+
+  def html_wrap(str)
+    "<span class=\"money #{direction_class}\">#{str}</span>"
+  end
+
+  def direction_class
+    if cents > 0
+      'positive'
+    elsif cents < 0
+      'negative'
+    else
+      'zero'
+    end
+  end
+end
+
+class Money
+  prepend HtmlFormat
+end

data/lib/money_extensions/integer.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Integer
-  #Returns self as a money (treated as cents)
+  # Returns self as a money (treated as cents)
   def total_money
     zero? ? ::Money.new(0) : ::Money.new(self)
   end

data/lib/money_extensions/money_field.rb

@@ -1,5 +1,6 @@
-module MoneyField
+# frozen_string_literal: true
 
+module MoneyField
   def self.included(base)
     base.extend(ClassMethods)
   end
@@ -23,12 +24,10 @@ module MoneyField
       METHOD
     end
 
-
     def money_fields(*attributes)
-      attributes.each {|a| self.money_field(a)}
+      attributes.each { |a| money_field(a) }
     end
 
-
     def money(*fields)
       fields.each do |field|
         class_eval <<-METHOD
@@ -38,7 +37,5 @@ module MoneyField
         METHOD
       end
     end
-
   end
-
-end
+end

data/lib/money_extensions/numeric.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Numeric
   # Converts this numeric to a Money object in the default currency. It
   # multiplies the numeric value by 100 and treats that as cents.
@@ -11,6 +13,6 @@ class Numeric
   # require 'bigdecimal'
   # BigDecimal.new('100').to_money => #<Money @cents=10000>
   def to_money(currency = nil)
-    ::Money.new((self * 100).round, currency)
+    ::Money.new((self * 100).round, currency || Money.default_currency)
   end
-end
+end

data/lib/money_extensions/split_between.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module SplitBetween
+  # Override division -- should not do it, but use split_between
+  def /(*_params)
+    raise "Division of money NOT allowed - use 'split_between' to avoid rounding errors"
+  end
+
+  # Split the money between the specified number - and return an array of money
+  # Remainder in splits are given to the highest value e.g.
+  # $2.00 splits [40, 81, 40] into [49, 102, 49]
+  # $1.01 splits [ 1,  1,  1] into [35,  33, 33]
+  def split_between(params)
+    # if just a number is passed in, then money is split equally
+    if params.is_a?(Integer)
+      divisor = params
+      raise ArgumentError, 'Can only split up over a positive number' if divisor < 1
+
+      rounded_split = lossy_divide(divisor)
+      results       = Array.new(divisor, rounded_split) # Create with 'divisor' num elements
+
+      # if an array of monies is passed in, then split in proportions
+    elsif params.is_a?(Array)
+
+      raise ArgumentError, 'Can only split up over at least one ration' if params.empty? && !zero?
+
+      results = params.map { |p| p.is_a?(::Money) ? p.cents : p }
+
+      total = results.inject(:+)
+      if total.zero?
+        return Array.new(results.size, ::Money.new(0)) if zero?
+
+        raise ArgumentError, "Total of ratios should not be zero! You sent in: #{params.inspect}"
+      end
+
+      results.map! do |ratio|
+        ::Money.new((cents * (ratio.to_f / total)).round)
+      end
+    else
+      raise 'Either a Integer or array has to be passed in for splitting money'
+    end
+
+    # Distribute rounding to max absolute to avoid a $0 amount getting the rounding
+    biggest_value_index = results.index(results.max_by(&:abs))
+    results[biggest_value_index] += self - results.total_money
+
+    results
+  end
+end
+
+class Money
+  alias lossy_divide /
+  include SplitBetween
+end

data/lib/money_extensions/string.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class String
   # Converts this string to a float and then to a Money object in the default currency.
   # It multiplies the converted numeric value by 100 and treats that as cents.
@@ -9,6 +11,6 @@ class String
   # '100'.to_money => #<Money @cents=10000>
   # '100.37'.to_money => #<Money @cents=10037>
   def to_money(currency = nil)
-    Money.new((self.to_f * 100).round, currency)
+    Money.new((to_f * 100).round, currency)
   end
-end
+end

data/lib/money_extensions/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MoneyExtensions
-  VERSION = '0.1.0'
+  VERSION = '1.0.0'
 end

data/money_extensions.gemspec

@@ -19,8 +19,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'money', '>= 3.0.0', '< 6.0.0'
+  spec.add_dependency 'money', '>= 6.0.0'
+  spec.add_dependency 'activesupport', '>= 5'
+
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'coverage-kit'
   spec.add_development_dependency 'simplecov-rcov'

data/spec/big_decimal_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe BigDecimal do
 
   it "should allow verifying if it's a positive value" do
-    expect(BigDecimal.new('-1')).to_not be_positive
-    expect(BigDecimal.new('0')).to_not be_positive
-    expect(BigDecimal.new('1')).to be_positive
+    expect(BigDecimal('-1')).to_not be_positive
+    expect(BigDecimal('0')).to_not be_positive
+    expect(BigDecimal('1')).to be_positive
   end
 
   it "should allow verifying if it's a negative value" do
-    expect(BigDecimal.new('-1')).to be_negative
-    expect(BigDecimal.new('0')).to_not be_negative
-    expect(BigDecimal.new('1')).to_not be_negative
+    expect(BigDecimal('-1')).to be_negative
+    expect(BigDecimal('0')).to_not be_negative
+    expect(BigDecimal('1')).to_not be_negative
   end
 
 end

data/spec/html_format_spec.rb

@@ -0,0 +1,48 @@
+require 'money'
+require 'money_extensions/string'
+require 'money_extensions/html_format'
+
+RSpec.describe Money do
+  before { Money.locale_backend = nil }
+  after { Money.locale_backend = :legacy }
+
+  let(:money_positive) { Money.new(100)  }
+  let(:money_negative) { Money.new(-100) }
+  let(:money_zero)     { Money.new(0)    }
+
+  subject { money_positive.format(*rules) }
+
+  it "should format the output correctly" do
+    expect(money_negative.format(html_wrap: true, sign_before_symbol: true)).to eq "<span class=\"money negative\">-$1.00</span>"
+    expect(money_positive.format(html_wrap: true)).to eq "<span class=\"money positive\">$1.00</span>"
+    expect(money_zero.format(html_wrap: true)).to eq "<span class=\"money zero\">$0.00</span>"
+
+    expect(money_positive.format(html_wrap: true)).to eq "<span class=\"money positive\">$1.00</span>"
+    expect(money_negative.format(html_wrap: true, sign_before_symbol: true)).to eq "<span class=\"money negative\">-$1.00</span>"
+    expect(money_zero.format(html_wrap: true)).to eq "<span class=\"money zero\">$0.00</span>"
+
+    expect(money_positive.format(signed: true, sign_positive: true, sign_before_symbol: true)).to eq "+$1.00"
+    expect(money_negative.format(signed: true, sign_before_symbol: true)).to eq "-$1.00"
+    expect(money_zero.format(signed: true)).to eq "$0.00"
+
+    expect(money_positive.format(separator: '~')).to eq "$1~00"
+  end
+
+  it 'should work with as_html' do
+    expect(money_negative.as_html(sign_before_symbol: true)).to eq "<span class=\"money negative\">-$1.00</span>"
+    expect(money_positive.as_html).to eq "<span class=\"money positive\">$1.00</span>"
+    expect(money_zero.as_html).to eq "<span class=\"money zero\">$0.00</span>"
+
+    expect(money_positive.as_html).to eq "<span class=\"money positive\">$1.00</span>"
+    expect(money_negative.as_html(sign_before_symbol: true)).to eq "<span class=\"money negative\">-$1.00</span>"
+    expect(money_zero.as_html).to eq "<span class=\"money zero\">$0.00</span>"
+  end
+
+  it 'should format cents where appropriate' do
+    expect('1.50'.to_money.format(no_cents: true)).to eq '$1'
+    expect('1.00'.to_money.format(no_cents: true)).to eq '$1'
+
+    expect('1.50'.to_money.format(no_cents_if_whole: true)).to eq '$1.50'
+    expect('1.00'.to_money.format(no_cents_if_whole: true)).to eq '$1'
+  end
+end

data/spec/money_spec.rb

@@ -1,23 +1,6 @@
 require 'spec_helper'
 
 describe Money do
-  it "should get correct direction class" do
-    expect(Money.new(-1).direction_class).to eq 'negative'
-    expect(Money.new(0).direction_class).to eq 'zero'
-    expect(Money.new(1).direction_class).to eq 'positive'
-  end
-
-  it "should round correctly" do
-    money = Money.new(511)
-    expect(money.round.cents).to eq 500
-    expect(money.round(10).cents).to eq 510
-    expect(money.round(1).cents).to eq 511
-
-    expect(money.round(100, 'up').cents).to eq 600
-    expect(money.round(100, 'down').cents).to eq 500
-    expect(money.round(100, 'nearest').cents).to eq 500
-  end
-
   it "should deny division of money (to prevent rounding errors)" do
     expect { Money.new(50)/10 }.to raise_error(RuntimeError)
   end
@@ -38,7 +21,7 @@ describe Money do
     expect(money.split_between([1,2])).to eq [33,67].map{ |i| Money.new(i)}
 
     money_negative = Money.new(-100)
-    expect(money_negative.split_between(3)).to eq [-32,-34,-34].map{ |i| Money.new(i)}
+    expect(money_negative.split_between(3)).to eq [-34,-33,-33].map{ |i| Money.new(i)}
     expect(money_negative.split_between([1,2,2,5])).to eq [-10,-20,-20,-50].map{ |i| Money.new(i)}
     expect(money_negative.split_between([1,2])).to eq [-33,-67].map{ |i| Money.new(i)}
 
@@ -60,14 +43,14 @@ describe Money do
 
   it "should return a nice, Big Decimal if so converted" do
     money = Money.new(1428)
-    bigdecimal = BigDecimal.new("14.28")
+    bigdecimal = BigDecimal("14.28")
     expect(money.to_d).to eq bigdecimal
   end
 
   it "should be createable from strings and numbers" do
     money = Money.new(100)
     expect("1".to_money.cents).to eq money.cents
-    expect(BigDecimal.new('1').to_money.cents).to eq money.cents
+    expect(BigDecimal('1').to_money.cents).to eq money.cents
     expect(100.total_money.cents).to eq money.cents
   end
 
@@ -89,29 +72,4 @@ describe Money do
     expect(money_negative.abs).to eq money_positive
     expect(money_zero.abs).to eq money_zero
   end
-
-  it "should format the output correctly" do
-    expect(money_positive.format).to eq "<span class=\"money positive\">$1.00</span>"
-    expect(money_negative.format).to eq "<span class=\"money negative\">-$1.00</span>"
-    expect(money_zero.format).to eq "<span class=\"money zero\">$0.00</span>"
-
-    expect(money_positive.format(:html)).to eq "<span class=\"money positive\">$1.00</span>"
-    expect(money_negative.format(:html)).to eq "<span class=\"money negative\">-$1.00</span>"
-    expect(money_zero.format(:html)).to eq "<span class=\"money zero\">$0.00</span>"
-
-    expect(money_positive.format(:signed)).to eq "+$1.00"
-    expect(money_negative.format(:signed)).to eq "-$1.00"
-    expect(money_zero.format(:signed)).to eq "$0.00"
-
-    expect("1.50".to_money.format(:separator => '~')).to eq "$1~50"
-  end
-
-  it 'should format cents where appropriate' do
-    expect('1.50'.to_money.format(:no_cents)).to eq '$1'
-    expect('1.00'.to_money.format(:no_cents)).to eq '$1'
-
-    expect('1.50'.to_money.format(:hide_zero_cents)).to eq '$1.50'
-    expect('1.00'.to_money.format(:hide_zero_cents)).to eq '$1'
-  end
-
 end

data/spec/support/coverage_loader.rb

@@ -1,4 +1,4 @@
 require 'simplecov-rcov'
 require 'coveralls'
 require 'coverage/kit'
-Coverage::Kit.setup(minimum_coverage: 84.2)
+Coverage::Kit.setup(minimum_coverage: 86.6)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: money_extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Noack
@@ -9,16 +9,13 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
   type: :runtime
@@ -26,11 +23,22 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +53,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,28 +187,29 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- gemfiles/rails3.gemfile
-- gemfiles/rails4.gemfile
 - gemfiles/rails5.gemfile
+- gemfiles/rails6.gemfile
 - lib/money_extensions.rb
 - lib/money_extensions/active_record/extensions.rb
 - lib/money_extensions/array.rb
-- lib/money_extensions/big_decimal.rb
-- lib/money_extensions/extensions.rb
+- lib/money_extensions/html_format.rb
 - lib/money_extensions/integer.rb
 - lib/money_extensions/money_field.rb
 - lib/money_extensions/numeric.rb
+- lib/money_extensions/split_between.rb
 - lib/money_extensions/string.rb
 - lib/money_extensions/version.rb
 - money_extensions.gemspec
 - rails/init.rb
 - spec/big_decimal_spec.rb
+- spec/html_format_spec.rb
 - spec/money_field_spec.rb
 - spec/money_spec.rb
 - spec/schema.rb
@@ -197,13 +234,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Set of extensions to the money gem used by TravelLink Technology.
 test_files:
 - spec/big_decimal_spec.rb
+- spec/html_format_spec.rb
 - spec/money_field_spec.rb
 - spec/money_spec.rb
 - spec/schema.rb

data/gemfiles/rails3.gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-gemspec :path => "../"
-
-gem 'money', '< 5.1', :platform => :ruby_18
-
-group :development, :test do
-  gem 'activerecord', '~> 3.2.0'
-end

data/lib/money_extensions/big_decimal.rb

@@ -1,12 +0,0 @@
-class BigDecimal
-  
-  def negative?
-    self < BigDecimal.new('0')
-  end
-
-  def positive?
-    self > BigDecimal.new('0')
-  end
-  
-end
-

data/lib/money_extensions/extensions.rb

@@ -1,189 +0,0 @@
-require 'money'
-
-module Extensions
-
-  def self.included(base)
-    base.class_eval do
-      alias_method :to_s_without_currency_hack, :to_s
-      alias_method :to_s, :to_s_with_currency_hack
-      alias_method :to_d_without_currency_hack, :to_d
-      alias_method :to_d, :to_d_with_currency_hack
-    end
-  end
-
-  # Override division -- should not do it, but use split_between
-  def /(*params)
-    raise "Division of money NOT allowed - use 'split_between' to avoid rounding errors"
-  end
-
-  def to_d_with_currency_hack
-    BigDecimal.new("#{cents/100.0}")
-  end
-
-  # Split the money between the specified number - and return an array of money
-  # Remainder in splits are given to the highest value e.g.
-  # $2.00 splits [40, 81, 40] into [49, 102, 49]
-  # $1.01 splits [ 1,  1,  1] into [35,  33, 33]
-  def split_between(params)
-    #if just a number is passed in, then money is split equally
-    if params.is_a?(Integer)
-      divisor = params
-      raise ArgumentError, "Can only split up over a positive number" if divisor < 1
-
-      rounded_split = self.lossy_divide(divisor)
-      results       = Array.new(divisor, rounded_split) # Create with 'divisor' num elements
-
-      #if an array of monies is passed in, then split in proportions
-    elsif params.is_a?(Array)
-
-      raise ArgumentError, "Can only split up over at least one ration" if params.empty? && !self.zero?
-
-
-      results = params.map { |p| p.is_a?(::Money) ? p.cents : p }
-
-      total = results.inject(:+)
-      if total.zero?
-        return Array.new(results.size, ::Money.new(0)) if self.zero?
-        raise ArgumentError, "Total of ratios should not be zero! You sent in: #{params.inspect}"
-      end
-
-      results.map! do |ratio|
-        ::Money.new((self.cents * (ratio.to_f / total)).round)
-      end
-    else
-      raise "Either a Integer or array has to be passed in for splitting money"
-    end
-
-    # Distribute rounding to max absolute to avoid a $0 amount getting the rounding
-    biggest_value_index          = results.index(results.max_by(&:abs))
-    results[biggest_value_index] += self - results.total_money
-
-    return results
-  end
-
-
-  DEFAULT_FORMAT_RULES = [:html]
-  # HACK COZ WE ARE PRETENDING WE DON'T HAVE CURRENCY!!!
-  #
-  # TODO: Make this not a hack...
-  def to_s_with_currency_hack
-    sprintf("%.2f", cents.to_f / 100) #currency.subunit_to_unit)
-  end
-
-  def inspect
-    inbuilt_inspect_style_id = '%x' % (object_id << 1)
-    "\#<Money:0x#{inbuilt_inspect_style_id} $#{self}>"
-  end
-
-  # Money's default formatted is not flexible enought.
-  #  - we don't want it to say 'free' when 0 (not correct for 'discounts' and such)
-  def format(*rules)
-    rules = rules.empty? ? DEFAULT_FORMAT_RULES.dup : rules.flatten
-
-    options = {}
-    rules.each do |rule|
-      if rule.is_a? Hash
-        options = rule
-      end
-    end
-
-    html_wrap = rules.include?(:html)
-
-    options[:delimiter] ||= ','
-    options[:separator] ||= '.'
-
-    ''.tap do |formatted|
-      formatted << "<span class=\"money #{direction_class}\">" if html_wrap
-
-      rules << :signed if cents < 0
-
-      if rules.include?(:signed)
-        formatted << if cents > 0
-                       '+'
-                     elsif cents < 0
-                       '-'
-                     else
-                       ''
-                     end
-      end
-
-      no_cents      = rules.include?(:no_cents) ||
-        (rules.include?(:hide_zero_cents) && cents % 100 == 0)
-      format_string = no_cents ? "$%d" : "$%.2f"
-      amount        = format_string % (cents.abs.to_f / 100)
-      amount.gsub!('.', options[:separator])
-      amount.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
-      formatted << amount
-
-      formatted << "</span>" if html_wrap
-    end
-  end
-
-  def direction_class
-    if cents > 0
-      'positive'
-    elsif cents < 0
-      'negative'
-    else
-      'zero'
-    end
-  end
-
-  def mark_up(mark_up_definition)
-    mark_up_cents      = mark_up_definition.cents || 0
-    rounding_direction = mark_up_definition.rounding_direction.try(:to_sym)
-    multiplier         = ((100 + mark_up_definition.percent)/100.0)
-    (self * multiplier).round(mark_up_definition.rounding_cents, rounding_direction) + ::Money.new(mark_up_cents)
-  end
-
-  # money = Money.new(501)
-  # money.round
-  # => 500
-  # money.round(10)
-  # => 510
-  # money.round(1)
-  # => 511
-
-  # money.round(100, 'up')
-  # => 600
-  # money.round(100, 'down')
-  # => 500
-  # money.round(100, 'nearest')
-  # => 500
-  def round(round_to_cents = 100, direction = :nearest)
-    round_to_cents = 100 if round_to_cents.nil?
-    case direction.to_sym
-      when :nearest
-        rounded_cents = (cents + round_to_cents/2) / round_to_cents * round_to_cents
-      when :up
-        rounded_cents = (cents + round_to_cents) / round_to_cents * round_to_cents
-      when :down
-        rounded_cents = (cents) / round_to_cents * round_to_cents
-      else
-    end
-    ::Money.new(rounded_cents)
-  end
-
-  def abs
-    if cents >= 0
-      self.clone
-    else
-      ::Money.new(0 - cents)
-    end
-  end
-
-  def positive?
-    cents > 0
-  end
-
-  def negative?
-    cents < 0
-  end
-
-end
-
-::Money.class_eval do
-  alias_method :lossy_divide, :/
-end
-
-::Money.send(:include, Extensions)