simple_currency 1.0.0 → 1.0.1

data/.rvmrc

@@ -0,0 +1 @@
+rvm --create use ruby-1.8.7@simple_currency > /dev/null

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/lib/simple_currency/currency_convertible.rb

@@ -35,8 +35,10 @@ module CurrencyConvertible
 
       # If not, perform a call to the api
       json_response = call_api(original, target, amount)
-      return nil unless json_response
-      result = sprintf("%.2f", JSON.parse(json_response)["result"]["value"]).to_f
+      return nil unless json_response && parsed_response = JSON.parse(json_response)
+      raise parsed_response["message"] if parsed_response["status"] != "ok"
+
+      result = sprintf("%.2f", parsed_response["result"]["value"]).to_f
 
       # Cache exchange rate for today only
       Rails.cache.write("#{original}_#{target}_#{Time.now.to_a[3..5].join('-')}", calculate_rate(amount,result)) if defined?(Rails)
@@ -55,7 +57,7 @@ module CurrencyConvertible
     end
 
     def check_cache(original, target, amount)
-      if rate = ::Rails.cache.read("#{original}_#{target}_#{Time.now.to_a[3..5].join('-')}")
+      if rate = Rails.cache.read("#{original}_#{target}_#{Time.now.to_a[3..5].join('-')}")
         result = (amount * rate).to_f
         return result = (result * 100).round.to_f / 100
       end

data/simple_currency.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_currency}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   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"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-08-31}
   s.description = %q{A really simple currency converter using the Xurrency API. It's Ruby 1.8, 1.9 and JRuby compatible, and it also takes advantage of Rails cache when available.}
   s.email = %q{info@codegram.com}
   s.extra_rdoc_files = [
@@ -19,9 +19,9 @@ Gem::Specification.new do |s|
   s.files = [
     ".autotest",
      ".bundle/config",
-     ".document",
      ".gitignore",
      ".rspec",
+     ".rvmrc",
      "Gemfile",
      "Gemfile.lock",
      "LICENSE",

data/spec/simple_currency_spec.rb

@@ -2,9 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "SimpleCurrency" do
 
-  def mock_uri(from_currency, to_currency, amount, result)
+  def mock_uri(from_currency, to_currency, amount, result, options = {})
     args = [from_currency, to_currency, amount]
+
     response = "{\"result\":{\"value\":#{result},\"target\":\"#{to_currency}\",\"base\":\"#{from_currency}\"},\"status\":\"ok\"}"
+
+    response = "{\"message\":\"#{options[:fail_with]}\", \"status\":\"fail\"\}" if options[:fail_with]
+
     FakeWeb.register_uri(:get, "http://xurrency.com/api/#{args.join('/')}", :body => response)
   end
 
@@ -29,6 +33,14 @@ describe "SimpleCurrency" do
     8.should respond_to(:to_eur)
   end
 
+  it "raises any error returned by the api call" do
+    mock_uri('usd', 'xxx', 1, 1.5, :fail_with => "The currencies are not valid")
+    mock_uri('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")
+  end
+
   context "when Rails is present" do
 
     before(:all) do
@@ -50,13 +62,15 @@ describe "SimpleCurrency" do
     it "ensures the cache is valid only for today" do
       now = Time.parse('2010-08-30')
 
+      Time.stub(:now).and_return(now)
+
       Rails.stub_chain("cache.write").and_return(true)
       Rails.stub_chain("cache.read").with('usd_eur_30-8-2010').and_return(1.5)
 
       mock_uri('usd', 'eur', 1, 1.5)
       1.usd.to_eur.should == 1.5
 
-      Time.stub(:now).and_return(now + 86400) # Tomorrow
+      Time.stub(:now).and_return(now + 86400) # One day later
       Rails.stub_chain("cache.read").with('usd_eur_31-8-2010').and_return(nil)
 
       # Exchange rate has changed next day, so forget cache rate!

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Oriol Gual
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,9 +117,9 @@ extra_rdoc_files:
 files: 
 - .autotest
 - .bundle/config
-- .document
 - .gitignore
 - .rspec
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE