property_sets 0.6.0 → 0.6.2

data/Appraisals

@@ -5,7 +5,7 @@ appraise "rails2.3" do
 end
 
 appraise "rails3.2" do
-  gem "activerecord", "3.2.1"
-  gem "activesupport", "3.2.1"
-  gem "actionpack", "3.2.1"
+  gem "activerecord", "3.2.2"
+  gem "activesupport", "3.2.2"
+  gem "actionpack", "3.2.2"
 end

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,7 +4,6 @@ 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,11 +1,10 @@
 PATH
-  remote: /Users/ben/src/property_sets
+  remote: /Users/primdahl/Git/property_sets
   specs:
-    property_sets (0.5.6)
+    property_sets (0.6.1)
       actionpack (>= 2.3.14, < 3.3)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
-      json
 
 GEM
   remote: http://rubygems.org/
@@ -23,23 +22,13 @@ 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
@@ -57,5 +46,4 @@ DEPENDENCIES
   mysql
   property_sets!
   rake
-  ruby-debug
   shoulda

data/gemfiles/rails3.2.gemfile

@@ -4,9 +4,8 @@ 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"
+gem "activerecord", "3.2.2"
+gem "activesupport", "3.2.2"
+gem "actionpack", "3.2.2"
 
 gemspec :path=>"../"

data/gemfiles/rails3.2.gemfile.lock

@@ -1,18 +1,17 @@
 PATH
-  remote: /Users/ben/src/property_sets
+  remote: /Users/primdahl/Git/property_sets
   specs:
-    property_sets (0.5.6)
+    property_sets (0.6.1)
       actionpack (>= 2.3.14, < 3.3)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
-      json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
@@ -20,74 +19,63 @@ GEM
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-jdbc-adapter (1.2.2)
     activerecord-jdbcmysql-adapter (1.2.2)
       activerecord-jdbc-adapter (~> 1.2.2)
       jdbc-mysql (~> 5.1.0)
-    activesupport (3.2.1)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     appraisal (0.4.0)
       bundler
       rake
-    arel (3.0.0)
+    arel (3.0.2)
     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)
+    journey (1.0.3)
     metaclass (0.0.1)
     mocha (0.10.3)
       metaclass (~> 0.0.1)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     mysql (2.8.1)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     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)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     tilt (1.3.3)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  actionpack (= 3.2.1)
-  activerecord (= 3.2.1)
+  actionpack (= 3.2.2)
+  activerecord (= 3.2.2)
   activerecord-jdbcmysql-adapter (= 1.2.2)
-  activesupport (= 3.2.1)
+  activesupport (= 3.2.2)
   appraisal
   bundler
   mocha
   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.6.0"
+  VERSION = "0.6.2"
 
   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

@@ -49,7 +49,6 @@ 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
@@ -57,10 +56,6 @@ 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
@@ -93,7 +88,6 @@ 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
@@ -117,8 +111,6 @@ 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,5 +1,3 @@
-require 'json'
-
 module PropertySets
   module Casting
 
@@ -17,8 +15,6 @@ module PropertySets
           value.to_i
         when :boolean
           ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
-        when :serialized
-          JSON.parse(value)
       end
     end
 
@@ -32,8 +28,6 @@ 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,8 +28,6 @@ module PropertySets
         value.to_s
       end
 
-      attr_accessor :validate_serialization
-
       private
 
       def validate_format_of_name
@@ -40,12 +38,6 @@ 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
@@ -59,7 +51,6 @@ 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,7 +13,7 @@ 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.0'
+  s.version           = '0.6.2'
   s.date              = '2012-03-22'
   s.rubyforge_project = 'property_sets'
 
@@ -50,7 +50,6 @@ 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

@@ -69,6 +69,5 @@ 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,10 +8,6 @@ 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
@@ -28,10 +24,6 @@ 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

@@ -302,22 +302,6 @@ 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: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Morten Primdahl
@@ -87,7 +87,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rake
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -98,10 +98,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: bundler
   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: bundler
+  name: shoulda
   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: shoulda
+  name: mocha
   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: mocha
+  name: appraisal
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -156,20 +156,6 @@ 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: []