acvwilson-currency 0.6.1 → 0.6.2

data/Manifest.txt

@@ -15,7 +15,6 @@ lib/currency/config.rb
 lib/currency/core_extensions.rb
 lib/currency/currency.rb
 lib/currency/currency/factory.rb
-lib/currency/currency_version.rb
 lib/currency/exception.rb
 lib/currency/exchange.rb
 lib/currency/exchange/rate.rb

data/currency.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{currency}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
  
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Asa Wilson"]
@@ -8,11 +8,11 @@ Gem::Specification.new do |s|
   s.description = %q{Currency conversions for Ruby}
   s.email = ["acvwilson@gmail.com"]
   s.extra_rdoc_files = ["ChangeLog", "COPYING.txt", "LICENSE.txt", "Manifest.txt", "README.txt", "Releases.txt", "TODO.txt"]
-  s.files = ["COPYING.txt", "currency.gemspec", "examples/ex1.rb", "examples/xe1.rb", "lib/currency/active_record.rb", "lib/currency/config.rb", "lib/currency/core_extensions.rb", "lib/currency/currency/factory.rb", "lib/currency/currency.rb", "lib/currency/currency_version.rb", "lib/currency/exception.rb", "lib/currency/exchange/rate/deriver.rb", "lib/currency/exchange/rate/source/base.rb", "lib/currency/exchange/rate/source/failover.rb", "lib/currency/exchange/rate/source/federal_reserve.rb", "lib/currency/exchange/rate/source/historical/rate.rb", "lib/currency/exchange/rate/source/historical/rate_loader.rb", "lib/currency/exchange/rate/source/historical/writer.rb", "lib/currency/exchange/rate/source/historical.rb", "lib/currency/exchange/rate/source/new_york_fed.rb", "lib/currency/exchange/rate/source/provider.rb", "lib/currency/exchange/rate/source/test.rb", "lib/currency/exchange/rate/source/the_financials.rb", "lib/currency/exchange/rate/source/timed_cache.rb", "lib/currency/exchange/rate/source/xe.rb", "lib/currency/exchange/rate/source.rb", "lib/currency/exchange/rate.rb", "lib/currency/exchange/time_quantitizer.rb", "lib/currency/exchange.rb", "lib/currency/formatter.rb", "lib/currency/macro.rb", "lib/currency/money.rb", "lib/currency/money_helper.rb", "lib/currency/parser.rb", "lib/currency.rb", "LICENSE.txt", "Manifest.txt", "README.txt", "Releases.txt", "spec/ar_spec_helper.rb", "spec/ar_column_spec.rb", "spec/ar_simple_spec.rb", "spec/config_spec.rb", "spec/federal_reserve_spec.rb", "spec/formatter_spec.rb", "spec/historical_writer_spec.rb", "spec/macro_spec.rb", "spec/money_spec.rb", "spec/new_york_fed_spec.rb", "spec/parser_spec.rb", "spec/spec_helper.rb", "spec/time_quantitizer_spec.rb", "spec/timed_cache_spec.rb", "spec/xe_spec.rb", "TODO.txt"]
+  s.files = ["COPYING.txt", "currency.gemspec", "examples/ex1.rb", "examples/xe1.rb", "lib/currency/active_record.rb", "lib/currency/config.rb", "lib/currency/core_extensions.rb", "lib/currency/currency/factory.rb", "lib/currency/currency.rb", "lib/currency/exception.rb", "lib/currency/exchange/rate/deriver.rb", "lib/currency/exchange/rate/source/base.rb", "lib/currency/exchange/rate/source/failover.rb", "lib/currency/exchange/rate/source/federal_reserve.rb", "lib/currency/exchange/rate/source/historical/rate.rb", "lib/currency/exchange/rate/source/historical/rate_loader.rb", "lib/currency/exchange/rate/source/historical/writer.rb", "lib/currency/exchange/rate/source/historical.rb", "lib/currency/exchange/rate/source/new_york_fed.rb", "lib/currency/exchange/rate/source/provider.rb", "lib/currency/exchange/rate/source/test.rb", "lib/currency/exchange/rate/source/the_financials.rb", "lib/currency/exchange/rate/source/timed_cache.rb", "lib/currency/exchange/rate/source/xe.rb", "lib/currency/exchange/rate/source.rb", "lib/currency/exchange/rate.rb", "lib/currency/exchange/time_quantitizer.rb", "lib/currency/exchange.rb", "lib/currency/formatter.rb", "lib/currency/macro.rb", "lib/currency/money.rb", "lib/currency/money_helper.rb", "lib/currency/parser.rb", "lib/currency.rb", "LICENSE.txt", "Manifest.txt", "README.txt", "Releases.txt", "spec/ar_spec_helper.rb", "spec/ar_column_spec.rb", "spec/ar_simple_spec.rb", "spec/config_spec.rb", "spec/federal_reserve_spec.rb", "spec/formatter_spec.rb", "spec/historical_writer_spec.rb", "spec/macro_spec.rb", "spec/money_spec.rb", "spec/new_york_fed_spec.rb", "spec/parser_spec.rb", "spec/spec_helper.rb", "spec/time_quantitizer_spec.rb", "spec/timed_cache_spec.rb", "spec/xe_spec.rb", "TODO.txt"]
   s.has_rdoc = true
   s.homepage = %q{http://currency.rubyforge.org/}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{#{s.name} #{s.version}}
-end
+end

data/lib/currency/active_record.rb

@@ -139,7 +139,7 @@ module Currency::ActiveRecord
         attr_name = attr_name.to_s
         opts[:class] = self
         opts[:table] = self.table_name
-        opts[:attr_name] = attr_name.intern
+        opts[:attr_name] = attr_name.to_sym
         ::ActiveRecord::Base.register_money_attribute(opts)
 
         column = opts[:column] || opts[:attr_name]
@@ -204,7 +204,6 @@ end_eval
         validate << "\nvalidates_numericality_of :#{attr_name}#{validate_allow_nil}\n"
         validate << "\nvalidates_format_of :#{currency_column}, :with => /^[A-Z][A-Z][A-Z]$/#{validate_allow_nil}\n" if currency_column
 
- 
         alias_accessor ||= ''
 
         module_eval (opts[:module_eval] = x = <<-"end_eval"), __FILE__, __LINE__
@@ -225,7 +224,7 @@ def #{attr_name}
 end
 
 def #{attr_name}=(value)
-  if value.nil?
+  if value.nil? || value.to_s.strip == ''
     #{attr_name}_money = nil
   elsif value.kind_of?(Integer) || value.kind_of?(String) || value.kind_of?(Float)
     #{attr_name}_money = ::Currency::Money(value, #{currency})
@@ -238,7 +237,7 @@ def #{attr_name}=(value)
     raise ::Currency::Exception::InvalidMoneyValue, value
   end
 
-  @#{attr_name} = #{attr_name}_money
+  @#{attr_name} = #{attr_name}_money # TODO: Really needed? Isn't the write_attribute enough?
   
   write_attribute(:#{column}, #{attr_name}_money.nil? ? nil : #{money_rep})
   #{write_time}

data/lib/currency/money.rb

@@ -58,9 +58,9 @@ class Currency::Money
         else
           m = ::Currency::Parser.default.parse(x)
         end
-        @currency = m.currency unless @currency
-        @time = m.time if m.time
-        @rep = m.rep
+        @currency = m.currency if m && !@currency
+        @time = m.time if m && m.time
+        @rep = m.nil?? 0 : m.rep 
       else
         @currency = ::Currency::Currency.default unless @currency
         @rep = x.Money_rep(@currency)

data/lib/currency/parser.rb

@@ -46,6 +46,8 @@ class Currency::Parser
 
 
   def _parse(str) # :nodoc:
+    return nil if str.to_s.strip == ''
+
     x = str
 
     # Get currency.
@@ -70,6 +72,7 @@ class Currency::Parser
       end
       x = md.pre_match + md.post_match
     end
+
     # Default time
     time ||= @time
     time = Time.new if time == :now
@@ -108,35 +111,35 @@ class Currency::Parser
     if md = /^([-+]?\d+)\.?$/.match(x)
       # $stderr.puts "'#{self}'.parse(#{str}) => EXACT"
       x = ::Currency::Money.new_rep(md[1].to_i * currency.scale, currency, @time)
-      
+
       # Match: fractional Currency value.
     elsif md = /^([-+]?)(\d*)\.(\d+)$/.match(x)
       sign = md[1]
       whole = md[2]
       part = md[3]
-      
+
       # $stderr.puts "'#{self}'.parse(#{str}) => DECIMAL (#{sign} #{whole} . #{part})"
-      
+
       if part.length != currency.scale
-        
+
         # Pad decimal places with additional '0'
         while part.length < currency.scale_exp
           part << '0'
         end
-        
+
         # Truncate to Currency's decimal size. 
         part = part[0 ... currency.scale_exp]
-        
+
         # $stderr.puts "  => INEXACT DECIMAL '#{whole}'"
       end
-      
+
       # Put the string back together:
       #   #{sign}#{whole}#{part}
       whole = sign + whole + part
       # $stderr.puts "  => REP = #{whole}"
-      
+
       x = whole.to_i
-      
+
       x = ::Currency::Money.new_rep(x, currency, time)
     else
       # $stderr.puts "'#{self}'.parse(#{str}) => ??? '#{x}'"

data/lib/currency.rb

@@ -118,13 +118,13 @@ module Currency
   #
   # See Money#new.
   def self.Money(*opts)
+    return nil if opts.to_s.strip == ''
     Money.new(*opts)
   end
 end
 
 $:.unshift(File.expand_path(File.dirname(__FILE__))) unless $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'currency/currency_version'
 require 'currency/config'
 require 'currency/exception'
 require 'currency/money'

data/spec/money_spec.rb

@@ -3,14 +3,33 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Currency::Money do
 
-  it "create" do
+  before :all do
+    Currency::Config.configure do |config|
+      config.scale_exp = 6
+    end
+    
+  end
+
+  def zero_money
+    @zero_money ||= Currency::Money.new(0)
+  end
+  
+  def negative_money
+    @negative_money ||= Currency::Money.new(-1.00, :USD)
+  end
+  
+  def positive_money
+    @positive_money ||= Currency::Money.new(2.99, :USD)
+  end
+
+  it "creates Monies" do
     m = Currency::Money.new(1.99)
     m.should be_kind_of(Currency::Money) 
     Currency::Currency.default.should == m.currency
     :USD.should == m.currency.code
   end
 
-  describe "object money method" do
+  describe "Converts different objects to Money with the 'money' method" do
     it "works with a float" do
       m = 1.99.money(:USD)
       m.should be_kind_of(Currency::Money)
@@ -38,45 +57,46 @@ describe Currency::Money do
       :EUR.should == m.currency.code
       m.rep.should == 45990000
     end
+    
+    describe "deals with voids" do
+      it "does not raise with an empty string" do
+        lambda{
+          Currency::Money.new('')
+        }.should_not raise_error
+      end
+      
+      it "considers the empty string to be nil " do
+        Currency::Money.new('').should be_nil
+      end
+    end
   end
 
-  def zero_money
-    @zero_money ||= Currency::Money.new(0)
-  end
-  
-  it "zero" do
+  it "deals with zero in the least surprising way" do
     zero_money.negative?.should_not == true
     zero_money.zero?.should_not == nil
     zero_money.positive?.should_not == true
   end
   
-  def negative_money
-    @negative_money ||= Currency::Money.new(-1.00, :USD)
-  end
-  
-  it "negative" do
+  it "deals with negatives in the least surprising way" do
     negative_money.negative?.should_not == nil
     negative_money.zero?.should_not == true
     negative_money.positive?.should_not == true
   end
 
-  def positive_money
-    @positive_money ||= Currency::Money.new(2.99, :USD)
-  end
-  it "positive" do
+  it "deals with positive numbers in the least surprising way" do
     positive_money.negative?.should_not == true
     positive_money.zero?.should_not == true
     positive_money.positive?.should_not == nil
   end
 
-  it "relational" do
+  it "can do comparisons between monies" do
     n = negative_money
     z = zero_money
     p = positive_money
 
-    (n.should < p)
-     (n > p).should_not == true
-     (p < n).should_not == true
+    negative_money.should < positive_money
+    (negative_money > positive_money).should_not be_true
+    (positive_money < negative_money).should_not be_true
     (p.should > n)
     (p != n).should_not == nil
 

data/spec/parser_spec.rb

@@ -1,105 +1,105 @@
 # Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
 # See LICENSE.txt for details.
+require File.dirname(__FILE__) + '/spec_helper'
 
-require 'test/test_base'
-require 'currency'
-
-module Currency
-
-class ParserTest < TestBase
+describe Currency::Parser do
   before do
-    super
     @parser = ::Currency::Currency.USD.parser_or_default
   end
 
-  ############################################
-  # Simple stuff.
-  #
-
-  it "default" do
-    
+  describe "is great at parsing strings" do
+    it "can use a string that uses the thousands-separator (comma)" do
+      @parser.parse("1234567.89").rep.should == 123456789
+      @parser.parse("1,234,567.89").rep.should == 123456789
+    end
+
+
+    it "parses cents" do
+      @parser.parse("1234567.89").rep.should == 123456789
+      @parser.parse("1234567").rep.should == 123456700
+      @parser.parse("1234567.").rep.should == 123456700
+      @parser.parse("1234567.8").rep.should == 123456780
+      @parser.parse("1234567.891").rep.should == 123456789
+      @parser.parse("-1234567").rep.should == -123456700
+      @parser.parse("+1234567").rep.should == 123456700
+    end
   end
 
-
-  it "thousands" do
-    @parser.parse("1234567.89").rep.should == 123456789
-    assert_equal 123456789, @parser.parse("1,234,567.89").rep
+  describe "can convert the right hand side argument" do
+    it "converts the right hand argument to the left hand side currency if needed" do
+      m = "123.45 USD".money + "100 CAD"
+      m.should_not == nil
+      m.rep.should == ("123.45".money(:USD) + "100 CAD".money(:USD)).rep
+    end
+
+    it "uses the left hand sides currency if the right hand side argument does provide currency info" do
+      m = "123.45 USD".money
+      (m + 100).rep.should == (m + "100".money(:USD)).rep
+    end
   end
 
+  describe "can use the inspect method as a serialization of self" do
+    it "can recreate a money object by using a .inspect-string" do
+      ::Currency::Currency.default = :USD
+      m = ::Currency::Money("1234567.89", :CAD)
+      m2 = ::Currency::Money(m.inspect)
 
-  it "cents" do
-    @parser.parse("1234567.89").rep.should == 123456789
-    @parser.parse("1234567").rep.should == 123456700
-    @parser.parse("1234567.").rep.should == 123456700
-    @parser.parse("1234567.8").rep.should == 123456780
-    @parser.parse("1234567.891").rep.should == 123456789
-    @parser.parse("-1234567").rep.should == -123456700
-    @parser.parse("+1234567").rep.should == 123456700
-  end
+      m2.rep.should == m.rep
+      m2.currency.should == m.currency
 
+      m2.inspect.should == m.inspect
+    end
 
-  it "misc" do
-    m = "123.45 USD".money + "100 CAD".should_not == nil
-     (m.rep == 200.45).should_not == true
-  end
 
+    it "can recreate a money objectby using a .inspect-string and keep the time parameter as well" do
+      ::Currency::Currency.default = :USD
+      time = Time.now.getutc
+      m = ::Currency::Money("1234567.89", :CAD, time)
+      m.time.should_not == nil
 
-  it "round trip" do
-    ::Currency::Currency.default = :USD
-    m = ::Currency::Money("1234567.89", :CAD).should_not == nil
-    m2 = ::Currency::Money(m.inspect).should_not == nil
-    m2.rep.should == m.rep
-    m2.currency.should == m.currency
-    m2.time.should == nil
-    m2.inspect.should == m.inspect
-  end
+      m2 = ::Currency::Money(m.inspect)
+      m2.time.should_not == nil
 
+      m.should_not be(m2)
 
-  it "round trip time" do
-    ::Currency::Currency.default = :USD
-    time = Time.now.getutc
-    m = ::Currency::Money("1234567.89", :CAD, time).should_not == nil
-    m.time.should_not == nil
-    m2 = ::Currency::Money(m.inspect).should_not == nil
-    m2.time.should_not == nil
-    m2.rep.should == m.rep
-    m2.currency.should == m.currency
-    m2.time.to_i.should == m.time.to_i
-    m2.inspect.should == m.inspect
+      m2.rep.should == m.rep
+      m2.currency.should == m.currency
+      m2.time.to_i.should == m.time.to_i
+      m2.inspect.should == m.inspect
+    end
   end
 
+  describe "deals with time when creating money objects" do
+    before do
+      @parser = ::Currency::Parser.new
+    end
+    
+    it "can parse even though the parser time is nil" do
+      @parser.time = nil
 
-  it "time nil" do
-    parser = ::Currency::Parser.new
-    parser.time = nil
+      m = @parser.parse("$1234.55")
+      m.time.should == nil
+    end
 
-    m = parser.parse("$1234.55").should_not == nil
-    m.time.should == nil
-  end
 
+    it "parses money strings into money object using the parsers time" do
+      @parser.time = Time.now
 
-  it "time" do
-    parser = ::Currency::Parser.new
-    parser.time = Time.new
+      m = @parser.parse("$1234.55")
+      m.time.should == @parser.time
+    end
 
-    m = parser.parse("$1234.55").should_not == nil
-   m.time.should == parser.time
-  end
 
+    it "when re-initializing a money object, the time is also re-initialized" do
+      @parser.time = :now
 
-  it "time now" do
-    parser = ::Currency::Parser.new
-    parser.time = :now
+      m = @parser.parse("$1234.55")
+      m1_time = m.time
 
-    m = parser.parse("$1234.55").should_not == nil
-    m1_time = m.time.should_not == nil
+      m = @parser.parse("$1234.55")
+      m2_time = m.time
 
-    m = parser.parse("$1234.55").should_not == nil
-    m2_time = m.time.should_not == nil
-
-    assert_not_equal m1_time, m2_time
+      m1_time.should_not == m2_time
+    end
   end
 end
-
-end # module
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acvwilson-currency
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Asa Wilson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-01 05:56:33.845186 -08:00
+date: 2008-12-01 08:54:17.132058 -08:00
 default_executable: 
 dependencies: []
 
@@ -38,7 +38,6 @@ files:
 - lib/currency/core_extensions.rb
 - lib/currency/currency/factory.rb
 - lib/currency/currency.rb
-- lib/currency/currency_version.rb
 - lib/currency/exception.rb
 - lib/currency/exchange/rate/deriver.rb
 - lib/currency/exchange/rate/source/base.rb

data/lib/currency/currency_version.rb

@@ -1,6 +0,0 @@
-module Currency
-  CurrencyVersion = '0.4.11'
-end
-# DO NOT EDIT
-# This file is auto-generated by build scripts.
-# See:  rake update_version