currency 0.1.0 → 0.1.1

data/ChangeLog

@@ -1,5 +1,8 @@
+2006-10-30  Kurt A. Stephens  <kurt@umleta.com>
+
+	* Fix gem packaging error.
+
 2006-10-29  Kurt Stephens  <kurt@umleta.com>
 
 	* Initial release
 
-	

data/README

@@ -8,7 +8,14 @@ gem install currency
 
 == For User Documentation, see
 
-This package deals with currencies, conversions between currencies and monetary values in an object-oriented fashion.
+http://rubyforge.org/projects/currency/
+
+The RubyForge package currency
+implements an object-oriented representation of currencies, monetary values, foreign exchanges and rates.
+
+Currency::Money uses a scaled integer representation of the monetary value and performs accurate conversions from string values.
+
+See: http://umleta.com/node/5 for more details.
 
 == Home page
 

data/Rakefile

@@ -2,6 +2,18 @@
 # Adapted from RubyGems/Rakefile
 # upload_package NOT WORKING YET
 
+#################################################################
+
+PKG_Name = 'Currency'
+def package_version
+  '0.1.1'
+end
+def package_description
+  %{Currency models currencies, monetary values, foreign exchanges.}
+end
+
+#################################################################
+
 #require 'rubygems'
 require 'rake/clean'
 require 'rake/testtask'
@@ -9,18 +21,15 @@ require 'rake/packagetask'
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 
+#################################################################
+
 def announce(msg='')
   STDERR.puts msg
 end
 
-PKG_Name = 'Currency'
 PKG_NAME = PKG_Name.gsub(/[a-z][A-Z]/) {|x| "#{x[0,1]}_#{x[1,1]}"}.downcase
 RUBY_FORGE_PROJECT = PKG_NAME
 
-def package_version
-  '0.1.0'
-end
-
 if ENV['REL']
   PKG_VERSION = ENV['REL']
   CURRENT_VERSION = package_version
@@ -250,8 +259,7 @@ Spec = Gem::Specification.new do |s|
   s.name = PKG_NAME 
   s.version = PKG_VERSION
   s.summary = "#{PKG_Name} GEM"
-  s.description = %{Currency models currencies, monetary values, foreign exchanges.
-}
+  s.description = package_description
   s.files = PKG_FILES.to_a
   s.require_path = 'lib'
   s.author = "Kurt Stephens"

data/Releases

@@ -1,5 +1,9 @@
 = Currency Release History
 
+== Release 0.1.1: 2006/10/30
+
+* Fixes gem packaging errors.
+
 == Release 0.1.0: 2006/10/29
 
 * Initial Release

data/examples/ex1.rb

@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'currency'
-require 'currency/currency_exchange_test'
+require 'currency/exchange/test'
 
 x = Currency::Money.new("1,203.43", 'USD')
 

data/examples/xe1.rb

@@ -1,9 +1,9 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'currency'
-require 'currency/currency_exchange_xe'
+require 'currency/exchange/xe'
 
-ex = Currency::CurrencyExchangeXe.new()
+ex = Currency::Exchange::Xe.new()
 
 puts ex.inspect
 puts ex.parse_page_rates.inspect

data/lib/currency.rb

@@ -7,7 +7,6 @@ require 'currency/money'
 require 'currency/currency_factory'
 require 'currency/currency'
 require 'currency/money'
-require 'currency/exchange_rate'
-require 'currency/currency_exchange'
+require 'currency/exchange'
 require 'currency/core_extensions'
 

data/lib/currency/currency.rb

@@ -4,9 +4,9 @@ module Currency
   class Currency
     # Create a new currency
     def initialize(code, symbol = nil, scale = 100)
-      self.code= code
-      self.symbol= symbol
-      self.scale= scale
+      self.code = code
+      self.symbol = symbol
+      self.scale = scale
     end
 
     def self.get(code)
@@ -19,6 +19,18 @@ module Currency
      x
     end
 
+    def hash
+      @code.hash
+    end
+
+    def eql?(x)
+      self.class == x.class && @code == x.code
+    end
+
+    def ==(x)
+      self.class == x.class && @code == x.code
+    end
+
     # Accessors
     def code
       @code

data/lib/currency/exception.rb

@@ -1,10 +1,15 @@
 module Currency
-  class InvalidMoneyString < Exception
+  class Error < Exception; end
+
+  class InvalidMoneyString < Error
   end
   
-  class InvalidCurrencyCode < Exception
+  class InvalidCurrencyCode < Error
   end
   
-  class IncompatibleCurrency < Exception
+  class IncompatibleCurrency < Error
+  end
+
+  class UndefinedExchange < Error
   end
 end

data/lib/currency/exchange.rb

@@ -0,0 +1,24 @@
+module Currency
+module Exchange
+
+    @@default = nil
+    def self.default 
+      @@default ||= Base.new
+    end
+    def self.default=(x)
+      @@default = x
+    end
+
+    @@current = nil
+    def self.current
+      @@current || self.default || (raise UndefinedExchange, "Currency::Exchange.current not defined")
+    end
+    def self.current=(x)
+      @@current = x
+    end
+
+end
+end
+
+require 'currency/exchange/base'
+require 'currency/exchange/rate'

data/lib/currency/{currency_exchange.rb → exchange/base.rb}

@@ -1,18 +1,12 @@
 module Currency
+module Exchange
+
   # Represents a method of converting between two currencies
-  # TODO: 
-  #  Create an ExchangeRateLoader class.
-  #  Create an ExchangeRateLoader subclass that interfaces to xe.com or other FX quote source.
-  class CurrencyExchange
-    @@default = nil
-    def self.default 
-      @@default ||= self.new
-    end
-    def self.default=(x)
-      @@default = x
-    end
+  class Base
+    attr_accessor :name
 
     def initialize(*opt)
+      @name = nil
       @exchange_rate = { }
     end 
 
@@ -43,8 +37,14 @@ module Currency
     def load_exchange_rate(c1, c2)
       raise "Subclass responsibility: load_exchange_rate"
     end
+
+    def to_s
+      "#<#{self.class.name} #{self.name && self.name.inspect}>"
+    end
+
   end
 
-  # END MODULE
-end
+  
+end # module
+end # module
 

data/lib/currency/{exchange_rate.rb → exchange/rate.rb}

@@ -1,6 +1,7 @@
 module Currency
+module Exchange
   # Represents a convertion rate between two currencies
-  class ExchangeRate
+  class Rate
     def initialize(c1, c2, c1_to_c2_rate, source = "UNKNOWN", date = nil, recip = true)
       @c1 = c1
       @c2 = c2
@@ -42,6 +43,8 @@ module Currency
     end
   end
 
-  # END MODULE
-end
+  
+end # module
+end # module
+
 

data/lib/currency/{currency_exchange_test.rb → exchange/test.rb}

@@ -1,11 +1,18 @@
 module Currency
-  # This can convert only between USD and CAD
-  class CurrencyExchangeTest < CurrencyExchange
+module Exchange
+
+  # This class is a text Exchange.
+  # It can convert only between USD and CAD
+  class Test < Base
     @@instance = nil
     def self.instance(*opts)
       @@instance ||= self.new(*opts)
     end
 
+    def initialize(*opts)
+      super(*opts)
+    end
+
     # Sample constant.
     def self.USD_CAD; 1.1708; end
 
@@ -15,13 +22,13 @@ module Currency
       if ( c1.code == :USD && c2.code == :CAD )
         rate = self.class.USD_CAD
       end
-      rate > 0 ? ExchangeRate.new(c1, c2, rate, self.class.name) : nil
+      rate > 0 ? Rate.new(c1, c2, rate, self) : nil
     end
   end
 
-  # END MODULE
-end
+end # module
+end # module
 
 # Install as current
-Currency::CurrencyExchange.default = Currency::CurrencyExchangeTest.instance
+Currency::Exchange.default = Currency::Exchange::Test.instance
 

data/lib/currency/{currency_exchange_xe.rb → exchange/xe.rb}

@@ -2,15 +2,19 @@ require 'net/http'
 require 'open-uri'
 
 module Currency
+module Exchange
   # Represents connects to http://xe.com and groks "XE.com Quick Cross Rates"
 
-  class CurrencyExchangeXe < CurrencyExchange
+  class Xe < Base
     @@instance = nil
     def self.instance(*opts)
       @@instance ||= self.new(*opts)
     end
 
     attr_accessor :uri
+    def name
+      uri
+    end
 
     def initialize(*opt)
       super(*opt)
@@ -128,13 +132,14 @@ module Currency
 
       # $stderr.puts "XE Rate: #{c1.code} / #{c2.code} = #{rate}"
 
-      rate > 0 ? ExchangeRate.new(c1, c2, rate, self.class.name, @rate_timestamp) : nil
+      rate > 0 ? Rate.new(c1, c2, rate, self, @rate_timestamp) : nil
     end
   end
 
-  # END MODULE
-end
+end # module
+end # module
+
 
 # Install as current
-Currency::CurrencyExchange.default = Currency::CurrencyExchangeXe.instance
+Currency::Exchange.default = Currency::Exchange::Xe.instance
 

data/lib/currency/money.rb

@@ -76,11 +76,15 @@ module Currency
       if @currency == currency
         self
       else
-        CurrencyExchange.default.convert(self, currency)
+        Exchange.current.convert(self, currency)
       end
     end
 
     # Relational operations on Money values.
+    def hash
+      @rep.hash ^ @currency.hash
+    end
+
     def eql?(x)
       @rep == x.rep && @currency == x.currency
     end
@@ -184,7 +188,7 @@ module Currency
     #def inspect_deep(*opts)
     #  self.class.superclass.instance_method(:inspect).bind(self).call 
     #end
-  end
 
-  # END MODULE
-end
+  end # class
+
+end # module

data/test/money_test.rb

@@ -157,7 +157,7 @@ class MoneyTest < TestBase
     assert_equal_float 3.0, m
     
     assert_kind_of Numeric, m = (usd / cad)
-    assert_equal_float CurrencyExchangeTest.USD_CAD, m, 0.0001
+    assert_equal_float Exchange::Test.USD_CAD, m, 0.0001
   end
 
 end

data/test/test_base.rb

@@ -2,15 +2,15 @@
 
 require 'test/unit'
 require 'currency'
-require 'currency/currency_exchange_test'
+require 'currency/exchange/test'
 
 module Currency
 
 class TestBase < Test::Unit::TestCase
   def setup
     super
-    # Force XE Exchange.
-    CurrencyExchange.default = CurrencyExchangeTest.instance
+    # Force Test Exchange.
+    Exchange.default = Exchange::Test.instance
   end
 
   # Avoid "No test were specified" error.

data/test/xe_test.rb

@@ -3,7 +3,7 @@
 
 require 'test/test_base'
 require 'currency' # For :type => :money
-require 'currency/currency_exchange_xe'
+require 'currency/exchange/xe'
 
 module Currency
 
@@ -11,11 +11,11 @@ class XeTest < TestBase
   def setup
     super
     # Force XE Exchange.
-    CurrencyExchange.default = CurrencyExchangeXe.instance
+    Exchange.default = Exchange::Xe.instance
   end
 
   def test_xe_usd_cad
-    assert_not_nil rates = CurrencyExchange.default.rates
+    assert_not_nil rates = Exchange.default.rates
     assert_not_nil rates[:USD]
     assert_not_nil usd_cad = rates[:USD][:CAD]
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: currency
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-10-29 00:00:00 -04:00
+  version: 0.1.1
+date: 2006-10-30 00:00:00 -05:00
 summary: Currency GEM
 require_paths: 
 - lib
@@ -25,28 +25,6 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNDCCAhygAwIBAgIBADANBgkqhkiG9w0BAQUFADBAMREwDwYDVQQDDAhydWJ5
-  Z2VtczEWMBQGCgmSJomT8ixkARkWBnVtbGV0YTETMBEGCgmSJomT8ixkARkWA2Nv
-  bTAeFw0wNjEwMjkxMjQwMTFaFw0wNzEwMjkxMjQwMTFaMEAxETAPBgNVBAMMCHJ1
-  YnlnZW1zMRYwFAYKCZImiZPyLGQBGRYGdW1sZXRhMRMwEQYKCZImiZPyLGQBGRYD
-  Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuFJ/j1P9qdyQ0yDn
-  M3a2D0OY/48fMtYnHRMBw77VVe1r0fh3K6mHQ4KMhokq+tYmpLZA6R7zDPyqgmq+
-  MLIjgm3BG/4MRMwMDjQpAlMUzhivhEUbi/3TwDGzm0BKAwx1QZJGxX5hBuNT0IC4
-  39UrfF6Rp3JYO2V3315VNhRnTzSy7mTywMvcdFDHtqJMwS7dxog3Zk0GEwFOpgSh
-  YZWpRtxEyNkFZFhzu2f6Ay+W8KICTDoKZLXWuih7WLeZ+jjMmcuw+fMmAgK5twel
-  NedBtKBIddWwFYdSWUY0aM8llCUSF2K0DlMCf5MIa/KU9SFCEvPFgyL0mhp7J4rM
-  8iZvpQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU
-  hF6+rNXLnYshcQYq5+OZ5ymAepMwDQYJKoZIhvcNAQEFBQADggEBAIQeOwoJ8119
-  sq6gSomz4hlmn/UKChxhl2dvv3LaHO1n2O537+9rVs6rvUZ4kANaZVzsclptovsS
-  k8H52y5nv4KXhd5IYVIin8q4rL15CYuRE/F2axWVtXBev1g24qyrIDOPhXNruG5q
-  CCmbkyVneSonHVJ5/aEqCK3NHTzxV3uM9gWjUjX1QoKLMV3tIm3umPFxmcq45YPZ
-  anMAtfW19iRYBV2iaage8GmLFbc8zl3GuTHYYHDKMVfOGRWgam36a95kXvkHI403
-  lXIJO2glhnPbub1eX+KnUMK3iocqB1qAC3hCk3Qgul+Q9mrTPyuSrOPHJB4aU1wk
-  +Wg1asFvX0E=
-  -----END CERTIFICATE-----
-
 authors: 
 - Kurt Stephens
 files: 
@@ -66,10 +44,11 @@ files:
 - lib/currency/money.rb
 - lib/currency/active_record.rb
 - lib/currency/currency.rb
-- lib/currency/currency_exchange.rb
-- lib/currency/exchange_rate.rb
-- lib/currency/currency_exchange_test.rb
-- lib/currency/currency_exchange_xe.rb
+- lib/currency/exchange.rb
+- lib/currency/exchange/base.rb
+- lib/currency/exchange/test.rb
+- lib/currency/exchange/xe.rb
+- lib/currency/exchange/rate.rb
 - scripts/gemdoc.rb
 - test/xe_test.rb
 - test/money_test.rb

data.tar.gz.sig

@@ -1 +0,0 @@
-)͍�����[�����֕�p|z;���&����ЃV1tD����B��PF�b���&�该0w��%[P�����uy��G��M-���J��D���4`"곮��m{QM4O�Uv�D��]_