exchange 0.4.1 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/exchange.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "exchange"
-  s.version = "0.4.1"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Beat Richartz"]
-  s.date = "2012-04-15"
+  s.date = "2012-06-10"
   s.description = "The Exchange Gem gives you easy access to currency functions directly on your Numbers. Imagine a conversion as easy as \n    1.eur.to_usd\n  or even better \n    1.eur.to_usd(:at => Time.now - 84600)\n  which gets you an exchange at the rates of yesterday."
   s.email = "exchange_gem@gmail.com"
   s.extra_rdoc_files = [

data/lib/exchange.rb

@@ -1,4 +1,4 @@
-EXCHANGE_GEM_ROOT_PATH = File.dirname(__FILE__).sub(/\/lib/, '') if __FILE__.is_a?(String) 
+EXCHANGE_GEM_ROOT_PATH = File.dirname(__FILE__).sub(/\/lib/, '') if __FILE__.is_a?(String)
 
 require 'bigdecimal'
 require 'open-uri'

data/lib/exchange/cache/memcached.rb

@@ -32,10 +32,10 @@ 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          
           raise CachingWithoutBlockError.new('Caching needs a block') unless block_given?
           begin
-            result = opts[:plain] ? client.get(key(api, opts)) : JSON.load(client.get(key(api, opts)))
+            result = opts[:plain] ? client.get(key(api, opts)).gsub(/["\s+]/, '') : JSON.load(client.get(key(api, opts)))
           rescue ::Memcached::NotFound
             result = block.call
             if result && !result.to_s.empty?

data/lib/exchange/cache/redis.rb

@@ -36,7 +36,7 @@ module Exchange
           raise CachingWithoutBlockError.new('Caching needs a block') unless block_given?
           
           if result = client.get(key(api, opts))
-            result = opts[:plain] ? result : JSON.load(result)
+            result = opts[:plain] ? result.gsub(/["\s+]/, '') : JSON.load(result)
           else
             result = block.call
             if result && !result.to_s.empty?

data/lib/exchange/external_api/base.rb

@@ -77,7 +77,7 @@ module Exchange
       #   Exchange::ExternalAPI::Base.new.rate(:usd, :eur, :at => Time.gm(3,23,2009))
       #     #=> 1.232231231
       def rate(from, to, opts={})
-        rate = Configuration.cache_class.cached(Exchange::Configuration.api, opts.merge(:key_for => [from, to], :plain => true)) do
+        rate = Exchange::Configuration.cache_class.cached(Exchange::Configuration.api, opts.merge(:key_for => [from, to], :plain => true)) do
           update(opts)
           rate_from   = self.rates[to.to_s.upcase]
           rate_to     = self.rates[from.to_s.upcase]

data/lib/exchange/external_api/call.rb

@@ -31,7 +31,7 @@ module Exchange
       #   # Do something with that result
       
       def initialize url, options={}, &block
-        result = Configuration.cache_class(options).cached(options[:api] || Configuration.api, options) do
+        result = Exchange::Configuration.cache_class(options).cached(options[:api] || Exchange::Configuration.api, options) do
           load_url(url, options[:retries] || Exchange::Configuration.retries, options[:retry_with])
         end
         

data/lib/exchange/external_api/ecb.rb

@@ -28,12 +28,12 @@ module Exchange
         api_url       = api_url(time)
         times         = Exchange::Configuration.retries.times.map{ |i| time - 86400 * (i+1) }
         
-        Kernel.warn "WARNING: Using the ECB API without caching can be very, very slow." unless Configuration.cache
+        Kernel.warn "WARNING: Using the ECB API without caching can be very, very slow." unless Exchange::Configuration.cache
         
-        Configuration.cache_class.cached(self.class, :at => time) do
+        Exchange::Configuration.cache_class.cached(self.class, :at => time) do
           Call.new(api_url, :format => :xml, :at => time, :cache => :file, :cache_period => time >= Time.now - 90 * 86400 ? :daily : :monthly) do |result|
             t = time
-            debugger
+
             while (r = result.css("Cube[time=\"#{t.strftime("%Y-%m-%d")}\"]")).empty? && !times.empty?
               t = times.shift
             end

data/spec/exchange/cache/memcached_spec.rb

@@ -31,15 +31,32 @@ describe "Exchange::Cache::Memcached" do
     context "when a cached result exists" do
       let(:client) { mock('memcached') }
       before(:each) do
-        subject.should_receive(:key).with('API_CLASS', {}).and_return('KEY')
         ::Memcached.should_receive(:new).with("HOST:PORT").and_return(client)
-        client.should_receive(:get).with('KEY').and_return "{\"RESULT\":\"YAY\"}"
       end
       after(:each) do
         subject.send(:remove_class_variable, "@@client")
       end
-      it "should return the JSON loaded result" do
-        subject.cached('API_CLASS') { 'something' }.should == {'RESULT' => 'YAY'}
+      context "when loading json" do
+        before(:each) do
+          subject.should_receive(:key).with('API_CLASS', {}).and_return('KEY')
+          client.should_receive(:get).with('KEY').and_return "{\"RESULT\":\"YAY\"}"
+        end
+        it "should return the JSON loaded result" do
+          subject.cached('API_CLASS') { 'something' }.should == {'RESULT' => 'YAY'}
+        end
+      end
+      context "when loading plain" do
+        before(:each) do
+          subject.should_receive(:key).with('API_CLASS', {:plain => true}).and_return('KEY')
+        end
+        it "should return a String result in the right format" do
+          client.should_receive(:get).with('KEY').and_return "122.0"
+          subject.cached('API_CLASS', :plain => true) { 'something' }.should == "122.0"
+        end
+        it "should also return a String result in the right format when memcached adds quotes and spaces" do
+          client.should_receive(:get).with('KEY').and_return "\"122.0\" "
+          subject.cached('API_CLASS', :plain => true) { 'something' }.should == "122.0"
+        end
       end
     end
     context "when no cached result exists" do

data/spec/exchange/cache/redis_spec.rb

@@ -33,15 +33,32 @@ describe "Exchange::Cache::Redis" do
     context "when a cached result exists" do
       let(:client) { mock('redis') }
       before(:each) do
-        subject.should_receive(:key).with('API_CLASS', {}).and_return('KEY')
         ::Redis.should_receive(:new).with(:host => 'HOST', :port => 'PORT').and_return(client)
-        client.should_receive(:get).with('KEY').and_return "{\"RESULT\":\"YAY\"}"
       end
       after(:each) do
         subject.send(:remove_class_variable, "@@client")
       end
-      it "should return the JSON loaded result" do
-        subject.cached('API_CLASS') { 'something' }.should == {'RESULT' => 'YAY'}
+      context "when loading json" do
+        before(:each) do
+          subject.should_receive(:key).with('API_CLASS', {}).and_return('KEY')
+          client.should_receive(:get).with('KEY').and_return "{\"RESULT\":\"YAY\"}"
+        end
+        it "should return the JSON loaded result" do
+          subject.cached('API_CLASS') { 'something' }.should == {'RESULT' => 'YAY'}
+        end
+      end
+      context "when loading plain" do
+        before(:each) do
+          subject.should_receive(:key).with('API_CLASS', {:plain => true}).and_return('KEY')
+        end
+        it "should return a String result in the right format" do
+          client.should_receive(:get).with('KEY').and_return "122.0"
+          subject.cached('API_CLASS', :plain => true) { 'something' }.should == "122.0"
+        end
+        it "should also return a String result in the right format when redis adds quotes and spaces" do
+          client.should_receive(:get).with('KEY').and_return "\"122.0\" "
+          subject.cached('API_CLASS', :plain => true) { 'something' }.should == "122.0"
+        end
       end
     end
     context "when no cached result exists" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exchange
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-15 00:00:00.000000000 Z
+date: 2012-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -235,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -901477728370743168
+      hash: -2237646329564279677
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: