nofxx-money 2.3.10 → 2.3.11

data/README.rdoc

@@ -81,6 +81,11 @@ www.xe.com for the current rates or just returns <tt>rand(2)</tt>:
 
   Money.default_bank = ExchangeBankWhichScrapesXeDotCom.new
 
+=== `new` or `to_money` ?
+
+If you already have a value in integer/float or a string which ruby can parse
+with `to_i`, use new. It'll avoid the string parser, which is resource intensive.
+
 
 === Default Currency
 

data/VERSION

@@ -1 +1 @@
-2.3.9
+2.3.11

data/lib/money/money.rb

@@ -41,6 +41,7 @@ class Money
   self.default_bank = ExchangeBank.instance
   self.default_currency = "USD"
 
+  # http://www.xe.com/symbols.php
   CURRENCIES = {
     "USD" => { :delimiter => ",", :separator => ".", :symbol => "$" },
     "CAD" => { :delimiter => ",", :separator => ".", :symbol => "$" },
@@ -126,6 +127,10 @@ class Money
     end
   end
 
+  def -@
+    Money.new(-cents)
+  end
+
   # multiply money by fixnum
   def *(fixnum)
     Money.new(cents * fixnum, currency)
@@ -215,31 +220,36 @@ class Money
   end
 
   # Format the price according to several rules
-  # Currently supported are :with_currency, :no_cents, :symbol and :html
+  # Currently supported are :with_currency, :no_cents, :symbol and :html.
   #
-  # with_currency:
+  # === +:with_currency+
   #
-  #  Money.ca_dollar(0).format => "free"
   #  Money.ca_dollar(100).format => "$1.00"
   #  Money.ca_dollar(100).format(:with_currency => true) => "$1.00 CAD"
   #  Money.us_dollar(85).format(:with_currency => true) => "$0.85 USD"
   #
-  # no_cents:
+  # === +:no_cents+
   #
   #  Money.ca_dollar(100).format(:no_cents) => "$1"
   #  Money.ca_dollar(599).format(:no_cents) => "$5"
-  #
   #  Money.ca_dollar(570).format(:no_cents, :with_currency) => "$5 CAD"
   #  Money.ca_dollar(39000).format(:no_cents) => "$390"
   #
-  # symbol:
+  # === +:symbol+
   #
   #  Money.new(100, :currency => "GBP").format(:symbol => "£") => "£1.00"
+  #  Money.new(100, :currency => "GBP").format(:symbol => "UU") => "UU1.00"
+  #
+  # === +:display_free+
+  #
+  #  Money.ca_dollar(0).format => "free"
+  #  Money.real(0).format(:display_free => "Gratis") => "Gratis"
   #
-  # html:
+  # === +:html+
   #
   #  Money.ca_dollar(570).format(:html => true, :with_currency => true) =>  "$5.70 <span class=\"currency\">CAD</span>"
-   def format(*rules)
+  #
+  def format(*rules)
     # support for old format parameters
     rules = normalize_formatting_rules(rules)
 
@@ -251,19 +261,10 @@ class Money
       end
     end
 
-    if rules.has_key?(:symbol)
-      if rules[:symbol]
-        symbol = rules[:symbol]
-      else
-        symbol = "$"
-      end
-    else
-      symbol = (CURRENCIES[currency] ? CURRENCIES[currency][:symbol] : "$")
-    end
-    self.currency
-
-    delimiter = (CURRENCIES[currency] ? CURRENCIES[currency][:delimiter] : "," )
-    separator = (CURRENCIES[currency] ? CURRENCIES[currency][:separator] : "." )
+    curr = CURRENCIES[currency]
+    symbol = rules.has_key?(:symbol) ? (rules[:symbol] || "") : (curr ? curr[:symbol] : "$")
+    delimiter = (curr ? curr[:delimiter] : "," )
+    separator = (curr ? curr[:separator] : "." )
 
     if rules[:no_cents]
       formatted = sprintf("#{symbol}%d", cents.to_f / 100)
@@ -283,11 +284,11 @@ class Money
       formatted << currency
       formatted << '</span>' if rules[:html]
     end
-    formatted.gsub!(symbol,CURRENCIES[currency][:html]) if rules[:html]
+    formatted.gsub!(symbol,curr[:html]) if rules[:html]
     formatted
-   end
+  end
 
-   def normalize_formatting_rules(rules)
+  def normalize_formatting_rules(rules)
     if rules.size == 1
       rules = rules.pop
       rules = { rules => true } if rules.is_a?(Symbol)

data/money.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{money}
-  s.version = "2.3.10"
+  s.version = "2.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Money Team"]
-  s.date = %q{2009-06-20}
+  s.date = %q{2009-08-18}
   s.description = %q{This library aids one in handling money and different currencies.}
   s.email = %q{see@reame}
   s.extra_rdoc_files = [
@@ -41,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/nofxx/money}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{This library aids one in handling money and different currencies.}
   s.test_files = [
     "spec/db/schema.rb",

data/spec/money/money_spec.rb

@@ -214,6 +214,9 @@ describe Money do
       it { @cash.format(:symbol => "R$ ").should eql("R$ 2.00") }
       it { @cash.format(:no_cents => true).should eql("¥2") }
       it { @cash.format(:no_cents => true, :symbol => "R$ ").should eql("R$ 2") }
+      it { @cash.format(:symbol => false).should eql("2.00") }
+      it { @cash.format(:symbol => nil).should eql("2.00") }
+      it { @cash.format(:symbol => "").should eql("2.00") }
       it { @cash.format(:html => true).should eql("¥2.00") }
     end
 
@@ -260,6 +263,14 @@ describe Money do
         it "#- substracts the other object's amount from the current object's amount while retaining the currency" do
           (Money.new(10_00, "USD") - Money.new(90, "USD")).should == Money.new(9_10, "USD")
         end
+
+        it "should return to -@ method" do
+          (-(Money.new(5))).cents.should eql(-5)
+        end
+
+        it "should return to -@ method" do
+          (-(Money.new(-5))).cents.should eql(5)
+        end
       end
 
       describe "if the other Money object has a different currency" do

data/spec/spec_helper.rb

@@ -15,6 +15,7 @@ config = YAML.load_file(File.dirname(__FILE__) + '/db/database.yml')
 ActiveRecord::Base.logger = Logger.new("/tmp/money-debug.log")
 ActiveRecord::Base.establish_connection(config)
 
-db_file = File.exists?(File.dirname(__FILE__) + '/../tmp/acts_as_money.sqlite3')
-load(File.dirname(__FILE__) + "/db/schema.rb") unless db_file
+unless File.exists?(File.dirname(__FILE__) + '/../tmp/acts_as_money.sqlite3')
+  load(File.dirname(__FILE__) + "/db/schema.rb")
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nofxx-money
 version: !ruby/object:Gem::Version 
-  version: 2.3.10
+  version: 2.3.11
 platform: ruby
 authors: 
 - Money Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-20 00:00:00 -07:00
+date: 2009-08-18 00:00:00 -07:00
 default_executable: 
 dependencies: []