persistent_settings 1.1.1 → 1.2.0

data/lib/persistent_settings/version.rb

@@ -1,3 +1,3 @@
 module PersistentSettings
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/lib/settings.rb

@@ -1,5 +1,6 @@
 class Settings < ActiveRecord::Base
   include ::PersistentSettings
+  @mutex = Mutex.new
 
   serialize :value
 
@@ -17,12 +18,19 @@ class Settings < ActiveRecord::Base
 
     (class << self; self; end).instance_eval do
       define_method method_name do |value|
-        persist(getter, value)
-        instance_variable_set(:"@#{getter}", value)
+        @mutex.synchronize do
+          persist(getter, value)
+          write_to_cache getter, value
+        end
       end
 
       define_method getter do
-        instance_variable_get(:"@#{getter}")
+        value = read_from_cache getter
+        unless value
+          value = read_from_persistance getter
+          write_to_cache getter, value
+        end
+        value
       end
     end
   end
@@ -46,10 +54,26 @@ class Settings < ActiveRecord::Base
     end
   end
 
+  def self.read_from_persistance(key)
+    Settings.find_by_var(key).value
+  end
+
   def self.load_from_persistance
     load_from_persistance! if ready?
   end
 
+  def self.cache_key_for(key)
+    "settings/#{key}"
+  end
+
+  def self.write_to_cache(key, value)
+    ::Rails.cache.write(cache_key_for(key), value)
+  end
+
+  def self.read_from_cache(key)
+    ::Rails.cache.fetch(cache_key_for(key))
+  end
+
   def self.ready?
     connected? && table_exists?
   end

data/spec/lib/settings_spec.rb

@@ -16,13 +16,50 @@ describe Settings do
   end
 
   describe :define_setter_and_getter do
-    it "creates the setter and getter methods" do
+    before do
       Settings.define_setter_and_getter(:method_name=)
+    end
+
+    it "creates the setter and getter methods" do
       Settings.should respond_to(:method_name=)
       Settings.should respond_to(:method_name)
-      Settings.should_receive(:persist)
-      Settings.method_name = 'value'
-      Settings.method_name.should == 'value'
+    end
+
+    context :getter_method do
+      context "value is persisted on cache" do
+        before do
+          Settings.should_receive(:read_from_cache).with('method_name').
+              and_return('value from cache')
+        end
+
+        it "reads and returns value from cache" do
+          Settings.method_name.should == 'value from cache'
+        end
+      end
+
+      context "value is not persisted on cache" do
+        before do
+          Settings.should_receive(:read_from_cache).with('method_name')
+        end
+
+        it "reads and returns value from persistance, then saves to cache" do
+          Settings.should_receive(:read_from_persistance).with('method_name').
+              and_return 'value from persistance'
+
+          Settings.should_receive(:write_to_cache).
+              with('method_name', 'value from persistance')
+
+          Settings.method_name.should == 'value from persistance'
+        end
+      end
+    end
+
+    context :setter_method do
+      it "persists and writes to cache the key/value" do
+        Settings.should_receive(:persist).with('method_name', 'value')
+        Settings.should_receive(:write_to_cache).with('method_name', 'value')
+        Settings.method_name = 'value'
+      end
     end
   end
 
@@ -48,6 +85,44 @@ describe Settings do
     end
   end
 
+  describe :read_from_persistance do
+    it "reads the value from persistance" do
+      object = Settings.new :var => 'foo', :value => 'bar'
+      Settings.should_receive(:find_by_var).with('foo').and_return(object)
+
+      Settings.read_from_persistance('foo').should eq 'bar'
+    end
+  end
+
+  describe :cache_key_for do
+    it "returns the name for the rails cache key" do
+      Settings.cache_key_for('foo').should eq('settings/foo')
+    end
+  end
+
+  context "cache" do
+    let(:cache) { mock }
+
+    before do
+      Rails.should_receive(:cache).and_return cache
+      Settings.stub(:cache_key_for).with('foo').and_return 'settings/foo'
+    end
+
+    describe :write_to_cache do
+      it "writes the key, value to Rails cache" do
+        cache.should_receive(:write).with('settings/foo', 'bar')
+        Settings.write_to_cache('foo', 'bar')
+      end
+    end
+
+    describe :read_from_cache do
+      it "reads the value from Rails cache" do
+        cache.should_receive(:fetch).with('settings/foo')
+        Settings.read_from_cache('foo')
+      end
+    end
+  end
+
   describe :method_missing do
     context "A method ending with =" do
       it "calls define_setter_and_getter" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: persistent_settings
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2798642706016126182
+      hash: 4009893083530099684
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2798642706016126182
+      hash: 4009893083530099684
 requirements: []
 rubyforge_project: persistent_settings
 rubygems_version: 1.8.23