property_sets 1.0.5 → 2.0.0

data/gemfiles/rails2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/primdahl/Git/property_sets
   specs:
-    property_sets (1.0.4)
+    property_sets (2.0.0)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
       json
@@ -23,7 +23,8 @@ GEM
       bundler
       rake
     jdbc-mysql (5.1.13)
-    json (1.7.7)
+    json (1.8.0)
+    json (1.8.0-java)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)

data/gemfiles/rails3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/primdahl/Git/property_sets
   specs:
-    property_sets (1.0.4)
+    property_sets (2.0.0)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
       json
@@ -45,7 +45,8 @@ GEM
       abstract (>= 1.0.0)
     i18n (0.5.0)
     jdbc-mysql (5.1.13)
-    json (1.7.7)
+    json (1.8.0)
+    json (1.8.0-java)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/primdahl/Git/property_sets
   specs:
-    property_sets (1.0.4)
+    property_sets (2.0.0)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
       json
@@ -46,7 +46,8 @@ GEM
     i18n (0.6.1)
     jdbc-mysql (5.1.13)
     journey (1.0.4)
-    json (1.7.7)
+    json (1.8.0)
+    json (1.8.0-java)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)

data/lib/property_sets/action_view_extension.rb

@@ -21,8 +21,9 @@ module ActionView
         end
 
         def radio_button(property, checked_value = "1", options = {})
+          options[:id] ||= "#{object_name}_#{property_set}_#{property}_#{checked_value}"
           options = prepare_options(property, options) do |properties|
-            properties.send("#{property}") == checked_value.to_s
+            properties.send("#{property}") == checked_value
           end
           template.radio_button(object_name, property, checked_value, options)
         end
@@ -34,7 +35,7 @@ module ActionView
         def hidden_field(property, options = {})
           options = prepare_id_name(property, options)
           unless options.keys.include?(:value)
-            options[:value] = cast_boolean(options[:object].send(property_set).send(property)) 
+            options[:value] = cast_boolean(options[:object].send(property_set).send(property))
           end
           template.hidden_field(object_name, property, options)
         end

data/lib/property_sets/property_set_model.rb

@@ -1,3 +1,5 @@
+require 'active_support'
+
 module PropertySets
   module PropertySetModel
     module InstanceMethods
@@ -89,7 +91,7 @@ module PropertySets
       end
 
       def property(key, options = nil)
-        @properties ||= {}
+        @properties ||= HashWithIndifferentAccess.new
         @properties[key] = options
       end
 

data/property_sets.gemspec

@@ -1,4 +1,4 @@
-Gem::Specification.new "property_sets", "1.0.5" do |s|
+Gem::Specification.new "property_sets", "2.0.0" do |s|
   s.summary     = "Property sets for ActiveRecord."
   s.description = "This gem is an ActiveRecord extension which provides a convenient interface for managing per row properties."
   s.authors  = ["Morten Primdahl"]

data/test/test_property_sets.rb

@@ -62,6 +62,11 @@ class TestPropertySets < ActiveSupport::TestCase
       assert_equal 'skep', @account.settings.hep
     end
 
+    should "be flexible when fetching property data" do
+      assert_equal 'skep', @account.settings.default(:hep)
+      assert_equal 'skep', @account.settings.default('hep')
+    end
+
     context 'querying for a setting that does not exist' do
       setup do
         assert_equal([], @account.settings)

data/test/test_view_extensions.rb

@@ -116,16 +116,45 @@ class TestViewExtensions < ActiveSupport::TestCase
     end
 
     context "#radio_button" do
+      setup do
+        settings = stub(@property => 'hello')
+        @object.stubs(@property_set).returns(settings)
+
+        @expected_options = base_options.merge(
+          :id      => "#{@object_name}_#{@property_set}_#{@property}_hello",
+          :checked => false
+        )
+      end
+
+      should "generate a unique id when one is not provided" do
+          @expected_options.merge!(
+            :id => "#{@object_name}_#{@property_set}_#{@property}_pancake"
+          )
+          @template.expects(:radio_button).with(@object_name, @property, 'pancake', @expected_options)
+          @proxy.radio_button(@property, 'pancake')
+      end
+
       context "when called with checked true for a truth value" do
+
+        should "call with checked true for a truth value" do
+          @expected_options.merge!(:checked => true)
+          @template.expects(:radio_button).with(@object_name, @property, 'hello', @expected_options)
+          @proxy.radio_button(@property, 'hello')
+        end
+      end
+
+      context "when called with a value of a different type" do
         setup do
-          settings = stub(@property => 'hello')
+          settings = stub(@property => '1')
           @object.stubs(@property_set).returns(settings)
         end
 
-        should "call with checked true for a truth value" do
-          expected_options = base_options.merge(:checked => true)
-          @template.expects(:radio_button).with(@object_name, @property, 'hello', expected_options)
-          @proxy.radio_button(@property, 'hello')
+        should "call with checked false" do
+          @expected_options.merge!(
+            :id => "#{@object_name}_#{@property_set}_#{@property}_1"
+          )
+          @template.expects(:radio_button).with(@object_name, @property, 1, @expected_options)
+          @proxy.radio_button(@property, 1)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport