property_sets 0.6.2 → 0.7.1

data/lib/property_sets/active_record_extension.rb

@@ -49,6 +49,7 @@ module PropertySets
             define_method "#{key}=" do |value|
               instance = lookup(key)
               instance.value = PropertySets::Casting.write(property_class.type(key), value)
+              instance.value
             end
 
             define_method "#{key}_record" do
@@ -56,6 +57,10 @@ module PropertySets
             end
           end
 
+          define_method :property_serialized? do |key|
+            property_class.type(key) == :serialized
+          end
+
           def save(*args)
             each { |p| p.save(*args) }
           end
@@ -88,6 +93,7 @@ module PropertySets
           def lookup(arg)
             instance   = lookup_without_default(arg)
             instance ||= build_default(arg)
+            instance.value_serialized = property_serialized?(arg)
 
             if ActiveRecord::VERSION::MAJOR == 3
               owner = proxy_association.owner
@@ -102,7 +108,7 @@ module PropertySets
           # This finder method returns the property if present, otherwise a new instance with the default value.
           # It does not have the side effect of adding a new setting object.
           def lookup_or_default(arg)
-            instance   = detect { |property| property.name.to_sym == arg.to_sym }
+            instance   = lookup_without_default(arg)
             instance ||= begin
               if ActiveRecord::VERSION::MAJOR == 3
                 association_class = proxy_association.klass
@@ -111,6 +117,8 @@ module PropertySets
               end
               association_class.new(:value => default(arg))
             end
+            instance.value_serialized = property_serialized?(arg)
+            instance
           end
         end
       end

data/lib/property_sets/casting.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module PropertySets
   module Casting
 
@@ -15,6 +17,9 @@ module PropertySets
           value.to_i
         when :boolean
           ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
+        when :serialized
+          # deserialization happens in the model
+          value
       end
     end
 
@@ -28,6 +33,9 @@ module PropertySets
           else
             value.in_time_zone("UTC").to_s
           end
+        when :serialized
+          # write the object directly.
+          value
         else
           value.to_s
       end

data/lib/property_sets/property_set_model.rb

@@ -24,10 +24,36 @@ module PropertySets
         self.class.protected?(name.to_sym)
       end
 
+      def value
+        if value_serialized
+          v = read_attribute(:value)
+          return nil if v == "null"
+          @deserialized_value ||= JSON.parse(v)
+        else
+          super
+        end
+      end
+
+      def value=(v)
+        if value_serialized
+          @deserialized_value = v
+          write_attribute(:value, v.to_json)
+        else
+          super(v)
+        end
+      end
+
+      def reload(*args, &block)
+        @deserialized_value = nil
+        super
+      end
+
       def to_s
         value.to_s
       end
 
+      attr_accessor :value_serialized
+
       private
 
       def validate_format_of_name
@@ -38,10 +64,17 @@ module PropertySets
         end
       end
 
-      def coerce_value
-        self.value = value.to_s unless value.nil?
+      def validate_length_of_serialized_data
+        if value_serialized && self.read_attribute(:value).to_s.size > self.class.columns_hash["value"].limit
+          errors.add(:value, :invalid)
+        end
       end
 
+      def coerce_value
+        if value && !value_serialized
+          self.value = value.to_s
+        end
+      end
 
       def owner_class_instance
         send(self.class.owner_class_sym)
@@ -51,6 +84,7 @@ module PropertySets
     module ClassMethods
       def self.extended(base)
         base.validate      :validate_format_of_name
+        base.validate      :validate_length_of_serialized_data
         base.before_create :coerce_value
       end
 

data/lib/property_sets.rb

@@ -3,7 +3,7 @@ require 'property_sets/active_record_extension'
 require 'property_sets/action_view_extension'
 
 module PropertySets
-  VERSION = "0.6.2"
+  VERSION = "0.7.1"
 
   def self.ensure_property_set_class(association, owner_class)
     const_name = "#{owner_class.name}#{association.to_s.singularize.capitalize}".to_sym

data/property_sets.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'property_sets'
-  s.version           = '0.6.2'
-  s.date              = '2012-03-22'
+  s.version           = '0.7.1'
+  s.date              = '2012-04-09'
   s.rubyforge_project = 'property_sets'
 
   ## Make sure your summary is short. The description may be as long
@@ -50,6 +50,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("activesupport", ">= 2.3.14", "< 3.3")
   s.add_runtime_dependency("activerecord", ">= 2.3.14", "< 3.3")
   s.add_runtime_dependency("actionpack", ">= 2.3.14", "< 3.3")
+  s.add_runtime_dependency("json")
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

data/test/helper.rb

@@ -1,4 +1,6 @@
 require 'rubygems'
+require 'bundler'
+Bundler.setup
 require 'active_support'
 require 'test/unit'
 require 'active_record'
@@ -69,5 +71,6 @@ class Account < ActiveRecord::Base
     property :datetime_prop, :type => :datetime
     property :float_prop, :type => :float
     property :int_prop, :type => :integer
+    property :serialized_prop, :type => :serialized
   end
 end

data/test/test_casting.rb

@@ -8,6 +8,10 @@ class TestCasting < ActiveSupport::TestCase
       assert_equal nil, PropertySets::Casting.read(:string, nil)
       assert_equal nil, PropertySets::Casting.read(:hello, nil)
     end
+
+    should "leave serialized data alone" do
+      assert_equal [1,2,3], PropertySets::Casting.read(:serialized, [1, 2, 3])
+    end
   end
 
   context "Casting#write" do
@@ -24,6 +28,11 @@ class TestCasting < ActiveSupport::TestCase
     should "convert integers to strings" do
       assert_equal "123", PropertySets::Casting.write(:integer, 123)
     end
+
+    should "leave serialized data alone for the record to deal with" do
+      a = [123]
+      assert_equal a, PropertySets::Casting.write(:serialized, a)
+    end
   end
 
 end

data/test/test_property_sets.rb

@@ -302,6 +302,34 @@ class TestPropertySets < ActiveSupport::TestCase
           assert_equal string_rep, @account.typed_data.lookup("datetime_prop").value
         end
       end
+
+      context "serialized data" do
+        should "store data in json" do
+          value = {:a => 1, :b => 2}
+          @account.typed_data.serialized_prop = value
+          @account.save!
+          @account.reload
+          assert_equal({'a' => 1, 'b' => 2},  @account.typed_data.serialized_prop)
+        end
+
+        should "not overflow the column" do
+          @account.typed_data.serialized_prop = (1..100_000).to_a
+          assert !@account.typed_data.lookup(:serialized_prop).valid?
+          assert !@account.save
+        end
+
+        should "allow for destructive operators" do
+          value = {:a => 1, :b => 2}
+          @account.typed_data.serialized_prop = value
+          @account.typed_data.serialized_prop[:c] = 3
+          assert_equal 3, @account.typed_data.serialized_prop[:c]
+        end
+
+        should "deal with nil values properly" do
+          @account.typed_data.serialized_prop = nil
+          @account.save!
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
-  - 6
-  - 2
-  version: 0.6.2
+  - 7
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-22 00:00:00 Z
+date: 2012-04-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -87,7 +87,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -98,10 +98,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -115,7 +115,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: bundler
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -129,7 +129,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: shoulda
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -143,7 +143,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: appraisal
+  name: mocha
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -156,6 +156,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: appraisal
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: This gem is an ActiveRecord extension which provides a convenient interface for managing per row properties.
 email: primdahl@me.com
 executables: []