exchange 1.0.4 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0a30e01a5f55d57a9201b8da420a8c3849ca73c6
+  data.tar.gz: 3fde15afd9be50c593edab5bf94f517cc55e24b2
+SHA512:
+  metadata.gz: ef1eafc5d5d39a7e68508285e6c2b1dfd194034fd11792106180d63265b1ad500d0c362f2c77cb35aaa510f47412704559b09c47fbcd210afee3f398d319f2f6
+  data.tar.gz: 27dce37969266711bbba84ddb2777e78b25fc3bca17092364ca0baadb787fa92843904b2020224c338d2d47c2d67907a917caf3b7bbaa0fd0cdae670c4bb60ea

data/.ruby-gemset

@@ -0,0 +1 @@
+exchange

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/.travis.yml

@@ -1,13 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - ree
-  - rbx-18mode
   - rbx-19mode
-  - jruby-18mode
   - jruby-19mode
+  - jruby-20mode
   
 script: bundle exec rspec

data/README.rdoc

@@ -1,4 +1,4 @@
-= exchange {<img src="https://secure.travis-ci.org/beatrichartz/exchange.png?branch=master" />}[http://travis-ci.org/beatrichartz/exchange] {<img src="https://gemnasium.com/beatrichartz/exchange.png" alt="Dependency Status" />}[https://gemnasium.com/beatrichartz/exchange] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/beatrichartz/exchange]
+= exchange {<img src="https://secure.travis-ci.org/beatrichartz/exchange.png?branch=master" />}[http://travis-ci.org/beatrichartz/exchange] {<img src="https://gemnasium.com/beatrichartz/exchange.png" alt="Dependency Status" />}[https://gemnasium.com/beatrichartz/exchange] {<img src="https://codeclimate.com/github/beatrichartz/exchange.png" />}[https://codeclimate.com/github/beatrichartz/exchange]
 
 The Exchange Gem gives you easy access to currency functions directly on your Numbers. {It is tested against}[http://travis-ci.org/beatrichartz/exchange]: ruby 2.0, 1.9, ruby 1.8, ree and rubinius (1.8 and 1.9 mode). Exchange will in future versions take advantage of 2.0 features, be sure to check this page for updates!
 

data/lib/exchange/base.rb

@@ -3,7 +3,7 @@ module Exchange
   
   # The current version of the exchange gem
   #
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
   
   # The root installation path of the gem
   # @version 0.5
@@ -21,6 +21,6 @@ module Exchange
   # @version 0.10
   # @since 0.10
   #
-  NoCurrencyError   = Class.new(ArgumentError)
+  NoCurrencyError   = Class.new ArgumentError
   
 end

data/lib/exchange/cache/base.rb

@@ -48,7 +48,7 @@ module Exchange
       # @raise [CachingWithoutBlockError] an Argument Error when no mandatory block has been given
       #
       def cached api, opts={}, &block
-        raise CachingWithoutBlockError.new('Caching needs a block') unless block_given?
+        raise_caching_needs_block! unless block_given?
 
         block.call
       end
@@ -63,6 +63,8 @@ module Exchange
       # Generates a key which can handle expiration by itself
       # @param [Exchange::ExternalAPI::Subclass] api The API to store the data for
       # @param [Hash] opts The options for caching
+      # @option opts [Array] :key_for An array of additional key elements
+      # @option opts [Time] :at The timestamp for the key 
       # @return [String] A string that can be used as cache key
       # @example
       #   Exchange::Cache::Base.key(Exchange::ExternalAPI::OpenExchangeRates, Time.gm(2012,1,1)) #=> "Exchange_ExternalAPI_CurrencyBot_2012_1"
@@ -91,6 +93,12 @@ module Exchange
       def helper
         @helper ||= Exchange::Helper
       end
+      
+      # Raise a caching needs a block error
+      #
+      def raise_caching_needs_block!
+        raise CachingWithoutBlockError.new('Caching needs a block')
+      end
         
     end
     
@@ -98,6 +106,6 @@ module Exchange
     # @since 0.1
     # @version 0.1
     #
-    CachingWithoutBlockError = Class.new(ArgumentError)
+    CachingWithoutBlockError = Class.new ArgumentError
   end
 end

data/lib/exchange/cache/configuration.rb

@@ -8,10 +8,16 @@ module Exchange
     # @since 0.9
     #
     class Configuration < Exchange::Configurable
+      
+      # Additional properties which are proprietary to the cache configuration
+      #
       attr_accessor :expire, :host, :port, :path
             
       class << self
         
+        # Alias method chain to set the client to nil before an attribute of the configuration is set.
+        # @param setters The attribute names for which the chain has to be installed
+        #
         def wipe_client_before_setting *setters
           
           setters.each do |setter|
@@ -27,26 +33,39 @@ module Exchange
         
       end
       
+      # delegate all necessary methods to the instance
+      #
       def_delegators :instance, :expire, :expire=, :host, :host=, :port, :port=, :path, :path=
+      
+      # set the client to nil before setting the host or the port
+      #
       wipe_client_before_setting :host, :port
       
-      # Overrides the parent class method to wipe the client before setting
+      # Overrides the parent class method to set the client to nil before setting the configuration via a hash
+      # @param [Hash] hash The hash with the configuration options to set the configuration to
       # 
       def set hash
         wipe_subclass_client!
         super
       end
       
+      # The parent module to get the constants from
+      # @returns [Class] the Cache class, always
+      #
       def parent_module
         Cache
       end
       
+      # The key of the configuration
+      #
       def key
         :cache
       end
       
       private
       
+      # set the client instance variable to nil if possible
+      #
       def wipe_subclass_client!
         subclass.wipe_client! if subclass && subclass.respond_to?(:wipe_client!)
       end

data/lib/exchange/cache/file.rb

@@ -3,9 +3,10 @@ module Exchange
   module Cache
     
     # @author Beat Richartz
-    # A class that allows to store api call results in files. THIS NOT A RECOMMENDED CACHING OPTION!
+    # A class that allows to store api call results in files. 
     # It just may be necessary to cache large files somewhere, this class allows you to do that
-    # 
+    # @note This is not a recommended caching option
+    #
     # @version 0.6
     # @since 0.3
     
@@ -21,6 +22,8 @@ module Exchange
       # @raise [CachingWithoutBlockError] an Argument Error when no mandatory block has been given
       #
       def cached api, opts={}, &block
+        raise_caching_needs_block! unless block_given?
+        
         today = Time.now
         dir   = config.path
         path  = ::File.join(dir, key(api, opts[:cache_period]))
@@ -50,7 +53,7 @@ module Exchange
       # @example
       #   Exchange::Cache::Base.key(Exchange::ExternalAPI::OpenExchangeRates, :monthly) #=> "Exchange_ExternalAPI_CurrencyBot_monthly_2012_1"
       #
-      def key(api_class, cache_period=:daily)
+      def key api_class, cache_period=:daily
         time      = Time.now
         [api_class.to_s.gsub(/::/, '_'), cache_period, time.year, time.send(cache_period == :monthly ? :month : :yday)].join('_')
       end

data/lib/exchange/cache/memcached.rb

@@ -14,7 +14,9 @@ module Exchange
     #   end
     #
     class Memcached < Base
-        
+      
+      # delegate client and wiping the client to the instance
+      #
       def_delegators :instance, :client, :wipe_client!
         
       # instantiates a memcached client and memoizes it in a class variable.

data/lib/exchange/cache/memory.rb

@@ -46,7 +46,7 @@ module Exchange
       # @param [Hash] opts The options for caching
       # @return [String] A string that can be used as instance variable name
       #
-      def instance_variable_name(api, opts)
+      def instance_variable_name api, opts
         conversion_time          = helper.assure_time(opts[:at], :default => :now)
         time                     = Time.now
         expire_hourly            = config.expire == :hourly || nil

data/lib/exchange/cache/rails.rb

@@ -33,7 +33,7 @@ module Exchange
       # @raise [CachingWithoutBlockError] an Argument Error when no mandatory block has been given
       #
       def cached api, opts={}, &block
-        raise CachingWithoutBlockError.new('Caching needs a block') unless block_given?
+        raise_caching_needs_block! unless block_given?
         
         result = client.fetch key(api, opts), :expires_in => config.expire == :daily ? 86400 : 3600, &block
         client.delete(key(api, opts)) unless result && !result.to_s.empty?

data/lib/exchange/cache/redis.rb

@@ -14,6 +14,8 @@ module Exchange
     #   end
     class Redis < Base
       
+      # delegate the client and wiping the client to the instance
+      #
       def_delegators :instance, :client, :wipe_client!
       
       # instantiates a redis client and memoizes it in a class variable.
@@ -41,7 +43,7 @@ module Exchange
       # @yield [] This method takes a mandatory block with an arity of 0 and calls it if no cached result is available
       # @raise [CachingWithoutBlockError] an Argument Error when no mandatory block has been given
       #
-      def cached api, opts={}, &block          
+      def cached api, opts={}, &block         
         if result = client.get(key(api, opts))
           result = opts[:plain] ? result : result.decachify
         else

data/lib/exchange/configurable.rb

@@ -12,6 +12,9 @@ module Exchange
     
     def_delegators :instance, :subclass, :subclass=, :set
     
+    # Alias method chain to instantiate the subclass from a symbol should it not be a class
+    # @return [NilClass, Class] The subclass or nil
+    #
     def subclass_with_constantize
       self.subclass = parent_module.const_get camelize(self.subclass_without_constantize) unless !self.subclass_without_constantize || self.subclass_without_constantize.is_a?(Class)
       subclass_without_constantize

data/lib/exchange/core_extensions/cachify.rb

@@ -2,6 +2,8 @@
 module Exchange
   module Cachify
     
+    # Use cachify as an alias for Marshal dumping
+    #
     def cachify
       Marshal.dump self
     end
@@ -10,6 +12,8 @@ module Exchange
   
   module Decachify
     
+    # Use cachify as an alias for Marshal loading
+    #
     def decachify
       Marshal.load self
     end

data/lib/exchange/external_api/base.rb

@@ -124,7 +124,7 @@ module Exchange
       #   Exchange::ExternalAPI::Base.new.rate(:usd, :eur, :at => Time.gm(3,23,2009))
       #     #=> 1.232231231
       #
-      def rate(from, to, opts={})        
+      def rate from, to, opts={}        
         rate = cache.cached(self.class, opts.merge(:key_for => [from, to])) do
           update(opts)
           
@@ -150,7 +150,7 @@ module Exchange
       #   Exchange::ExternalAPI::Base.new.convert(23, :eur, :chf, :at => Time.gm(12,1,2011))
       #     #=> 30.12
       #
-      def convert(amount, from, to, opts={})
+      def convert amount, from, to, opts={}
         amount * rate(from, to, opts)
       end
       

data/lib/exchange/external_api/call.rb

@@ -52,7 +52,7 @@ module Exchange
         # @param [Array] retry_with An array of urls to retry the API call with if the call to the original URL should fail. These values will be shifted until a call succeeds or the number of maximum retries is reached
         # @todo install a timeout for slow requests, but respect when loading large files
         #
-        def load_url(url, retries, retry_with)          
+        def load_url url, retries, retry_with          
           begin            
             result = URI.parse(url).open.read
           rescue SocketError

data/lib/exchange/external_api/configuration.rb

@@ -13,6 +13,8 @@ module Exchange
       
       def_delegators :instance, :retries, :retries=, :app_id, :app_id=, :protocol, :protocol=, :fallback, :fallback=
       
+      # Constantize fallback apis on the fly
+      #
       def fallback_with_constantize
         self.fallback = Array(fallback_without_constantize).map do |fb|
           unless !fb || fb.is_a?(Class)
@@ -27,10 +29,16 @@ module Exchange
       alias_method :fallback_without_constantize, :fallback
       alias_method :fallback, :fallback_with_constantize
       
+      # The configuration parent module
+      # @return [Class] ExternalAPI, always
+      #
       def parent_module
         ExternalAPI
       end
       
+      # The configuration key
+      # @return [Symbol] :api, always
+      #
       def key
         :api
       end

data/lib/exchange/external_api/ecb.rb

@@ -32,7 +32,7 @@ module Exchange
       # @since 0.1
       # @version 0.7
       #
-      def update(opts={})
+      def update opts={}
         time          = helper.assure_time(opts[:at], :default => :now)
         times         = map_retry_times time
         
@@ -57,7 +57,7 @@ module Exchange
         # @param [Time] time The exchange rate date for which the URL should be built
         # @return [String] An ECB API URL to get the xml from
         #
-        def api_url(time)
+        def api_url time
           border = Time.now - 90 * 86400
           [ "#{config.protocol}:/", 
             API_URL, 

data/lib/exchange/external_api/open_exchange_rates.rb

@@ -24,7 +24,7 @@ module Exchange
       # @example Update the Open Exchange Rates API to use the file of March 2, 2010
       #   Exchange::ExternalAPI::OpenExchangeRates.new.update(:at => Time.gm(3,2,2010))
       #
-      def update(opts={})
+      def update opts={}
         time = helper.assure_time(opts[:at])
         
         Call.new(api_url(time), :at => time, :api => self.class) do |result|
@@ -52,7 +52,7 @@ module Exchange
         # @since 0.1
         # @version 0.2.6
         #
-        def api_url(time=nil)
+        def api_url time=nil
           today   = Time.now
           [ 
             "#{config.protocol}:/", 

data/lib/exchange/external_api/random.rb

@@ -10,7 +10,7 @@ module Exchange
     class Random < Base
       
       CURRENCIES           = Exchange::ISO.currencies
-      RANDOM_RATES         = lambda { Hash[*CURRENCIES.zip(CURRENCIES.size.times.map{|i| rand}).flatten] }
+      RANDOM_RATES         = lambda { Hash[*CURRENCIES.map{|c| [c, rand] }.flatten] }
       
       # Updates the rates with new random ones
       # The call gets cached for a maximum of 24 hours.
@@ -20,7 +20,7 @@ module Exchange
       # @example Update the currency bot API to use the file of March 2, 2010
       #   Exchange::ExternalAPI::XavierMedia.new.update(:at => Time.gm(3,2,2010))
       #
-      def update(opts={})
+      def update opts={}
         @base                 = :usd
         @rates                = RANDOM_RATES.call
         @timestamp            =  Time.now.to_i

data/lib/exchange/external_api/xavier_media.rb

@@ -23,7 +23,7 @@ module Exchange
       # @example Update the currency bot API to use the file of March 2, 2010
       #   Exchange::ExternalAPI::XavierMedia.new.update(:at => Time.gm(3,2,2010))
       #
-      def update(opts={})
+      def update opts={}
         time       = helper.assure_time(opts[:at], :default => :now)
         api_url    = api_url(time)
         
@@ -40,7 +40,7 @@ module Exchange
         # @param [Time] time The exchange rate date for which the URL should be built
         # @return [String] An Xaviermedia API URL for the specified time
         #
-        def api_url(time)
+        def api_url time
           ["#{config.protocol}:/", API_URL, "#{time.strftime("%Y/%m/%d")}.xml"].join('/')
         end
         
@@ -51,7 +51,7 @@ module Exchange
         # @since 0.6
         # @version 0.6
         #
-        def api_opts(opts={})
+        def api_opts opts={}
           retry_urls = config.retries.times.map { |i| api_url(opts[:at] - 86400 * (i+1)) }
           
           { :format => :xml, :at => opts[:at], :retry_with => retry_urls }
@@ -63,7 +63,7 @@ module Exchange
         # @since 0.7
         # @version 0.7
         #
-        def extract_timestamp(result)
+        def extract_timestamp result
           Time.gm(*result.css('fx_date').children[0].to_s.split('-')).to_i
         end
         
@@ -73,7 +73,7 @@ module Exchange
         # @since 0.7
         # @version 0.7
         #
-        def extract_rates(result)
+        def extract_rates result
           rates_array = result.css('fx currency_code').children.map{|c| c.to_s.downcase.to_sym }.zip(result.css('fx rate').children.map{|c| BigDecimal.new(c.to_s) }).flatten
           to_hash!(rates_array)
         end
@@ -84,7 +84,7 @@ module Exchange
         # @since 0.7
         # @version 0.7
         #
-        def extract_base_currency(result)
+        def extract_base_currency result
           result.css('basecurrency').children[0].to_s.downcase.to_sym
         end
         

data/lib/exchange/helper.rb

@@ -18,7 +18,7 @@ module Exchange
     # @param [Hash] opts Options for assertion
     # @option opts [Symbol] :default a method that can be sent to Time if the argument is nil (:now for example)
     #
-    def assure_time(arg=nil, opts={})
+    def assure_time arg=nil, opts={}
       if arg
         arg.kind_of?(Time) ? arg : Time.gm(*arg.split('-'))
       elsif opts[:default]

data/lib/exchange/iso.rb

@@ -23,7 +23,7 @@ module Exchange
       
         def install_operation op      
           self.class_eval <<-EOV
-            def #{op}(amount, currency, precision=nil, opts={})
+            def #{op} amount, currency, precision=nil, opts={}
               minor = definitions[currency][:minor_unit]
               money = amount.is_a?(BigDecimal) ? amount : BigDecimal.new(amount.to_s, precision_for(amount, currency))
               if opts[:psych] && minor > 0
@@ -87,7 +87,7 @@ module Exchange
     #   Exchange::ISO.instantiate("4523", "usd") #=> #<Bigdecimal 4523.00>
     # @note Reinstantiation is not needed in case the amount is already a big decimal. In this case, the maximum precision is already given.
     #
-    def instantiate(amount, currency)
+    def instantiate amount, currency
       if amount.is_a?(BigDecimal)
         amount
       else
@@ -111,18 +111,14 @@ module Exchange
     # @example Convert a currency to a string without the currency
     #   Exchange::ISO.stringif(34.34, :omr, :amount_only => true) #=> "34.340"
     #
-    def stringify(amount, currency, opts={})
+    def stringify amount, currency, opts={}    
       definition    = definitions[currency]
       separators    = definition[:separators] || {}
       format        = "%.#{definition[:minor_unit]}f"
       string        = format % amount
       major, minor  = string.split('.')
-      
-      if separators[:major] && opts[:format] != :plain
-        major.reverse!
-        major.gsub!(/(\d{3})(?=.)/) { $1 + separators[:major] }
-        major.reverse!
-      end
+
+      major.gsub!(/(\d)(?=(\d\d\d)+(?!\d))/) { $1 + separators[:major] } if separators[:major] && opts[:format] != :plain
       
       string      = minor ? major + (opts[:format] == :plain || !separators[:minor] ? '.' : separators[:minor]) + minor : major
       pre         = [[:amount, :plain].include?(opts[:format]) && '', opts[:format] == :symbol && definition[:symbol], currency.to_s.upcase + ' '].detect{|a| a.is_a?(String)}
@@ -130,6 +126,14 @@ module Exchange
       "#{pre}#{string}"
     end
     
+    # Returns the symbol for a given currency. Returns nil if no symbol is present
+    # @param currency The currency to return the symbol for
+    # @return [String, NilClass] The symbol or nil
+    # 
+    def symbol currency      
+      definitions[currency][:symbol]
+    end
+    
     # Use this to round a currency amount. This allows us to round exactly to the number of minors the currency has in the 
     # iso definition
     # @param [BigDecimal, Fixed, Float, String] amount The amount of money you want to round
@@ -159,7 +163,7 @@ module Exchange
     
     # Forwards the assure_time method to the instance using singleforwardable
     #
-    def_delegators :instance, :definitions, :instantiate, :stringify, :round, :ceil, :floor, :currencies, :country_map, :defines?, :assert_currency!
+    def_delegators :instance, :definitions, :instantiate, :stringify, :symbol, :round, :ceil, :floor, :currencies, :country_map, :defines?, :assert_currency!
     
     private
     
@@ -176,6 +180,9 @@ module Exchange
       new_hsh
     end
     
+    # Interpolates a string with separators every 3 characters
+    # 
+    
     # get a precision for a specified amount and a specified currency
     # @params [Float, Integer] amount The amount to get the precision for
     # @params [Symbol] currency the currency to get the precision for

data/lib/exchange/money.rb

@@ -85,8 +85,8 @@ module Exchange
     #
     def to other, options={}
       other = ISO.assert_currency!(other)
-      
-      if api_supports_currency?(other)
+
+      if api_supports_currency?(other) && api_supports_currency?(currency)
         opts = { :at => time, :from => self }.merge(options)
         Money.new(api.new.convert(value, currency, other, opts), other, opts)
       elsif fallback!
@@ -111,9 +111,12 @@ module Exchange
         # @!macro [attach] install_operation
         #
         def install_operation op
-          define_method op do |*precision|
-            psych = precision.first == :psych
-            Exchange::Money.new(ISO.send(op, self.value, self.currency, psych ? nil : precision.first, {:psych => psych}), currency, :at => time, :from => self)
+          define_method op do |*arguments|
+            psych       = arguments.first == :psych
+            precision   = psych ? nil : arguments.first
+            val         = ISO.send(op, self.value, self.currency, precision, {:psych => psych})
+            
+            Exchange::Money.new(val, currency, :at => time, :from => self)
           end
         end
       
@@ -309,12 +312,18 @@ module Exchange
     # @example Convert a currency with a three decimal minor to a string with a currency symbol
     #   Exchange::Money.new(34.34, :usd).to_s(:symbol) #=> "$34.34"
     # @example Convert a currency with a three decimal minor to a string with just the amount
-    #   Exchange::Money.new(34.34, :omr).to_s(:amount) #=> "34.340"
+    #   Exchange::Money.new(3423.34, :usd).to_s(:amount) #=> "3,423.34"
+    # @example Convert a currency with just the plain amount using decimal notation
+    #   Exchange::Money.new(3423.34, :omr).to_s(:plain) #=> "3423.340"
     #
     def to_s format=:currency
       ISO.stringify(value, currency, :format => format)
     end
     
+    # Returns the symbol for the given currency
+    # @since 1.0
+    # @version 0.1
+    
     private
     
       # Fallback to the next api defined in the api fallbacks. Changes the api for the given instance
@@ -340,7 +349,7 @@ module Exchange
       # @since 0.6
       # @version 0.6
       #
-      def is_currency? other
+      def is_money? other
         other.is_a?(Exchange::Money)
       end
       
@@ -351,7 +360,7 @@ module Exchange
       # @version 0.6
       #
       def is_same_currency? other
-        is_currency?(other) && other.currency == currency
+        is_money?(other) && other.currency == currency
       end
       
       # determine if another given object is an instance of Exchange::Money and has another currency
@@ -361,7 +370,7 @@ module Exchange
       # @version 0.6
       #
       def is_other_currency? other
-        is_currency?(other) && other.currency != currency
+        is_money?(other) && other.currency != currency
       end
       
       # determine wether the chosen api supports converting the given currency
@@ -379,7 +388,7 @@ module Exchange
       # @version 0.6
       #
       def test_for_currency_mix_error other
-        raise ImplicitConversionError.new("You\'re trying to mix up #{currency} with #{other.currency}. You denied mixing currencies in the configuration, allow it or convert the currencies before mixing") if !Exchange.configuration.implicit_conversions && other.is_a?(Money) && other.currency != currency
+        raise ImplicitConversionError.new("You\'re trying to mix up #{currency} with #{other.currency}. You denied mixing currencies in the configuration, allow it or convert the currencies before mixing") if !Exchange.configuration.implicit_conversions && is_other_currency?(other)
       end
       
       # Helper method to raise a no rate error for a given currency if no rate is given
@@ -389,13 +398,13 @@ module Exchange
       # @version 0.7.2
       #
       def raise_no_rate_error other
-        raise NoRateError.new("Cannot convert to #{other} because the defined api nor the fallbacks provide a rate")
+        raise NoRateError.new("Cannot convert #{currency} to #{other} because the defined api nor the fallbacks provide a rate")
       end
   
   end
   
   # The error that will get thrown when implicit conversions take place and are not allowed
   #
-  ImplicitConversionError = Class.new(StandardError)
+  ImplicitConversionError = Class.new StandardError
   
 end

data/spec/exchange/iso_spec.rb

@@ -781,6 +781,22 @@ describe "Exchange::ISO" do
       subject.floor(BigDecimal.new("23.232524"), :clp, nil, {:psych => true}).should == BigDecimal.new("19")
     end
   end
+  describe "self.symbol" do
+    context "with a symbol present" do
+      it "should return the symbol" do
+        subject.symbol(:usd).should == '$'
+        subject.symbol(:gbp).should == '£'
+        subject.symbol(:eur).should == '€'
+      end
+    end
+    context "with no symbol present" do
+      it "should return nil" do
+        subject.symbol(:chf).should be_nil
+        subject.symbol(:etb).should be_nil
+        subject.symbol(:tnd).should be_nil
+      end
+    end
+  end
   describe "self.stringify" do
     it "should stringify a currency according to ISO 4217 Definitions" do
       subject.stringify(BigDecimal.new("23234234.232524"), :tnd).should == "TND 23234234.233"

data/spec/exchange/money_spec.rb

@@ -75,14 +75,28 @@ describe "Exchange::Money" do
         end
       end
     end
-    context "with a currency not provided by the given api" do
+    context "with a 'from' currency not provided by the given api" do
+      subject { Exchange::Money.new(36.36, :chf) }
+      context "but provided by a fallback api" do
+        it "should use the fallback" do
+          subject.api::CURRENCIES.should_receive(:include?).with(:usd).and_return true
+          subject.api::CURRENCIES.should_receive(:include?).with(:chf).and_return true
+          URI.should_receive(:parse).with("http://openexchangerates.org/api/latest.json?app_id=").once.and_raise Exchange::ExternalAPI::APIError
+          mock_api("http://api.finance.xaviermedia.com/api/#{Time.now.strftime("%Y/%m/%d")}.xml", fixture('api_responses/example_xml_api.xml'), 3)
+          subject.to(:usd).value.round(2).should == 40.00
+          subject.to(:usd).currency.should == :usd
+          subject.to(:usd).should be_kind_of Exchange::Money
+        end
+      end
+    end
+    context "with a 'to' currency not provided by the given api" do
       context "but provided by a fallback api" do
         it "should use the fallback" do
           subject.api::CURRENCIES.stub! :include? => false
           mock_api("http://api.finance.xaviermedia.com/api/#{Time.now.strftime("%Y/%m/%d")}.xml", fixture('api_responses/example_xml_api.xml'), 3)
-          subject.to(:ch).value.round(2).should == 36.36
-          subject.to(:ch).currency.should == :chf
-          subject.to(:ch).should be_kind_of Exchange::Money
+          subject.to(:chf).value.round(2).should == 36.36
+          subject.to(:chf).currency.should == :chf
+          subject.to(:chf).should be_kind_of Exchange::Money
         end
       end
       context "but not provided by any fallback api" do

metadata

@@ -1,81 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: exchange
 version: !ruby/object:Gem::Version
-  version: 1.0.4
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Beat Richartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: ! 'Simple Money handling for your ruby app – ISO4217-compatible Currency
+description: 'Simple Money handling for your ruby app – ISO4217-compatible Currency
   instantiation, conversion, string formatting and more via an intuitive DSL: 1.in(:usd).to(:eur)'
 email: attr_accessor@gmail.com
 executables: []
@@ -85,6 +76,8 @@ files:
 - .document
 - .gitignore
 - .rspec
+- .ruby-gemset
+- .ruby-version
 - .travis.yml
 - Gemfile
 - LICENSE.txt
@@ -165,27 +158,26 @@ files:
 homepage: http://beatrichartz.github.com/exchange
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Money handling for your ruby app
 test_files:
 - spec/exchange/cache/base_spec.rb