mm-money 0.1.0 → 0.1.1

data/.gitignore

@@ -2,4 +2,4 @@ announcement.txt
 coverage
 doc
 pkg
-
+spec/log/*

data/lib/mm-money.rb

@@ -3,30 +3,21 @@ require 'money'
 
 class Money
   def self.to_mongo(value)
-    value = if value.instance_of? Money
+    if value.kind_of?(Array)
       value
-    elsif value.kind_of? Numeric
-      value.to_money
-    elsif value.kind_of? String
-      value.to_money
-    end
-
-    unless value.nil?
-      value.format(:with_currency => true)
-    else
+    elsif value.nil? || !value.respond_to?(:to_money)
       nil
+    else
+      value = value.to_money
+      [value.cents, value.currency.iso_code]
     end
   end
 
   def self.from_mongo(value)
-    if value.instance_of? Money
-      value
-    elsif value.kind_of? Numeric
-      value.to_money
-    elsif value.kind_of? String
-      value.to_money
-    else
+    if value.nil?
       nil
+    else
+      Money.new(value.first, value.second)
     end
   end
 end

data/mm-money.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mm-money}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Toni Tuominen"]
-  s.date = %q{2010-07-04}
+  s.date = %q{2010-07-12}
   s.description = %q{Handle money keys with MongoMapper.}
   s.email = %q{toni@piranhadigital.fi}
   s.extra_rdoc_files = ["History.txt", "README.txt", "version.txt"]
-  s.files = [".gitignore", "History.txt", "README.txt", "Rakefile", "lib/mm-money.rb", "spec/log/spec.log", "spec/mm-money_spec.rb", "spec/spec_helper.rb", "version.txt"]
+  s.files = [".gitignore", "History.txt", "README.txt", "Rakefile", "lib/mm-money.rb", "mm-money.gemspec", "spec/mm-money_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "version.txt"]
   s.homepage = %q{http://github.com/tjtuom/mm-money}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]

data/spec/mm-money_spec.rb

@@ -22,6 +22,10 @@ describe "Money key" do
     Product.new(:price => 10).price.should be_kind_of(Money)
   end
 
+  it 'handles nils correctly' do
+    Product.new().price.should be_nil
+  end
+
   it 'handles integers correctly' do
     Product.new(:price => 10).price.should == Money.new(1000, 'EUR')
   end
@@ -34,6 +38,10 @@ describe "Money key" do
     Product.new(:price => '10').price.should == Money.new(1000, 'EUR')
   end
 
+  it 'handles money objects correctly' do
+    Product.new(:price => Money.new(1000, 'EUR')).price.should == Money.new(1000, 'EUR')
+  end
+
   it 'handles strings with currency in them correctly' do
     Product.new(:price => '10 USD').price.should == Money.new(1000, 'USD')
   end
@@ -44,10 +52,11 @@ describe "Money key" do
   end
 
   it 'handles sorting in the db properly' do
-    first = Product.create!(:price => 10)
-    third = Product.create!(:price => 30)
-    second = Product.create!(:price => 20)
+    first = Product.create!(:price => 0)
+    third = Product.create!(:price => 35)
+    second = Product.create!(:price => 5)
 
     Product.sort(:price.asc).all.should == [first, second, third]
+    Product.sort(:price.desc).all.should == [third, second, first]
   end
 end

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/version.txt

@@ -1 +1 @@
-0.1.0
+0.1.1

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Toni Tuominen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 +03:00
+date: 2010-07-12 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,8 +90,8 @@ files:
 - Rakefile
 - lib/mm-money.rb
 - mm-money.gemspec
-- spec/log/spec.log
 - spec/mm-money_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 - version.txt
 has_rdoc: true

data/spec/log/spec.log

@@ -1,69 +0,0 @@
-# Logfile created on Sun Jul 04 10:28:58 +0300 2010 by logger.rb/22285
-  MONGODB admin['$cmd'].find({:ismaster=>1}, {}).limit(-1)
-  MONGODB mm-money-test-1-8-7['system.namespaces'].find({}, {})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['system.indexes'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30383a0e9dab57f0000006')}, {"price"=>"$10.00 USD", "_id"=>BSON::ObjectID('4c30383a0e9dab57f0000006')})
-  MONGODB mm-money-test-1-8-7['products'].find({}, {}).limit(-1)
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30383a0e9dab57f0000007')}, {"price"=>"€10.00 EUR", "_id"=>BSON::ObjectID('4c30383a0e9dab57f0000007')})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30383a0e9dab57f0000008')}, {"price"=>"€30.00 EUR", "_id"=>BSON::ObjectID('4c30383a0e9dab57f0000008')})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30383a0e9dab57f0000009')}, {"price"=>"€20.00 EUR", "_id"=>BSON::ObjectID('4c30383a0e9dab57f0000009')})
-  MONGODB mm-money-test-1-8-7['products'].find({}, {}).sort([["price", 1]])
-  MONGODB admin['$cmd'].find({:ismaster=>1}, {}).limit(-1)
-  MONGODB mm-money-test-1-8-7['system.namespaces'].find({}, {})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['system.indexes'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c3039180e9dab5d86000006')}, {"price"=>"$10.00 USD", "_id"=>BSON::ObjectID('4c3039180e9dab5d86000006')})
-  MONGODB mm-money-test-1-8-7['products'].find({}, {}).limit(-1)
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c3039180e9dab5d86000007')}, {"price"=>"€10.00 EUR", "_id"=>BSON::ObjectID('4c3039180e9dab5d86000007')})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c3039180e9dab5d86000008')}, {"price"=>"€30.00 EUR", "_id"=>BSON::ObjectID('4c3039180e9dab5d86000008')})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c3039180e9dab5d86000009')}, {"price"=>"€20.00 EUR", "_id"=>BSON::ObjectID('4c3039180e9dab5d86000009')})
-  MONGODB mm-money-test-1-8-7['products'].find({}, {}).sort([["price", 1]])
-  MONGODB admin['$cmd'].find({:ismaster=>1}, {}).limit(-1)
-  MONGODB mm-money-test-1-8-7['system.namespaces'].find({}, {})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['system.indexes'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30396b0e9dab5fae000006')}, {"price"=>"$10.00 USD", "_id"=>BSON::ObjectID('4c30396b0e9dab5fae000006')})
-  MONGODB mm-money-test-1-8-7['products'].find({}, {}).limit(-1)
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30396b0e9dab5fae000007')}, {"price"=>"€10.00 EUR", "_id"=>BSON::ObjectID('4c30396b0e9dab5fae000007')})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30396b0e9dab5fae000008')}, {"price"=>"€30.00 EUR", "_id"=>BSON::ObjectID('4c30396b0e9dab5fae000008')})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30396b0e9dab5fae000009')}, {"price"=>"€20.00 EUR", "_id"=>BSON::ObjectID('4c30396b0e9dab5fae000009')})
-  MONGODB mm-money-test-1-8-7['products'].find({}, {}).sort([["price", 1]])
-  MONGODB admin['$cmd'].find({:ismaster=>1}, {}).limit(-1)
-  MONGODB mm-money-test-1-8-7['system.namespaces'].find({}, {})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['system.indexes'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30397d0e9dab6021000006')}, {"price"=>"$10.00 USD", "_id"=>BSON::ObjectID('4c30397d0e9dab6021000006')})
-  MONGODB mm-money-test-1-8-7['products'].find({}, {}).limit(-1)
-  MONGODB mm-money-test-1-8-7['products'].remove({})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30397d0e9dab6021000007')}, {"price"=>"€10.00 EUR", "_id"=>BSON::ObjectID('4c30397d0e9dab6021000007')})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30397d0e9dab6021000008')}, {"price"=>"€30.00 EUR", "_id"=>BSON::ObjectID('4c30397d0e9dab6021000008')})
-  MONGODB mm-money-test-1-8-7['products'].update({:_id=>BSON::ObjectID('4c30397d0e9dab6021000009')}, {"price"=>"€20.00 EUR", "_id"=>BSON::ObjectID('4c30397d0e9dab6021000009')})
-  MONGODB mm-money-test-1-8-7['products'].find({}, {}).sort([["price", 1]])