property_sets 2.0.0 → 2.0.1

data/benchmark/read.rb

@@ -0,0 +1,82 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test/helper')
+
+class Account < ActiveRecord::Base
+  # Benchmark reading from an object with many settings when:
+  # 1. Settings are undefined and use the default value (empty)
+  # 2. Settings are defined and use the database value (fully defined)
+
+  # This is a fairly realastic example of an object that has a lot of settings
+  property_set :benchmark_settings do
+    # 30 simple objects
+    10.times do |i|
+      property "float_prop_#{i}", :type => :float,   :default => 3.1415
+      property "int_prop_#{i}",   :type => :integer, :default => 22
+      property "string_prop_#{i}", :type => :string,  :default => "Sausalito, CA"
+    end
+
+    # 10 complex
+    5.times do |i|
+      property "datetime_prop_#{i}",   :type => :datetime,   :default => Time.now.to_s
+      property "serialized_prop_#{i}", :type => :serialized, :default => { "Hello" => "There" }
+    end
+
+    # 60 booleans
+    60.times do |i|
+      property "boolean_prop_#{i}", :type => :boolean, :default => true
+    end
+  end
+
+end
+
+class BenchmarkRead < ActiveSupport::TestCase
+
+  context "property sets" do
+
+    setup do
+      @account = Account.create(:name => "Name")
+    end
+
+    should "benchmark fully defined settings" do
+      # Most settings are defined and will come from the database
+      @account.benchmark_settings.keys.each do |key|
+        @account.benchmark_settings.build_default(key)
+      end
+      @account.save!
+      @account.reload
+      assert_equal 100, @account.benchmark_settings.count
+
+      GC.start
+      full_timing = Benchmark.ms do
+        1_000.times do
+          read_settings(@account)
+        end
+      end
+      puts "Reading fully defined settings: #{full_timing}ms"
+    end
+
+    should "benchmark defaults" do
+      assert_equal 0, @account.benchmark_settings.count
+      # Most settings are undefined and will use the default value
+      GC.start
+      empty_timing = Benchmark.ms do
+        1_000.times do
+          read_settings(@account)
+        end
+      end
+      puts "Reading empty settings: #{empty_timing}ms"
+    end
+
+  end
+
+  def read_settings(account)
+    account.benchmark_settings.float_prop_1
+    account.benchmark_settings.int_prop_1
+    account.benchmark_settings.string_prop_1
+    account.benchmark_settings.datetime_prop_1
+    account.benchmark_settings.boolean_prop_20?
+    account.benchmark_settings.boolean_prop_30?
+    account.benchmark_settings.boolean_prop_40?
+    account.benchmark_settings.boolean_prop_50?
+  end
+
+end

data/gemfiles/rails2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/primdahl/Git/property_sets
   specs:
-    property_sets (2.0.0)
+    property_sets (2.0.1)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
       json

data/gemfiles/rails3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/primdahl/Git/property_sets
   specs:
-    property_sets (2.0.0)
+    property_sets (2.0.1)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
       json

data/gemfiles/rails3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/primdahl/Git/property_sets
   specs:
-    property_sets (2.0.0)
+    property_sets (2.0.1)
       activerecord (>= 2.3.14, < 3.3)
       activesupport (>= 2.3.14, < 3.3)
       json

data/lib/property_sets/active_record_extension.rb

@@ -38,12 +38,15 @@ module PropertySets
 
             # Reports the coerced truth value of the property
             define_method "#{key}?" do
-              lookup_or_default(key).true?
+              type  = property_class.type(key)
+              value = lookup_value(type, key)
+              ![ "false", "0", "", "off", "n" ].member?(value.to_s.downcase)
             end
 
             # Returns the value of the property
             define_method "#{key}" do
-              PropertySets::Casting.read(property_class.type(key), lookup(key).value)
+              type = property_class.type(key)
+              lookup_value(type, key)
             end
 
             # Assigns a new value to the property
@@ -83,13 +86,47 @@ module PropertySets
           end
 
           def build_default(arg)
-            build(:name => arg.to_s, :value => default(arg))
+            build(:name => arg.to_s, :value => raw_default(arg))
           end
 
           def lookup_without_default(arg)
             detect { |property| property.name.to_sym == arg.to_sym }
           end
 
+          if ActiveRecord::VERSION::STRING < "3.2.0"
+            def lookup_value(type, key)
+              serialized = property_serialized?(key)
+
+              if instance = lookup_without_default(key)
+                instance.value_serialized = serialized
+                PropertySets::Casting.read(type, instance.value)
+              else
+                value = default(key)
+                if serialized
+                  PropertySets::Casting.deserialize(value)
+                else
+                  PropertySets::Casting.read(type, value)
+                end
+              end
+            end
+          else
+            def lookup_value(type, key)
+              serialized = property_serialized?(key)
+
+              if instance = lookup_without_default(key)
+                instance.value_serialized = serialized
+                PropertySets::Casting.read(type, instance.value)
+              else
+                value = proxy_association.klass.default(key)
+                if serialized
+                  PropertySets::Casting.deserialize(value)
+                else
+                  PropertySets::Casting.read(type, value)
+                end
+              end
+            end
+          end
+
           # The finder method which returns the property if present, otherwise a new instance with defaults
           def lookup(arg)
             instance   = lookup_without_default(arg)
@@ -116,7 +153,7 @@ module PropertySets
               else
                 association_class = @reflection.klass
               end
-              association_class.new(:value => default(arg))
+              association_class.new(:value => raw_default(arg))
             end
             instance.value_serialized = property_serialized?(arg)
             instance

data/lib/property_sets/casting.rb

@@ -41,5 +41,10 @@ module PropertySets
       end
     end
 
+    def self.deserialize(value)
+      return nil if value.nil? || value == "null"
+      JSON.parse(value)
+    end
+
   end
 end

data/lib/property_sets/property_set_model.rb

@@ -29,8 +29,7 @@ module PropertySets
       def value
         if value_serialized
           v = read_attribute(:value)
-          return nil if v.nil? || v == "null"
-          @deserialized_value ||= JSON.parse(v)
+          @deserialized_value ||= PropertySets::Casting.deserialize(v)
         else
           super
         end
@@ -100,6 +99,12 @@ module PropertySets
       end
 
       def default(key)
+        if @properties[key] && @properties[key].key?(:default)
+          PropertySets::Casting.read(type(key), @properties[key][:default])
+        end
+      end
+
+      def raw_default(key)
         @properties[key] && @properties[key].key?(:default) ? @properties[key][:default] : nil
       end
 

data/property_sets.gemspec

@@ -1,4 +1,4 @@
-Gem::Specification.new "property_sets", "2.0.0" do |s|
+Gem::Specification.new "property_sets", "2.0.1" 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/database.rb

@@ -65,6 +65,16 @@ ActiveRecord::Schema.define(:version => 1) do
 
   add_index :account_typed_data, [ :account_id, :name ], :unique => true
 
+  create_table "account_benchmark_settings", :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_benchmark_settings, [ :account_id, :name ], :unique => true
+
   create_table "accounts", :force => true do |t|
     t.string   "name"
     t.datetime "created_at"

data/test/helper.rb

@@ -30,6 +30,12 @@ end
 ActiveSupport::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
 $LOAD_PATH.unshift(ActiveSupport::TestCase.fixture_path)
 
+class ActsLikeAnInteger
+  def to_i
+    123
+  end
+end
+
 class Account < ActiveRecord::Base
   property_set :settings do
     property :foo
@@ -58,5 +64,7 @@ class Account < ActiveRecord::Base
     property :float_prop, :type => :float
     property :int_prop, :type => :integer
     property :serialized_prop, :type => :serialized
+    property :default_prop, :type => :integer, :default => ActsLikeAnInteger.new
+    property :serialized_prop_with_default, :type => :serialized, :default => "[]"
   end
 end

data/test/test_property_sets.rb

@@ -270,6 +270,11 @@ class TestPropertySets < ActiveSupport::TestCase
     end
 
     context "typed columns" do
+
+      should "typecast the default value" do
+        assert_equal 123, @account.typed_data.default(:default_prop)
+      end
+
       context "string data" do
         should "be writable and readable" do
           @account.typed_data.string_prop = "foo"
@@ -301,6 +306,7 @@ class TestPropertySets < ActiveSupport::TestCase
         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
@@ -324,6 +330,10 @@ class TestPropertySets < ActiveSupport::TestCase
           assert_equal({'a' => 1, 'b' => 2},  @account.typed_data.serialized_prop)
         end
 
+        should "retrieve default values from JSON" do
+          assert_equal([],  @account.typed_data.serialized_prop_with_default)
+        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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: property_sets
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -204,6 +204,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- benchmark/read.rb
 - gemfiles/rails2.3.gemfile
 - gemfiles/rails2.3.gemfile.lock
 - gemfiles/rails3.0.gemfile
@@ -245,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Property sets for ActiveRecord.