has_settings 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/has_settings.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_settings}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
-  s.date = %q{2010-11-04}
+  s.date = %q{2010-11-11}
   s.description = %q{This gem is an ActiveRecord extension which provides a convenient interface for managing per row settings}
   s.email = %q{morten@zendesk.com}
   s.extra_rdoc_files = [

data/lib/has_settings/active_record_extension.rb

@@ -9,7 +9,7 @@ module HasSettings
 
           def build(*setting_names)
             setting_names.each do |setting_name|
-              self << proxy_reflection.klass.new(:name => setting_name)
+              self << proxy_reflection.klass.new(:name => setting_name.to_s)
             end
           end
 

data/lib/has_settings/has_settings_helper.rb

@@ -2,7 +2,8 @@ module ActionView
   module Helpers
     def setting_check_box(model_name, method, options = {}, checked_value = "1", unchecked_value = "0")
       the_model = @template.instance_variable_get("@#{model_name}")
-      throw "setting_check_box only work on models with settings" unless the_model.respond_to?(:settings)
+      throw "No @#{model_name} in scope" if the_model.nil?
+      throw "The setting_check_box only works on models with settings" unless the_model.respond_to?(:settings)
       options[:checked] = the_model.settings.send("#{method}?")
       options[:id]    ||= "#{model_name}_settings_#{method}"
       options[:name]    = "#{model_name}[settings][#{method}]"

data/lib/has_settings/setting.rb

@@ -2,8 +2,9 @@ module HasSettings
   class Setting < ActiveRecord::Base
     abstract_class = true
 
-    after_create   :reset_owner_association
-    after_destroy  :reset_owner_association
+    after_create  :reset_owner_association
+    after_destroy :reset_owner_association
+    validate      :validate_format_of_name
 
     def create
       if new_record?
@@ -35,6 +36,14 @@ module HasSettings
 
     private
 
+    def validate_format_of_name
+      if name.blank?
+        errors.add(:name, :blank)
+      elsif !name.is_a?(String) || name !~ /^([a-z0-9]+_?)+$/
+        errors.add(:name, :invalid)
+      end
+    end
+
     def owner_class_instance
       send(self.class.owner_class_sym)
     end

data/test/test_has_settings.rb

@@ -12,7 +12,7 @@ end
 class TestHasSettings < ActiveSupport::TestCase
   context "settings" do
     fixtures :accounts, :account_settings
-    
+
     should "be accessable from the owner association" do
       a = Account.create(:name => 'name')
       assert a.settings.empty?
@@ -22,7 +22,7 @@ class TestHasSettings < ActiveSupport::TestCase
       assert a.settings.archive?
       assert a.settings.archive.id == a.settings.archive.create.id
     end
-    
+
     should "be destroyable via the association" do
       a = accounts(:account1)
       assert a.settings.archive?
@@ -30,14 +30,14 @@ class TestHasSettings < ActiveSupport::TestCase
       a.settings.reload
       assert !a.settings.archive?
     end
-    
+
     should "have convenience methods for checking presence" do
       a = accounts(:account1)
       assert a.settings.archive?
       assert a.settings.ssl?
       assert !a.settings.reports?
     end
-    
+
     should "support mass updates" do
       a = Account.create(:name => 'name')
       assert a.settings.empty?
@@ -52,7 +52,7 @@ class TestHasSettings < ActiveSupport::TestCase
       assert !a.settings.archive?
       assert !a.settings.reports?
     end
-    
+
     should "support protecting certain settings from mass updates" do
       a = Account.create(:name => 'name')
       assert a.settings.empty?
@@ -69,14 +69,41 @@ class TestHasSettings < ActiveSupport::TestCase
       assert !a.settings.archive?
       assert a.settings.ssl?
     end
-    
+
     should "be able to build multiple settings in one go" do
       a = Account.create(:name => 'name')
       assert a.settings.empty?
       a.settings.build('archive', 'ssl')
       assert a.settings.size == 2
     end
-    
+
+    should "convert symbols to strings when building multiple settings" do
+      a = Account.create(:name => 'name')
+      assert a.settings.empty?
+      a.settings.build(:archive, :ssl)
+      a.save!
+      assert a.settings.size == 2
+      assert a.settings.archive?
+      assert a.settings.ssl?
+      assert a.settings.ssl.name == 'ssl'
+      assert a.settings.archive.name == 'archive'
+    end
+
+    should "reject settings with an invalid name" do
+      a = Account.create(:name => 'name')
+      s = AccountSetting.new(:account => a)
+      s.name = 'hello'
+      assert s.valid?
+      s.name = :hello
+      assert !s.valid?
+      s.name = "_foo_bar"
+      assert !s.valid?
+      s.name = "foo_bar"
+      assert s.valid?
+      s.name = "horse4"
+      assert s.valid?
+    end
+
     should "validate uniqueness of settings" do
       a = Account.create(:name => 'name')
       AccountSetting.create!(:account => a, :name => 'fish')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_settings
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -07:00
+date: 2010-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency