property_sets 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/property_sets/action_view_extension.rb

@@ -28,6 +28,10 @@ module ActionView
           template.radio_button(object_name, property, checked_value, options)
         end
 
+        def text_field(property, options = {})
+          template.text_field(object_name, property, prepare_id_name(property, options))
+        end
+
         def hidden_field(property, options = {})
           template.hidden_field(object_name, property, prepare_id_name(property, options))
         end

data/lib/property_sets/active_record_extension.rb

@@ -28,6 +28,35 @@ module PropertySets
             end
           end
 
+          def read_value_cast_for_property_set(type, value)
+            return nil if value.nil?
+
+            case type
+              when :string
+                value
+              when :datetime
+                Time.parse(value).in_time_zone
+              when :float
+                value.to_f
+              when :integer
+                value.to_i
+            end
+          end
+
+          def write_value_cast_for_property_set(type, value)
+            return nil if value.nil?
+            case type
+              when :datetime
+                if value.is_a?(String)
+                  value
+                else
+                  value.in_time_zone("UTC").to_s
+                end
+              else
+                value.to_s
+            end
+          end
+
           property_class.keys.each do |key|
             raise "Invalid property key #{key}" if self.respond_to?(key)
 
@@ -38,7 +67,13 @@ module PropertySets
 
             # Returns the value of the property
             define_method "#{key}" do
-              lookup(key).value
+              read_value_cast_for_property_set(property_class.type(key), lookup(key).value)
+            end
+
+            # Assigns a new value to the property
+            define_method "#{key}=" do |value|
+              instance = lookup(key)
+              instance.value = write_value_cast_for_property_set(property_class.type(key), value)
             end
 
             define_method "#{key}_record" do
@@ -57,13 +92,6 @@ module PropertySets
               send("#{arg}=", "0")
             end
 
-            # Assigns a new value to the property
-            define_method "#{key}=" do |value|
-              instance = lookup(key)
-              instance.value = value
-              value
-            end
-
             # The finder method which returns the property if present, otherwise a new instance with defaults
             define_method "lookup" do |arg|
               instance   = detect { |property| property.name.to_sym == arg.to_sym }
@@ -81,7 +109,6 @@ module PropertySets
               instance = detect { |property| property.name.to_sym == arg.to_sym }
               instance ||= property_class.new(:value => property_class.default(arg))
             end
-
           end
         end
       end

data/lib/property_sets/property_set_model.rb

@@ -42,6 +42,7 @@ module PropertySets
         self.value = value.to_s unless value.nil?
       end
 
+
       def owner_class_instance
         send(self.class.owner_class_sym)
       end
@@ -66,6 +67,10 @@ module PropertySets
         @properties[key] && @properties[key].key?(:default) ? @properties[key][:default] : nil
       end
 
+      def type(key)
+        @properties[key] && @properties[key].key?(:type) ? @properties[key][:type] : :string
+      end
+
       def protected?(key)
         @properties[key] && !!@properties[key][:protected]
       end

data/property_sets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{property_sets}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Morten Primdahl"]
-  s.date = %q{2011-04-26}
+  s.date = %q{2011-08-03}
   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,12 +43,6 @@ 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/schema.rb

@@ -29,6 +29,16 @@ ActiveRecord::Schema.define(:version => 1) do
 
   add_index :account_validations, [ :account_id, :name ], :unique => true
 
+  create_table "account_typed_data", :force => true do |t|
+    t.integer  "account_id"
+    t.string   "name"
+    t.string   "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index :account_typed_data, [ :account_id, :name ], :unique => true
+
   create_table "accounts", :force => true do |t|
     t.string   "name"
     t.datetime "created_at"

data/test/test_property_sets.rb

@@ -15,7 +15,7 @@ class TestPropertySets < ActiveSupport::TestCase
     end
 
     should "register the property sets used on a class" do
-      assert_equal [ :settings, :texts, :validations ], Account.property_set_index
+      assert_equal [ :settings, :texts, :validations, :typed_data ], Account.property_set_index
     end
 
     should "support protecting attributes" do
@@ -102,7 +102,6 @@ class TestPropertySets < ActiveSupport::TestCase
 
     should "coerce everything but nil to string" do
       @account.settings.foo = 3
-      assert @account.settings.foo == 3
       @account.save
       assert @account.settings.foo == "3"
       @account.settings.foo = nil
@@ -208,5 +207,52 @@ class TestPropertySets < ActiveSupport::TestCase
         assert !@account.settings.pro?
       end
     end
+
+    context "typed columns" do
+      context "string data" do
+        should "be writable and readable" do
+          @account.typed_data.string_prop = "foo"
+          assert_equal "foo", @account.typed_data.string_prop
+        end
+      end
+
+      context "floating point data" do
+        should "be writable and readable" do
+          @account.typed_data.float_prop = 1.97898
+          assert_equal 1.97898,  @account.typed_data.float_prop
+          @account.save!
+          assert_equal 1.97898,  @account.typed_data.float_prop
+        end
+      end
+
+      context "integer data" do
+        should "be writable and readable" do
+          @account.typed_data.int_prop = 25
+          assert_equal 25,  @account.typed_data.int_prop
+          @account.save!
+          assert_equal 25,  @account.typed_data.int_prop
+
+          assert_equal "25", @account.typed_data.lookup("int_prop").value
+        end
+      end
+
+      context "datetime data" do
+        should "be writable and readable" do
+          ts = Time.at(Time.now.to_i)
+          @account.typed_data.datetime_prop = ts
+          assert_equal ts,  @account.typed_data.datetime_prop
+          @account.save!
+          assert_equal ts,  @account.typed_data.datetime_prop
+        end
+
+        should "store data in UTC" do
+          ts = Time.at(Time.now.to_i)
+          string_rep = ts.in_time_zone("UTC").to_s
+          @account.typed_data.datetime_prop = ts
+          @account.save!
+          assert_equal string_rep, @account.typed_data.lookup("datetime_prop").value
+        end
+      end
+    end
   end
 end

data/test/test_view_extensions.rb

@@ -71,6 +71,25 @@ class TestViewExtensions < ActiveSupport::TestCase
       end
     end
 
+    context "text_field" do
+      should "call with :value set" do
+        settings = stub(@property => "hello")
+        object   = stub()
+        object.stubs(@association).returns(settings)
+
+        options  = {
+          :value => "im text", :name => "object_name[#{@association}][#{@property}]",
+          :id => "object_name_#{@association}_#{@property}", :object => object
+        }
+        template = stub()
+        template.expects(:instance_variable_get).with("@object_name").returns(object)
+        template.expects(:text_field).with("object_name", @property, options)
+
+        @proxy.stubs(:template).returns(template)
+        @proxy.text_field(@property, options)
+      end
+    end
+
     context "radio_button" do
       should "call with checked true for a truth value" do
         settings = stub(@property => "hello")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -07:00
+date: 2011-08-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,8 +205,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Property sets for ActiveRecord
-test_files: 
-- test/helper.rb
-- test/schema.rb
-- test/test_property_sets.rb
-- test/test_view_extensions.rb
+test_files: []
+