setler 0.0.8 → 0.0.9

data/lib/generators/setler/setler_generator.rb

@@ -2,13 +2,13 @@ require 'rails/generators/migration'
 
 class SetlerGenerator < Rails::Generators::NamedBase
   include Rails::Generators::Migration
-  
+
   argument :name, type: :string, default: "settings"
-  
+
   source_root File.expand_path('../templates', __FILE__)
-  
+
   @@migrations = false
-  
+
   def self.next_migration_number(dirname)
     if ActiveRecord::Base.timestamped_migrations
       if @@migrations
@@ -21,7 +21,7 @@ class SetlerGenerator < Rails::Generators::NamedBase
       "%.3d" % (current_migration_number(dirname) + 1)
     end
   end
-  
+
   def generate_model
     template "model.rb", File.join("app/models",class_path,"#{file_name}.rb"), force: true
     migration_template "migration.rb", "db/migrate/setler_create_#{table_name}.rb"

data/lib/generators/setler/templates/migration.rb

@@ -7,7 +7,7 @@ class SetlerCreate<%= table_name.camelize %> < ActiveRecord::Migration
       t.string  :thing_type, limit: 30, null: true
       t.timestamps
     end
-    
+
     add_index :<%= table_name %>, [ :thing_type, :thing_id, :var ], unique: true
   end
 

data/lib/setler/active_record.rb

@@ -1,11 +1,11 @@
 module Setler
   module ActiveRecord
-    
+
     def has_setler(scopename = 'settings')
       define_method scopename do
         Setler::ScopedSettings.for_thing(self, scopename)
       end
     end
-    
+
   end
 end

data/lib/setler/scoped_settings.rb

@@ -5,10 +5,10 @@ module Setler
       @object = object
       self
     end
-    
+
     def self.thing_scoped
       self.base_class.where(thing_type: @object.class.base_class.to_s, thing_id: @object.id)
     end
-    
+
   end
-end
+end

data/lib/setler/settings.rb

@@ -3,9 +3,8 @@ module Setler
     serialize :value
     self.abstract_class = true
     
-    def self.defaults
-      @defaults ||= {}.with_indifferent_access
-    end
+    cattr_accessor :defaults
+    @@defaults = {}.with_indifferent_access
     
     # Get and Set variables when the calling method is the variable name
     def self.method_missing(method, *args, &block)
@@ -23,7 +22,7 @@ module Setler
 
     def self.[](var)
       the_setting = thing_scoped.find_by_var(var.to_s)
-      the_setting.present? ? the_setting.value : defaults[var]
+      the_setting.present? ? the_setting.value : @@defaults[var]
     end
 
     def self.[]=(var, value)
@@ -47,15 +46,15 @@ module Setler
         raise SettingNotFound, "Setting variable \"#{var_name}\" not found"
       end
     end
-    
+
     def self.all
-      defaults.merge(Hash[thing_scoped.all.collect{ |s| [s.var, s.value] }])
+      @@defaults.merge(Hash[thing_scoped.all.collect{ |s| [s.var, s.value] }])
     end
-    
+
     def self.thing_scoped
       self.where(thing_type: nil, thing_id: nil)
     end
-    
+
   end
-  
+
 end

data/lib/setler/version.rb

@@ -1,3 +1,3 @@
 module Setler
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/test/settings_test.rb

@@ -2,41 +2,41 @@ require 'test_helper'
 
 class ::SettingsTest < Test::Unit::TestCase
   setup_db
-  
+
   def setup
     ::Settings.create(:var => 'test',  :value => 'foo')
     ::Settings.create(:var => 'test2', :value => 'bar')
   end
-  
+
   def teardown
     ::Settings.delete_all
     ::Preferences.delete_all
   end
-  
+
   def test_defaults
     ::Settings.defaults[:foo] = 'default foo'
-    
+
     assert_equal 'default foo', ::Settings.foo
-    
+
     ::Settings.foo = 'bar'
     assert_equal 'bar', ::Settings.foo
   end
-  
+
   def tests_defaults_false
     ::Settings.defaults[:foo] = false
     assert_equal false, ::Settings.foo
   end
-  
+
   def test_get
     assert_equal 'foo', ::Settings.test
     assert_equal 'bar', ::Settings.test2
   end
-  
+
   def test_get_with_array_syntax
     assert_equal 'foo', ::Settings["test"]
     assert_equal 'bar', ::Settings[:test2]
   end
-  
+
   def test_update
     ::Settings.test = '321'
     assert_equal '321', ::Settings.test
@@ -56,33 +56,33 @@ class ::SettingsTest < Test::Unit::TestCase
   def test_update_with_array_syntax
     ::Settings["test"] = '321'
     assert_equal '321', ::Settings.test
-  
+
     ::Settings[:test] = '567'
     assert_equal '567', ::Settings.test
   end
-  
+
   def test_create
     ::Settings.onetwothree = '123'
     assert_equal '123', ::Settings.onetwothree
   end
-  
+
   def test_complex_serialization
     complex = [1, '2', {:three => true}]
     ::Settings.complex = complex
     assert_equal complex, ::Settings.complex
   end
-  
+
   def test_serialization_of_float
     ::Settings.float = 0.01
     ::Settings.reload
     assert_equal 0.01, ::Settings.float
     assert_equal 0.02, ::Settings.float * 2
   end
-  
+
   def test_all
     assert_equal({ "test2" => "bar", "test" => "foo" }, ::Settings.all)
   end
-  
+
   def test_destroy
     assert_not_nil ::Settings.test
     ::Settings.destroy :test
@@ -101,7 +101,7 @@ class ::SettingsTest < Test::Unit::TestCase
     ::Settings.testing = '123'
     assert_nil ::Preferences.testing
   end
-  
+
   def test_user_has_setler
     user = User.create name: 'user 1'
     assert_nil user.preferences.likes_bacon
@@ -110,7 +110,7 @@ class ::SettingsTest < Test::Unit::TestCase
     user.preferences.destroy :likes_bacon
     assert_nil user.preferences.likes_bacon
   end
-   
+
   def test_user_settings_all
     ::Settings.destroy_all
     user = User.create name: 'user 1'
@@ -122,7 +122,7 @@ class ::SettingsTest < Test::Unit::TestCase
     assert user.preferences.all['really_likes_bacon']
     assert !::Settings.all['really_likes_bacon']
   end
-  
+
   def test_user_settings_override_defaults
     ::Settings.defaults[:foo] = false
     user = User.create name: 'user 1'
@@ -132,7 +132,13 @@ class ::SettingsTest < Test::Unit::TestCase
     user.preferences.foo = false
     assert !user.preferences.foo
   end
-  
+
+  def test_user_preferences_has_defaults
+    ::Preferences.defaults[:foo] = true
+    user = User.create name: 'user 1'
+    assert user.preferences.foo
+  end
+
   # def test_user_has_settings_for
   #   user1 = User.create name: 'awesome user'
   #   user2 = User.create name: 'bad user'
@@ -148,8 +154,8 @@ class ::SettingsTest < Test::Unit::TestCase
   end
 
   def test_implementations_are_independent
-    ::Preferences.create(:var => 'test',  :value => 'preferences foo')
-    ::Preferences.create(:var => 'test2', :value => 'preferences bar')
+    ::Preferences.create var: 'test',  value: 'preferences foo'
+    ::Preferences.create var: 'test2', value: 'preferences bar'
 
     assert_not_equal ::Settings.defaults, ::Preferences.defaults
 

data/test/test_helper.rb

@@ -37,7 +37,7 @@ def setup_db
       t.timestamps
     end
     add_index :settings, [ :thing_type, :thing_id, :var ], :unique => true
-    
+
     create_table :preferences do |t|
       t.string :var, :null => false
       t.text   :value, :null => true
@@ -46,7 +46,7 @@ def setup_db
       t.timestamps
     end
     add_index :preferences, [ :thing_type, :thing_id, :var ], :unique => true
-    
+
     create_table :users do |t|
       t.string :name
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: setler
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord