property_sets 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/property_sets/action_view_extension.rb

@@ -36,25 +36,25 @@ module ActionView
           template.hidden_field(object_name, property, prepare_id_name(property, options))
         end
 
-        def select(property, choices, options = {})
+        def select(property, choices, options = {}, html_options = {})
           options = prepare_id_name(property, options)
           current_value = options[:object].send(property_set).send(property)
-          template.select("#{object_name}[#{property_set}]", property, choices, :selected => current_value)
+          template.select("#{object_name}[#{property_set}]", property, choices, { :selected => current_value }, html_options )
         end
 
         def prepare_id_name(property, options)
           throw "Invalid options type #{options.inspect}" unless options.is_a?(Hash)
 
-          instance = template.instance_variable_get("@#{object_name}")
+          options.clone.tap do |prepared_options|
+            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)
+            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
+            prepared_options[:id]     ||= "#{object_name}_#{property_set}_#{property}"
+            prepared_options[:name]     = "#{object_name}[#{property_set}][#{property}]"
+            prepared_options[:object]   = instance
+          end
         end
 
         def prepare_options(property, options, &block)

data/property_sets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property_sets}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
-  s.date = %q{2011-08-16}
+  s.date = %q{2011-09-22}
   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 = [
@@ -43,6 +43,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Property sets for ActiveRecord}
+  s.test_files = [
+    "test/helper.rb",
+    "test/schema.rb",
+    "test/test_property_sets.rb",
+    "test/test_view_extensions.rb"
+  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/helper.rb

@@ -54,4 +54,11 @@ class Account < ActiveRecord::Base
 
     validates_format_of :value, :with => /\d+/, :message => "BEEP", :if => lambda { |r| r.name.to_sym == :validated }
   end
+
+  property_set :typed_data do
+    property :string_prop, :type => :string
+    property :datetime_prop, :type => :datetime
+    property :float_prop, :type => :float
+    property :int_prop, :type => :integer
+  end
 end

data/test/test_view_extensions.rb

@@ -110,22 +110,34 @@ class TestViewExtensions < ActiveSupport::TestCase
     end
 
     context "select" do
-      should "render a <select> with <option>s" do
+      setup do
         settings = stub(:count => "2")
         object   = stub()
-        object.expects(@association).returns(settings)
+        object.stubs(@association).returns(settings)
 
-        template = stub()
-        template.expects(:instance_variable_get).with("@object_name").returns(object)
+        @template = stub()
+        @template.expects(:instance_variable_get).with("@object_name").returns(object)
+      end
+
+      should "render a <select> with <option>s" do
 
         select_options = { :selected => "2" }
         select_choices = [["One", 1], ["Two", 2], ["Three", 3]]
-        html_options   = { :id => "foo", :name => "bar" }
-        template.expects(:select).with("object_name[settings]", :count, select_choices, select_options)
 
-        @proxy.stubs(:template).returns(template)
+        @template.expects(:select).with("object_name[settings]", :count, select_choices, select_options, {})
+        @proxy.stubs(:template).returns(@template)
         @proxy.select(:count, select_choices)
       end
+
+      should "merge :html_options" do
+        select_options = { :selected => "2" }
+        select_choices = [["One", 1], ["Two", 2], ["Three", 3]]
+        html_options   = { :id => "foo", :name => "bar", :disabled => true }
+
+        @template.expects(:select).with("object_name[settings]", :count, select_choices, select_options, html_options)
+        @proxy.stubs(:template).returns(@template)
+        @proxy.select(:count, select_choices, select_options, html_options)
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 -07:00
+date: 2011-09-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,12 +32,12 @@ dependencies:
         - 3
         - 10
         version: 2.3.10
-  name: activesupport
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +48,12 @@ dependencies:
         - 3
         - 10
         version: 2.3.10
-  name: activerecord
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +64,12 @@ dependencies:
         - 3
         - 10
         version: 2.3.10
-  name: actionpack
-  version_requirements: *id003
-  prerelease: false
+  type: :runtime
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +78,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +94,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +110,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  name: jeweler
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -123,12 +124,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  prerelease: false
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -137,9 +138,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: thoughtbot-shoulda
-  version_requirements: *id008
-  prerelease: false
+  type: :development
+  requirement: *id008
 description: This gem is an ActiveRecord extension which provides a convenient interface for managing per row properties
 email: morten@zendesk.com
 executables: []
@@ -205,5 +205,8 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Property sets for ActiveRecord
-test_files: []
-
+test_files: 
+- test/helper.rb
+- test/schema.rb
+- test/test_property_sets.rb
+- test/test_view_extensions.rb