google_currency_rails_cache 1.0.0 → 1.1.0

data/Rakefile

@@ -5,7 +5,7 @@ CLOBBER.include('.yardoc', 'doc')
 
 def gemspec
   @gemspec ||= begin
-    file = File.expand_path("../google_currency.gemspec", __FILE__)
+    file = File.expand_path("../google_currency_rails_cache.gemspec", __FILE__)
     eval(File.read(file), binding, file)
   end
 end

data/google_currency_rails_cache.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "google_currency_rails_cache"
-  s.version     = "1.0.0"
+  s.version     = "1.1.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Shane Emmons", "Alex Kremer"]
   s.email       = ["semmons99@gmail.com", "alex@flextrip.com"]

data/lib/money/bank/google_currency_rails_cache.rb

@@ -9,23 +9,21 @@ class Money
       SERVICE_HOST = "www.google.com"
       SERVICE_PATH = "/ig/calculator"
 
-      # @return [Hash] Stores the currently known rates.
-      attr_reader :rates
-
       ##
       # Clears all rates stored in @rates
       #
-      # @return [Hash] The empty @rates Hash.
-      #
       # @example
-      #   @bank = GoogleCurrency.new  #=> <Money::Bank::GoogleCurrency...>
+      #   @bank = GoogleCurrencyRailsCache.new  #=> <Money::Bank::GoogleCurrency...>
       #   @bank.get_rate(:USD, :EUR)  #=> 0.776337241
-      #   @bank.flush_rates           #=> {}
+      #   @bank.flush_rates           #=> nil
       def flush_rates
-        @rates.keys.each do |rate_key|
-          Rails.cache.delete "exchange_rate/#{rate_key}"
+        rates = Rails.cache.read("exchange_rate/all_rates")
+        unless rates.nil?
+          rates.each do |rate_key|
+            Rails.cache.delete "exchange_rate/#{rate_key}"
+          end
         end
-        @rates.clear
+        Rails.cache.delete("exchange_rate/all_rates")
       end
 
       ##
@@ -36,16 +34,16 @@ class Money
       # @param [String, Symbol, Currency] to Currency to convert to (used for
       #   key into @rates).
       #
-      # @return [Float] The flushed rate.
+      # @return [Boolean] Indicating successful removal.
       #
       # @example
-      #   @bank = GoogleCurrency.new    #=> <Money::Bank::GoogleCurrency...>
+      #   @bank = GoogleCurrencyRailsCache.new    #=> <Money::Bank::GoogleCurrency...>
       #   @bank.get_rate(:USD, :EUR)    #=> 0.776337241
       #   @bank.flush_rate(:USD, :EUR)  #=> 0.776337241
       def flush_rate(from, to)
         rate_key = rate_key_for(from, to)
-        Rails.cache.delete "exchange_rate/#{rate_key}"
-        @rates.delete(rate_key)
+        Rails.cache.delete("exchange_rate/#{rate_key}")
+        remove_from_stored_rates(rate_key)
       end
 
       ##
@@ -57,13 +55,22 @@ class Money
       # @return [Float] The requested rate.
       #
       # @example
-      #   @bank = GoogleCurrency.new  #=> <Money::Bank::GoogleCurrency...>
+      #   @bank = GoogleCurrencyRailsCache.new  #=> <Money::Bank::GoogleCurrency...>
       #   @bank.get_rate(:USD, :EUR)  #=> 0.776337241
       def get_rate(from, to)
-          @rates[rate_key_for(from, to)] ||= Rails.cache.fetch("exchange_rate/#{rate_key_for(from, to)}", :expires_in => 12.hours ) {
-            fetch_rate(from, to) 
+          Rails.cache.fetch("exchange_rate/#{rate_key_for(from, to)}", :expires_in => 12.hours ) {
+            fetch_rate(from, to)
           }
       end
+      
+      ##
+      # Lists all rates currency cached.
+      #
+      # @return [Array] An array of rates.
+      #
+      def cached_rates
+        Rails.cache.read("exchange_rate/all_rates")
+      end
 
       private
 
@@ -82,6 +89,7 @@ class Money
 
         error = data['error']
         raise UnknownRate unless error == '' || error == '0'
+        add_to_stored_rates(rate_key_for(from, to))
         decode_rate data['rhs']
       end
 
@@ -164,6 +172,36 @@ class Money
       def decode_basic_rate(rhs)
         BigDecimal(rhs.gsub(/[^\d\.]/, ''))
       end
+      
+      ##
+      # Removes the specified rate from the global list of stored rates
+      #
+      # @param [String] rate The rate to remove
+      #
+      # @return [Boolean]
+      def remove_from_stored_rates(rate)
+        rates = Rails.cache.read("exchange_rate/all_rates")
+        unless rates.nil?
+          rates.delete(rate)
+          Rails.cache.write("exchange_rate/all_rates", rates)
+        end
+      end
+      
+      ##
+      # Add the specified rate to the global list of stored rates
+      #
+      # @param [String] rate The rate to add
+      #
+      # @return [Boolean]
+      def add_to_stored_rates(rate)
+        rates = Rails.cache.read("exchange_rate/all_rates")
+        if rates.nil?
+          rates = []
+        end
+        rates << rate
+        Rails.cache.write("exchange_rate/all_rates", rates)
+      end      
+
     end
   end
 end

data/spec/google_currency_with_json_spec.rb

@@ -29,10 +29,10 @@ describe "GoogleCurrency" do
     it "should return the correct rate" do
       @bank.get_rate('USD', 'USD').should == 1.0
     end
-
+    
     it "should store the rate for faster retreival" do
       @bank.get_rate('USD', 'EUR')
-      @bank.rates.should include('USD_TO_EUR')
+      @bank.cached_rates.should include('USD_TO_EUR')
     end
 
     it "should handle complex rates" do
@@ -45,20 +45,32 @@ describe "GoogleCurrency" do
   end
 
   describe "#flush_rates" do
-    it "should empty @rates" do
+    it "should empty all rates" do
       @bank.get_rate('USD', 'EUR')
       @bank.flush_rates
-      @bank.rates.should == {}
+      @bank.cached_rates.should == nil
+      @bank.should_receive(:fetch_rate)
+      @bank.get_rate('USD', 'EUR')
+    end
+    
+    it "should handle flushing rates even if there are no rates" do
+      @bank.flush_rates
+      @bank.cached_rates.should == nil
     end
   end
 
   describe "#flush_rate" do
-    it "should remove a specific rate from @rates" do
+    it "should remove a specific rate from cache" do
       @bank.get_rate('USD', 'EUR')
       @bank.get_rate('USD', 'JPY')
+      @bank.flush_rate('USD', 'EUR').should == true
+      @bank.cached_rates.should include('USD_TO_JPY')
+      @bank.cached_rates.should_not include('USD_TO_EUR')
+    end
+    
+    it "should handle flushing a rate even if it was not previously stored" do
       @bank.flush_rate('USD', 'EUR')
-      @bank.rates.should include('USD_TO_JPY')
-      @bank.rates.should_not include('USD_TO_EUR')
+      @bank.cached_rates.should == nil
     end
   end
 end

data/spec/google_currency_with_yajl_spec.rb

@@ -32,7 +32,7 @@ describe "GoogleCurrency" do
 
     it "should store the rate for faster retreival" do
       @bank.get_rate('USD', 'EUR')
-      @bank.rates.should include('USD_TO_EUR')
+      @bank.cached_rates.should include('USD_TO_EUR')
     end
 
     it "should handle complex rates" do
@@ -47,7 +47,14 @@ describe "GoogleCurrency" do
     it "should empty @rates" do
       @bank.get_rate('USD', 'EUR')
       @bank.flush_rates
-      @bank.rates.should == {}
+      @bank.cached_rates.should == nil
+      @bank.should_receive(:fetch_rate)
+      @bank.get_rate('USD', 'EUR')
+    end
+    
+    it "should handle flushing rates even if there are no rates" do
+      @bank.flush_rates
+      @bank.cached_rates.should == nil
     end
   end
 
@@ -55,9 +62,14 @@ describe "GoogleCurrency" do
     it "should remove a specific rate from @rates" do
       @bank.get_rate('USD', 'EUR')
       @bank.get_rate('USD', 'JPY')
+      @bank.flush_rate('USD', 'EUR').should == true
+      @bank.cached_rates.should include('USD_TO_JPY')
+      @bank.cached_rates.should_not include('USD_TO_EUR')
+    end
+    
+    it "should handle flushing a rate even if it was not previously stored" do
       @bank.flush_rate('USD', 'EUR')
-      @bank.rates.should include('USD_TO_JPY')
-      @bank.rates.should_not include('USD_TO_EUR')
+      @bank.cached_rates.should == nil
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google_currency_rails_cache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec