currency 0.4.7 → 0.4.9

data/Manifest.txt

@@ -6,6 +6,7 @@ README.txt
 Rakefile
 Releases.txt
 TODO.txt
+bin/currency_historical_rate_load
 examples/ex1.rb
 examples/xe1.rb
 lib/currency.rb
@@ -25,6 +26,7 @@ lib/currency/exchange/rate/source/failover.rb
 lib/currency/exchange/rate/source/federal_reserve.rb
 lib/currency/exchange/rate/source/historical.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/new_york_fed.rb
 lib/currency/exchange/rate/source/provider.rb

data/Releases.txt

@@ -1,5 +1,18 @@
 = Currency Release History
 
+== Release 0.4.9: 2007/11/01
+
+CRITICAL FIXES
+
+* xe.rb - http://xe.com format change: Handle inline div in rates table.
+* exception.rb - Currency::Exception::Base can take Array with optional key/values.
+* exception.rb - Additional exception classes.
+* ALL - use raise instead of throw throughout.
+
+== Release 0.4.8: 2007/09/04
+
+* bin/currency_historical_rate_load - script for pulling rates from sources into historical rate table.
+
 == Release 0.4.7: 2007/06/25
 
 CRITICAL FIXES

data/TODO.txt

@@ -1,6 +1,8 @@
 
 = Currency To Do List
 
+* Clean up and normalize all exceptions:
+** Rate sources should add :source => source, etc.
 * Refactor all configuration class variables into Currency::Config
 * Refactor all cached values into objects that can be reinstantiated on a per-thread basis
 * Support http://www.xe.com/ucc/full.php rate queries.

data/bin/currency_historical_rate_load

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
+# Dependencies
+bin_dir = File.dirname(__FILE__)
+$:.unshift File.expand_path(bin_dir + "/../lib")
+
+require 'rubygems'
+
+gem 'activesupport'
+gem 'activerecord'
+
+require 'active_record'
+
+require 'currency'
+require 'currency/exchange/rate/source/historical/rate_loader'
+require 'optparse'
+require 'ostruct'
+require 'yaml'
+
+
+# Parse command line arguments.
+opts = { }
+opts[:db_config] = bin_dir + '/.db_config.yml'
+opts[:rate_sources] = [ ]
+opts[:required_currencies] = 
+  [
+   :USD,
+   :GBP,
+   :CAD,
+   :EUR,
+  ]
+opts[:RAILS_ENV] = ENV["RAILS_ENV"] || 'development'
+
+
+op = OptionParser.new do | op |
+  op.banner = "currency_historical_rate_load - loads currency rates from sources into historical rates table"
+  op.separator "Usage:"
+  op.on("--deploy-table",
+        TrueClass,
+        "If true the database table will be created."
+        ) do | v |
+    opts[:deploy_table] = v
+  end
+  op.on("-d",
+        "--db-config FILE",
+        String,
+        "The YAML file containing the ActiveRecord::Base database configuration."
+        ) do | v |
+    opts[:db_config] = v
+  end
+  op.on("-e",
+        "--rails-env ENV",
+        String,
+        "The configuration key to use from the --db-config file; default #{opts[:RAILS_ENV].inspect}."
+        ) do | v |
+    opts[:RAILS_ENV] = v
+  end
+  op.on("-s",
+        "--rate-source RATE_SOURCE",
+        String,
+        "The rate source to be queried."
+        ) do | v |
+    opts[:rate_sources] += v.split(/[\s,]+/)
+  end
+  op.on("-c",
+        "--currencies CURRENCY",
+        String,
+        "The required currencies; default: #{opts[:required_currencies].inspect}."
+        ) do | v |
+    opts[:required_currencies] = v.split(/[\s,]+/)
+  end
+  op.on("-h",
+        "--help",
+        "Show this message") do 
+    STDERR.puts op.to_s
+    exit(1)
+  end
+end
+
+args = ARGV.dup
+op.parse!(args)
+
+# Setup the database environment.
+db_config = File.open(opts[:db_config]) do | fh | 
+  YAML::load(fh)
+end
+db_config.freeze
+db_config = db_config[opts[:RAILS_ENV]] || raise("Cannot locate #{opts[:RAILS_ENV].inspect} in --db-config; available environments: #{db_config.keys.sort.inspect}")
+db_config.freeze
+ActiveRecord::Base.establish_connection(db_config)
+
+# Deploy table?
+if opts[:deploy_table]
+  require 'active_record/migration'
+  Currency::Exchange::Rate::Source::Historical::Rate.__create_table(ActiveRecord::Migration)
+end
+
+# Start Loading Rates.
+instance = Currency::Exchange::Rate::Source::Historical::RateLoader.new(opts)
+instance.run
+
+# Finished
+exit(0)
+

data/lib/currency/active_record.rb

@@ -235,7 +235,7 @@ def #{attr_name}=(value)
     #{write_preferred_currency}
     #{write_currency ? write_currency : "#{attr_name}_money = #{attr_name}_money.convert(#{currency})"}
   else
-    throw ::Currency::Exception::InvalidMoneyValue.new(value)
+    raise ::Currency::Exception::InvalidMoneyValue, value
   end
 
   @#{attr_name} = #{attr_name}_money

data/lib/currency/config.rb

@@ -32,7 +32,7 @@ class Currency::Config
   def self.current
     Thread.current[:Currency__Config] ||= 
       self.default || 
-      (raise ::Currency::Exception::UndefinedConfig.new("Currency::Config.default not defined"))
+      (raise ::Currency::Exception::UndefinedConfig, "Currency::Config.default not defined")
   end
   
   # Sets the current Currency::Config object used

data/lib/currency/currency.rb

@@ -69,8 +69,8 @@ class Currency::Currency
     # Symbol format.
     def self.cast_code(x)
       x = x.upcase.intern if x.kind_of?(String)
-      raise ::Currency::Exception::InvalidCurrencyCode.new(x) unless x.kind_of?(Symbol)
-      raise ::Currency::Exception::InvalidCurrencyCode.new(x) unless x.to_s.length == 3
+      raise ::Currency::Exception::InvalidCurrencyCode, x unless x.kind_of?(Symbol)
+      raise ::Currency::Exception::InvalidCurrencyCode, x unless x.to_s.length == 3
       x
     end
 

data/lib/currency/currency/factory.rb

@@ -83,7 +83,7 @@ class Currency::Currency::Factory
 
     # Installs a new Currency for #get_by_symbol and #get_by_code.
     def install(currency)
-      raise ::Currency::Exception::UnknownCurrency.new() unless currency
+      raise ::Currency::Exception::UnknownCurrency unless currency
       @currency_by_symbol[currency.symbol] ||= currency unless currency.symbol.nil?
       @currency_by_code[currency.code] = currency
     end

data/lib/currency/currency_version.rb

@@ -1,5 +1,5 @@
 module Currency
-  CurrencyVersion = '0.4.7'
+  CurrencyVersion = '0.4.9'
 end
 # DO NOT EDIT
 # This file is auto-generated by build scripts.

data/lib/currency/exception.rb

@@ -3,7 +3,62 @@
 
 module Currency::Exception
     # Base class for all Currency::Exception objects.
+    #
+    #   raise Currency::Exception [ "msg", :opt1, 1, :opt2, 2 ]
+    #
     class Base < ::Exception
+      EMPTY_HASH = { }.freeze
+
+      def initialize(arg1, *args)
+        case arg1
+        # [ description, ... ]
+        when Array
+          @opts = arg1
+          arg1 = arg1.shift
+        else
+          @opts = nil
+        end
+
+        case @opts
+        when Array
+          if @opts.size == 1 && @opts.first.kind_of?(Hash)
+            # [ description, { ... } ]
+            @opts = @opts.first
+          else
+            # [ description, :key, value, ... ]
+            @opts = Hash[*@opts]
+          end
+        end
+
+        case @opts
+        when Hash
+          @opts = @opts.dup.freeze
+        else
+          @opts = { :info => @opts }.freeze
+        end
+
+        @opts ||= EMPTY_HASH
+
+        super(arg1, *args)
+      end
+
+
+      def method_missing(sel, *args, &blk)
+        sel = sel.to_sym
+        if args.empty? && ! block_given? && @opts.key?(sel) 
+          return @opts[sel]
+        end
+        super
+      end
+
+      def to_s
+        super + ": #{@opts.inspect}"
+      end
+
+    end
+
+    # Generic Error.
+    class Generic < Base
     end
 
     # Error during parsing of Money values from String.
@@ -22,6 +77,10 @@ module Currency::Exception
     class IncompatibleCurrency < Base
     end
 
+    # Error during locating currencies.
+    class MissingCurrency < Base
+    end
+
     # Error if an Exchange is not defined.
     class UndefinedExchange < Base
     end
@@ -49,5 +108,12 @@ module Currency::Exception
     # Error if a subclass is responsible for implementing a method.
     class SubclassResponsibility < Base
     end
+
+    # Error if some functionality is unimplemented
+    class Unimplemented < Base
+    end
   
+    # Error if reentrantancy is d
+    class InvalidReentrancy < Base
+    end
 end # module

data/lib/currency/exchange.rb

@@ -20,7 +20,7 @@ module Currency::Exchange
     # created.  Currency::Exchange::Base cannot service any
     # conversion rate requests.
     def self.default 
-      @@default ||= raise("UNIMPLEMENTED")
+      @@default ||= raise :Currency::Exception::Unimplemented, :default
     end
 
     # Sets the default Currency::Exchange object.
@@ -34,7 +34,7 @@ module Currency::Exchange
     # If #current= has not been called and #default= has not been called,
     # then UndefinedExchange is raised.
     def self.current
-      @@current || self.default || (raise ::Currency::Exception::UndefinedExchange.new("Currency::Exchange.current not defined"))
+      @@current || self.default || (raise ::Currency::Exception::UndefinedExchange, "Currency::Exchange.current not defined")
     end
 
     # Sets the current Currency::Exchange object used during

data/lib/currency/exchange/rate.rb

@@ -57,7 +57,13 @@ class Currency::Exchange::Rate
       @c1 = c1
       @c2 = c2
       @rate = c1_to_c2_rate
-      raise ::Currency::Exception::InvalidRate.new(@rate) unless @rate && @rate >= 0.0
+      raise ::Currency::Exception::InvalidRate, 
+      [ 
+       "rate is not positive",
+       :rate, @rate,
+       :c1, c1,
+       :c2, c2,
+      ] unless @rate && @rate >= 0.0
       @source = source
       @date = date
       @derived = derived
@@ -139,7 +145,12 @@ class Currency::Exchange::Rate
       if @c1 == rate.c2 && @c2 == rate.c1
         collect_rate(rate.reciprocal)
       elsif ! (@c1 == rate.c1 && @c2 == rate.c2)
-        raise("Cannot collect rates between different currency pairs")
+        raise ::Currency::Exception::InvalidRate,
+        [ 
+         "Cannot collect rates between different currency pairs",
+          :rate1, self,
+          :rate2, rate,
+        ]
       else
         # Multisource?
         @source = "<<multiple-sources>>" unless @source == rate.source

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

@@ -76,7 +76,7 @@ module Currency::Exchange::Rate::Source
     # If #current= has not been called and #default= has not been called,
     # then UndefinedExchange is raised.
     def self.current
-      @@current || self.default || (raise ::Currency::Exception::UndefinedExchange.new("Currency::Exchange.current not defined"))
+      @@current || self.default || (raise ::Currency::Exception::UndefinedExchange, "Currency::Exchange.current not defined")
     end
 
     # Sets the current Currency::Exchange object used during

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

@@ -41,6 +41,16 @@ class Currency::Exchange::Rate::Source::Base
     end 
 
 
+    def __subclass_responsibility(meth)
+      raise ::Currency::Exception::SubclassResponsibility, 
+      [
+       "#{self.class}#\#{meth}", 
+       :class, self.class, 
+       :method, method,
+      ]
+    end
+
+
     # Converts Money m in Currency c1 to a new
     # Money value in Currency c2.
     def convert(m, c2, time = nil, c1 = nil)
@@ -90,7 +100,7 @@ class Currency::Exchange::Rate::Source::Base
     # Gets all rates available by this source.
     #
     def rates(time = nil)
-      raise ::Currency::Exception::SubclassResponsibility, "#{self.class}#rate"
+      __subclass_responsibility(:rates)
     end
 
 
@@ -108,14 +118,14 @@ class Currency::Exchange::Rate::Source::Base
     # rates.
     #
     def get_rate(c1, c2, time)
-      raise ::Currency::Exception::SubclassResponsibility, "#{self.class}#get_rate"
+      __subclass_responsibility(:get_rate)
     end
 
     # Returns a base Rate.
     #
     # Subclasses are required to implement this method.
     def get_rate_base(c1, c2, time)
-      raise ::Currency::Exception::SubclassResponsibility, "#{self.class}#get_rate_base"
+      __subclass_responsibility(:get_rate_base)
     end
 
 
@@ -123,7 +133,7 @@ class Currency::Exchange::Rate::Source::Base
     #
     # Subclasses must override this method.
     def get_rates(time = nil)
-      raise ::Currency::Exception::SubclassResponsibility, "#{self.class}#get_rate"
+      __subclass_responsibility(:get_rates)
     end
 
 

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

@@ -38,13 +38,19 @@ class Currency::Exchange::Rate::Source::Failover < ::Currency::Exchange::Base
 
 
     if rate == nil || err
-      $stderr.put "Failover: primary failed for get_rate(#{c1}, #{c2}, #{time}) : #{err.inspect}"
+      $stderr.puts "Failover: primary failed for get_rate(#{c1}, #{c2}, #{time}) : #{err.inspect}"
       rate = @secondary.get_rate(c1, c2, time)
     end
 
 
     unless rate
-      raise("Failover: secondary failed for get_rate(#{c1}, #{c2}, #{time})")
+      raise Currency::Exception::UnknownRate, 
+      [ 
+       "Failover: secondary failed for get_rate(#{c1}, #{c2}, #{time})", 
+       :c1, c1,
+       :c2, c2, 
+       :time, time,
+      ]
     end
 
     rate

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

@@ -101,7 +101,7 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
     c1, c2 = @@country_to_currency[country_code]
 
     unless c1 && c2
-      raise(::Currency::Exception::UnavailableRates, "Cannot determine currency code for federalreserve.gov country code #{country_code.inspect}")
+      raise ::Currency::Exception::UnavailableRates, "Cannot determine currency code for federalreserve.gov country code #{country_code.inspect}"
     end
 
     data.split(/\r?\n\r?/).each do | line |
@@ -122,7 +122,7 @@ class Currency::Exchange::Rate::Source::FederalReserve < ::Currency::Exchange::R
 
       rate = m[4].to_f
 
-      STDERR.puts "#{c1} #{c2} #{rate} #{date}" if @verbose
+      STDERR.puts "#{c1} #{c2} #{rate}\t#{date}" if @verbose
 
       rates << new_rate(c1, c2, rate, date)
 

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

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'active_record/base'
 
 require 'currency/exchange/rate/source/historical'

data/lib/currency/exchange/rate/source/historical/rate_loader.rb

@@ -0,0 +1,186 @@
+require 'currency/exchange/rate/source/historical'
+require 'currency/exchange/rate/source/historical/rate'
+require 'currency/exchange/rate/source/historical/writer'
+
+
+# Currency::Config.current.historical_table_name = 'currency_rates'
+# opts['uri_path'] ||= 'syndicated/cnusa/fxrates.xml'
+
+# Loads rates from multiple sources and will store them
+# as historical rates in a database.
+
+class ::Currency::Exchange::Rate::Source::Historical::RateLoader
+  attr_accessor :options
+  attr_accessor :source_options
+  attr_accessor :required_currencies
+  attr_accessor :rate_sources
+  attr_accessor :rate_source_options
+  attr_accessor :verbose
+  attr_accessor :preferred_summary_source
+  attr_accessor :base_currencies
+  attr_accessor :summary_rate_src
+  attr_reader   :writer
+
+  def initialize(opts = { })
+    self.summary_rate_src = 'summary'
+    self.source_options = { }
+    self.options = opts.dup.freeze
+    self.base_currencies = [ :USD ]
+    self.required_currencies =
+      [
+       :USD,
+       :GBP,
+       :CAD,
+       :EUR,
+       #   :MXP,
+      ]
+    self.verbose = ! ! ENV['CURRENCY_VERBOSE']
+    opts.each do | k, v | 
+      setter = "#{k}="
+      send(setter, v) if respond_to?(setter)
+    end
+  end
+
+
+  def initialize_writer(writer = Currency::Exchange::Rate::Source::Historical::Writer.new)
+    @writer = writer
+
+    writer.time_quantitizer = :current
+    writer.required_currencies = required_currencies
+    writer.base_currencies = base_currencies
+    writer.preferred_currencies = writer.required_currencies
+    writer.reciprocal_rates = true
+    writer.all_rates = true
+    writer.identity_rates = false 
+ 
+    options.each do | k, v |
+      setter = "#{k}="
+      writer.send(setter, v) if writer.respond_to?(setter)
+    end
+
+    writer
+  end
+
+
+  def run
+    rate_sources.each do | src |
+      # Create a historical rate writer.
+      initialize_writer
+
+      # Handle creating a summary rates called 'summary'.
+      if src == summary_rate_src
+        summary_rates(src)
+      else
+        require "currency/exchange/rate/source/#{src}"
+        src_cls_name = src.gsub(/(^|_)([a-z])/) { | m | $2.upcase }
+        src_cls = Currency::Exchange::Rate::Source.const_get(src_cls_name)
+        src = src_cls.new(source_options)
+        
+        writer.source = src  
+        
+        writer.write_rates
+      end
+    end
+  ensure
+    @writer = nil
+  end
+
+
+  def summary_rates(src)
+    # A list of summary rates.
+    summary_rates = [ ]
+    
+    # Get a list of all rate time ranges before today,
+    # that do not have a 'cnu' summary rate.
+    h_rate_cls = Currency::Exchange::Rate::Source::Historical::Rate
+    conn = h_rate_cls.connection
+    
+    # Select only rates from yesterday or before back till 30 days.
+    date_1 = Time.now - (0 * 24 * 60 * 60)
+    date_0 = date_1 - (30 * 24 * 60 * 60)
+    
+    date_0 = conn.quote(date_0)
+    date_1 = conn.quote(date_1)
+    
+    query = 
+"SELECT 
+  DISTINCT a.date_0, a.date_1 
+FROM 
+  #{h_rate_cls.table_name} AS a 
+WHERE 
+      a.source <> '#{src}' 
+  AND a.date_1 >= #{date_0} AND a.date_1 < #{date_1} 
+  AND (SELECT COUNT(b.id) FROM #{h_rate_cls.table_name} AS b 
+       WHERE 
+             b.c1 = a.c1 AND b.c2 = a.c2 
+         AND b.date_0 = a.date_0 AND b.date_1 = a.date_1 
+         AND b.source = '#{src}') = 0 
+ORDER BY
+   date_0"
+    STDERR.puts "query = \n#{query.split("\n").join(' ')}" if verbose
+      
+    dates = conn.query(query)
+      
+    dates.each do | date_range |
+      STDERR.puts "\n=============================================\n" if verbose
+      STDERR.puts "date_range = #{date_range.inspect}"                if verbose
+      
+      # Query for all rates that have the same date range.
+      q_rate = h_rate_cls.new(:date_0 => date_range[0], :date_1 => date_range[1])
+      available_rates = q_rate.find_matching_this(:all)
+      
+      # Collect all the currency pairs and rates.
+      currency_pair = { }
+      available_rates.each do | h_rate |
+        rate = h_rate.to_rate
+        (currency_pair[ [ rate.c1, rate.c2 ] ] ||= [ ]) << [ h_rate, rate ]
+        # STDERR.puts "rate = #{rate} #{h_rate.date_0} #{h_rate.date_1}" if verbose
+      end
+      
+      currency_pair.each_pair do | currency_pair, rates |
+        STDERR.puts "\n  =============================================\n" if verbose
+        STDERR.puts "  currency_pair = #{currency_pair}"                  if verbose
+        
+        # Create a summary rate for the currency pair.
+        selected_rates = [ ]
+        
+        rates.each do | h_rates |
+          h_rate, rate = *h_rates
+          
+          # Sanity check!
+          next if h_rate.source == src
+          
+          # Found perferred source?
+          if h_rate.source == preferred_summary_source
+            selected_rates = [ h_rates ]
+            break
+          end
+          
+          selected_rates << h_rates
+        end
+        
+        unless selected_rates.empty?
+          summary_rate = Currency::Exchange::Rate::Writable.new(currency_pair[0], currency_pair[1], 0.0)
+          selected_rates.each do | h_rates |
+            h_rate, rate = *h_rates
+            STDERR.puts "    rate = #{rate.inspect}" if verbose
+            summary_rate.collect_rate(rate)
+          end
+          
+          # Save the rate.
+          summary_rate.rate = summary_rate.rate_avg
+          summary_rate.source = src
+          summary_rate.derived = 'summary(' + selected_rates.collect{|r| r[0].id}.sort.join(',') + ')'
+          STDERR.puts "  summary_rate = #{summary_rate} #{summary_rate.rate_samples}" if verbose
+          
+          summary_rates << summary_rate
+        end
+      end
+    end
+    
+    writer.write_rates(summary_rates)
+  end
+  
+end
+
+

data/lib/currency/exchange/rate/source/historical/writer.rb

@@ -78,7 +78,12 @@ class Currency::Exchange::Rate::Source::Historical::Writer
 
       self.required_currencies.each do | c |
         unless currencies.include?(c)
-          raise("Required currency #{c.inspect} not in #{currencies.inspect}")
+          raise ::Currency::Exception::MissingCurrency, 
+          [ 
+           "Required currency #{c.inspect} not in #{currencies.inspect}", 
+           :currency, c, 
+           :required_currency, currencies,
+          ]
         end
       end
     end
@@ -194,7 +199,11 @@ class Currency::Exchange::Rate::Source::Historical::Writer
           begin
             rr.save!
           rescue Object => err
-            raise Error, "During save of #{rr.inspect} : #{err.inspect}"
+            raise ::Currency::Exception::Generic, 
+            [ 
+             "During save of #{rr.inspect}", 
+             :error, err,
+            ]
           end
           stored_h_rates << rr # Written.
         end

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

@@ -103,7 +103,11 @@ class Currency::Exchange::Rate::Source::NewYorkFed < ::Currency::Exchange::Rate:
     end
 
     # $stderr.puts "rates = #{rates.inspect}"
-    raise ::Currency::Exception::UnavailableRates, "No rates found in #{get_uri.inspect}" if rates.empty?
+    raise ::Currency::Exception::UnavailableRates, 
+    [
+     "No rates found in #{get_uri.inspect}",
+     :uri, get_uri,
+    ] if rates.empty?
 
     rates
   end

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

@@ -90,7 +90,7 @@ class Currency::Exchange::Rate::Source::Provider < Currency::Exchange::Rate::Sou
   #
   # Subclasses must define this method.
   def load_rates(time = nil)
-    raise('Subclass responsiblity')
+    raise Currency::Exception::SubclassResponsibility, :load_rates
   end
 
 

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

@@ -159,7 +159,7 @@ class Currency::Exchange::Rate::Source::TimedCache < ::Currency::Exchange::Rate:
 
     begin
       # Do not allow re-entrancy
-      raise "Reentry!" if @processing_rates
+      raise Currency::Exception::InvalidReentrancy, "Reentry!" if @processing_rates
       
       # Begin processing new rate request.
       @processing_rates = true

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

@@ -83,8 +83,16 @@ class Currency::Exchange::Rate::Source::Xe < ::Currency::Exchange::Rate::Source:
     rate = { }
     cur_i = -1 
     eat_lines_until /^\s*<\/tr>/i do 
-      if md = /<td[^>]+?>\s*?(\d+\.\d+)\s*?<\/td>/i.match(@line)
-        usd_to_cur = md[1].to_f
+      # Grok:
+      #
+      #   <td align="center" class="cur2 currencyA">114.676</td>\n
+      #
+      # AND
+      #
+      #   <td align="center" class="cur2 currencyA"><div id="positionImage">0.9502\n
+      #
+      if md = /<td[^>]+?>\s*(<div[^>]+?>\s*)?(\d+\.\d+)\s*(<\/td>)?/i.match(@line)
+        usd_to_cur = md[2].to_f
         cur_i = cur_i + 1
         cur = currency[cur_i]
         raise ParserError, "Currency not found at column #{cur_i}" unless cur
@@ -96,8 +104,15 @@ class Currency::Exchange::Rate::Source::Xe < ::Currency::Exchange::Rate::Source:
     end
 
     raise ::Currency::Exception::UnavailableRates, "No rates found in #{get_uri.inspect}" if rate.keys.empty?
-    raise ParserError, "Not all rates found" if rate.keys.size != currency.size
-    
+
+    raise ParserError, 
+    [
+     "Not all currencies found", 
+     :expected_currences, currency,
+     :found_currencies, rate.keys,
+     :missing_currencies, currency - rate.keys,
+    ] if rate.keys.size != currency.size
+
     @lines = @line = nil
 
     raise ParserError, "Rate date not found" unless @rate_timestamp
@@ -115,7 +130,9 @@ class Currency::Exchange::Rate::Source::Xe < ::Currency::Exchange::Rate::Source:
       end
       yield @line if block_given?
     end
-    raise ParserError, rx.inspect
+
+    raise ParserError, [ 'eat_lines_until failed', :rx, rx ]
+
     false
   end
 
@@ -129,7 +146,11 @@ class Currency::Exchange::Rate::Source::Xe < ::Currency::Exchange::Rate::Source:
 
     rates = raw_rates # Load rates
     rates_pivot = rates[PIVOT_CURRENCY]
-    raise ::Currency::Exception::UnknownRate.new("#{self}: cannot get base rate #{PIVOT_CURRENCY.inspect}") unless rates_pivot
+    raise ::Currency::Exception::UnknownRate,
+    [ 
+     "Cannot get base rate #{PIVOT_CURRENCY.inspect}",
+     :pivot_currency, PIVOT_CURRENCY,
+    ] unless rates_pivot
     
     result = rates_pivot.keys.collect do | c2 | 
       new_rate(PIVOT_CURRENCY, c2, rates_pivot[c2], @rate_timestamp)

data/lib/currency/macro.rb

@@ -190,7 +190,7 @@ end_eval
           when :integer
             to_rep = 'to_i'
           else
-            throw ::Currency::Exception::InvalidMoneyValue.new("Cannot use value representation: #{rep.inspect}")
+            raise ::Currency::Exception::InvalidMoneyValue, "Cannot use value representation: #{rep.inspect}"
           end
           from_rep = '::Currency::Money.new'
         end
@@ -293,7 +293,7 @@ def #{attr_name}=(value)
     #{write_preferred_currency}
     #{convert_currency}
   else
-    throw ::Currency::Exception::InvalidMoneyValue.new(value)
+    raise ::Currency::Exception::InvalidMoneyValue, value
   end
 
   @#{attr_name} = #{attr_name}_money

data/lib/currency/money.rb

@@ -272,7 +272,7 @@ class Currency::Money
       # Attempt conversion?
       if @currency != currency || (time && @time != time)
 	self.convert(currency, time).rep
-        # raise("Incompatible Currency: #{@currency} != #{currency}")
+        # raise ::Currency::Exception::Generic, "Incompatible Currency: #{@currency} != #{currency}"
       else
         @rep
       end

data/lib/currency/parser.rb

@@ -60,7 +60,13 @@ class Currency::Parser
     if (md = /(\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d+)?Z)/.match(x))
       time = Time.xmlschema(md[1])
       unless time
-        raise ::Currency::Exception::InvalidMoneyString.new("time: #{str.inspect} #{currency} #{x.inspect}")
+        raise Currency::Exception::InvalidMoneyString,
+        [
+         "time: #{str.inspect} #{currency} #{x.inspect}",
+         :string => str,
+         :currency => currency,
+         :state => x,
+        ]
       end
       x = md.pre_match + md.post_match
     end
@@ -76,7 +82,13 @@ class Currency::Parser
       x = md.pre_match + md.post_match
       if @currency && @currency != curr
         if @enforce_currency
-          raise ::Currency::Exception::IncompatibleCurrency.new("currency: #{str.inspect} #{@currency.code}")
+          raise ::Currency::Exception::IncompatibleCurrency, 
+          [ 
+           "currency: #{str.inspect} #{@currency.code}",
+           :string, str,
+           :default_currency, @currency,
+           :parsed_currency, curr,
+          ]
         end
         convert_currency = @currency
       end
@@ -129,7 +141,13 @@ class Currency::Parser
     else
       # $stderr.puts "'#{self}'.parse(#{str}) => ??? '#{x}'"
       #x.to_f.Money_rep(self)
-      raise ::Currency::Exception::InvalidMoneyString.new("#{str.inspect} #{currency} #{x.inspect}")
+      raise ::Currency::Exception::InvalidMoneyString, 
+      [
+       "#{str.inspect} #{currency} #{x.inspect}",
+       :string => str,
+       :currency => currency,
+       :state => x,
+      ]
     end
 
     # Do conversion.

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.4
 specification_version: 1
 name: currency
 version: !ruby/object:Gem::Version 
-  version: 0.4.7
-date: 2007-06-25 00:00:00 -04:00
+  version: 0.4.9
+date: 2007-11-01 00:00:00 -05:00
 summary: "Currency models currencies, monetary values, foreign exchanges rates.   Pulls live and historical rates from http://xe.com/, http://newyorkfed.org/, http://thefinancials.com/. Can store/retrieve historical rate data from database using ActiveRecord. Can store/retrieve Money values using ActiveRecord.  For more details, see:  http://rubyforge.org/projects/currency/ http://currency.rubyforge.org/ http://currency.rubyforge.org/files/README_txt.html"
 require_paths: 
 - lib
-- test
 email: ruby-currency@umleta.com
 homepage: http://rubyforge.org/projects/currency
 rubyforge_project: currency
@@ -38,6 +37,7 @@ files:
 - Rakefile
 - Releases.txt
 - TODO.txt
+- bin/currency_historical_rate_load
 - examples/ex1.rb
 - examples/xe1.rb
 - lib/currency.rb
@@ -57,6 +57,7 @@ files:
 - lib/currency/exchange/rate/source/federal_reserve.rb
 - lib/currency/exchange/rate/source/historical.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/new_york_fed.rb
 - lib/currency/exchange/rate/source/provider.rb
@@ -86,14 +87,35 @@ files:
 - test/time_quantitizer_test.rb
 - test/timed_cache_test.rb
 - test/xe_test.rb
-test_files: []
-
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
+test_files: 
+- test/config_test.rb
+- test/test_base.rb
+- test/parser_test.rb
+- test/ar_test_core.rb
+- test/ar_test_base.rb
+- test/ar_simple_test.rb
+- test/formatter_test.rb
+- test/xe_test.rb
+- test/money_test.rb
+- test/timed_cache_test.rb
+- test/historical_writer_test.rb
+- test/ar_column_test.rb
+- test/macro_test.rb
+- test/federal_reserve_test.rb
+- test/new_york_fed_test.rb
+- test/time_quantitizer_test.rb
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- COPYING.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
+- Releases.txt
+- TODO.txt
+executables: 
+- currency_historical_rate_load
 extensions: []
 
 requirements: []
@@ -106,5 +128,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.2
+        version: 1.3.0
     version: