acvwilson-acvwilson-currency 0.5.0 → 0.6.0

data/currency.gemspec

@@ -1,18 +1,18 @@
 Gem::Specification.new do |s|
   s.name = %q{acvwilson-currency}
-  s.version = "0.5.0"
+  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_base_spec.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.3.0}
-  s.summary = %q{acvwilson-currency 0.5.0}
+  s.rubygems_version = %q{1.2.0}
+  s.summary = %q{#{s.name} #{s.version}}
 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'
@@ -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' # 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,24 +15,13 @@ class Integer
   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_precision(precision = nil)
-    precision.nil? ? round_without_precision : (self * (10 ** precision)).round_without_precision / (10 ** precision).to_f
-  end
-  alias_method :round_without_precision, :round
-  alias_method :round, :round_with_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
 
 
@@ -129,7 +126,7 @@ class Currency::Currency
     # Formats the Money value as a string using the current Formatter.
     # See Currency::Formatter#format.
     def format(m, *opt)
-       formatter_or_default.format(m, *opt)
+      formatter_or_default.format(m, *opt)
     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.rb

@@ -1,8 +1,6 @@
 # Copyright (C) 2006-2007 Kurt Stephens <ruby-currency(at)umleta.com>
 # See LICENSE.txt for details.
 
-require 'currency'
-
 # The Currency::Exchange package is responsible for
 # the buying and selling of currencies.
 #

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

@@ -228,7 +228,15 @@ class Currency::Formatter
     fraction = x[currency.format_right .. -1]
     
     # Round the fraction to the supplied number of decimal places
-    fraction = ((fraction.to_f / currency.scale).round(@decimals) * (10 ** @decimals)).to_i.to_s
+    fraction = (fraction.to_f / currency.scale).round(@decimals).to_s[2..-1]
+    # raise "decimals: #{@decimals}, scale_exp: #{currency.scale_exp}, x is: #{x.inspect}, currency.scale_exp is #{currency.scale_exp.inspect}, fraction: #{fraction.inspect}"
+    while ( fraction.length < @decimals )
+      fraction = fraction + "0" 
+    end
+    
+    
+    # raise "x is: #{x.inspect}, currency.scale_exp is #{currency.scale_exp.inspect}, fraction: #{fraction.inspect}"
+    # fraction = ((fraction.to_f / currency.scale).round(decimals) * (10 ** decimals)).to_i.to_s
     
     # Do thousands.
     x = whole

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