acvwilson-currency 0.5.1 → 0.5.2

data/currency.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{currency}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
  
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Asa Wilson"]
@@ -14,5 +14,5 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.2.0}
-  s.summary = %q{currency 0.5.1}
+  s.summary = %q{currency 0.5.2}
 end

data/lib/currency.rb

@@ -131,8 +131,8 @@ require 'currency/money'
 require 'currency/currency'
 require 'currency/currency/factory'
 require 'currency/money'
-require 'currency/formatter'
 require 'currency/parser'
+require 'currency/formatter' # require this one before the parser and enjoy the weird bugs!
 require 'currency/exchange'
 require 'currency/exchange/rate'
 require 'currency/exchange/rate/deriver'

data/spec/ar_column_spec.rb

@@ -1,76 +1,57 @@
-# Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
-# See LICENSE.txt for details.
-
-# require 'test/ar_test_core'
-# require 'currency'
-# 
-# require 'rubygems'
-# require 'active_record'
-# require 'active_record/migration'
-# require 'currency/active_record'
-
 require File.dirname(__FILE__) + '/ar_spec_helper'
 
-# module Currency
-# 
-# class ArFieldTest < ArTestCore
 
-  ##################################################
-  # Basic CurrenyTest AR::B class
-  #
+##################################################
+# Basic CurrenyTest AR::B class
+#
 
-  TABLE_NAME = 'currency_column_test'
+# TODO: Move elsewhere, combine with other AR tests
 
-  class CurrencyColumnTestMigration < AR_M
-    def self.up
-      create_table TABLE_NAME.intern do |t|
-        t.column :name,     :string
-        t.column :amount,   :integer # Money
-        t.column :amount_currency,   :string, :size => 3 # Money.currency.code
-      end
-    end
+TABLE_NAME = 'currency_column_test'
 
-    def self.down
-      drop_table TABLE_NAME.intern
+class CurrencyColumnTestMigration < AR_M
+  def self.up
+    create_table TABLE_NAME.intern do |t|
+      t.column :name,     :string
+      t.column :amount,   :integer # Money
+      t.column :amount_currency,   :string, :size => 3 # Money.currency.code
     end
   end
 
-  class CurrencyColumnTest < AR_B
-    set_table_name TABLE_NAME
-    attr_money :amount, :currency_column => true
-  end 
-
-  ##################################################
-
+  def self.down
+    drop_table TABLE_NAME.intern
+  end
+end
 
-  # def teardown
-  #   super
-  # end
+class CurrencyColumnTest < AR_B
+  set_table_name TABLE_NAME
+  attr_money :amount, :currency_column => true
+end 
 
-  ##################################################
+##################################################
 
 describe "ActiveRecord macros" do
   before(:all) do
     AR_B.establish_connection(database_spec)
     @currency_test_migration ||= CurrencyColumnTestMigration 
     @currency_test ||= CurrencyColumnTest
-    # schema_down
+    schema_down
     schema_up
   end
   
   after(:all) do
-    # schema_down
+    schema_down
   end
 
-  it "field" do
+  it "can store and retrieve money values from a DB and automagically transfomr them to Money" do
     insert_records
 
     usd = @currency_test.find(@usd.id)
-    usd.should_not be_nil
-    assert_equal_currency usd, @usd
+    usd.should == @usd
+    usd.object_id.should_not == @usd.object_id # not same object
 
     cad = @currency_test.find(@cad.id)
-    cad.should_not be_nil
-    assert_equal_currency cad, @cad
+    cad.should == @cad
+    cad.object_id.should_not == @cad.object_id # not same object
   end
 end

data/spec/ar_spec_helper.rb

@@ -105,10 +105,10 @@ def assert_equal_money(a,b)
   # Make sure a and b are not the same object.
   b.object_id.should_not == a.object_id
   b.id.should == a.id
-  a.amount.should.not == nil
-  a.amount.should be_kind_of(Money) 
-  b.amount.should.not == nil
-  b.amount.should be_kind_of(Money) 
+  a.amount.should_not == nil
+  a.amount.should be_kind_of(Currency::Money) 
+  b.amount.should_not == nil
+  b.amount.should be_kind_of(Currency::Money) 
   # Make sure that what gets stored in the database comes back out
   # when converted back to the original currency.
   b.amount.rep.should == a.amount.convert(b.amount.currency).rep

data/spec/federal_reserve_spec.rb

@@ -40,12 +40,12 @@ class FederalReserveTest < TestBase
 
     # yesterday = Time.now.to_date - 1
 
-    rates = Exchange::Rate::Source.default.source.raw_rates.should.not == nil
+    rates = Exchange::Rate::Source.default.source.raw_rates.should_not == nil
     #assert_not_nil rates[:USD]
     #assert_not_nil usd_cad = rates[:USD][:CAD]
 
-    usd = Money.new(123.45, :USD).should.not == nil
-    cad = usd.convert(:CAD).should.not == nil
+    usd = Money.new(123.45, :USD).should_not == nil
+    cad = usd.convert(:CAD).should_not == nil
 
     # assert_kind_of Numeric, m = (cad.to_f / usd.to_f)
     # $stderr.puts "m = #{m}"
@@ -56,13 +56,13 @@ class FederalReserveTest < TestBase
   it "cad eur" do
     return unless available?
 
-    rates = Exchange::Rate::Source.default.source.raw_rates.should.not == nil
+    rates = Exchange::Rate::Source.default.source.raw_rates.should_not == nil
     #assert_not_nil rates[:USD]
     #assert_not_nil usd_cad = rates[:USD][:CAD]
     #assert_not_nil usd_eur = rates[:USD][:EUR]
 
-    cad = Money.new(123.45, :CAD).should.not == nil
-    eur = cad.convert(:EUR).should.not == nil
+    cad = Money.new(123.45, :CAD).should_not == nil
+    eur = cad.convert(:EUR).should_not == nil
 
     #assert_kind_of Numeric, m = (eur.to_f / cad.to_f)
     # $stderr.puts "m = #{m}"

data/spec/historical_writer_spec.rb

@@ -49,8 +49,8 @@ class HistoricalWriterTest < ArTestBase
 
   
   it "writer" do
-    src = @src.should.not == nil
-    writer = Exchange::Rate::Source::Historical::Writer.new().should.not == nil
+    src = @src.should_not == nil
+    writer = Exchange::Rate::Source::Historical::Writer.new().should_not == nil
     writer.time_quantitizer = :current
     writer.required_currencies = [ :USD, :GBP, :EUR, :CAD ]
     writer.base_currencies = [ :USD ]
@@ -67,9 +67,9 @@ class HistoricalWriterTest < ArTestBase
     writer = test_writer
     writer.source = @src
     rates = writer.write_rates
-    rates.should.not == nil
+    rates.should_not == nil
     rates.size.should > 0
-    12, rates.size.should.not == nil
+    12, rates.size.should_not == nil
     assert_h_rates(rates, writer)
   end
 
@@ -79,7 +79,7 @@ class HistoricalWriterTest < ArTestBase
     writer.source = @src2
     return unless writer.source.available?
     rates = writer.write_rates
-    rates.should.not == nil
+    rates.should_not == nil
     rates.size.should > 0
     rates.size.should == 12
     assert_h_rates(rates, writer)
@@ -87,8 +87,8 @@ class HistoricalWriterTest < ArTestBase
 
 
   def xxx_test_required_failure
-    writer = Exchange::Rate::Source::Historical::Writer.new().should.not == nil
-    src = @src.should.not == nil
+    writer = Exchange::Rate::Source::Historical::Writer.new().should_not == nil
+    src = @src.should_not == nil
     writer.source = src
     writer.required_currencies = [ :USD, :GBP, :EUR, :CAD, :ZZZ ]
     writer.preferred_currencies = writer.required_currencies
@@ -106,33 +106,33 @@ class HistoricalWriterTest < ArTestBase
     deriver = Exchange::Rate::Deriver.new(:source => source)
     Exchange::Rate::Source.default = deriver
 
-    rates = source.get_raw_rates.should.not == nil
-     rates.empty?.should.not == true
+    rates = source.get_raw_rates.should_not == nil
+     rates.empty?.should_not == true
     # $stderr.puts "historical rates = #{rates.inspect}"
 
-    rates = source.get_rates.should.not == nil
-     rates.empty?.should.not == true
+    rates = source.get_rates.should_not == nil
+     rates.empty?.should_not == true
     # $stderr.puts "historical rates = #{rates.inspect}"
     
-    m_usd = ::Currency.Money('1234.56', :USD, :now).should.not == nil
+    m_usd = ::Currency.Money('1234.56', :USD, :now).should_not == nil
     # $stderr.puts "m_usd = #{m_usd.to_s(:code => true)}"
-    m_eur = m_usd.convert(:EUR).should.not == nil
+    m_eur = m_usd.convert(:EUR).should_not == nil
     # $stderr.puts "m_eur = #{m_eur.to_s(:code => true)}"
 
   end
 
 
   def assert_h_rates(rates, writer = nil)
-    hr0 = rates[0].should.not == nil
+    hr0 = rates[0].should_not == nil
     rates.each do | hr |
       found_hr = nil
       begin
-        found_hr = hr.find_matching_this(:first).should.not == nil
+        found_hr = hr.find_matching_this(:first).should_not == nil
       rescue Object => err
         raise "#{hr.inspect}: #{err}:\n#{err.backtrace.inspect}"
       end
 
-      hr0.should.not == nil
+      hr0.should_not == nil
 
       hr.date.should == hr0.date
       hr.date_0.should == hr0.date_0

data/spec/macro_spec.rb

@@ -46,7 +46,7 @@ class MacroTest < TestBase
 
   it "read money" do
     assert_kind_of  Record, r = Record.new
-    r.gross = 10.00.should.not == nil
+    r.gross = 10.00.should_not == nil
     r.gross.should == r.gross_money.to_f
     r.currency.should == r.gross_money.currency.code
     r.date.should == r.gross_money.time
@@ -57,7 +57,7 @@ class MacroTest < TestBase
 
   it "write money rep" do
     assert_kind_of  Record, r = Record.new
-    r.gross_money = 10.00.should.not == nil
+    r.gross_money = 10.00.should_not == nil
     r.gross.should == r.gross_money.to_f
     r.currency.should == r.gross_money.currency.code
     r.date.should == r.gross_money.time
@@ -69,20 +69,20 @@ class MacroTest < TestBase
   it "money cache" do
     r = test_read_money
 
-    r_gross = r.gross.should.not == nil
+    r_gross = r.gross.should_not == nil
     r_gross.object_id.should == r.gross.object_id
 
     # Cache flush
-    r.gross = 12.00.should.not == nil
+    r.gross = 12.00.should_not == nil
     r.gross.should == r.gross_money.to_f
-    r_gross.object_id != r.gross.object_id.should.not == nil
+    r_gross.object_id != r.gross.object_id.should_not == nil
   end
 
 
   it "currency" do
     r = test_read_money
 
-    r.gross_money.currency.should.not == nil
+    r.gross_money.currency.should_not == nil
     r.currency.should == r.gross_money.currency.code
     
   end
@@ -90,8 +90,8 @@ class MacroTest < TestBase
 
   it "compute" do
     assert_kind_of  Record, r = Record.new
-    r.gross = 10.00.should.not == nil
-    r.tax = 1.50.should.not == nil
+    r.gross = 10.00.should_not == nil
+    r.tax = 1.50.should_not == nil
     r.compute_net
 
     r.net.should == 8.50

data/spec/money_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/spec_helper'
-
+# require File.dirname(__FILE__) + '/../lib/currency/formatter'
 
 describe Currency::Money do
 
@@ -38,14 +38,6 @@ describe Currency::Money do
       :EUR.should == m.currency.code
       m.rep.should == 45990000
     end
-    
-    it "creates money objects from strings" do
-       "12.0001".money(:USD).to_s.should == "$12.0001"
-       # "12.000108".money(:USD).to_s(:thousands => false, :decimals => 5).should == "$12.00011"
-       @money = Currency::Money.new_rep(1234567890000, :USD, nil)
-       
-       Currency::Money.new("12.000108").to_s(:thousands => false, :decimals => 5).should == "$12.00011"
-    end
   end
 
   def zero_money

data/spec/new_york_fed_spec.rb

@@ -38,12 +38,12 @@ class NewYorkFedTest < TestBase
   it "usd cad" do
     return unless available?
 
-    rates = Exchange::Rate::Source.default.source.raw_rates.should.not == nil
-    rates[:USD].should.not == nil
-    usd_cad = rates[:USD][:CAD].should.not == nil
+    rates = Exchange::Rate::Source.default.source.raw_rates.should_not == nil
+    rates[:USD].should_not == nil
+    usd_cad = rates[:USD][:CAD].should_not == nil
 
-    usd = Money.new(123.45, :USD).should.not == nil
-    cad = usd.convert(:CAD).should.not == nil
+    usd = Money.new(123.45, :USD).should_not == nil
+    cad = usd.convert(:CAD).should_not == nil
 
     assert_kind_of Numeric, m = (cad.to_f / usd.to_f)
     # $stderr.puts "m = #{m}"
@@ -54,13 +54,13 @@ class NewYorkFedTest < TestBase
   it "cad eur" do
     return unless available?
 
-    rates = Exchange::Rate::Source.default.source.raw_rates.should.not == nil
-    rates[:USD].should.not == nil
-    usd_cad = rates[:USD][:CAD].should.not == nil
-    usd_eur = rates[:USD][:EUR].should.not == nil
+    rates = Exchange::Rate::Source.default.source.raw_rates.should_not == nil
+    rates[:USD].should_not == nil
+    usd_cad = rates[:USD][:CAD].should_not == nil
+    usd_eur = rates[:USD][:EUR].should_not == nil
 
-    cad = Money.new(123.45, :CAD).should.not == nil
-    eur = cad.convert(:EUR).should.not == nil
+    cad = Money.new(123.45, :CAD).should_not == nil
+    eur = cad.convert(:EUR).should_not == nil
 
     assert_kind_of Numeric, m = (eur.to_f / cad.to_f)
     # $stderr.puts "m = #{m}"

data/spec/parser_spec.rb

@@ -39,15 +39,15 @@ class ParserTest < TestBase
 
 
   it "misc" do
-    m = "123.45 USD".money + "100 CAD".should.not == nil
-     (m.rep == 200.45).should.not == true
+    m = "123.45 USD".money + "100 CAD".should_not == nil
+     (m.rep == 200.45).should_not == true
   end
 
 
   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
+    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
@@ -58,10 +58,10 @@ class ParserTest < TestBase
   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
+    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
@@ -73,7 +73,7 @@ class ParserTest < TestBase
     parser = ::Currency::Parser.new
     parser.time = nil
 
-    m = parser.parse("$1234.55").should.not == nil
+    m = parser.parse("$1234.55").should_not == nil
     m.time.should == nil
   end
 
@@ -82,7 +82,7 @@ class ParserTest < TestBase
     parser = ::Currency::Parser.new
     parser.time = Time.new
 
-    m = parser.parse("$1234.55").should.not == nil
+    m = parser.parse("$1234.55").should_not == nil
    m.time.should == parser.time
   end
 
@@ -91,11 +91,11 @@ class ParserTest < TestBase
     parser = ::Currency::Parser.new
     parser.time = :now
 
-    m = parser.parse("$1234.55").should.not == nil
-    m1_time = m.time.should.not == nil
+    m = parser.parse("$1234.55").should_not == nil
+    m1_time = m.time.should_not == nil
 
-    m = parser.parse("$1234.55").should.not == nil
-    m2_time = m.time.should.not == nil
+    m = parser.parse("$1234.55").should_not == nil
+    m2_time = m.time.should_not == nil
 
     assert_not_equal m1_time, m2_time
   end

data/spec/timed_cache_spec.rb

@@ -28,12 +28,12 @@ class TimedCacheTest < TestBase
 
 
   it "timed cache usd cad" do
-    rates = @source.raw_rates.should.not == nil
-    rates[:USD].should.not == nil
-    usd_cad = rates[:USD][:CAD].should.not == nil
+    rates = @source.raw_rates.should_not == nil
+    rates[:USD].should_not == nil
+    usd_cad = rates[:USD][:CAD].should_not == nil
 
-    usd = Money.new(123.45, :USD).should.not == nil
-    cad = usd.convert(:CAD).should.not == nil
+    usd = Money.new(123.45, :USD).should_not == nil
+    cad = usd.convert(:CAD).should_not == nil
 
     assert_kind_of Numeric, m = (cad.to_f / usd.to_f)
     # $stderr.puts "m = #{m}"
@@ -42,13 +42,13 @@ class TimedCacheTest < TestBase
 
 
   it "timed cache cad eur" do
-    rates = @source.raw_rates.should.not == nil
-    rates[:USD].should.not == nil
-    usd_cad = rates[:USD][:CAD].should.not == nil
-    usd_eur = rates[:USD][:EUR].should.not == nil
+    rates = @source.raw_rates.should_not == nil
+    rates[:USD].should_not == nil
+    usd_cad = rates[:USD][:CAD].should_not == nil
+    usd_eur = rates[:USD][:EUR].should_not == nil
 
-    cad = Money.new(123.45, :CAD).should.not == nil
-    eur = cad.convert(:EUR).should.not == nil
+    cad = Money.new(123.45, :CAD).should_not == nil
+    eur = cad.convert(:EUR).should_not == nil
 
     assert_kind_of Numeric, m = (eur.to_f / cad.to_f)
     # $stderr.puts "m = #{m}"
@@ -61,32 +61,32 @@ class TimedCacheTest < TestBase
 
     test_timed_cache_cad_eur
 
-    rates = @source.raw_rates.should.not == nil
-    rates[:USD].should.not == nil
-    usd_cad_1 = rates[:USD][:CAD].should.not == nil
+    rates = @source.raw_rates.should_not == nil
+    rates[:USD].should_not == nil
+    usd_cad_1 = rates[:USD][:CAD].should_not == nil
 
-    t1 = @cache.rate_load_time.should.not == nil
-    t1_reload = @cache.rate_reload_time.should.not == nil
+    t1 = @cache.rate_load_time.should_not == nil
+    t1_reload = @cache.rate_reload_time.should_not == nil
     t1_reload.to_i.should > t1.to_i
 
     @cache.time_to_live = 5
     @cache.time_to_live_fudge = 0
 
     # puts @cache.rate_reload_time.to_i - @cache.rate_load_time.to_i
-    @cache.rate_reload_time.to_i - @cache.rate_load_time.to_i == @cache.time_to_live.should.not == nil
+    @cache.rate_reload_time.to_i - @cache.rate_load_time.to_i == @cache.time_to_live.should_not == nil
 
     sleep 10
 
     test_timed_cache_cad_eur
     
-    t2 = @cache.rate_load_time.should.not == nil
-    t1.to_i != t2.to_i.should.not == nil
+    t2 = @cache.rate_load_time.should_not == nil
+    t1.to_i != t2.to_i.should_not == nil
 
-    rates = @source.raw_rates.should.not == nil
-    rates[:USD].should.not == nil
-    usd_cad_2 = rates[:USD][:CAD].should.not == nil
+    rates = @source.raw_rates.should_not == nil
+    rates[:USD].should_not == nil
+    usd_cad_2 = rates[:USD][:CAD].should_not == nil
 
-    usd_cad_1.object_id != usd_cad_2.object_id.should.not == nil
+    usd_cad_1.object_id != usd_cad_2.object_id.should_not == nil
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acvwilson-currency
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Asa Wilson
@@ -112,6 +112,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: currency 0.5.1
+summary: currency 0.5.2
 test_files: []