money_persistent_bank 0.1.0 → 0.2.0.alpha

data/Readme.md

@@ -8,7 +8,7 @@ This can be useful in a Rails application. You fetch rates from external source
 
 Add it to your gemfile:
 
-    gem "persistent_bank", "~> 0.1.0"
+    gem "money_persistent_bank", "~> 0.1.0"
 
 Now you can use it in a rake task.
 

data/lib/money/bank/persistent_bank.rb

@@ -3,54 +3,28 @@ require "money/bank/variable_exchange"
 class Money
   module Bank
     class PersistentBank < VariableExchange
+      attr_reader :storage
 
-      class << self
-        attr_accessor :default_storage
+      def initialize storage, key = 'persistent_bank/rates', format = :yaml
+        super()
+        @storage = storage
+        @storage_key = key
+        @storage_format = format
       end
 
-      attr_accessor :storage
-
-      RATE_FORMAT = :yaml
-      CACHE_KEY = 'persistent_bank/rates'
-
-      # Inherited .instance returns VariableExchange for some reason
-      def self.instance
-        @@pb_singleton ||= new
-      end
-
-      def setup
-        super
-        @storage = self.class.default_storage
-        self
+      def export_rates
+        storage.write(@storage_key, super(@storage_format))
       end
 
-      def update_rates
-        previous_cache = @rates_cache
-        @rates_cache = storage.read(CACHE_KEY)
-        return if previous_cache == @rates_cache # Do not reload rates if cache wasn't changed
+      def import_rates
         rates.clear
-        import_rates(RATE_FORMAT, @rates_cache) if @rates_cache
-      end
-
-      def get_rate(*)
-        update_rates
-        super
+        cache = storage.read(@storage_key)
+        super(@storage_format, cache) if cache
       end
 
-      def rates(*)
-        update_rates
-        super
+      def clear
+        storage.delete(@storage_key)
       end
-
-      def save
-        storage.write(CACHE_KEY, export_rates(RATE_FORMAT))
-      end
-      alias_method :save!, :save
-
-      def destroy
-        storage.delete(CACHE_KEY)
-      end
-
     end
   end
 end

data/lib/money_persistent_bank/railtie.rb

@@ -1,16 +1,28 @@
+require "rails/railtie"
+
 module MoneyPersistentBank
   class Railtie < Rails::Railtie
-
-    initializer "money_persistent_bank.default_storage" do
+    initializer "money_persistent_bank" do |app|
+      require "money"
       require "money/bank/persistent_bank"
-      Money::Bank::PersistentBank.default_storage = Rails.cache
+      tmp = app.paths['tmp'].first
+      cache = ActiveSupport::Cache::FileStore.new("#{tmp}/money_persistent_bank")
+      bank = Money::Bank::PersistentBank.new(cache)
+      Money.default_bank = bank
+      app.config.middleware.use Synchronization, bank
     end
+  end
 
-    initializer "money_persistent_bank.make_default" do
-      require "money"
-      require "money/bank/persistent_bank"
-      Money.default_bank = Money::Bank::PersistentBank.instance
+  # Updates rates from the cache on each request
+  class Synchronization
+    def initialize app, bank = Money.default_bank
+      @app = app
+      @bank = bank
     end
 
+    def call env
+      @bank.import_rates
+      @app.call env
+    end
   end
 end

data/lib/money_persistent_bank/version.rb

@@ -1,3 +1,3 @@
 module MoneyPersistentBank
-  VERSION = "0.1.0"
+  VERSION = "0.2.0.alpha"
 end

data/lib/money_persistent_bank.rb

@@ -1,2 +1 @@
-require "money/bank/persistent_bank"
-require "money_persistent_bank/railtie" if defined? Rails
+require "money_persistent_bank/railtie"

data/test/persistent_bank_test.rb

@@ -6,51 +6,33 @@ $:.unshift(File.expand_path('../../lib', __FILE__))
 require "money_persistent_bank"
 require "active_support/cache"
 
-STORAGE = ActiveSupport::Cache::MemoryStore.new
-Money::Bank::PersistentBank.default_storage = STORAGE
-
 class PersistentBankTest < MiniTest::Unit::TestCase
   include Money::Bank
 
-  def test_instance
-    assert_equal PersistentBank, PersistentBank.instance.class
-  end
-
   def setup
-    STORAGE.clear
+    @storage = ActiveSupport::Cache::MemoryStore.new
+    @writer = PersistentBank.new(@storage)
+    @reader = PersistentBank.new(@storage)
   end
 
   def test_persistance
-    pb = PersistentBank.new
-    pb.add_rate('USD', 'AZN', 123)
-
-    assert_nil PersistentBank.new.get_rate('USD', 'AZN')
-
-    pb.save
-    assert_equal 123, PersistentBank.new.get_rate('USD', 'AZN')
+    @writer.add_rate('USD', 'AZN', 123)
+    @writer.export_rates
+    assert_nil @reader.get_rate('USD', 'AZN')
+    @reader.import_rates
+    assert_equal 123, @reader.get_rate('USD', 'AZN')
   end
 
-  def test_destroy
-    PersistentBank.instance.add_rate('USD', 'AZN', 123)
-    PersistentBank.instance.save
-
-    refute_nil PersistentBank.instance.get_rate('USD', 'AZN')
-    refute_nil PersistentBank.new.get_rate('USD', 'AZN')
-    PersistentBank.instance.destroy
+  def test_clear
+    @writer.add_rate('USD', 'AZN', 123)
+    @writer.export_rates
 
-    assert_nil PersistentBank.instance.get_rate('USD', 'AZN')
-    assert_nil PersistentBank.new.get_rate('USD', 'AZN')
-  end
+    @reader.import_rates
+    refute_nil @reader.get_rate('USD', 'AZN')
 
-  def test_updating_rates
-    assert_nil PersistentBank.instance.get_rate('USD', 'AZN')
-    PersistentBank.new.tap{|b| b.add_rate('USD', 'AZN', 123)}.save
-    assert_equal 123, PersistentBank.instance.get_rate('USD', 'AZN')
-  end
+    @writer.clear
 
-  def test_rates_also_trigger_update
-    assert_nil PersistentBank.instance.get_rate('USD', 'AZN')
-    PersistentBank.new.tap{|b| b.add_rate('USD', 'AZN', 123)}.save
-    assert_equal({ "USD_TO_AZN" => 123 }, PersistentBank.instance.rates)
+    @reader.import_rates
+    assert_nil @reader.get_rate('USD', 'AZN')
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: money_persistent_bank
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0.alpha
+  prerelease: 6
 platform: ruby
 authors:
 - Semyon Perepelitsa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -76,9 +76,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: money_persistent_bank
 rubygems_version: 1.8.23