redis-bank 0.1.2 → 0.1.4

data/README.md

@@ -15,6 +15,6 @@ Money.bank.add_rate("USD", "CAD", 1.24515)
 Money.bank.add_rate("CAD", "USD", 0.803115)
 Money.us_dollar(100).exchange_to("CAD") => Money.ca_dollar(124)
 Money.ca_dollar(100).exchange_to("USD") => Money.us_dollar(80)
-Money.bank.rates => {"EXCHANGE_RATE_USD_TO_CAD" => 1.24515,
-                     "EXCHANGE_RATE_CAD_TO_USD" => 0.803115}
+Money.bank.rates => {"usd_to_cad" => 1.24515,
+                     "cad_to_usd" => 0.803115}
 ```

data/lib/redis-bank.rb

@@ -1,12 +1,11 @@
 require 'money/bank/base'
+require 'active_support/core_ext'
 
 class Money
   module Bank
     # Thrown when an unknown rate format is requested.
     class UnknownRateFormat < StandardError; end
 
-    KEY='redis_bank_exchange_rates'
-
     # Class for aiding in exchanging money between different currencies. By
     # default, the +Money+ class uses an object of this class (accessible
     # through +Money#bank+) for performing currency exchanges.
@@ -25,15 +24,47 @@ class Money
     #   # Exchange 100 CAD to USD:
     #   bank.exchange_with(c2, "USD") #=> #<Money @cents=803115>
     class RedisBank < Base
+      KEY='redis_bank_exchange_rates'
 
       def initialize(redis_client, &block)
         super(&block)
         @redis_client = redis_client
       end
 
+      # This allows the user to define a method of obtaining exchange rates
+      # should they not exist in redis.
+      # Once the new set of rates is obtained, it is stored in redis if
+      # write_through is set to true.
+      #
+      # @example
+      #   bank = Money::Bank::RedisBank.new redis_client
+      #   bank.set_fallback(true) { {"gbp_to_aud" => rand, "jpy_to_aud" => rand} }
+      #   bank.rates # => {"gbp_to_aud"=>"1.75", "jpy_to_aud"=>"0.002"}
+      #   redis_client.del "redis_bank_exchange_rates" # Oops!
+      #   bank.rates # => {"gbp_to_aud"=>"0.861522064707917",
+      #                    "jpy_to_aud"=>"0.552042440462882"}
+      #
+      def set_fallback(write_through, &block)
+        @write_through = write_through
+        @fallback = block
+      end
+
       # hash of exchange rates
       def rates
-        @redis_client.hgetall KEY
+        begin
+          rates = @redis_client.hgetall KEY
+          if rates.blank? && @fallback
+            rates = @fallback.call
+            @redis_client.mapped_hmset KEY, rates if @write_through
+          end
+          rates
+        rescue
+          if @fallback
+            @fallback.call
+          else
+            raise
+          end
+        end
       end
 
       # Exchanges the given +Money+ object to a new +Money+ object in
@@ -103,11 +134,10 @@ class Money
       #   bank.add_rate("USD", "CAD", 1.24515)
       #   bank.add_rate("CAD", "USD", 0.803115)
       def add_rate(from, to, rate)
-        set_rate(from, to, rate)
+        set_rate from, to, rate
       end
 
-      # Set the rate for the given currencies. Uses +Mutex+ to synchronize data
-      # access.
+      # Set the rate for the given currencies.
       #
       # @param [Currency, String, Symbol] from Currency to exchange from.
       # @param [Currency, String, Symbol] to Currency to exchange to.
@@ -122,9 +152,6 @@ class Money
       def set_rate(from, to, rate)
         @redis_client.hset KEY, rate_key_for(from, to), rate
       end
-
-      # Retrieve the rate for the given currencies. Uses +Mutex+ to synchronize
-      # data access.
       #
       # @param [Currency, String, Symbol] from Currency to exchange from.
       # @param [Currency, String, Symbol] to Currency to exchange to.
@@ -139,7 +166,25 @@ class Money
       #   bank.get_rate("USD", "CAD") #=> 1.24515
       #   bank.get_rate("CAD", "USD") #=> 0.803115
       def get_rate(from, to)
-        @redis_client.hget KEY, rate_key_for(from, to)
+        from = from.downcase.strip if from.is_a? String
+        to = to.downcase.strip if to.is_a? String
+        return 1 if from == to
+        begin
+          rate = @redis_client.hget KEY, rate_key_for(from, to)
+          if rate.blank? && @fallback
+            rates = @fallback.call
+            rate = rates[rate_key_for(from, to)]
+            @redis_client.mapped_hmset KEY, rates if @write_through
+          end
+          rate
+        rescue
+          if @fallback
+            rates = @fallback.call
+            rate = rates[rate_key_for(from, to)]
+          else
+            raise
+          end
+        end
       end
 
       # Return the rate hashkey for the given currencies.
@@ -150,7 +195,7 @@ class Money
       # @return [String]
       #
       # @example
-      #   rate_key_for("USD", "CAD") #=> "exchange_rate_usd_to_cad"
+      #   rate_key_for("USD", "CAD") #=> "usd_to_cad"
       def rate_key_for(from, to)
         "#{Currency.wrap(from).iso_code}_to_#{Currency.wrap(to).iso_code}".downcase
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redis-bank
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Cameron Walsh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-20 00:00:00 Z
+date: 2012-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: money
@@ -32,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: money
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,10 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: money
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,7 +60,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,7 +74,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,7 +88,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: simplecov
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,7 +102,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: yard
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -115,6 +115,34 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: redis
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: Redis-backed Bank for the Money gem based on the VariableExchange Bank
 email: cameron.walsh@gmail.com
 executables: []
@@ -163,4 +191,3 @@ specification_version: 3
 summary: Redis-backed Bank for the Money gem
 test_files: []
 
-has_rdoc: yard