exchange 0.5.1 → 0.6.0

data/spec/exchange/cache/no_cache_spec.rb

@@ -7,14 +7,20 @@ describe "Exchange::Cache::Rails" do
   end
   subject { Exchange::Cache::NoCache }
   before(:each) do
-    Exchange::Configuration.define do |c|
-      c.cache      = false
-    end
+    Exchange.configuration = Exchange::Configuration.new { |c|
+      c.cache = {
+        :class => :no_cache
+      }
+    }
   end
   after(:each) do
-    Exchange::Configuration.define do |c|
-      c.cache      = :memcached
-    end
+    Exchange.configuration = Exchange::Configuration.new { |c|
+      c.cache = {
+        :class => :memcached,
+        :host => 'localhost',
+        :port => 11211
+      }
+    }
   end
   describe "cached" do
     it "should directly call the block" do

data/spec/exchange/cache/rails_spec.rb

@@ -5,16 +5,20 @@ describe "Exchange::Cache::Rails" do
     class ::Rails
     end
   end
-  subject { Exchange::Cache::Rails }
+  subject { Exchange::Cache::Rails.instance }
   before(:each) do
-    Exchange::Configuration.define do |c|
-      c.cache      = :rails
-    end
+    Exchange.configuration = Exchange::Configuration.new { |c|
+      c.cache = {
+        :class => :rails
+      }
+    }
   end
   after(:each) do
-    Exchange::Configuration.define do |c|
-      c.cache      = :memcached
-    end
+    Exchange.configuration = Exchange::Configuration.new { |c|
+      c.cache = {
+        :class => :memcached
+      }
+    }
   end
   describe "client" do
     let(:client) { mock('rails_cache') }
@@ -41,13 +45,13 @@ describe "Exchange::Cache::Rails" do
       end
       context "with an hourly cache" do
         before(:each) do
-          Exchange::Configuration.update = :hourly
+          Exchange.configuration.cache.expire = :hourly
           subject.should_receive(:key).with('API_CLASS', {}).and_return('KEY')
           ::Rails.should_receive(:cache).and_return(client)
           client.should_receive(:fetch).with('KEY', :expires_in => 3600).and_return "{\"RESULT\":\"YAY\"}"
         end
         after(:each) do
-          Exchange::Configuration.update = :daily
+          Exchange.configuration.cache.expire = :daily
         end
         it "should return the JSON loaded result" do
           subject.cached('API_CLASS') { 'something' }.should == "{\"RESULT\":\"YAY\"}"

data/spec/exchange/cache/redis_spec.rb

@@ -1,25 +1,30 @@
 require 'spec_helper'
+require 'redis'
 
 describe "Exchange::Cache::Redis" do
-  subject { Exchange::Cache::Redis }
+  subject { Exchange::Cache::Redis.instance }
   before(:each) do
-    Exchange::Configuration.define do |c|
-      c.cache      = :redis
-      c.cache_host = 'HOST'
-      c.cache_port = 'PORT'
+    Exchange.configuration = Exchange::Configuration.new do |c|
+      c.cache = {
+        :class => :redis,
+        :host => 'HOST',
+        :port => 'PORT'
+      }
     end
   end
   after(:each) do
-    Exchange::Configuration.define do |c|
-      c.cache      = :memcached
-      c.cache_host = 'localhost'
-      c.cache_port = 11211
+    Exchange.configuration = Exchange::Configuration.new do |c|
+      c.cache = {
+        :class => :memcached,
+        :host => 'localhost',
+        :port => 11211
+      }
     end
   end
   describe "client" do
     let(:client) { mock('redis') }
     after(:each) do
-      subject.send(:remove_class_variable, "@@client")
+      subject.instance_variable_set "@client", nil
     end
     it "should set up a client on the specified host and port for the cache" do
       ::Redis.should_receive(:new).with(:host => 'HOST', :port => 'PORT').and_return(client)
@@ -27,17 +32,17 @@ describe "Exchange::Cache::Redis" do
     end
   end
   describe "cached" do
+    let(:client) { mock('redis', :get => nil) }
+    before(:each) do
+      ::Redis.should_receive(:new).with(:host => 'HOST', :port => 'PORT').and_return(client)
+    end
+    after(:each) do
+      subject.instance_variable_set "@client", nil
+    end
     it "should raise an error if no block was given" do
       lambda { subject.cached('API_CLASS') }.should raise_error(Exchange::Cache::CachingWithoutBlockError)
     end
     context "when a cached result exists" do
-      let(:client) { mock('redis') }
-      before(:each) do
-        ::Redis.should_receive(:new).with(:host => 'HOST', :port => 'PORT').and_return(client)
-      end
-      after(:each) do
-        subject.send(:remove_class_variable, "@@client")
-      end
       context "when loading json" do
         before(:each) do
           subject.should_receive(:key).with('API_CLASS', {}).and_return('KEY')
@@ -62,15 +67,10 @@ describe "Exchange::Cache::Redis" do
       end
     end
     context "when no cached result exists" do
-      let(:client) { mock('redis') }
       before(:each) do
         subject.should_receive(:key).with('API_CLASS', {}).at_most(3).times.and_return('KEY')
-        ::Redis.should_receive(:new).with(:host => 'HOST', :port => 'PORT').and_return(client)
         client.should_receive(:get).with('KEY').and_return nil
       end
-      after(:each) do
-        subject.send(:remove_class_variable, "@@client")
-      end
       context "with daily cache" do
         it "should call the block and set and return the result" do
           client.should_receive(:set).with('KEY', "{\"RESULT\":\"YAY\"}").once
@@ -80,10 +80,10 @@ describe "Exchange::Cache::Redis" do
       end
       context "with hourly cache" do
         before(:each) do
-          Exchange::Configuration.update = :hourly
+          Exchange.configuration.cache.expire = :hourly
         end
         after(:each) do
-          Exchange::Configuration.update = :daily
+          Exchange.configuration.cache.expire = :daily
         end
         it "should call the block and set and return the result" do
           client.should_receive(:set).with('KEY', "{\"RESULT\":\"YAY\"}").once

data/spec/exchange/configuration_spec.rb

@@ -1,47 +1,55 @@
 require 'spec_helper'
 
 describe "Exchange::Configuration" do
-  let(:subject) { Exchange::Configuration }
+  let(:subject) { Exchange::Configuration.new }
   it "should have a standard configuration" do
-    subject.api.should == :xavier_media
-    subject.api_class.should == Exchange::ExternalAPI::XavierMedia
-    subject.cache.should == :memcached
-    subject.cache_class.should == Exchange::Cache::Memcached
-    subject.cache_host.should == 'localhost'
-    subject.cache_port.should == 11211
-    subject.retries.should == 5
+    subject.api.retries.should == 5
+    subject.api.subclass.should == Exchange::ExternalAPI::XavierMedia
+    subject.cache.subclass.should == Exchange::Cache::Memcached
+    subject.cache.host.should == 'localhost'
+    subject.cache.port.should == 11211
+    subject.cache.expire.should == :daily
   end
   it "should respond to all configuration getters and setters" do
-    [:api, :retries, :allow_mixed_operations, :cache, :cache_host, :cache_port, :update].each do |k|
+    [:api, :allow_mixed_operations, :cache].each do |k|
       subject.should be_respond_to(k)
       subject.should be_respond_to(:"#{k}=")
     end
   end
-  it "should allow to be defined with a block" do
-    subject.define do |c|
-      c.api = :xavier_media
-      c.cache = :redis
-      c.retries = 60
+  it 'should respond to nested getters and setters for the api and the cache' do
+    {:api => [:subclass, :retries], :cache => [:subclass, :host, :port, :expire]}.each do |k,m|
+      m.each do |meth|
+        subject.send(k).should be_respond_to(meth)
+        subject.send(k).should be_respond_to(:"#{meth}=")
+      end
     end
-    subject.api.should == :xavier_media
-    subject.api_class.should == Exchange::ExternalAPI::XavierMedia
-    subject.cache.should == :redis
-    subject.cache_class.should == Exchange::Cache::Redis
-    subject.retries.should == 60
+  end
+  it "should allow to be defined with a block" do
+    Exchange.configuration = Exchange::Configuration.new {|c|
+      c.api = {
+        :subclass => :xavier_media,
+        :retries => 60
+      }
+      c.cache = {
+        :subclass => :redis
+      }
+    }
+    Exchange.configuration.api.subclass.should == Exchange::ExternalAPI::XavierMedia
+    Exchange.configuration.api.retries.should == 60
+    Exchange.configuration.cache.subclass.should == Exchange::Cache::Redis
   end
   it "should allow to be set directly" do
-    subject.api = :paypal
-    subject.cache = :yml
-    subject.retries = 1
-    subject.api.should == :paypal
-    subject.cache.should == :yml
-    subject.retries.should == 1
+    subject.api = {
+      :subclass => :ecb,
+      :retries => 1
+    }
+    subject.api.subclass.should == Exchange::ExternalAPI::Ecb
+    subject.api.retries.should == 1
   end
   after(:all) do
-    subject.api = :currency_bot
-    subject.cache = :memcached
-    subject.cache_host = 'localhost'
-    subject.cache_port = 11211
-    subject.retries = 5
+    subject.api = {
+      :subclass => :currency_bot,
+      :retries => 5
+    }
   end  
 end

data/spec/exchange/currency_spec.rb

@@ -3,13 +3,22 @@ require 'spec_helper'
 describe "Exchange::Currency" do
   subject { Exchange::Currency.new(40, :usd) }
   before(:all) do
-    Exchange::Configuration.define do |c|
-      c.api = :currency_bot
-      c.cache = false
+    Exchange.configuration = Exchange::Configuration.new do |c|
+      c.api = {
+        :subclass => :currency_bot
+      }
+      c.cache = {
+        :subclass => :no_cache
+      }
+      c.allow_mixed_operations = true
     end
   end
   after(:all) do
-    Exchange::Configuration.cache = :memcached
+    Exchange.configuration = Exchange::Configuration.new do |c|
+      c.api = {
+        :subclass => :memcached
+      }
+    end
   end
   it "should initialize with a number and a currency" do
     subject.value.should == 40
@@ -37,15 +46,15 @@ describe "Exchange::Currency" do
         (subject + Exchange::Currency.new(30, :sek)).currency.should == :usd
       end
       it "should raise when currencies get mixed and the configuration does not allow it" do
-        Exchange::Configuration.allow_mixed_operations = false
+        Exchange.configuration.allow_mixed_operations = false
         lambda { subject + Exchange::Currency.new(30, :chf) }.should raise_error(Exchange::CurrencyMixError)
-        Exchange::Configuration.allow_mixed_operations = true
+        Exchange.configuration.allow_mixed_operations = true
       end
       it "should not raise when currencies get mixed and the configuration does not allow if the other currency is the same" do
-        Exchange::Configuration.allow_mixed_operations = false
+        Exchange.configuration.allow_mixed_operations = false
         mock_api("http://openexchangerates.org/api/latest.json?app_id=", fixture('api_responses/example_json_api.json'), 2)
         lambda { subject + Exchange::Currency.new(30, :usd) }.should_not raise_error
-        Exchange::Configuration.allow_mixed_operations = true
+        Exchange.configuration.allow_mixed_operations = true
       end
     end
     describe "- other" do
@@ -57,19 +66,20 @@ describe "Exchange::Currency" do
       end
       it "should be able to subtract another currency value" do
         mock_api("http://openexchangerates.org/api/latest.json?app_id=", fixture('api_responses/example_json_api.json'), 2)
+        Exchange.configuration.allow_mixed_operations = true
         (subject + Exchange::Currency.new(10, :chf)).value.round(2).should == 50.96
         (subject + Exchange::Currency.new(23.3, :eur)).currency.should == :usd
       end
       it "should raise when currencies get mixed and the configuration does not allow it" do
-        Exchange::Configuration.allow_mixed_operations = false
+        Exchange.configuration.allow_mixed_operations = false
         lambda { subject - Exchange::Currency.new(30, :chf) }.should raise_error(Exchange::CurrencyMixError)
-        Exchange::Configuration.allow_mixed_operations = true
+        Exchange.configuration.allow_mixed_operations = true
       end
       it "should not raise when currencies get mixed and the configuration does not allow if the other currency is the same" do
-        Exchange::Configuration.allow_mixed_operations = false
+        Exchange.configuration.allow_mixed_operations = false
         mock_api("http://openexchangerates.org/api/latest.json?app_id=", fixture('api_responses/example_json_api.json'), 2)
         lambda { subject - Exchange::Currency.new(30, :usd) }.should_not raise_error
-        Exchange::Configuration.allow_mixed_operations = true
+        Exchange.configuration.allow_mixed_operations = true
       end
     end
     describe "* other" do
@@ -81,19 +91,20 @@ describe "Exchange::Currency" do
       end
       it "should be able to multiply by another currency value" do
         mock_api("http://openexchangerates.org/api/latest.json?app_id=", fixture('api_responses/example_json_api.json'), 2)
+        Exchange.configuration.allow_mixed_operations = true
         (subject * Exchange::Currency.new(10, :chf)).value.round(1).should == 438.3
         (subject * Exchange::Currency.new(23.3, :eur)).currency.should == :usd
       end
       it "should raise when currencies get mixed and the configuration does not allow it" do
-        Exchange::Configuration.allow_mixed_operations = false
+        Exchange.configuration.allow_mixed_operations = false
         lambda { subject * Exchange::Currency.new(30, :chf) }.should raise_error(Exchange::CurrencyMixError)
-        Exchange::Configuration.allow_mixed_operations = true
+        Exchange.configuration.allow_mixed_operations = true
       end
       it "should not raise when currencies get mixed and the configuration does not allow if the other currency is the same" do
-        Exchange::Configuration.allow_mixed_operations = false
+        Exchange.configuration.allow_mixed_operations = false
         mock_api("http://openexchangerates.org/api/latest.json?app_id=", fixture('api_responses/example_json_api.json'), 2)
         lambda { subject * Exchange::Currency.new(30, :usd) }.should_not raise_error
-        Exchange::Configuration.allow_mixed_operations = true
+        Exchange.configuration.allow_mixed_operations = true
       end
     end
     describe "/ other" do
@@ -105,19 +116,20 @@ describe "Exchange::Currency" do
       end
       it "should be able to multiply by another currency value" do
         mock_api("http://openexchangerates.org/api/latest.json?app_id=", fixture('api_responses/example_json_api.json'), 2)
+        Exchange.configuration.allow_mixed_operations = true
         (subject / Exchange::Currency.new(10, :chf)).value.round(2).should == BigDecimal.new("3.65")
         (subject / Exchange::Currency.new(23.3, :eur)).currency.should == :usd
       end
       it "should raise when currencies get mixed and the configuration does not allow it" do
-        Exchange::Configuration.allow_mixed_operations = false
+        Exchange.configuration.allow_mixed_operations = false
         lambda { subject / Exchange::Currency.new(30, :chf) }.should raise_error(Exchange::CurrencyMixError)
-        Exchange::Configuration.allow_mixed_operations = true
+        Exchange.configuration.allow_mixed_operations = true
       end
       it "should not raise when currencies get mixed and the configuration does not allow if the other currency is the same" do
-        Exchange::Configuration.allow_mixed_operations = false
+        Exchange.configuration.allow_mixed_operations = false
         mock_api("http://openexchangerates.org/api/latest.json?app_id=", fixture('api_responses/example_json_api.json'), 2)
         lambda { subject / Exchange::Currency.new(30, :usd) }.should_not raise_error
-        Exchange::Configuration.allow_mixed_operations = true
+        Exchange.configuration.allow_mixed_operations = true
       end
     end
     describe "comparison" do
@@ -272,7 +284,7 @@ describe "Exchange::Currency" do
       5.eur(:at => Time.gm(2011,1,1)).to_usd.value.should == 5.eur.to_usd(:at => Time.gm(2011,1,1)).value
     end
     it "should raise errors for currency conversions it does not have rates for" do
-      lambda { subject.to_ssp }.should raise_error(NoRateError)
+      lambda { subject.to_ssp }.should raise_error(Exchange::NoRateError)
     end
     it "should pass on methods it does not understand to its number" do
       subject.to_f.should == 40

data/spec/exchange/external_api/base_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe "Exchange::ExternalAPI::Base" do
   subject { Exchange::ExternalAPI::Base.new }
   before(:each) do
-    Exchange::Configuration.cache = false
+    Exchange.configuration = Exchange::Configuration.new{|c|
+      c.cache = {:subclass => :no_cache}
+    }
   end
   before(:each) do
     subject.instance_variable_set("@rates", {'EUR' => BigDecimal.new("3.45"), 'CHF' => BigDecimal.new("5.565")})

data/spec/exchange/external_api/call_spec.rb

@@ -2,7 +2,11 @@ require 'spec_helper'
 
 describe "Exchange::ExternalAPI::Call" do
   before(:all) do
-    Exchange::Configuration.cache = false
+    Exchange.configuration = Exchange::Configuration.new{|c|
+      c.cache = {
+        :subclass => :no_cache
+      }
+    }
   end
   describe "initialization" do
     context "with a json api" do

data/spec/exchange/external_api/currency_bot_spec.rb

@@ -2,7 +2,11 @@ require 'spec_helper'
 
 describe "Exchange::ExternalAPI::CurrencyBot" do
   before(:all) do
-    Exchange::Configuration.cache = false
+    Exchange.configuration = Exchange::Configuration.new{|c|
+      c.cache = {
+        :subclass => :no_cache
+      }
+    }
   end
   describe "updating rates" do
     subject { Exchange::ExternalAPI::CurrencyBot.new }

data/spec/exchange/external_api/ecb_spec.rb

@@ -1,15 +1,19 @@
 require 'spec_helper'
 
-describe "Exchange::ExternalAPI::ECB" do
+describe "Exchange::ExternalAPI::Ecb" do
   before(:all) do
-    Exchange::Configuration.cache = false
+    Exchange.configuration = Exchange::Configuration.new { |c|
+      c.cache = {
+        :subclass => :no_cache
+      }
+    }
   end
   before(:each) do
     time = Time.gm(2012,2,3)
     Time.stub! :now => time
   end
   describe "updating rates" do
-    subject { Exchange::ExternalAPI::ECB.new }
+    subject { Exchange::ExternalAPI::Ecb.new }
     before(:each) do
       mock_api("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml", fixture('api_responses/example_ecb_xml_90d.xml'))
     end
@@ -23,7 +27,7 @@ describe "Exchange::ExternalAPI::ECB" do
     end
   end
   describe "conversion" do
-    subject { Exchange::ExternalAPI::ECB.new }
+    subject { Exchange::ExternalAPI::Ecb.new }
     before(:each) do
       mock_api("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist-90d.xml", fixture('api_responses/example_ecb_xml_90d.xml'))
     end
@@ -38,7 +42,7 @@ describe "Exchange::ExternalAPI::ECB" do
     end
   end
   describe "historic conversion" do
-    subject { Exchange::ExternalAPI::ECB.new }
+    subject { Exchange::ExternalAPI::Ecb.new }
     before(:each) do
       mock_api("http://www.ecb.europa.eu/stats/eurofxref/eurofxref-hist.xml", fixture('api_responses/example_ecb_xml_history.xml'))
     end