property_sets 0.2.0 → 0.3.0

data/README.rdoc

@@ -52,10 +52,10 @@ And for existing records:
 Using nested attributes is subject to implementing your own security measures for mass update assignments.
 Alternatively, it is possible to use a custom hash structure:
 
-  params = { :property_sets => {
+  params = {
     :settings => { :version => "v4.0", :featured => "1" },
     :texts    => { :epilogue => "Wibble wobble" }
-  }}
+  }
   @account.update_attributes(params)
 
 The above will not update +featured+ as this has the protected flag set and is hence protected from

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/property_sets/action_view_extension.rb

@@ -1,47 +1,51 @@
 require 'action_view'
-require 'delegate'
 
 module ActionView
   module Helpers
-    # property_set_check_box(:account, :property_association, :property_key, options)
-    def property_set_check_box(model_name, property_set, property, options = {}, checked_value = "1", unchecked_value = "0")
-      the_model = @template.instance_variable_get("@#{model_name}")
-
-      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_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
-      class PropertySetFormBuilderProxy < Delegator
-        attr_accessor :builder
+      class PropertySetFormBuilderProxy
         attr_accessor :property_set
+        attr_accessor :template
+        attr_accessor :object_name
 
-        def initialize(property_set, builder)
+        def initialize(property_set, template, object_name)
           self.property_set = property_set
-          self.builder      = builder
+          self.template     = template
+          self.object_name  = object_name
         end
 
-        def __getobj__
-          builder
+        def check_box(property, options = {}, checked_value = "1", unchecked_value = "0")
+          options = prepare_options(property, options) do |properties|
+            properties.send("#{property}?")
+          end
+          template.check_box(object_name, property, options, checked_value, unchecked_value)
         end
 
-        def check_box(property, options = {}, checked_value = "1", unchecked_value = "0")
-          builder.property_set_check_box(property_set, property, options, checked_value, unchecked_value)
+        def radio_button(property, checked_value = "1", options = {})
+          options = prepare_options(property, options) do |properties|
+            properties.send("#{property}") == checked_value.to_s
+          end
+          template.radio_button(object_name, property, checked_value, options)
+        end
+
+        def prepare_options(property, options, &block)
+          instance = template.instance_variable_get("@#{object_name}")
+          throw "No @#{object_name} in scope" if instance.nil?
+          throw "The property_set_check_box only works on models with property set #{property_set}" unless instance.respond_to?(property_set)
+
+          options[:id]     ||= "#{object_name}_#{property_set}_#{property}"
+          options[:name]     = "#{object_name}[#{property_set}][#{property}]"
+          options[:object]   = instance
+          options[:checked]  = yield(instance.send(property_set))
+
+          options
         end
       end
 
       def property_set(identifier)
-        PropertySetFormBuilderProxy.new(identifier, self)
+        PropertySetFormBuilderProxy.new(identifier, @template, @object_name)
       end
 
-      def property_set_check_box(property_set, property, options, checked_value, unchecked_value)
-        @template.property_set_check_box(@object_name, property_set, property, objectify_options(options), checked_value, unchecked_value)
-      end
     end
   end
 end

data/lib/property_sets/active_record_extension.rb

@@ -1,5 +1,3 @@
-require 'delegate'
-
 module PropertySets
   module ActiveRecordExtension
     module ClassMethods
@@ -7,7 +5,7 @@ module PropertySets
         unless include?(PropertySets::ActiveRecordExtension::InstanceMethods)
           self.send(:include, PropertySets::ActiveRecordExtension::InstanceMethods)
           cattr_accessor :property_set_index
-          self.property_set_index ||= []
+          self.property_set_index = []
         end
 
         raise "Invalid association name, letters only" unless association.to_s =~ /[a-z]+/

data/property_sets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property_sets}
-  s.version = "0.2.0"
+  s.version = "0.3.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-19}
+  s.date = %q{2011-01-27}
   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 = [
@@ -35,7 +35,8 @@ Gem::Specification.new do |s|
     "test/fixtures/accounts.yml",
     "test/helper.rb",
     "test/schema.rb",
-    "test/test_property_sets.rb"
+    "test/test_property_sets.rb",
+    "test/test_view_extensions.rb"
   ]
   s.homepage = %q{http://github.com/morten/property_sets}
   s.require_paths = ["lib"]
@@ -44,7 +45,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
     "test/schema.rb",
-    "test/test_property_sets.rb"
+    "test/test_property_sets.rb",
+    "test/test_view_extensions.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/helper.rb

@@ -13,7 +13,7 @@ ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
 load(File.dirname(__FILE__) + "/schema.rb")
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'property_sets'
+require File.dirname(__FILE__)+'/../lib/property_sets'
 
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
@@ -32,3 +32,20 @@ end
 
 ActiveSupport::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
 $LOAD_PATH.unshift(ActiveSupport::TestCase.fixture_path)
+
+class Account < ActiveRecord::Base
+  property_set :settings do
+    property :foo
+    property :bar
+    property :baz
+    property :hep, :default   => 'skep'
+    property :pro, :protected => true
+  end
+
+  property_set :texts do
+    property :foo
+    property :bar
+  end
+
+  accepts_nested_attributes_for :texts
+end

data/test/test_property_sets.rb

@@ -1,22 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class Account < ActiveRecord::Base
-  property_set :settings do
-    property :foo
-    property :bar
-    property :baz
-    property :hep, :default   => 'skep'
-    property :pro, :protected => true
-  end
-
-  property_set :texts do
-    property :foo
-    property :bar
-  end
-
-  accepts_nested_attributes_for :texts
-end
-
 class TestPropertySets < ActiveSupport::TestCase
 
   context "property sets" do
@@ -166,15 +149,5 @@ class TestPropertySets < ActiveSupport::TestCase
         assert !@account.settings.pro?
       end
     end
-
-    context "view construction" do
-      should "provide a form builder proxy" do
-        proxy = ActionView::Helpers::FormBuilder.new("hi", "hi", "hi", nil, nil).property_set(:foo)
-        assert proxy.is_a?(ActionView::Helpers::FormBuilder::PropertySetFormBuilderProxy)
-        assert_equal :foo, proxy.property_set
-        proxy.builder.expects(:property_set_check_box).once.with(:foo, :bar, {}, "1", "0")
-        proxy.check_box(:bar)
-      end
-    end
   end
 end

data/test/test_view_extensions.rb

@@ -0,0 +1,74 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+
+class TestViewExtensions < ActiveSupport::TestCase
+
+  context "property set view extensions" do
+    setup do
+      @association = :settings
+      @property    = :active
+      @builder     = ActionView::Helpers::FormBuilder.new("object_name", "object", "template", "options", "proc")
+      @proxy       = @builder.property_set(@association)
+    end
+
+    should "provide a form builder proxy" do
+      assert @proxy.is_a?(ActionView::Helpers::FormBuilder::PropertySetFormBuilderProxy)
+      assert_equal @association, @proxy.property_set
+    end
+
+    context "check_box" do
+      should "call with checked true for a truth value" do
+        settings = stub(@property => "1", "#{@property}?".to_sym => true)
+        object   = stub()
+        object.expects(@association).returns(settings)
+        options  = {
+          :checked => true, :name => "object_name[#{@association}][#{@property}]",
+          :id => "object_name_#{@association}_#{@property}", :object => object
+        }
+        template = stub()
+        template.expects(:instance_variable_get).with("@object_name").returns(object)
+        # def check_box(object_name, method, options = {}, checked_value = "1", unchecked_value = "0")
+        template.expects(:check_box).with("object_name", @property, options, "1", "0")
+
+        @proxy.stubs(:template).returns(template)
+        @proxy.check_box(@property)
+      end
+
+      should "call with checked false for a truth value" do
+        settings = stub(@property => "0", "#{@property}?".to_sym => false)
+        object   = stub()
+        object.expects(@association).returns(settings)
+        options  = {
+          :checked => false, :name => "object_name[#{@association}][#{@property}]",
+          :id => "object_name_#{@association}_#{@property}", :object => object
+        }
+        template = stub()
+        template.expects(:instance_variable_get).with("@object_name").returns(object)
+        # def check_box(object_name, method, options = {}, checked_value = "1", unchecked_value = "0")
+        template.expects(:check_box).with("object_name", @property, options, "1", "0")
+
+        @proxy.stubs(:template).returns(template)
+        @proxy.check_box(@property)
+      end
+    end
+
+    context "radio_button" do
+      should "call with checked true for a truth value" do
+        settings = stub(@property => "hello")
+        object   = stub()
+        object.expects(@association).returns(settings)
+        options  = {
+          :checked => true, :name => "object_name[#{@association}][#{@property}]",
+          :id => "object_name_#{@association}_#{@property}", :object => object
+        }
+        template = stub()
+        template.expects(:instance_variable_get).with("@object_name").returns(object)
+        # def radio_button(object_name, method, tag_value, options = {})
+        template.expects(:radio_button).with("object_name", @property, "hello", options)
+
+        @proxy.stubs(:template).returns(template)
+        @proxy.radio_button(@property, "hello")
+      end
+    end
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-19 00:00:00 -08:00
+date: 2011-01-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -169,6 +169,7 @@ files:
 - test/helper.rb
 - test/schema.rb
 - test/test_property_sets.rb
+- test/test_view_extensions.rb
 has_rdoc: true
 homepage: http://github.com/morten/property_sets
 licenses: []
@@ -207,3 +208,4 @@ test_files:
 - test/helper.rb
 - test/schema.rb
 - test/test_property_sets.rb
+- test/test_view_extensions.rb