simple_currency 1.1.2 → 1.2.0

data/Gemfile

@@ -3,7 +3,7 @@ source :gemcutter
 gem "crack"
 
 group :test do
-  gem "rspec", ">= 2.0.0.beta.20"
+  gem "rspec", ">= 2.0.0.beta.22"
   gem "fakeweb"
   gem "rails"
 end

data/Gemfile.lock

@@ -62,14 +62,16 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rspec (2.0.0.beta.20)
-      rspec-core (= 2.0.0.beta.20)
-      rspec-expectations (= 2.0.0.beta.20)
-      rspec-mocks (= 2.0.0.beta.20)
-    rspec-core (2.0.0.beta.20)
-    rspec-expectations (2.0.0.beta.20)
+    rspec (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+      rspec-mocks (= 2.0.0.beta.22)
+    rspec-core (2.0.0.beta.22)
+    rspec-expectations (2.0.0.beta.22)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.20)
+    rspec-mocks (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
     thor (0.14.0)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
@@ -83,4 +85,4 @@ DEPENDENCIES
   crack
   fakeweb
   rails
-  rspec (>= 2.0.0.beta.20)
+  rspec (>= 2.0.0.beta.22)

data/README.rdoc

@@ -1,9 +1,17 @@
-= simple_currency
+# simple_currency
 
-A really simple currency converter using Xurrency and XavierMedia APIs.
+A really simple currency converter using XavierMedia API.
 Compatible with Ruby 1.8, 1.9 and JRuby.
 
-== Usage
+## Notes
+
+Since version 1.2, simple_currency no longer uses Xurrency API in its
+background, due to restrictions on the number of daily requests. If you
+would like to use it, please use the [fork by Alfonso
+Jiménez](http://github.com/alfonsojimenez/simple_currency), author and
+maintainer of xurrency.com service.
+
+## Usage
 
 Just require it and all your numeric stuff gets this fancy DSL for free:
 
@@ -29,15 +37,15 @@ in the past? Just do this:
   42.eur.at(Time.parse('2009-09-01')).to_usd
   # => 60.12
 
-== Installation
+## Installation
 
-=== Rails 3
+### Rails 3
 
 In your Gemfile:
 
   gem "simple_currency"
 
-=== Not using Rails?
+### Not using Rails?
 
 Then you have to manually install the gem:
 
@@ -47,7 +55,7 @@ And manually require it as well:
 
   require "simple_currency"
 
-== Note on Patches/Pull Requests
+## Note on Patches/Pull Requests
  
 * Fork the project.
 * Make your feature addition or bug fix.
@@ -58,6 +66,6 @@ And manually require it as well:
   in a commit by itself I can ignore when I pull.
 * Send me a pull request. Bonus points for topic branches.
 
-== Copyright
+## Copyright
 
 Copyright (c) 2010 Codegram. See LICENSE for details.

data/Rakefile

@@ -6,8 +6,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "simple_currency"
-    gem.summary = "A really simple currency converter using the Xurrency and XavierMedia APIs."
-    gem.description = "A really simple currency converter using the Xurrency and XavierMedia APIs. It's Ruby 1.8, 1.9 and JRuby compatible, and it also takes advantage of Rails cache when available."
+    gem.summary = "A really simple currency converter using XavierMedia API."
+    gem.description = "A really simple currency converter using XavierMedia API. It's Ruby 1.8, 1.9 and JRuby compatible, and it also takes advantage of Rails cache when available."
     gem.email = "info@codegram.com"
     gem.homepage = "http://github.com/codegram/simple_currency"
     gem.authors = ["Oriol Gual", "Josep M. Bach", "Josep Jaume Rey"]
@@ -15,7 +15,7 @@ begin
     gem.add_dependency 'crack', ">= 0.1.8"
 
     gem.add_development_dependency "jeweler", '>= 1.4.0'
-    gem.add_development_dependency "rspec", '>= 2.0.0.beta.20'
+    gem.add_development_dependency "rspec", '>= 2.0.0.beta.22'
     gem.add_development_dependency "fakeweb", '>= 1.3.0'
     gem.add_development_dependency "rails", '>= 3.0.0'
     gem.add_development_dependency "bundler", '>= 1.0.0'
@@ -26,7 +26,7 @@ rescue LoadError
 end
 
 # Rake RSpec2 task stuff
-gem 'rspec', '>= 2.0.0.beta.20'
+gem 'rspec', '>= 2.0.0.beta.22'
 gem 'rspec-expectations'
 
 require 'rspec/core/rake_task'

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/simple_currency/currency_convertible.rb

@@ -1,6 +1,6 @@
 require 'open-uri'
 require 'timeout'
-require 'crack'
+require 'crack/xml'
 
 module CurrencyConvertible
 
@@ -33,7 +33,7 @@ module CurrencyConvertible
     # 30.eur # => Calls _from and sets @original to 'eur'
     #
     def _from(currency)
-      @exchange_date = nil
+      @exchange_date = Time.now.send(:to_date)
       @original = currency
       self
     end

data/simple_currency.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_currency}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   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-09-01}
-  s.description = %q{A really simple currency converter using the Xurrency and XavierMedia APIs. It's Ruby 1.8, 1.9 and JRuby compatible, and it also takes advantage of Rails cache when available.}
+  s.date = %q{2010-10-03}
+  s.description = %q{A really simple currency converter using XavierMedia 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 = [
     "LICENSE",
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A really simple currency converter using the Xurrency and XavierMedia APIs.}
+  s.summary = %q{A really simple currency converter using XavierMedia API.}
   s.test_files = [
     "spec/simple_currency_spec.rb",
      "spec/spec_helper.rb"
@@ -54,14 +54,14 @@ Gem::Specification.new do |s|
     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"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.3.0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
     else
       s.add_dependency(%q<crack>, [">= 0.1.8"])
       s.add_dependency(%q<jeweler>, [">= 1.4.0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
       s.add_dependency(%q<fakeweb>, [">= 1.3.0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -69,7 +69,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<crack>, [">= 0.1.8"])
     s.add_dependency(%q<jeweler>, [">= 1.4.0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.22"])
     s.add_dependency(%q<fakeweb>, [">= 1.3.0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/spec/simple_currency_spec.rb

@@ -2,179 +2,82 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "SimpleCurrency" do
 
-  describe "in its basic behavior" do
-
-    it "enhances instances of Numeric with currency methods" do
-      expect { 30.eur && 30.usd && 30.gbp }.to_not raise_error
-    end
-
-    it "handles zero values (by returning them straight away)" do
-      0.usd.to_eur.should == 0.0 
-    end
-
+  it "enhances instances of Numeric with currency methods" do
+    expect { 30.eur && 30.usd && 30.gbp }.to_not raise_error
   end
 
-  context "using Xurrency API for right-now exchange" do
-
-    it "returns a converted amount from one currency to another" do
-      mock_xurrency_api('eur', 'usd', 2, 1.542)
-      2.eur.to_usd.should == 1.54
-
-      mock_xurrency_api('gbp', 'chf', 2, 3.4874)
-      2.gbp.to_chf.should == 3.49
-    end
-
-    it "caches methods for faster reuse" do
-      mock_xurrency_api('usd', 'eur', 1, 1.5)
-
-      1.usd.to_eur.should == 1.5
-
-      8.should respond_to(:usd)
-      8.should respond_to(:to_eur)
-    end
-
-    it "raises any error returned by the api call" 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(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
-      mock_xurrency_api('usd', 'eur', 1, 1.5)
-
-      -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
-
+  it "handles zero values (by returning them straight away)" do
+    0.usd.to_eur.should == 0.0 
   end
 
-  context "using XavierMedia API for exchange with historical date" do
+  context "using XavierMedia API for exchange" do
 
-    let(:the_past) { Time.parse('2010-08-25')}
-    let(:the_ancient_past) { Time.parse('1964-08-25')}
-
-    it "enhances instances of Numeric with :at method" do
-      expect { 30.eur.at(Time.now) }.to_not raise_error
-      expect { 30.usd.at("no date")}.to raise_error("Must use 'at' with a time or date object")
-      expect { 30.gbp.at(:whatever_arg) }.to raise_error("Must use 'at' with a time or date object")
-    end
+    let(:today) { Time.now }
 
     it "returns a converted amount from one currency to another" do
-      mock_xavier_api(the_past)
-      2.eur.at(the_past).to_usd.should == 2.54
-      2.usd.at(the_past).to_eur.should == 1.58
-      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)  # 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")
+      mock_xavier_api(today)
+      2.eur.to_usd.should == 2.54
+      2.usd.to_eur.should == 1.58
+      2.gbp.to_usd.should == 3.07
     end
 
     it "raises a CurrencyNotFoundException given an invalid currency" do
-      mock_xavier_api(the_past)
+      mock_xavier_api(today)
 
-      expect {1.usd.at(the_past).to_xxx}.to raise_error(CurrencyNotFoundException)
+      expect {1.usd.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.eur.at(the_past).to_rol}.to raise_error(NoRatesFoundException)
-    end
-
-  end
-
-  context "when Rails (and its cache goodness) is present" do
+      mock_xavier_api(today)
 
-    let(:now) { Time.parse('2010-08-30') }
-
-    before(:all) do
-      require 'rails'
+      expect {1.eur.to_rol}.to raise_error(NoRatesFoundException)
     end
 
-    context "using Xurrency API for right-now exchange" do
-
-      before(:each) do
-        Time.stub(:now).and_return(now)
-
-        Rails.stub_chain("cache.read").and_return(false)
-        Rails.stub_chain("cache.write").and_return(true)
-      end
-
-      it "reads the exchange rate from the cache" do
-        Rails.stub_chain("cache.read").and_return(1.5)
+    context "in a particular historical date" do
 
-        mock_xurrency_api('usd', 'eur', 1, 1.5)
-        1.usd.to_eur.should == 1.5
+      let(:the_past) { Time.parse('2010-08-25')}
+      let(:the_ancient_past) { Time.parse('1964-08-25')}
 
-        URI.should_not_receive(:parse)
-        2.usd.to_eur.should == 3
+      it "enhances instances of Numeric with :at method" do
+        expect { 30.eur.at(Time.now) }.to_not raise_error
+        expect { 30.usd.at("no date")}.to raise_error("Must use 'at' with a time or date object")
+        expect { 30.gbp.at(:whatever_arg) }.to raise_error("Must use 'at' with a time or date object")
       end
 
-      it "reads the inverse exchange rate from the cache" do
-        Rails.stub_chain("cache.read").with('usd_eur_30-8-2010').and_return(1.5)
-        Rails.stub_chain("cache.read").with('gbp_eur_30-8-2010').and_return(3)
-        Rails.stub_chain("cache.read").with('gbp_usd_30-8-2010').and_return(false)
-
-        mock_xurrency_api('usd', 'eur', 1, 1.5)
-        mock_xurrency_api('gbp', 'eur', 1, 3)
-
-        1.usd.to_eur.should == 1.5
-        1.gbp.to_eur.should == 3
-
-        URI.should_not_receive(:parse)
-        3.eur.to_usd.should == 2
-        3.eur.to_gbp.should == 1
+      it "returns a converted amount from one currency to another in that particular date" do
+        mock_xavier_api(the_past)
+        2.eur.at(the_past).to_usd.should == 2.54
+        2.usd.at(the_past).to_eur.should == 1.58
+        2.gbp.at(the_past).to_usd.should == 3.07
       end
 
-      it "caches the exchange rate" do
-        Rails.stub_chain("cache.read").with('usd_eur_30-8-2010').and_return(false)
-
-        Rails.cache.should_receive(:write).with('usd_eur_30-8-2010', 1.5)
+      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
 
-        mock_xurrency_api('usd', 'eur', 1, 1.5)
-        1.usd.to_eur.should == 1.5
+        2.eur.at(the_past).to_usd.should == 2.54
       end
 
-      it "ensures the cache is valid only for today" do
-        Rails.stub_chain("cache.read").with('usd_eur_30-8-2010').and_return(1.5)
+      it "raises an error when no data available" 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, :fail => true)  # It's a holiday
 
-        mock_xurrency_api('usd', 'eur', 1, 1.5)
-        1.usd.to_eur.should == 1.5
-
-        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!
-        mock_xurrency_api('usd', 'eur', 2, 4)
-        2.usd.to_eur.should == 4
+        expect {1.usd.at(the_past).to_eur}.to raise_error("404 Not Found")
       end
 
     end
 
-    context "using XavierMedia API for exchange with historical date" do
+    context "when Rails (and its cache goodness) is present" do
 
+      let(:now) { Time.parse('2010-08-30') }
       let(:the_past) { Time.parse('2010-08-25') }
 
+      before(:all) do
+        require 'rails'
+      end
+
       before(:each) do
         Rails.stub_chain("cache.read").and_return(false)
         Rails.stub_chain("cache.write").and_return(true)
@@ -217,6 +120,9 @@ describe "SimpleCurrency" do
         1.eur.at(the_past).to_gbp.should == 0.82
         2.gbp.at(the_past).to_usd.should == 3.07
       end
+
     end
+
   end
+
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'fakeweb'
 
 require 'simple_currency'
 require 'rspec'
-require 'rspec/autorun'
+# require 'rspec/autorun'   => require it back in beta.23
 
 module HelperMethods
   def fixture(name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_currency
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Oriol Gual
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +02:00
+date: 2010-10-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,14 +60,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196427
+        hash: 62196431
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 20
-        version: 2.0.0.beta.20
+        - 22
+        version: 2.0.0.beta.22
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -118,7 +118,7 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id006
-description: A really simple currency converter using the Xurrency and XavierMedia APIs. It's Ruby 1.8, 1.9 and JRuby compatible, and it also takes advantage of Rails cache when available.
+description: A really simple currency converter using XavierMedia API. It's Ruby 1.8, 1.9 and JRuby compatible, and it also takes advantage of Rails cache when available.
 email: info@codegram.com
 executables: []
 
@@ -180,7 +180,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A really simple currency converter using the Xurrency and XavierMedia APIs.
+summary: A really simple currency converter using XavierMedia API.
 test_files: 
 - spec/simple_currency_spec.rb
 - spec/spec_helper.rb