property_sets 0.5.8 → 0.6.0

data/Gemfile

@@ -2,6 +2,6 @@ source "http://rubygems.org"
 
 gem 'activerecord-jdbcmysql-adapter', '1.2.2', :platforms => :jruby
 gem 'mysql', :platforms => :ruby
-
+gem 'ruby-debug'
 gemspec
 

data/gemfiles/rails2.3.gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 
 gem "activerecord-jdbcmysql-adapter", "1.2.2", :platforms=>:jruby
 gem "mysql", :platforms=>:ruby
+gem "ruby-debug"
 gem "activerecord", "2.3.14"
 gem "activesupport", "2.3.14"
 gem "actionpack", "2.3.14"

data/gemfiles/rails2.3.gemfile.lock

@@ -1,10 +1,11 @@
 PATH
-  remote: /Users/primdahl/Git/property_sets
+  remote: /Users/ben/src/property_sets
   specs:
     property_sets (0.5.6)
       actionpack (>= 2.3.14, < 3.3)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
+      json
 
 GEM
   remote: http://rubygems.org/
@@ -22,13 +23,23 @@ GEM
     appraisal (0.4.0)
       bundler
       rake
+    columnize (0.3.6)
     jdbc-mysql (5.1.13)
+    json (1.6.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     metaclass (0.0.1)
     mocha (0.10.3)
       metaclass (~> 0.0.1)
     mysql (2.8.1)
     rack (1.1.3)
     rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     shoulda (2.11.3)
 
 PLATFORMS
@@ -46,4 +57,5 @@ DEPENDENCIES
   mysql
   property_sets!
   rake
+  ruby-debug
   shoulda

data/gemfiles/rails3.2.gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 
 gem "activerecord-jdbcmysql-adapter", "1.2.2", :platforms=>:jruby
 gem "mysql", :platforms=>:ruby
+gem "ruby-debug"
 gem "activerecord", "3.2.1"
 gem "activesupport", "3.2.1"
 gem "actionpack", "3.2.1"

data/gemfiles/rails3.2.gemfile.lock

@@ -1,10 +1,11 @@
 PATH
-  remote: /Users/primdahl/Git/property_sets
+  remote: /Users/ben/src/property_sets
   specs:
     property_sets (0.5.6)
       actionpack (>= 2.3.14, < 3.3)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
+      json
 
 GEM
   remote: http://rubygems.org/
@@ -39,11 +40,15 @@ GEM
       rake
     arel (3.0.0)
     builder (3.0.0)
+    columnize (0.3.6)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
     jdbc-mysql (5.1.13)
     journey (1.0.1)
+    json (1.6.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     metaclass (0.0.1)
     mocha (0.10.3)
       metaclass (~> 0.0.1)
@@ -55,6 +60,12 @@ GEM
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     shoulda (2.11.3)
     sprockets (2.1.2)
       hike (~> 1.2)
@@ -78,4 +89,5 @@ DEPENDENCIES
   mysql
   property_sets!
   rake
+  ruby-debug
   shoulda

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.5.8"
+  VERSION = "0.6.0"
 
   def self.ensure_property_set_class(association, owner_class)
     const_name = "#{owner_class.name}#{association.to_s.singularize.capitalize}".to_sym

data/lib/property_sets/active_record_extension.rb

@@ -4,7 +4,7 @@ module PropertySets
   module ActiveRecordExtension
     module ClassMethods
 
-      def property_set(association, &block)
+      def property_set(association, options = {}, &block)
         unless include?(PropertySets::ActiveRecordExtension::InstanceMethods)
           self.send(:include, PropertySets::ActiveRecordExtension::InstanceMethods)
           cattr_accessor :property_set_index
@@ -17,7 +17,8 @@ module PropertySets
         property_class = PropertySets.ensure_property_set_class(association, self)
         property_class.instance_eval(&block)
 
-        has_many association, :class_name => property_class.name, :autosave => true, :dependent => :destroy do
+        hash_opts = {:class_name => property_class.name, :autosave => true, :dependent => :destroy}.merge(options)
+        has_many association, hash_opts do
 
           # Accepts a name value pair hash { :name => 'value', :pairs => true } and builds a property for each key
           def set(property_pairs, with_protection = false)
@@ -48,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
@@ -55,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
@@ -87,6 +93,7 @@ module PropertySets
           def lookup(arg)
             instance   = lookup_without_default(arg)
             instance ||= build_default(arg)
+            instance.validate_serialization = property_serialized?(arg)
 
             if ActiveRecord::VERSION::MAJOR == 3
               owner = proxy_association.owner
@@ -110,6 +117,8 @@ module PropertySets
               end
               association_class.new(:value => default(arg))
             end
+            instance.validate_serialization = 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,8 @@ module PropertySets
           value.to_i
         when :boolean
           ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
+        when :serialized
+          JSON.parse(value)
       end
     end
 
@@ -28,6 +32,8 @@ module PropertySets
           else
             value.in_time_zone("UTC").to_s
           end
+        when :serialized
+          value.to_json
         else
           value.to_s
       end

data/lib/property_sets/property_set_model.rb

@@ -28,6 +28,8 @@ module PropertySets
         value.to_s
       end
 
+      attr_accessor :validate_serialization
+
       private
 
       def validate_format_of_name
@@ -38,6 +40,12 @@ module PropertySets
         end
       end
 
+      def validate_length_of_serialized_data
+        if validate_serialization && self.class.columns_hash["value"].limit < self.value.size
+          errors.add(:value, :invalid)
+        end
+      end
+
       def coerce_value
         self.value = value.to_s unless value.nil?
       end
@@ -51,6 +59,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/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.5.8'
-  s.date              = '2012-02-08'
+  s.version           = '0.6.0'
+  s.date              = '2012-03-22'
   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
@@ -93,4 +94,4 @@ Gem::Specification.new do |s|
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
   s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
-end
+end

data/test/helper.rb

@@ -69,5 +69,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 "deserialize properly" do
+      assert_equal [1,2,3], PropertySets::Casting.read(:serialized, "[1, 2, 3]")
+    end
   end
 
   context "Casting#write" do
@@ -24,6 +28,10 @@ class TestCasting < ActiveSupport::TestCase
     should "convert integers to strings" do
       assert_equal "123", PropertySets::Casting.write(:integer, 123)
     end
+
+    should "serialize data marked as :serialize to json" do
+      assert_equal "[123]", PropertySets::Casting.write(:serialized, [123])
+    end
   end
 
 end

data/test/test_property_sets.rb

@@ -15,7 +15,16 @@ class TestPropertySets < ActiveSupport::TestCase
     end
 
     should "register the property sets used on a class" do
-      assert_equal [ :settings, :texts, :validations, :typed_data ], Account.property_set_index
+      [ :settings, :texts, :validations, :typed_data ].each do |name|
+        assert Account.property_set_index.include?(name)
+      end
+    end
+
+    should "pass-through any options from the second parameter" do
+      Account.expects(:has_many).with { |association, h|
+        association == :foo && h[:conditions] == "bar"
+      }
+      Account.property_set(:foo, :conditions => "bar") {}
     end
 
     should "support protecting attributes" do
@@ -293,6 +302,22 @@ 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
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: property_sets
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 8
-  version: 0.5.8
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-08 00:00:00 Z
+date: 2012-03-22 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: []
@@ -226,3 +240,4 @@ test_files:
 - test/test_casting.rb
 - test/test_property_sets.rb
 - test/test_view_extensions.rb
+has_rdoc: