setler 0.0.3 → 0.0.4

data/lib/setler/settings.rb

@@ -15,9 +15,9 @@ module Setler
       else
         method_name = method.to_s
         if method_name.ends_with?("=")
-          self.find_or_create_by_var(method_name[0..-2]).update_attribute(:value, args.first)
+          thing_scoped.find_or_create_by_var(method_name[0..-2]).update_attribute(:value, args.first)
         else
-          self.find_by_var(method_name).try(:value) || @@defaults[method_name]
+          thing_scoped.find_by_var(method_name).try(:value) || @@defaults[method_name]
         end
       end
     end
@@ -33,7 +33,11 @@ module Setler
     end
     
     def self.all
-      Hash[super.collect{ |s| [s.var, s.value] }].merge(@@defaults)
+      Hash[thing_scoped.all.collect{ |s| [s.var, s.value] }].merge(@@defaults)
+    end
+    
+    def self.thing_scoped
+      self.where(thing_type: nil, thing_id: nil)
     end
   end
   

data/lib/setler/version.rb

@@ -1,3 +1,3 @@
 module Setler
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/settings_test.rb

@@ -74,12 +74,25 @@ class Setler::SettingsTest < Test::Unit::TestCase
   end
   
   def test_user_settings_all
+    Setler::Settings.destroy_all
     user = User.create name: 'user 1'
-    assert_equal user.preferences.all, Setler::Settings.all
+    assert_equal Setler::Settings.all, user.preferences.all
     user.preferences.likes_bacon = true
     user.preferences.really_likes_bacon = true
     assert user.preferences.all['likes_bacon']
+    assert !Setler::Settings.all['likes_bacon']
     assert user.preferences.all['really_likes_bacon']
+    assert !Setler::Settings.all['really_likes_bacon']
+  end
+  
+  def test_user_settings_override_defaults
+    Setler::Settings.defaults[:foo] = false
+    user = User.create name: 'user 1'
+    assert !user.preferences.foo
+    user.preferences.foo = true
+    assert user.preferences.foo
+    user.preferences.foo = false
+    assert !user.preferences.foo
   end
   
   # def test_user_has_settings_for

data/test/test_helper.rb

@@ -26,11 +26,11 @@ def setup_db
     create_table :settings do |t|
       t.string :var, :null => false
       t.text   :value, :null => true
-      t.integer :target_id, :null => true
-      t.string :target_type, :limit => 30, :null => true
+      t.integer :thing_id, :null => true
+      t.string :thing_type, :limit => 30, :null => true
       t.timestamps
     end
-    add_index :settings, [ :target_type, :target_id, :var ], :unique => true
+    add_index :settings, [ :thing_type, :thing_id, :var ], :unique => true
     
     create_table :users do |t|
       t.string :name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: setler
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-08-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70292790898140 !ruby/object:Gem::Requirement
+  requirement: &70271069152000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70292790898140
+  version_requirements: *70271069152000
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70292790897640 !ruby/object:Gem::Requirement
+  requirement: &70271069151500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70292790897640
+  version_requirements: *70271069151500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70292790897260 !ruby/object:Gem::Requirement
+  requirement: &70271069151120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292790897260
+  version_requirements: *70271069151120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70292790896800 !ruby/object:Gem::Requirement
+  requirement: &70271069150660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292790896800
+  version_requirements: *70271069150660
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70292790896380 !ruby/object:Gem::Requirement
+  requirement: &70271069150240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70292790896380
+  version_requirements: *70271069150240
 description: Setler is a Gem that lets one easily implement the "Feature Flags" pattern,
   or add settings to individual models. This is a cleanroom implementation of what
   the 'rails-settings' gem does. It's been forked all over the place, and my favorite