persistent_settings 1.2.0 → 1.3.0

data/.autotest

@@ -0,0 +1,5 @@
+require "autotest/growl"
+
+Autotest.add_hook :initialize do |at|
+  at.add_exception %w{test.log .git}
+end

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 tmp/
+test.log

data/.rspec

@@ -1,2 +1,2 @@
--fd
+-fp
 -c

data/README.md

@@ -16,24 +16,25 @@ Install
 
     bundle install
 
-Create the migrations
+Use the generator to create a Config class, or whatever you want to call it, that
+will include all the Persistent Settings functionality.
 
-    rails g persistent_settings:migration
+    rails g persistent_settings:create config
 
-Run those migrations
+Run migrations
 
     rake db:migrate
 
 ## Usage
 
-The gem adds a new class called Settings. It will automatically create new
+Assuming that your Persistent Settings class is named Config, it will automatically create new
 keys as you assign a value to them.
 
-    Settings.a_key = 'value'
+    Config.a_key = 'value'
 
 Reload your app:
 
-    Settings.a_key # => 'value'
+    Config.a_key # => 'value'
 
 It accepts all kinds of objects as the value
 

data/config/cucumber.yml

@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip

data/features/support/env.rb

@@ -1,6 +1,9 @@
 require 'rails'
 require 'persistent_settings'
+require 'logger'
 
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.logger = Logger.new("test.log")
 ::ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ::ActiveRecord::Schema.define(:version => 1) do
   create_table :settings do |t|
@@ -8,3 +11,11 @@ require 'persistent_settings'
     t.column :value, :string
   end
 end
+
+module Rails
+  RAILS_CACHE = ActiveSupport::Cache::MemoryStore.new
+end
+
+class Settings < ActiveRecord::Base
+  include Persistent::Settings
+end

data/lib/generators/persistent_settings/create_generator.rb

@@ -0,0 +1,28 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module PersistentSettings
+  class CreateGenerator < ::Rails::Generators::Base
+    include ::Rails::Generators::Migration
+
+    argument :class_name, :type => :string
+    argument :verbose, :type => :numeric, :default => 1
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    def create_model
+      @klass_name = class_name.classify
+      template 'model.rb.erb', "models/#{class_name}.rb", :verbose => (verbose == 1)
+    end
+
+    def create_migration
+      @table_name = class_name.pluralize.gsub("/", "_")
+      @migration_class = @table_name.camelize
+      migration_template "create_table.rb.erb", "db/migrate/create_#{@table_name}_table.rb", :verbose => (verbose == 1)
+    end
+
+    def self.next_migration_number(path)
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    end
+  end
+end

data/lib/generators/persistent_settings/templates/create_table.rb.erb

@@ -0,0 +1,8 @@
+class Create<%= @migration_class %>Table < ActiveRecord::Migration
+  def change
+    create_table :<%= @table_name %> do |t|
+      t.string :var
+      t.string :value
+    end
+  end
+end

data/lib/generators/persistent_settings/templates/model.rb.erb

@@ -0,0 +1,4 @@
+class <%= @klass_name %> < ActiveRecord::Base
+  include Persistent::Settings
+
+end

data/lib/persistent/settings/caching.rb

@@ -0,0 +1,17 @@
+module Persistent
+  module Settings
+    module Caching
+      def cache_key_for(key)
+        "settings/#{key}"
+      end
+
+      def write_to_cache(key, value)
+        ::Rails.cache.write(cache_key_for(key), value)
+      end
+
+      def read_from_cache(key)
+        ::Rails.cache.fetch(cache_key_for(key))
+      end
+    end
+  end
+end

data/lib/persistent/settings/persistance.rb

@@ -0,0 +1,29 @@
+module Persistent
+  module Settings
+    module Persistance
+      def load_from_persistance!
+        self.all.each do |setting|
+          self.send("#{setting.var}=", setting.value)
+        end
+      end
+
+      def load_from_persistance
+        load_from_persistance! if ready?
+      end
+
+      def persist(getter, value)
+        setting = self.where(:var => getter).last
+        if setting
+          setting.update_attribute(:value, value)
+        else
+          self.create(:var => getter, :value => value)
+        end
+      end
+
+      def read_from_persistance(key)
+        self.find_by_var(key).value
+      end
+
+    end
+  end
+end

data/lib/persistent/settings.rb

@@ -0,0 +1,72 @@
+module Persistent
+  module Settings
+    include ActiveModel::Serialization
+
+    def self.included(base)
+      base.send :extend, Persistent::Settings::ClassMethods
+      base.send :extend, Persistent::Settings::Caching
+      base.send :extend, Persistent::Settings::Persistance
+      base.send :serialize, :value
+    end
+
+    module ClassMethods
+      @@mutex = Mutex.new
+      @@accessors = []
+
+      def method_missing(method_name, *args)
+        if assignation?(method_name)
+          self.define_setter_and_getter(method_name)
+          self.send(method_name, args.first)
+        elsif accessors.include?(method_name)
+          nil
+        else
+          super
+        end
+      end
+
+      def define_setter_and_getter(method_name)
+        getter = method_name.to_s.chop
+
+        (class << self; self; end).instance_eval do
+          define_method method_name do |value|
+            @@mutex.synchronize do
+              persist(getter, value)
+              write_to_cache getter, value
+            end
+          end
+
+          define_method getter do
+            value = read_from_cache getter
+            unless value
+              value = read_from_persistance getter
+              write_to_cache getter, value
+            end
+            value
+          end
+        end
+      end
+
+      def assignation?(method_name)
+        method_name.to_s.match(/=$/)
+      end
+
+      def ready?
+        connected? && table_exists?
+      end
+
+      def keys
+        self.select(:var).collect { |s| s.var.to_sym }
+      end
+
+      def accessors
+        @@accessors
+      end
+
+      private
+      def attr_accessor(*args)
+        @@accessors << args[0]
+        super(*args)
+      end
+    end
+  end
+end

data/lib/persistent_settings/version.rb

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

data/lib/persistent_settings.rb

@@ -2,9 +2,16 @@ require "rails/version"
 require "rails/engine"
 require "active_record"
 require "persistent_settings/version"
-require "settings"
 
-unless Rails::VERSION::STRING < "3.1"
-  require "persistent_settings/rails/engine"
-  require "generators/persistent_settings/migration_generator"
+require "persistent_settings/rails/engine"
+require "generators/persistent_settings/create_generator"
+
+module Persistent
+  autoload :Settings, 'persistent/settings'
+  module Settings
+    autoload :Caching, 'persistent/settings/caching'
+    autoload :Persistance, 'persistent/settings/persistance'
+  end
 end
+
+module PersistentSettings ; end

data/persistent_settings.gemspec

@@ -20,6 +20,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'railties', '~> 3.0'
   s.add_dependency 'activerecord', '~> 3.0'
+  s.add_development_dependency "autotest"
+  s.add_development_dependency "autotest-growl"
   s.add_development_dependency "cucumber" , "~> 1.1.4"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"    , "~> 2.7.0"

data/spec/generators/persistent_settings/create_generator_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe PersistentSettings::CreateGenerator do
+  let(:destination) { 'tmp'}
+
+  let(:model_path) do
+    File.join(destination, 'models', 'module/config.rb')
+  end
+
+  let(:migration_path) do
+    File.join(destination, 'db', 'migrate', 'YYYYMMDDHHMM_create_module_configs_table.rb')
+  end
+
+  before do
+    File.unlink(model_path) if File.exists?(model_path)
+    File.unlink(migration_path) if File.exists?(migration_path)
+    PersistentSettings::CreateGenerator.stub(:next_migration_number).
+        and_return('YYYYMMDDHHMM')
+    PersistentSettings::CreateGenerator.start(['module/config', 0], :destination_root => destination)
+  end
+
+  it "creates the model file" do
+    File.exists?(model_path).should be_true
+    File.read(model_path).should match /Module::Config/
+  end
+
+  it "creates the migration file" do
+    File.exists?(migration_path).should be_true
+    file = File.read(migration_path)
+    file.should match /CreateModuleConfigs/
+    file.should match /create_table :module_configs/
+  end
+end

data/spec/lib/persistent/settings.rb

@@ -0,0 +1,241 @@
+require 'spec_helper'
+
+describe Settings do
+  describe :assignation? do
+    context "the method name ends with =" do
+      it "returns true" do
+        Settings.assignation?("method=").should be_true
+      end
+    end
+
+    context "the method name does not end with =" do
+      it "returns false" do
+        Settings.assignation?("method").should be_false
+      end
+    end
+  end
+
+  describe :define_setter_and_getter 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)
+    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
+
+  describe :persist do
+    context "a value already persisted" do
+      before :each do
+        @setting = mock(Settings)
+        Settings.stub_chain(:where, :last).and_return(@setting)
+      end
+
+      it "updates the setting" do
+        @setting.should_receive(:update_attribute).with(:value, :new_value)
+        Settings.persist('some_method', :new_value)
+      end
+    end
+
+    context "a value that is not persisted" do
+      it "creates the setting" do
+        Settings.stub_chain(:where, :last).and_return(nil)
+        Settings.should_receive(:create).with(:var => 'new_method', :value => 'value')
+        Settings.persist('new_method', 'value')
+      end
+    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
+        Settings.should_receive(:define_setter_and_getter).with(:new_method=)
+        Settings.should_receive(:new_method=).with('value')
+        Settings.method_missing(:new_method=, 'value')
+      end
+    end
+
+    context "method that does not end with =" do
+      context "already persisted" do
+        before :each do
+          @setting = mock(Settings, :var => 'persisted_method', :value => 'some value')
+          Settings.stub(:all).and_return([@setting])
+        end
+
+        it "pulls the value from the database and creates its setter and getter" do
+          Settings.should_receive(:persisted_method=).with('some value')
+          Settings.load_from_persistance!
+        end
+      end
+
+      context "not persisited" do
+        it "blows up" do
+          lambda {
+            Settings.just_a_method
+          }.should raise_error(NoMethodError)
+        end
+      end
+    end
+  end
+
+  describe :keys do
+    let(:settings) do
+      [ mock(:var => 'a_key'), mock(:var => 'another_key') ]
+    end
+
+    before do
+      Settings.should_receive(:select).with(:var).and_return(settings)
+    end
+
+    subject { Settings.keys }
+
+    specify { should include(:a_key) }
+    specify { should include(:another_key) }
+  end
+
+  describe :load_from_persistance! do
+    it "loads all settings from persistance and sets it up" do
+      settings = [ Settings.new(:var => 'foo', :value => 'bar') ]
+      Settings.should_receive(:all).and_return(settings)
+      Settings.should_receive("foo=").with('bar')
+
+      Settings.load_from_persistance!
+    end
+  end
+
+  describe :load_from_persistance do
+    context "is ready" do
+      before do
+        Settings.stub(:ready?).and_return true
+      end
+
+      it "calls load_from_persistance!" do
+        Settings.should_receive(:load_from_persistance!)
+        Settings.load_from_persistance
+      end
+    end
+
+    context "not ready" do
+      before do
+        Settings.stub(:ready?).and_return false
+      end
+
+      it "calls load_from_persistance!" do
+        Settings.should_not_receive(:load_from_persistance!)
+        Settings.load_from_persistance
+      end
+    end
+  end
+
+  describe :ready? do
+    context "AR is connected and table is created" do
+      before do
+        Settings.stub(:connected?).and_return true
+        Settings.stub(:table_exists?).and_return true
+      end
+
+      it "is true" do
+        Settings.ready?.should be_true
+      end
+    end
+
+    context "AR is not connected" do
+      before do
+        Settings.stub(:connected?).and_return false
+        Settings.stub(:table_exists?).and_return true
+      end
+
+      it "is false" do
+        Settings.ready?.should be_false
+      end
+    end
+
+    context "table is not created" do
+      before do
+        Settings.stub(:connected?).and_return false
+        Settings.stub(:table_exists?).and_return false
+      end
+
+      it "is false" do
+        Settings.ready?.should be_false
+      end
+    end
+  end
+end

data/spec/lib/settings_spec.rb

@@ -1,64 +1,70 @@
 require 'spec_helper'
 
-describe Settings do
+describe Persistent::Settings do
+  before do
+    klass = Class.new ActiveRecord::Base
+    suppress_warnings { ::Config = klass }
+    ::Config.send :include, Persistent::Settings
+  end
+
   describe :assignation? do
     context "the method name ends with =" do
       it "returns true" do
-        Settings.assignation?("method=").should be_true
+        Config.assignation?("method=").should be_true
       end
     end
 
     context "the method name does not end with =" do
       it "returns false" do
-        Settings.assignation?("method").should be_false
+        Config.assignation?("method").should be_false
       end
     end
   end
 
   describe :define_setter_and_getter do
     before do
-      Settings.define_setter_and_getter(:method_name=)
+      Config.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)
+      Config.should respond_to(:method_name=)
+      Config.should respond_to(:method_name)
     end
 
     context :getter_method do
       context "value is persisted on cache" do
         before do
-          Settings.should_receive(:read_from_cache).with('method_name').
+          Config.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'
+          Config.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')
+          Config.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').
+          Config.should_receive(:read_from_persistance).with('method_name').
               and_return 'value from persistance'
 
-          Settings.should_receive(:write_to_cache).
+          Config.should_receive(:write_to_cache).
               with('method_name', 'value from persistance')
 
-          Settings.method_name.should == 'value from persistance'
+          Config.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'
+        Config.should_receive(:persist).with('method_name', 'value')
+        Config.should_receive(:write_to_cache).with('method_name', 'value')
+        Config.method_name = 'value'
       end
     end
   end
@@ -66,37 +72,37 @@ describe Settings do
   describe :persist do
     context "a value already persisted" do
       before :each do
-        @setting = mock(Settings)
-        Settings.stub_chain(:where, :last).and_return(@setting)
+        @setting = mock(Config)
+        Config.stub_chain(:where, :last).and_return(@setting)
       end
 
       it "updates the setting" do
         @setting.should_receive(:update_attribute).with(:value, :new_value)
-        Settings.persist('some_method', :new_value)
+        Config.persist('some_method', :new_value)
       end
     end
 
     context "a value that is not persisted" do
       it "creates the setting" do
-        Settings.stub_chain(:where, :last).and_return(nil)
-        Settings.should_receive(:create).with(:var => 'new_method', :value => 'value')
-        Settings.persist('new_method', 'value')
+        Config.stub_chain(:where, :last).and_return(nil)
+        Config.should_receive(:create).with(:var => 'new_method', :value => 'value')
+        Config.persist('new_method', 'value')
       end
     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)
+      object = Config.new :var => 'foo', :value => 'bar'
+      Config.should_receive(:find_by_var).with('foo').and_return(object)
 
-      Settings.read_from_persistance('foo').should eq 'bar'
+      Config.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')
+      Config.cache_key_for('foo').should eq('settings/foo')
     end
   end
 
@@ -105,20 +111,20 @@ describe Settings do
 
     before do
       Rails.should_receive(:cache).and_return cache
-      Settings.stub(:cache_key_for).with('foo').and_return 'settings/foo'
+      Config.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')
+        Config.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')
+        Config.read_from_cache('foo')
       end
     end
   end
@@ -126,33 +132,40 @@ describe Settings do
   describe :method_missing do
     context "A method ending with =" do
       it "calls define_setter_and_getter" do
-        Settings.should_receive(:define_setter_and_getter).with(:new_method=)
-        Settings.should_receive(:new_method=).with('value')
-        Settings.method_missing(:new_method=, 'value')
+        Config.should_receive(:define_setter_and_getter).with(:new_method=)
+        Config.should_receive(:new_method=).with('value')
+        Config.method_missing(:new_method=, 'value')
       end
     end
 
     context "method that does not end with =" do
       context "already persisted" do
         before :each do
-          @setting = mock(Settings, :var => 'persisted_method', :value => 'some value')
-          Settings.stub(:all).and_return([@setting])
+          @setting = mock(Config, :var => 'persisted_method', :value => 'some value')
+          Config.stub(:all).and_return([@setting])
         end
 
         it "pulls the value from the database and creates its setter and getter" do
-          Settings.should_receive(:persisted_method=).with('some value')
-          Settings.load_from_persistance!
+          Config.should_receive(:persisted_method=).with('some value')
+          Config.load_from_persistance!
         end
       end
 
       context "not persisited" do
         it "blows up" do
           lambda {
-            Settings.just_a_method
+            Config.just_a_method
           }.should raise_error(NoMethodError)
         end
       end
     end
+
+    context "method that does not exist but is an accessor" do
+      it "returns nil" do
+        Config.send(:attr_accessor, :bananas)
+        Config.bananas.should be_nil
+      end
+    end
   end
 
   describe :keys do
@@ -161,10 +174,10 @@ describe Settings do
     end
 
     before do
-      Settings.should_receive(:select).with(:var).and_return(settings)
+      Config.should_receive(:select).with(:var).and_return(settings)
     end
 
-    subject { Settings.keys }
+    subject { Config.keys }
 
     specify { should include(:a_key) }
     specify { should include(:another_key) }
@@ -172,34 +185,34 @@ describe Settings do
 
   describe :load_from_persistance! do
     it "loads all settings from persistance and sets it up" do
-      settings = [ Settings.new(:var => 'foo', :value => 'bar') ]
-      Settings.should_receive(:all).and_return(settings)
-      Settings.should_receive("foo=").with('bar')
+      settings = [ Config.new(:var => 'foo', :value => 'bar') ]
+      Config.should_receive(:all).and_return(settings)
+      Config.should_receive("foo=").with('bar')
 
-      Settings.load_from_persistance!
+      Config.load_from_persistance!
     end
   end
 
   describe :load_from_persistance do
     context "is ready" do
       before do
-        Settings.stub(:ready?).and_return true
+        Config.stub(:ready?).and_return true
       end
 
       it "calls load_from_persistance!" do
-        Settings.should_receive(:load_from_persistance!)
-        Settings.load_from_persistance
+        Config.should_receive(:load_from_persistance!)
+        Config.load_from_persistance
       end
     end
 
     context "not ready" do
       before do
-        Settings.stub(:ready?).and_return false
+        Config.stub(:ready?).and_return false
       end
 
       it "calls load_from_persistance!" do
-        Settings.should_not_receive(:load_from_persistance!)
-        Settings.load_from_persistance
+        Config.should_not_receive(:load_from_persistance!)
+        Config.load_from_persistance
       end
     end
   end
@@ -207,35 +220,42 @@ describe Settings do
   describe :ready? do
     context "AR is connected and table is created" do
       before do
-        Settings.stub(:connected?).and_return true
-        Settings.stub(:table_exists?).and_return true
+        Config.stub(:connected?).and_return true
+        Config.stub(:table_exists?).and_return true
       end
 
       it "is true" do
-        Settings.ready?.should be_true
+        Config.ready?.should be_true
       end
     end
 
     context "AR is not connected" do
       before do
-        Settings.stub(:connected?).and_return false
-        Settings.stub(:table_exists?).and_return true
+        Config.stub(:connected?).and_return false
+        Config.stub(:table_exists?).and_return true
       end
 
       it "is false" do
-        Settings.ready?.should be_false
+        Config.ready?.should be_false
       end
     end
 
     context "table is not created" do
       before do
-        Settings.stub(:connected?).and_return false
-        Settings.stub(:table_exists?).and_return false
+        Config.stub(:connected?).and_return false
+        Config.stub(:table_exists?).and_return false
       end
 
       it "is false" do
-        Settings.ready?.should be_false
+        Config.ready?.should be_false
       end
     end
   end
+
+  describe :accessors do
+    it "returns accessors" do
+      Config.send(:attr_accessor, :access_key)
+      Config.accessors.should include(:access_key)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,19 @@
 require 'persistent_settings'
+require 'logger'
 
+ActiveRecord::Migration.verbose = false
+ActiveRecord::Base.logger = Logger.new("test.log")
 ::ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
+Dir["./spec/support/**/*.rb"].each {|f| require f}
+
 ::ActiveRecord::Schema.define(:version => 1) do
-  create_table "settings", :force => true do |t|
+  create_table "configs", :force => true do |t|
     t.string "var"
     t.string "value"
   end
 end
+
+#class Settings < ActiveRecord::Base
+  #include Persistent::Settings
+#end

data/spec/support/warnings_helper.rb

@@ -0,0 +1,9 @@
+module Kernel
+  def suppress_warnings
+    original_verbosity = $VERBOSE
+    $VERBOSE = nil
+    result = yield
+    $VERBOSE = original_verbosity
+    return result
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: persistent_settings
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -43,6 +43,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: autotest-growl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -114,25 +146,32 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .autotest
 - .gitignore
 - .rspec
 - .travis.yml
 - Gemfile
 - README.md
 - Rakefile
+- config/cucumber.yml
 - features/settings.feature
 - features/step_definitions/settings_steps.rb
 - features/support/env.rb
-- lib/generators/persistent_settings/migration_generator.rb
-- lib/generators/persistent_settings/templates/create_settings_table.rb
+- lib/generators/persistent_settings/create_generator.rb
+- lib/generators/persistent_settings/templates/create_table.rb.erb
+- lib/generators/persistent_settings/templates/model.rb.erb
+- lib/persistent/settings.rb
+- lib/persistent/settings/caching.rb
+- lib/persistent/settings/persistance.rb
 - lib/persistent_settings.rb
 - lib/persistent_settings/rails/engine.rb
 - lib/persistent_settings/version.rb
-- lib/settings.rb
 - persistent_settings.gemspec
-- spec/generators/persistent_settings/migration_generator_spec.rb
+- spec/generators/persistent_settings/create_generator_spec.rb
+- spec/lib/persistent/settings.rb
 - spec/lib/settings_spec.rb
 - spec/spec_helper.rb
+- spec/support/warnings_helper.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -147,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4009893083530099684
+      hash: 3906203279350267935
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4009893083530099684
+      hash: 3906203279350267935
 requirements: []
 rubyforge_project: persistent_settings
 rubygems_version: 1.8.23
@@ -167,6 +206,8 @@ test_files:
 - features/settings.feature
 - features/step_definitions/settings_steps.rb
 - features/support/env.rb
-- spec/generators/persistent_settings/migration_generator_spec.rb
+- spec/generators/persistent_settings/create_generator_spec.rb
+- spec/lib/persistent/settings.rb
 - spec/lib/settings_spec.rb
 - spec/spec_helper.rb
+- spec/support/warnings_helper.rb

data/lib/generators/persistent_settings/migration_generator.rb

@@ -1,17 +0,0 @@
-require 'rails/generators'
-require 'rails/generators/migration'
-
-module PersistentSettings
-  class MigrationGenerator < ::Rails::Generators::Base
-    include ::Rails::Generators::Migration
-    source_root File.expand_path('../templates', __FILE__)
-
-    def install
-      migration_template "create_settings_table.rb", "db/migrate/create_settings_table.rb"
-    end
-
-    def self.next_migration_number(path)
-      Time.now.utc.strftime("%Y%m%d%H%M%S")
-    end
-  end
-end

data/lib/generators/persistent_settings/templates/create_settings_table.rb

@@ -1,12 +0,0 @@
-class CreateSettingsTable < ActiveRecord::Migration
-  def self.up
-    create_table :settings do |t|
-      t.string :var
-      t.string :value
-    end
-  end
-
-  def self.down
-    drop_table :settings
-  end
-end

data/lib/settings.rb

@@ -1,86 +0,0 @@
-class Settings < ActiveRecord::Base
-  include ::PersistentSettings
-  @mutex = Mutex.new
-
-  serialize :value
-
-  def self.method_missing(method_name, *args)
-    if assignation?(method_name)
-      self.define_setter_and_getter(method_name)
-      self.send(method_name, args.first)
-    else
-      super
-    end
-  end
-
-  def self.define_setter_and_getter(method_name)
-    getter = method_name.to_s.chop
-
-    (class << self; self; end).instance_eval do
-      define_method method_name do |value|
-        @mutex.synchronize do
-          persist(getter, value)
-          write_to_cache getter, value
-        end
-      end
-
-      define_method getter do
-        value = read_from_cache getter
-        unless value
-          value = read_from_persistance getter
-          write_to_cache getter, value
-        end
-        value
-      end
-    end
-  end
-
-  def self.assignation?(method_name)
-    method_name.to_s.match(/=$/)
-  end
-
-  def self.persist(getter, value)
-    setting = Settings.where(:var => getter).last
-    if setting
-      setting.update_attribute(:value, value)
-    else
-      Settings.create(:var => getter, :value => value)
-    end
-  end
-
-  def self.load_from_persistance!
-    self.all.each do |setting|
-      self.send("#{setting.var}=", setting.value)
-    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
-
-  def self.keys
-    Settings.select(:var).collect { |s| s.var.to_sym }
-  end
-
-  load_from_persistance
-end

data/spec/generators/persistent_settings/migration_generator_spec.rb

@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe PersistentSettings::MigrationGenerator do
-  let(:destination) { 'tmp' }
-  let(:filename) { File.join(destination, 'db', 'migrate', 'YYYYMMDDHHMM_create_settings_table.rb') }
-
-  before do
-    File.unlink(filename) if File.exists?(filename)
-    PersistentSettings::MigrationGenerator.stub(:next_migration_number).
-        and_return('YYYYMMDDHHMM')
-    PersistentSettings::MigrationGenerator.start([], :destination_root => destination)
-  end
-
-  it "creates the migration to create the settings table" do
-    File.exists?(filename).should be_true
-  end
-end