acvwilson-currency 0.5.2 → 0.6.0

data/currency.gemspec

@@ -1,18 +1,18 @@
 Gem::Specification.new do |s|
   s.name = %q{currency}
-  s.version = "0.5.2"
+  s.version = "0.6.0"
  
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Asa Wilson"]
-  s.date = %q{2008-11-14}
+  s.date = %q{#{Date.today}}
   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_core_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/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.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{currency 0.5.2}
+  s.summary = %q{#{s.name} #{s.version}}
 end

data/lib/currency.rb

@@ -140,4 +140,4 @@ require 'currency/exchange/rate/source'
 require 'currency/exchange/rate/source/test'
 require 'currency/exchange/time_quantitizer'
 require 'currency/core_extensions'
-require 'active_support'
+require 'active_support' # high(-er) precision rounding

data/lib/currency/config.rb

@@ -7,38 +7,35 @@
 # TO DO:
 # 
 # Migrate all class variable configurations to this object.
+# Rewrite this whole class. It is not working at all after first config
+# Threads are bad. Use the Singleton library when rewriting this
 class Currency::Config
-  @@default = nil
-
   # Returns the default Currency::Config object.
   #
   # If one is not specfied an instance is
   # created.  This is a global, not thread-local.
   def self.default 
-    @@default ||= 
-      self.new
+    @@default ||= self.new
   end
   
   # Sets the default Currency::Config object.
   def self.default=(x)
     @@default = x
+    Currency::Currency::Factory.reset
+    @@default
   end
   
-  # Returns the current Currency::Config object used during
-  # in the current thread.
-  #
+  # Returns the current Currency::Config object
   # If #current= has not been called and #default= has not been called,
   # then UndefinedExchange is raised.
   def self.current
-    Thread.current[:Currency__Config] ||= 
-      self.default || 
-      (raise ::Currency::Exception::UndefinedConfig, "Currency::Config.default not defined")
+    self.default || (raise ::Currency::Exception::UndefinedConfig, "Currency::Config.default not defined")
   end
   
   # Sets the current Currency::Config object used
   # in the current thread.
   def self.current=(x)
-    Thread.current[:Currency__Config] = x
+    self.default = x
   end
 
   # Clones the current configuration and makes it current
@@ -49,36 +46,29 @@ class Currency::Config
   #     c.float_ref_filter = Proc.new { | x | x.round }
   #     "123.448".money.rep == 12345
   #   end
+  # TODO: rewrite from scratch
   def self.configure(&blk)
     c_prev = current
     c_new = self.current = current.clone
     result = nil
     begin
       result = yield c_new
-    ensure
+    rescue
       self.current = c_prev
     end
     result
   end
 
   
-  @@identity = Proc.new { |x| x } # :nodoc:
-  
   # Returns the current Float conversion filter.
   # Can be used to set rounding or truncation policies when converting
   # Float values to Money values.
   # Defaults to an identity function.
   # See Float#Money_rep.
+  attr_accessor :float_ref_filter
   def float_ref_filter
-    @float_ref_filter ||= 
-      @@identity
-  end
-  
-  # Sets the current Float conversion filter.
-  def float_ref_filter=(x)
-    @float_ref_filter = x
+    @float_ref_filter ||= Proc.new { |x| x }
   end
-
   
   # Defines the table name for Historical::Rate records.
   # Defaults to 'currency_historical_rates'.
@@ -86,6 +76,18 @@ class Currency::Config
   def historical_table_name
     @historical_table_name ||= 'currency_historical_rates'
   end
+  
+  attr_accessor :scale_exp
+  def scale_exp=(val)
+    raise ArgumentError, "Invalid scale exponent" unless val.integer?
+    raise ArgumentError, "Invalid scale: zero" if val.zero?
+    @scale_exp = val
+    Currency::Currency::Factory.reset
+  end
 
-end # module
-
+  attr_reader :scale
+  def scale
+    10 ** (scale_exp || 2)
+  end
+  
+end

data/lib/currency/core_extensions.rb

@@ -1,8 +1,6 @@
 # Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
 # See LICENSE.txt for details.
 
-
-
 class Object 
   # Exact conversion to Money representation value.
   def money(*opts)
@@ -10,8 +8,6 @@ class Object
   end
 end
 
-
-
 class Integer 
   # Exact conversion to Money representation value.
   def Money_rep(currency, time = nil)
@@ -19,59 +15,13 @@ class Integer
   end
 end
 
-# module Asa
-#   module Rounding
-#     def self.included(base) #:nodoc:
-#       puts "included by #{base.inspect}"
-#       base.class_eval do
-#         alias_method :round_without_precision, :round
-#         alias_method :round, :round_with_precision
-#       end
-#     end
-# 
-#     # Rounds the float with the specified precision.
-#     #
-#     #   x = 1.337
-#     #   x.round    # => 1
-#     #   x.round(1) # => 1.3
-#     #   x.round(2) # => 1.34
-#     def round_with_precision(precision = nil)
-#       precision.nil? ? round_without_precision : (self * (10 ** precision)).round / (10 ** precision).to_f
-#     end
-#     
-#   end
-# end
-# 
-# class Float 
-#   include Asa::Rounding
-#   # Inexact conversion to Money representation value.
-#   def Money_rep(currency, time = nil)  
-#     Integer(Currency::Config.current.float_ref_filter.call(self * currency.scale))
-#   end
-# end
-
 class Float 
   # Inexact conversion to Money representation value.
   def Money_rep(currency, time = nil)  
     Integer(Currency::Config.current.float_ref_filter.call(self * currency.scale))
   end
-  
-  # def round_with_awesome_precision(precision = nil)
-  #   # puts "self: #{self.inspect}"
-  #   # puts "precision: #{precision.inspect}"
-  #   # puts "round_without_precision: #{round_without_precision.inspect}"
-  #   # puts "self * (10 ** precision): #{(self * (10 ** precision)).inspect}"
-  #   # puts "(self * (10 ** precision)).round_without_precision: #{((self * (10 ** precision)).round_without_precision).inspect}"
-  #   # self.to_s.to_f.round_without_precision
-  #   precision.nil? ? round_without_awesome_precision : (self * (10 ** precision)).round_without_awesome_precision / (10 ** precision).to_f
-  # end
-  # alias_method :round_without_awesome_precision, :round
-  # alias_method :round, :round_with_awesome_precision
 end
 
-
-
-
 class String
   # Exact conversion to Money representation value.
   def Money_rep(currency, time = nil)

data/lib/currency/currency.rb

@@ -44,14 +44,11 @@ class Currency::Currency
 
     # Create a new currency.
     # This should only be called from Currency::Currency::Factory.
-    def initialize(code, symbol = nil, scale = 1000000)
+    # def initialize(code, symbol = nil, scale = 1000000)
+    def initialize(code, symbol = nil, scale = Currency::Config.current.scale)
       self.code = code
       self.symbol = symbol
       self.scale = scale
-
-      @formatter =
-        @parser = 
-        nil
     end
 
 

data/lib/currency/currency/factory.rb

@@ -22,6 +22,16 @@ class Currency::Currency::Factory
       @currency = nil
     end
 
+    def self.reset
+      default.reset
+    end
+
+    def reset
+      @currency_by_code = { }
+      @currency_by_symbol = { }
+      @currency = nil
+    end
+    
 
     # Lookup Currency by code.
     def get_by_code(x)
@@ -60,19 +70,19 @@ class Currency::Currency::Factory
 	# $stderr.puts "load('USD')"
         currency.code = :USD
         currency.symbol = '$'
-        currency.scale = 1000000
+        # currency.scale = 1000000
       elsif currency.code == :CAD
         # $stderr.puts "load('CAD')"
         currency.symbol = '$'
-        currency.scale = 1000000
+        # currency.scale = 1000000
       elsif currency.code == :EUR
         # $stderr.puts "load('CAD')"
         currency.symbol = nil
         currency.symbol_html = '€'
-        currency.scale = 1000000
+        # currency.scale = 1000000
       else
         currency.symbol = nil
-        currency.scale = 1000000
+        # currency.scale = 1000000
       end
   
       # $stderr.puts "AFTER: load(#{currency.inspect})"

data/lib/currency/exchange/rate/source/base.rb

@@ -41,7 +41,7 @@ class Currency::Exchange::Rate::Source::Base
     end 
 
 
-    def __subclass_responsibility(meth)
+    def __subclass_responsibility(method)
       raise ::Currency::Exception::SubclassResponsibility, 
       [
        "#{self.class}#\#{meth}", 
@@ -61,7 +61,7 @@ class Currency::Exchange::Rate::Source::Base
         m
       else
         rate = rate(c1, c2, time)
-        # raise ::Currency::Exception::UnknownRate, "#{c1} #{c2} #{time}" unless rate
+        raise ::Currency::Exception::UnknownRate, "Cannot convert #{m} from #{c1} to #{c2} at time #{time}" unless rate
           
         rate && ::Currency::Money(rate.convert(m, c1), c2, time)
       end

data/lib/currency/exchange/rate/source/federal_reserve.rb

@@ -1,12 +1,11 @@
 # Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
 # See LICENSE.txt for details.
 
-require 'currency/exchange/rate/source/provider'
+require File.dirname(__FILE__) + '/provider'
 
 require 'net/http'
 require 'open-uri'
 
-
 # Connects to http://www.federalreserve.gov/releases/H10/hist/dat00_<country>.txtb
 # Parses all known currency files.
 # 
@@ -26,13 +25,11 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
     super(*opt)
   end
   
-
   # Returns 'federalreserve.gov'.
   def name
     'federalreserve.gov'
   end
 
-
   # FIXME?
   #def available?(time = nil)
   #  time ||= Time.now
@@ -44,7 +41,6 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
     @raw_rates = nil
     super
   end
-  
 
   def raw_rates
     rates
@@ -56,8 +52,7 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
   # See http://www.jhall.demon.co.uk/currency/by_country.html
   #
   # Some data files list reciprocal rates!
-  @@country_to_currency = 
-    {
+  @@country_to_currency = {
     'al' => [ :AUD, :USD ],
     # 'au' => :ASH, # AUSTRIAN SHILLING: pre-EUR?
     'bz' => [ :USD, :BRL ],
@@ -84,7 +79,6 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
     've' => [ :USD, :VEB ],
   }
 
-
   # Parses text file for rates.
   def parse_rates(data = nil)
     data = get_page_content unless data
@@ -122,7 +116,7 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
 
       rate = m[4].to_f
 
-      STDERR.puts "#{c1} #{c2} #{rate}\t#{date}" if @verbose
+      # STDERR.puts "#{c1} #{c2} #{rate}\t#{date}" if @verbose
 
       rates << new_rate(c1, c2, rate, date)
 
@@ -140,7 +134,6 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
     rates
   end
   
-  
   # Return a list of known base rates.
   def load_rates(time = nil)
     # $stderr.puts "#{self}: load_rates(#{time})" if @verbose
@@ -152,8 +145,6 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
     end
     rates
   end
-  
- 
 end # class
 
 

data/lib/currency/exchange/rate/source/provider.rb

@@ -1,8 +1,7 @@
 # Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
 # See LICENSE.txt for details.
 
-require 'currency/exchange/rate/source'
-
+require File.dirname(__FILE__) + '/../source'
 
 # Base class for rate data providers.
 # Assumes that rate sources provide more than one rate per query.
@@ -31,6 +30,7 @@ class Currency::Exchange::Rate::Source::Provider < Currency::Exchange::Rate::Sou
 
   # Returns the date to query for rates.
   # Defaults to yesterday.
+  # TODO: use ActiveSupport here?
   def date
     @date || (Time.now - 24 * 60 * 60) # yesterday.
   end
@@ -56,19 +56,14 @@ class Currency::Exchange::Rate::Source::Provider < Currency::Exchange::Rate::Sou
 
   # Returns the URI string as evaluated with this object.
   def get_uri
-    uri = self.uri
-    uri = "\"#{uri}\""
-    uri = instance_eval(uri)
+    uri = instance_eval("\"#{self.uri}\"")
     $stderr.puts "#{self}: uri = #{uri.inspect}" if @verbose
     uri
   end
 
-
   # Returns the URI content.
   def get_page_content
-    data = open(get_uri) { |data| data.read }
-    
-    data
+    open(get_uri) { |data| data.read }
   end
 
 
@@ -96,10 +91,12 @@ class Currency::Exchange::Rate::Source::Provider < Currency::Exchange::Rate::Sou
 
   # Return a matching base rate.
   def get_rate(c1, c2, time)
+    # puts "Getting rates for c1: #{c1} and c2: #{c2} at #{time}\n rates: #{rates.map{|r| "#{r.c1}->#{r.c2}"}.inspect}"
     rates.each do | rate |
+      # puts " >#{rate.c1} == #{c1} && #{rate.c2} == #{c2} #{rate.c1 == c1} && #{rate.c2.to_s == c2.to_s}< "
       return rate if 
         rate.c1 == c1 &&
-        rate.c2 == c2 &&
+        rate.c2.to_s == c2.to_s && # FIXME: understand why this second param needs to be cast to String for specs to pass
         (! time || normalize_time(rate.date) == time)
     end
 

data/lib/currency/formatter.rb

@@ -293,8 +293,6 @@ class Currency::Formatter
   #     => "1,234,567.89 USD"
   #
   def format(m, opt = @@empty_hash)
-    # raise "huh: #{opt.inspect}"
-    
     fmt = self
 
     unless opt.empty? 

data/lib/currency/money.rb

@@ -48,16 +48,13 @@ class Currency::Money
     # See #Money_rep(currency) mixin.
     #
     def initialize(x, currency = nil, time = nil)
-      opts ||= @@empty_hash
-
-      # Set ivars.
-      currency = ::Currency::Currency.get(currency)
-      @currency = currency
+      @currency = ::Currency::Currency.get(currency)
       @time = time || ::Currency::Money.default_time
       @time = ::Currency::Money.now if @time == :now
+      
       if x.kind_of?(String)
-        if currency
-          m = currency.parser_or_default.parse(x, :currency => currency)
+        if @currency
+          m = @currency.parser_or_default.parse(x, :currency => @currency)
         else
           m = ::Currency::Parser.default.parse(x)
         end
@@ -237,8 +234,6 @@ class Currency::Money
 
     # Formats the Money value as a String.
     def to_s(*opt)
-      # raise "huh: #{opt.inspect}"
-      
       @currency.format(self, *opt)
     end
 

data/spec/ar_column_spec.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/ar_spec_helper'
 
-
 ##################################################
 # Basic CurrenyTest AR::B class
 #

data/spec/ar_spec_helper.rb

@@ -24,6 +24,7 @@ def ar_setup
   
 end
 
+# DB Connection info
 def database_spec
   # TODO: Get from ../config/database.yml:test
   # Create test database on:
@@ -59,6 +60,7 @@ def database_spec
   
 end
 
+# Run AR migrations UP
 def schema_up
   return unless @currency_test_migration
   begin
@@ -68,6 +70,8 @@ def schema_up
   end
 end
 
+
+# Run AR migrations DOWN
 def schema_down
   return unless @currency_test_migration
   begin
@@ -77,10 +81,7 @@ def schema_down
   end
 end
 
-##################################################
-# Scaffold
-# 
-
+# Scaffold: insert stuff into DB so we can test AR integration
 def insert_records
   delete_records
 
@@ -99,6 +100,7 @@ end
 
 ##################################################
 
+# TODO: need this?
 def assert_equal_money(a,b)
   a.should_not be_nil
   b.should_not be_nil
@@ -114,7 +116,7 @@ def assert_equal_money(a,b)
   b.amount.rep.should == a.amount.convert(b.amount.currency).rep
 end
 
-
+# TODO: need this?
 def assert_equal_currency(a,b)
   assert_equal_money a, b
 

data/spec/config_spec.rb

@@ -22,8 +22,49 @@ describe Currency::Config do
     end
 
   end
+  
+  describe "the scale expression is configurable" do
+    before(:all) do
+      @config = Currency::Config.new
+    end
+    
+    before(:each) do
+      Currency::Config.current = nil
+      Currency::Config.send(:class_variable_set, "@@default", nil)
+    end
+    
+    it "should have a scale_exp setter" do
+      Currency::Config.current.should respond_to(:scale_exp=)
+    end
+    
+    it "has a 'scale' reader" do
+      Currency::Config.current.should respond_to(:scale)
+    end
+    
+    it "uses the scale reader from the config when creating new Money object" do
+      Currency::Config.should_receive(:current).and_return(@config)
+      @config.should_receive(:scale).and_return(100)
+      10.money
+    end
+    
+    it "can be configured using a block" do
+      Currency::Config.configure do |config|
+        config.scale_exp = 6
+      end
 
-end # class
-
-
+      10.money.currency.scale_exp.should == 6
+      
+      Currency::Config.configure do |config|
+        config.scale_exp = 4
+      end
+      10.money.currency.scale_exp.should == 4
+    end
+    
+    it "can be configured using straight setters" do
+      10.money(:USD).currency.scale_exp.should == 2
+      Currency::Config.current.scale_exp = 6
+      10.money(:USD).currency.scale_exp.should == 6
+    end
+  end
 
+end

data/spec/federal_reserve_spec.rb

@@ -1,75 +1,71 @@
 # Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
 # See LICENSE.txt for details.
 
-require 'test/test_base'
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../lib/currency/exchange/rate/source/federal_reserve'
 
-require 'currency' # For :type => :money
-require 'currency/exchange/rate/source/federal_reserve'
+# Uncomment to avoid hitting the FED for every testrun
+Currency::Exchange::Rate::Source::FederalReserve.class_eval do
+  def get_page_content
+    %Q{
 
-module Currency
+      SPOT EXCHANGE RATE - DISNEYLAND
 
-class FederalReserveTest < TestBase
-  before do
-    super
+      ------------------------------
+      14-Nov-08                          1.1
+    }
   end
+end
 
-
-  @@available = nil
-
-  # New York Fed rates are not available on Saturday and Sunday.
+include Currency
+describe "FederalReserve" do
   def available?
-    if @@available == nil
-      @@available = @source.available?
-      STDERR.puts "Warning: FederalReserve unavailable on Saturday and Sunday, skipping tests." unless @@available
+    unless @available
+      @available = @source.available?
+      STDERR.puts "Warning: FederalReserve unavailable on Saturday and Sunday, skipping tests." unless @available
     end
-    @@available
+    @available
   end
-
-
-  def get_rate_source
-    # Force FederalReserve Exchange.
-    verbose = false
-    source = @source = Exchange::Rate::Source::FederalReserve.new(:verbose => verbose)
-    deriver = Exchange::Rate::Deriver.new(:source => source, :verbose => source.verbose)
+  
+  # Called by the before(:all) in spec_helper
+  # Overriding here to force FederalReserve Exchange.
+  # TODO: when refactoring the whole spec to test only specific FedralReserve Stuff, make sure this one goes away
+  def get_rate_source(source = nil)
+    @source   ||= Exchange::Rate::Source::FederalReserve.new(:verbose => false)
+    @deriver  ||= Exchange::Rate::Deriver.new(:source => @source, :verbose => @source.verbose)
   end
-
-
-
-  it "usd cad" do
-    return unless available?
-
-    # yesterday = Time.now.to_date - 1
-
-    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
-
-    # assert_kind_of Numeric, m = (cad.to_f / usd.to_f)
-    # $stderr.puts "m = #{m}"
-    # assert_equal_float usd_cad, m, 0.001
+  
+  def get_rates
+    @rates ||= @source.raw_rates
   end
-
-
-  it "cad eur" do
-    return unless available?
-
-    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
-
-    #assert_kind_of Numeric, m = (eur.to_f / cad.to_f)
-    # $stderr.puts "m = #{m}"
-    #assert_equal_float (1.0 / usd_cad) * usd_eur, m, 0.001
+  
+  before(:all) do
+    get_rate_source
+    get_rates
+  end
+  
+  before(:each) do
+    get_rate_source
+  end
+  
+  it "can retrieve rates from the FED" do
+    @rates.should_not be_nil
   end
 
-end
-
-end # module
+  it "can convert from USD to CAD" do
+    usd = Money.new(123.45, :USD)
 
+    cad = usd.convert(:CAD)
+    cad.should_not be_nil
+    cad.to_f.should be_kind_of(Numeric)
+  end
+  
+  it "can do conversions from AUD to USD to JPY" do
+    aud = Money.new(123.45, :AUD)
+    usd = aud.convert(:USD)
+    jpy = usd.convert(:JPY)
+    jpy.should_not be_nil
+    jpy.to_f.should be_kind_of(Numeric)
+  end
+  
+end

data/spec/historical_writer_spec.rb

@@ -1,56 +1,42 @@
 # Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
 # See LICENSE.txt for details.
+require File.dirname(__FILE__) + '/ar_spec_helper'
 
-require 'test/ar_test_base'
+require File.dirname(__FILE__) + '/../lib/currency/exchange/rate/source/historical'
+require File.dirname(__FILE__) + '/../lib/currency/exchange/rate/source/historical/writer'
+require File.dirname(__FILE__) + '/../lib/currency/exchange/rate/source/xe'
+require File.dirname(__FILE__) + '/../lib/currency/exchange/rate/source/new_york_fed'
 
-require 'rubygems'
-require 'active_record'
-require 'active_record/migration'
+include Currency
+RATE_CLASS = Exchange::Rate::Source::Historical::Rate
+TABLE_NAME = RATE_CLASS.table_name
 
-require 'currency' # For :type => :money
-
-require 'currency/exchange/rate/source/historical'
-require 'currency/exchange/rate/source/historical/writer'
-require 'currency/exchange/rate/source/xe'
-require 'currency/exchange/rate/source/new_york_fed'
-
-
-module Currency
-
-class HistoricalWriterTest < ArTestBase
-
-  RATE_CLASS = Exchange::Rate::Source::Historical::Rate
-  TABLE_NAME = RATE_CLASS.table_name
-
-  class HistoricalRateMigration < AR_M
-    def self.up
-      RATE_CLASS.__create_table(self)
-    end
-
-    def self.down
-      drop_table TABLE_NAME.intern
-    end
+class HistoricalRateMigration < ActiveRecord::Migration
+  def self.up
+    RATE_CLASS.__create_table(self)
   end
 
-
-  def initialize(*args)
-    @currency_test_migration = HistoricalRateMigration
-    super
-
-    @src = Exchange::Rate::Source::Xe.new
-    @src2 = Exchange::Rate::Source::NewYorkFed.new
+  def self.down
+    drop_table TABLE_NAME.to_sym
   end
+end
 
-
-  before do
-    super
-    
+describe "HistoricalWriter" do
+  before(:all) do
+    ActiveRecord::Base.establish_connection(database_spec)
+    @currency_test_migration ||= HistoricalRateMigration
+    schema_down
+    schema_up
+    @xe_src  = Exchange::Rate::Source::Xe.new
+    @fed_src = Exchange::Rate::Source::NewYorkFed.new
   end
-
   
-  it "writer" do
-    src = @src.should_not == nil
-    writer = Exchange::Rate::Source::Historical::Writer.new().should_not == nil
+  after(:all) do
+    schema_down
+  end
+  
+  def setup_writer(source)
+    writer = Exchange::Rate::Source::Historical::Writer.new
     writer.time_quantitizer = :current
     writer.required_currencies = [ :USD, :GBP, :EUR, :CAD ]
     writer.base_currencies = [ :USD ]
@@ -58,130 +44,78 @@ class HistoricalWriterTest < ArTestBase
     writer.reciprocal_rates = true
     writer.all_rates = true
     writer.identity_rates = false
-    
+    writer.source = source
     writer
   end
   
-
-  def writer_src
-    writer = test_writer
-    writer.source = @src
-    rates = writer.write_rates
-    rates.should_not == nil
-    rates.size.should > 0
-    12, rates.size.should_not == nil
-    assert_h_rates(rates, writer)
-  end
-
-
-  def writer_src2
-    writer = test_writer
-    writer.source = @src2
-    return unless writer.source.available?
+  it "can read, parse and write XE data" do
+    writer = setup_writer(@xe_src)
     rates = writer.write_rates
-    rates.should_not == nil
-    rates.size.should > 0
     rates.size.should == 12
     assert_h_rates(rates, writer)
   end
-
-
-  def xxx_test_required_failure
-    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
-    assert_raises(::RuntimeError) { writer.selected_rates }
-  end
-
-
-  it "historical rates" do
-    # Make sure there are historical Rates avail for today.
-    writer_src
-    writer_src2
-    
-    # Force Historical Rate Source.
-    source = Exchange::Rate::Source::Historical.new
-    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
-    # $stderr.puts "historical rates = #{rates.inspect}"
-
-    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
-    # $stderr.puts "m_usd = #{m_usd.to_s(:code => true)}"
-    m_eur = m_usd.convert(:EUR).should_not == nil
-    # $stderr.puts "m_eur = #{m_eur.to_s(:code => true)}"
-
+  
+  it "can read, parse and write NewYorkFed data (will fail on weekends)" do
+    if @fed_src.available?
+      writer = setup_writer(@fed_src)
+      rates = writer.write_rates
+      rates.size.should == 12
+      assert_h_rates(rates, writer)
+    end
   end
-
-
+  
   def assert_h_rates(rates, writer = nil)
-    hr0 = rates[0].should_not == nil
+    hr0 = rates[0]
+    hr0.should_not be_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)
+        found_hr.should_not be_nil
       rescue Object => err
         raise "#{hr.inspect}: #{err}:\n#{err.backtrace.inspect}"
       end
-
-      hr0.should_not == nil
-
-      hr.date.should == hr0.date
-      hr.date_0.should == hr0.date_0
-      hr.date_1.should == hr0.date_1
-      hr.source.should == hr0.source
-
       assert_equal_rate(hr, found_hr)
       assert_rate_defaults(hr, writer)
+
+      hr.instance_eval do
+        date.should    ==  hr0.date
+        date_0.should  ==  hr0.date_0
+        date_1.should  ==  hr0.date_1
+        source.should  ==  hr0.source
+      end
     end
   end
 
-
   def assert_equal_rate(hr0, hr)
+    tollerance = 0.00001
     hr.c1.to_s.should == hr0.c1.to_s
     hr.c2.to_s.should == hr0.c2.to_s
     hr.source.should == hr0.source
-    assert_equal_float hr0.rate, hr.rate
-    assert_equal_float hr0.rate_avg, hr.rate_avg
-    hr.rate_samples.should == hr0.rate_samples
-    assert_equal_float hr0.rate_lo, hr.rate_lo
-    assert_equal_float hr0.rate_hi, hr.rate_hi
-    assert_equal_float hr0.rate_date_0, hr.rate_date_0
-    assert_equal_float hr0.rate_date_1, hr.rate_date_1
-    hr.date.should == hr0.date
-    hr.date_0.should == hr0.date_0
-    hr.date_1.should == hr0.date_1
-    hr.derived.should == hr0.derived
+    
+    hr0.rate.should be_close(hr.rate, tollerance)
+    hr0.rate_avg.should be_close(hr.rate_avg, tollerance)
+    hr0.rate_samples.should == hr.rate_samples.should
+    
+    hr0.rate_lo.should be_close(hr.rate_lo, tollerance)
+    hr0.rate_hi.should be_close(hr.rate_hi, tollerance)
+    hr0.rate_date_0.should be_close(hr.rate_date_0, tollerance)
+    hr0.rate_date_1.should be_close(hr.rate_date_1, tollerance)
+    
+    hr0.date.should == hr.date
+    hr0.date_0.should == hr.date_0
+    hr0.date_1.should == hr.date_1
+    hr0.derived.should == hr.derived
   end
 
-
   def assert_rate_defaults(hr, writer)
-    hr.source if writer.should == writer.source.name
-    hr.rate_avg.should == hr.rate
-    1.should == hr.rate_samples
-    hr.rate_lo.should == hr.rate
-    hr.rate_hi.should == hr.rate
-    hr.rate_date_0.should == hr.rate
-    hr.rate_date_1.should == hr.rate
+    hr.source.should        ==  writer.source.name
+    hr.rate_avg.should      ==  hr.rate
+    hr.rate_samples.should  ==  1
+    hr.rate_lo.should       ==  hr.rate
+    hr.rate_hi.should       ==  hr.rate
+    hr.rate_date_0.should   ==  hr.rate
+    hr.rate_date_1.should   ==  hr.rate
   end
 
-
-  def assert_equal_float(x1, x2, eps = 0.00001)
-    eps = (x1 * eps).abs
-    assert((x1 - eps) <= x2)
-    assert((x1 + eps) >= x2)
-  end
-
-
-end
-
-end # module
-
+end

data/spec/spec_helper.rb

@@ -5,16 +5,16 @@ require 'spec'
 require File.dirname(__FILE__) + '/../lib/currency'
 require File.dirname(__FILE__) + '/../lib/currency/exchange/rate/source/test'
 
-def setup
-  rate_source ||= get_rate_source
+def setup(source = nil)
+  rate_source ||= get_rate_source(source)
   Currency::Exchange::Rate::Source.default = rate_source
 
   # Force non-historical money values.
   Currency::Money.default_time = nil
 end
 
-def get_rate_source
-  source = Currency::Exchange::Rate::Source::Test.instance
+def get_rate_source(source = nil)
+  source ||= Currency::Exchange::Rate::Source::Test.instance
   Currency::Exchange::Rate::Deriver.new(:source => source)
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acvwilson-currency
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors: 
 - Asa Wilson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-14 00:00:00 -08:00
+date: 2008-11-18 06:18:56.586682 -08:00
 default_executable: 
 dependencies: []
 
@@ -70,7 +70,6 @@ files:
 - Releases.txt
 - spec/ar_spec_helper.rb
 - spec/ar_column_spec.rb
-- spec/ar_core_spec.rb
 - spec/ar_simple_spec.rb
 - spec/config_spec.rb
 - spec/federal_reserve_spec.rb
@@ -112,6 +111,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: currency 0.5.2
+summary: "#{s.name} #{s.version}"
 test_files: []
 

data/spec/ar_core_spec.rb

@@ -1,68 +0,0 @@
-# Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
-# See LICENSE.txt for details.
-
-
-# =================================================================
-# = TODO: IS THIS STUFF ACTUALLY NEEDED? IF SO, MOVE TO AR HELPER =
-# =================================================================
-require 'test/ar_test_base'
-
-module Currency
-
-class ArTestCore < ArTestBase
-
-  ##################################################
-  # Basic CurrenyTest AR::B class
-  #
-
-  TABLE_NAME = 'currency_test'
-
-  class CurrencyTestMigration < AR_M
-    def self.up
-      create_table TABLE_NAME.intern do |t|
-        t.column :name,     :string
-        t.column :amount,   :integer # Money
-      end
-    end
-
-    def self.down
-      drop_table TABLE_NAME.intern
-    end
-  end
-
-
-  class CurrencyTest < AR_B
-    set_table_name TABLE_NAME
-    attr_money :amount
-  end 
-
-
-  ##################################################
-
-
-  before do
-    @currency_test_migration ||= CurrencyTestMigration 
-    @currency_test           ||= CurrencyTest
-    super
-  end
-
-
-  def teardown
-    super
-    # schema_down
-  end
-
-
-  ##################################################
-  # 
-  # 
-  
-
-  it "insert" do
-    insert_records
-  end
-
-end
-
-end # module
-