property_sets 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/property_sets/action_view_extension.rb

@@ -10,10 +10,10 @@ module ActionView
       throw "No @#{model_name} in scope" if the_model.nil?
       throw "The property_set_check_box only works on models with property set #{property_set}" unless the_model.respond_to?(property_set)
 
-      options[:checked] = the_model.send(property).send("#{method}?")
-      options[:id]    ||= "#{model_name}_property_sets_#{property_set}_#{method}"
-      options[:name]    = "#{model_name}[property_sets][#{property_set}][#{method}]"
-      @template.check_box(model_name, "property_sets_#{property_set}_#{method}", options, checked_value, unchecked_value)
+      options[:checked] = the_model.send(property_set).send("#{property}?")
+      options[:id]    ||= "#{model_name}_#{property_set}_#{property}"
+      options[:name]    = "#{model_name}[#{property_set}][#{property}]"
+      @template.check_box(model_name, "#{property_set}_#{property}", options, checked_value, unchecked_value)
     end
 
     class FormBuilder

data/lib/property_sets/active_record_extension.rb

@@ -2,10 +2,17 @@ require 'delegate'
 
 module PropertySets
   module ActiveRecordExtension
-
     module ClassMethods
       def property_set(association, &block)
+        unless include?(PropertySets::ActiveRecordExtension::InstanceMethods)
+          self.send(:include, PropertySets::ActiveRecordExtension::InstanceMethods)
+          cattr_accessor :property_set_index
+          self.property_set_index ||= []
+        end
+
         raise "Invalid association name, letters only" unless association.to_s =~ /[a-z]+/
+        self.property_set_index << association
+
         property_class = PropertySets.ensure_property_set_class(association, self)
         property_class.instance_eval(&block)
 
@@ -59,6 +66,11 @@ module PropertySets
     end
 
     module InstanceMethods
+      def self.included(base)
+        base.alias_method_chain :update_attributes, :property_sets
+        base.alias_method_chain :update_attributes!, :property_sets
+      end
+
       def update_attributes_with_property_sets(attributes)
         update_property_set_attributes(attributes)
         update_attributes_without_property_sets(attributes)
@@ -70,20 +82,17 @@ module PropertySets
       end
 
       def update_property_set_attributes(attributes)
-        if attributes && property_sets = attributes.delete(:property_sets)
-          property_sets.each do |property_set, property_set_attributes|
-            send(property_set).set(property_set_attributes, true)
+        if attributes && self.class.property_set_index.any?
+          self.class.property_set_index.each do |property_set|
+            if property_set_hash = attributes.delete(property_set)
+              send(property_set).set(property_set_hash, true)
+            end
           end
         end
       end
     end
+
   end
 end
 
-ActiveRecord::Base.class_eval do
-  include PropertySets::ActiveRecordExtension::InstanceMethods
-  extend  PropertySets::ActiveRecordExtension::ClassMethods
-
-  alias_method_chain :update_attributes, :property_sets
-  alias_method_chain :update_attributes!, :property_sets
-end
+ActiveRecord::Base.extend PropertySets::ActiveRecordExtension::ClassMethods

data/property_sets.gemspec

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

data/test/test_property_sets.rb

@@ -31,6 +31,10 @@ class TestPropertySets < ActiveSupport::TestCase
       assert defined?(AccountText)
     end
 
+    should "register the property sets used on a class" do
+      assert_equal [ :settings, :texts ], Account.property_set_index
+    end
+
     should "support protecting attributes" do
       assert @account.settings.protected?(:pro)
       assert !@account.settings.protected?(:foo)
@@ -138,10 +142,7 @@ class TestPropertySets < ActiveSupport::TestCase
 
       should "be updateable as a nested structure" do
         attribs = {
-          :name => "Kim",
-          :property_sets => {
-            :settings => { :foo => "1", :bar => "0" }
-          }
+          :name => "Kim", :settings => { :foo => "1", :bar => "0" }
         }
 
         assert @account.update_attributes(attribs)
@@ -154,10 +155,7 @@ class TestPropertySets < ActiveSupport::TestCase
         assert !@account.settings.pro?
 
         attribs = {
-          :name => "Kim",
-          :property_sets => {
-            :settings => { :foo => "1", :bar => "1", :baz => "1", :pro => "1" }
-          }
+          :name => "Kim", :settings => { :foo => "1", :bar => "1", :baz => "1", :pro => "1" }
         }
 
         assert @account.update_attributes!(attribs)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -08:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency