money 3.0.1 → 3.0.2

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== Money 3.0.2
+ * Added #div, #divmod, #modulo, #% and #remainder methods
+
 == Money 3.0.1
  * Added #eql? method
  * Updated Numeric#to_money to work with all children of Numeric

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.0.2

data/lib/money/money.rb

@@ -167,6 +167,47 @@ class Money
     end
   end
 
+  # synonym for #/
+  def div(val)
+    self / val
+  end
+
+  # divide money by money or fixnum and return array containing quotient and
+  # modulus
+  def divmod(val)
+    if val.is_a?(Money)
+      a = self.cents
+      b = self.currency == val.currency ? val.cents : val.exchange_to(self.currency).cents
+      q, m = a.divmod(b)
+      return [q, Money.new(m, self.currency)]
+    else
+      return [self.div(val), Money.new(self.cents.modulo(val), self.currency)]
+    end
+  end
+
+  # equivalent to `self.divmod(val)[1]`
+  def modulo(val)
+    self.divmod(val)[1]
+  end
+
+  # synonym for #modulo
+  def %(val)
+    self.modulo(val)
+  end
+
+  # if different signs `self.modulo(val) - val` otherwise `self.modulo(val)`
+  def remainder(val)
+    a, b = self, val
+    b = b.exchange_to(a.currency) if b.is_a?(Money) and a.currency != b.currency
+
+    a_sign, b_sign = :pos, :pos
+    a_sign = :neg if a.cents < 0
+    b_sign = :neg if (b.is_a?(Money) and b.cents < 0) or (b < 0)
+
+    return a.modulo(b) if a_sign == b_sign
+    a.modulo(b) - (b.is_a?(Money) ? b : Money.new(b, a.currency))
+  end
+
   # Test if the money amount is zero
   def zero?
     cents == 0

data/money.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "3.0.1"
+  s.version = "3.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Luetke", "Hongli Lai", "Jeremy McNevin", "Shane Emmons"]
-  s.date = %q{2010-05-26}
+  s.date = %q{2010-06-03}
   s.description = %q{Money and currency exchange support library.}
   s.email = %q{hongli@phusion.nl}
   s.extra_rdoc_files = [

data/test/money_spec.rb

@@ -191,6 +191,228 @@ describe Money do
     (Money.new(10_00, "USD") / 10).should == Money.new(1_00, "USD")
   end
 
+  specify "#/ -> money / fixnum" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 3, :USD)},
+      {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-4, :USD)},
+      {:a => Money.new(-13, :USD), :b =>  4, :c => Money.new(-4, :USD)},
+      {:a => Money.new(-13, :USD), :b => -4, :c => Money.new( 3, :USD)},
+    ]
+    ts.each do |t|
+      (t[:a] / t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#/ -> money / money (same currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :USD), :c =>  3.25},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :USD), :c => -3.25},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :USD), :c => -3.25},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :USD), :c =>  3.25},
+    ]
+    ts.each do |t|
+      (t[:a] / t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#/ -> money / money (difference currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :EUR), :c =>  1.625},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :EUR), :c => -1.625},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :EUR), :c => -1.625},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :EUR), :c =>  1.625},
+    ]
+    ts.each do |t|
+      t[:b].should_receive(:exchange_to).once.with(t[:a].currency).and_return(Money.new(t[:b].cents * 2, :USD))
+      (t[:a] / t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#div -> money / fixnum" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 3, :USD)},
+      {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-4, :USD)},
+      {:a => Money.new(-13, :USD), :b =>  4, :c => Money.new(-4, :USD)},
+      {:a => Money.new(-13, :USD), :b => -4, :c => Money.new( 3, :USD)},
+    ]
+    ts.each do |t|
+      t[:a].div(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#div -> money / money (same currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :USD), :c =>  3.25},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :USD), :c => -3.25},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :USD), :c => -3.25},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :USD), :c =>  3.25},
+    ]
+    ts.each do |t|
+      t[:a].div(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#div -> money / money (different currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :EUR), :c =>  1.625},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :EUR), :c => -1.625},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :EUR), :c => -1.625},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :EUR), :c =>  1.625},
+    ]
+    ts.each do |t|
+      t[:b].should_receive(:exchange_to).once.with(t[:a].currency).and_return(Money.new(t[:b].cents * 2, :USD))
+      t[:a].div(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#divmod -> money `divmod` fixnum" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b =>  4, :c => [Money.new( 3, :USD), Money.new( 1, :USD)]},
+      {:a => Money.new( 13, :USD), :b => -4, :c => [Money.new(-4, :USD), Money.new(-3, :USD)]},
+      {:a => Money.new(-13, :USD), :b =>  4, :c => [Money.new(-4, :USD), Money.new( 3, :USD)]},
+      {:a => Money.new(-13, :USD), :b => -4, :c => [Money.new( 3, :USD), Money.new(-1, :USD)]},
+    ]
+    ts.each do |t|
+      t[:a].divmod(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#divmod -> money `divmod` money (same currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :USD), :c => [ 3, Money.new( 1, :USD)]},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :USD), :c => [-4, Money.new(-3, :USD)]},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :USD), :c => [-4, Money.new( 3, :USD)]},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :USD), :c => [ 3, Money.new(-1, :USD)]},
+    ]
+    ts.each do |t|
+      t[:a].divmod(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#divmod -> money `divmod` money (different currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :EUR), :c => [ 1, Money.new( 5, :USD)]},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :EUR), :c => [-2, Money.new(-3, :USD)]},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :EUR), :c => [-2, Money.new( 3, :USD)]},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :EUR), :c => [ 1, Money.new(-5, :USD)]},
+    ]
+    ts.each do |t|
+      t[:b].should_receive(:exchange_to).once.with(t[:a].currency).and_return(Money.new(t[:b].cents * 2, :USD))
+      t[:a].divmod(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#modulo -> money `modulo` fixnum" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 1, :USD)},
+      {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-3, :USD)},
+      {:a => Money.new(-13, :USD), :b =>  4, :c => Money.new( 3, :USD)},
+      {:a => Money.new(-13, :USD), :b => -4, :c => Money.new(-1, :USD)},
+    ]
+    ts.each do |t|
+      t[:a].modulo(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#modulo -> money `modulo` money (same currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :USD), :c => Money.new( 1, :USD)},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :USD), :c => Money.new(-3, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :USD), :c => Money.new( 3, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :USD), :c => Money.new(-1, :USD)},
+    ]
+    ts.each do |t|
+      t[:a].modulo(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#modulo -> money `modulo` money (different currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :EUR), :c => Money.new( 5, :USD)},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :EUR), :c => Money.new(-3, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :EUR), :c => Money.new( 3, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :EUR), :c => Money.new(-5, :USD)},
+    ]
+    ts.each do |t|
+      t[:b].should_receive(:exchange_to).once.with(t[:a].currency).and_return(Money.new(t[:b].cents * 2, :USD))
+      t[:a].modulo(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#% -> money % fixnum" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 1, :USD)},
+      {:a => Money.new( 13, :USD), :b => -4, :c => Money.new(-3, :USD)},
+      {:a => Money.new(-13, :USD), :b =>  4, :c => Money.new( 3, :USD)},
+      {:a => Money.new(-13, :USD), :b => -4, :c => Money.new(-1, :USD)},
+    ]
+    ts.each do |t|
+      (t[:a] % t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#% -> money % money (same currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :USD), :c => Money.new( 1, :USD)},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :USD), :c => Money.new(-3, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :USD), :c => Money.new( 3, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :USD), :c => Money.new(-1, :USD)},
+    ]
+    ts.each do |t|
+      (t[:a] % t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#% -> money % money (different currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :EUR), :c => Money.new( 5, :USD)},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :EUR), :c => Money.new(-3, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :EUR), :c => Money.new( 3, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :EUR), :c => Money.new(-5, :USD)},
+    ]
+    ts.each do |t|
+      t[:b].should_receive(:exchange_to).once.with(t[:a].currency).and_return(Money.new(t[:b].cents * 2, :USD))
+      (t[:a] % t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#remainder -> money `remainder` fixnum" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b =>  4, :c => Money.new( 1, :USD)},
+      {:a => Money.new( 13, :USD), :b => -4, :c => Money.new( 1, :USD)},
+      {:a => Money.new(-13, :USD), :b =>  4, :c => Money.new(-1, :USD)},
+      {:a => Money.new(-13, :USD), :b => -4, :c => Money.new(-1, :USD)},
+    ]
+    ts.each do |t|
+      t[:a].remainder(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#remainder -> money `remainder` money (same currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :USD), :c => Money.new( 1, :USD)},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :USD), :c => Money.new( 1, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :USD), :c => Money.new(-1, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :USD), :c => Money.new(-1, :USD)},
+    ]
+    ts.each do |t|
+      t[:a].remainder(t[:b]).should == t[:c]
+    end
+  end
+
+  specify "#remainder -> money `remainder` money (different currency)" do
+    ts = [
+      {:a => Money.new( 13, :USD), :b => Money.new( 4, :EUR), :c => Money.new( 5, :USD)},
+      {:a => Money.new( 13, :USD), :b => Money.new(-4, :EUR), :c => Money.new( 5, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new( 4, :EUR), :c => Money.new(-5, :USD)},
+      {:a => Money.new(-13, :USD), :b => Money.new(-4, :EUR), :c => Money.new(-5, :USD)},
+    ]
+    ts.each do |t|
+      t[:b].should_receive(:exchange_to).once.with(t[:a].currency).and_return(Money.new(t[:b].cents * 2, :USD))
+      t[:a].remainder(t[:b]).should == t[:c]
+    end
+  end
+
   specify "Money.empty creates a new Money object of 0 cents" do
     Money.empty.should == Money.new(0)
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: money
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 3
   - 0
-  - 1
-  version: 3.0.1
+  - 2
+  version: 3.0.2
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -04:00
+date: 2010-06-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency