simple_currency 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/simple_currency/currency_convertible.rb

@@ -18,6 +18,7 @@ module CurrencyConvertible
   # Historical exchange lookup
   def at(exchange = nil)
     begin
+       
       @exchange_date = exchange.send(:to_date)
     rescue
       raise "Must use 'at' with a time or date object"
@@ -85,9 +86,16 @@ module CurrencyConvertible
     # Calls Xurrency API to perform the exchange without a specific date (assuming today)
     #
     def call_xurrency_api(original, target, amount)
+
+      if amount > 999_999_999 # Xurrency API does not support numbers bigger than this
+        amount = 1
+        multiplier = self.abs # Save a multiplier to apply it to the result later
+      end
+
       api_url = "http://xurrency.com/api/#{[original, target, amount].join('/')}"
       uri = URI.parse(api_url)
 
+
       retries = 10
       json_response = nil
       begin
@@ -100,11 +108,14 @@ module CurrencyConvertible
       end
 
       return nil unless json_response && parsed_response = Crack::JSON.parse(json_response)
-      raise parsed_response['message'] if parsed_response['status'] != 'ok'
+      if parsed_response['status'] != 'ok'
+        raise CurrencyNotFoundException if parsed_response['message'] =~ /currencies/
+        raise parsed_response['message']
+      end
 
       result = parsed_response['result']['value'].to_f
       cache_rate(original, target, (result / amount))
-      result
+      result * (multiplier || 1)
     end
 
     # Calls Xavier API to perform the exchange with a specific date.
@@ -123,9 +134,11 @@ module CurrencyConvertible
         date = @exchange_date
         args = [date.year, date.month.to_s.rjust(2, '0'), date.day.to_s.rjust(2,'0')]
         api_url = "http://api.finance.xaviermedia.com/api/#{args.join('/')}.xml"
+
         uri = URI.parse(api_url)
 
         retries = 10
+        not_found_retries=2
         xml_response = nil
         begin
           Timeout::timeout(1){
@@ -136,9 +149,21 @@ module CurrencyConvertible
         rescue Timeout::Error
           retries -= 1
           retries > 0 ? sleep(0.42) && retry : raise
+        rescue OpenURI::HTTPError # Try to fetch one day and 2 days earlier
+          not_found_retries -= 1
+          if not_found_retries >= 0
+            date = (Time.parse(date.to_s) - 86400).send(:to_date)
+            args = [date.year, date.month.to_s.rjust(2, '0'), date.day.to_s.rjust(2,'0')]
+            api_url = "http://api.finance.xaviermedia.com/api/#{args.join('/')}.xml"
+            uri = URI.parse(api_url)
+            retry
+          else
+            raise "404 Not Found"
+          end
         end
 
-        return nil unless xml_response && parsed_response = Crack::XML.parse(xml_response)["xavierresponse"]["exchange_rates"]["fx"]
+        return nil unless xml_response && parsed_response = Crack::XML.parse(xml_response)
+        parsed_response = parsed_response["xavierresponse"]["exchange_rates"]["fx"]
 
         # Cache successful XML response for later reuse
         if defined?(Rails)
@@ -148,21 +173,24 @@ module CurrencyConvertible
 
       # Calculate the exchange rate from the XML
       if parsed_response.first['basecurrency'].downcase == original
-        rate = parsed_response.select{|element| element["currency_code"].downcase == target}.first['rate'].to_f
+        rate = parse_rate(parsed_response, target)
       elsif parsed_response.first['basecurrency'].downcase == target
-        target_rate = parsed_response.select{|element| element["currency_code"].downcase == original}.first['rate'].to_f
-        rate = 1 / target_rate if target_rate
+        rate = 1 / parse_rate(parsed_response, original)
       else
-        original_rate = parsed_response.select{|element| element["currency_code"].downcase == original}.first['rate'].to_f
-        target_rate = parsed_response.select{|element| element["currency_code"].downcase == target}.first['rate'].to_f
+        original_rate = parse_rate(parsed_response, original)
+        target_rate = parse_rate(parsed_response, target)
         rate = target_rate / original_rate
       end
 
-      if rate
-        cache_rate(original, target, rate)
-        return amount * rate
-      end
-      nil
+      cache_rate(original, target, rate)
+      amount * rate
+    end
+
+    def parse_rate(parsed_response, currency)
+      rate = parsed_response.select{|element| element["currency_code"].downcase == currency}
+      raise CurrencyNotFoundException, "#{currency} is not a valid currency" unless rate && rate.is_a?(Array) && rate.first
+      raise NoRatesFoundException, "no exchange rate found for #{currency}" unless rate.first['rate'] && rate.first['rate'].to_f > 0
+      rate.first['rate'].to_f
     end
 
     # Caches currency methods to avoid method missing abuse.
@@ -224,3 +252,15 @@ module CurrencyConvertible
     end
 
 end
+
+  ##
+  # Custom Exceptions
+  ##
+   
+  class CurrencyNotFoundException < StandardError
+  end
+
+  class NoRatesFoundException < StandardError
+  end
+
+

data/simple_currency.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_currency}
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oriol Gual", "Josep M. Bach", "Josep Jaume Rey"]
@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/codegram/simple_currency}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A really simple currency converter using the Xurrency and XavierMedia APIs.}
   s.test_files = [
     "spec/simple_currency_spec.rb",
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<crack>, [">= 0.1.8"])
       s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.20"])

data/spec/simple_currency_spec.rb

@@ -37,8 +37,8 @@ describe "SimpleCurrency" do
       mock_xurrency_api('usd', 'xxx', 1, 1.5, :fail_with => "The currencies are not valid")
       mock_xurrency_api('usd', 'eur', 1_000_000_000, 1.5, :fail_with => "The amount should be between 0 and 999999999")
 
-      expect {1.usd.to_xxx}.to raise_error("The currencies are not valid")
-      expect {1_000_000_000.usd.to_eur}.to raise_error("The amount should be between 0 and 999999999")
+      expect {1.usd.to_xxx}.to raise_error(CurrencyNotFoundException)
+      expect {1_000_000_000.usd.to_eur}.to_not raise_error
     end
 
     it "handles a negative value returning a negative as well" do
@@ -47,6 +47,12 @@ describe "SimpleCurrency" do
       -1.usd.to_eur.should == -1.5
     end
 
+    it "handles big amounts" do
+      mock_xurrency_api('usd', 'eur', 1, 1.5)
+
+      1_000_000_000.usd.to_eur.should == 1_500_000_000
+    end
+
   end
 
   context "using XavierMedia API for exchange with historical date" do
@@ -67,12 +73,32 @@ describe "SimpleCurrency" do
       2.gbp.at(the_past).to_usd.should == 3.07
     end
 
+    it "retries yesterday and two days ago if no data found (could be a holiday)" do
+      mock_xavier_api(the_past, :fail => true)  # It's a holiday
+      mock_xavier_api(the_past - 86400, :fail => true)  # It's a holiday
+      mock_xavier_api(the_past - 86400 - 86400)  # It's a holiday
+
+      2.eur.at(the_past).to_usd.should == 2.54
+    end
+
     it "raises an error when no data available" do
-      mock_xavier_api(the_past, :fail => true)  # Currency does not exist!
-      mock_xavier_api(the_ancient_past, :fail => true) # Too old!
+      mock_xavier_api(the_past, :fail => true)  # It's a holiday
+      mock_xavier_api(the_past - 86400, :fail => true)  # It's a holiday
+      mock_xavier_api(the_past - 86400 - 86400, :fail => true)  # It's a holiday
+
+      expect {1.usd.at(the_past).to_eur}.to raise_error("404 Not Found")
+    end
+
+    it "raises a CurrencyNotFoundException given an invalid currency" do
+      mock_xavier_api(the_past)
+
+      expect {1.usd.at(the_past).to_xxx}.to raise_error(CurrencyNotFoundException)
+    end
+
+    it "raises a NoRatesFoundException if rate is 0.0 or non-existant" do
+      mock_xavier_api(the_past)
 
-      expect {1.usd.at(the_past).to_xxx}.to raise_error(OpenURI::HTTPError)
-      expect {1.usd.at(the_ancient_past).to_eur}.to raise_error(OpenURI::HTTPError)
+      expect {1.eur.at(the_past).to_rol}.to raise_error(NoRatesFoundException)
     end
 
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_currency
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Oriol Gual
@@ -23,9 +24,11 @@ dependencies:
   name: crack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 1
@@ -37,9 +40,11 @@ dependencies:
   name: jeweler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -51,9 +56,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196427
         segments: 
         - 2
         - 0
@@ -67,9 +74,11 @@ dependencies:
   name: fakeweb
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -81,9 +90,11 @@ dependencies:
   name: rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -95,9 +106,11 @@ dependencies:
   name: bundler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -144,23 +157,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A really simple currency converter using the Xurrency and XavierMedia APIs.