remodel-h 0.2.8 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.8
+0.2.9

data/lib/remodel/entity.rb

@@ -86,7 +86,7 @@ module Remodel
       name = name.to_sym
       mapper[name] = Remodel.mapper_for(options[:class])
       default_value = options[:default]
-      define_method(name) { @attributes[name].nil? ? default_value : @attributes[name] }
+      define_method(name) { @attributes[name].nil? ? self.class.copy_of(default_value) : @attributes[name] }
       define_method("#{name}=") { |value| @attributes[name] = value }
     end
 
@@ -211,6 +211,10 @@ module Remodel
       @associations ||= []
     end
 
+    def self.copy_of(value)
+      value.is_a?(Array) || value.is_a?(Hash) ? value.dup : value
+    end
+
   end
 
 end

data/remodel-h.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remodel-h}
-  s.version = "0.2.8"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Lossen"]
-  s.date = %q{2011-03-29}
+  s.date = %q{2011-04-18}
   s.default_executable = %q{redis-monitor.rb}
   s.description = %q{persist your objects to redis hashes.}
   s.email = %q{tim@lossen.de}
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "remodel-h.gemspec",
     "test/helper.rb",
     "test/test_entity.rb",
+    "test/test_entity_defaults.rb",
     "test/test_entity_delete.rb",
     "test/test_many_to_many.rb",
     "test/test_many_to_one.rb",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
     "test/test_entity.rb",
+    "test/test_entity_defaults.rb",
     "test/test_entity_delete.rb",
     "test/test_many_to_many.rb",
     "test/test_many_to_one.rb",

data/test/test_entity.rb

@@ -11,34 +11,6 @@ end
 
 class TestEntity < Test::Unit::TestCase
 
-  context "[default values]" do
-    should "be returned for missing properties" do
-      bar = Bar.new('cx')
-      assert_equal 123, bar.d
-    end
-
-    should "be returned for properties that are nil" do
-      bar = Bar.new('cx', :d => 'cool')
-      bar.d = nil
-      assert_equal 123, bar.d
-    end
-
-    should "not be returned for given properties" do
-      bar = Bar.new('cx', :d => 'cool')
-      assert_equal 'cool', bar.d
-    end
-
-    should "not be stored" do
-      bar = Bar.create('cx')
-      assert !(/123/ =~ redis.hget('cx', bar.key))
-    end
-
-    should "be returned by as_json" do
-      bar = Bar.new('cx')
-      assert_equal 123, bar.as_json[:d]
-    end
-  end
-
   context "new" do
     should "set properties" do
       foo = Foo.new('cx', :x => 1, :y => 2)

data/test/test_entity_defaults.rb

@@ -0,0 +1,55 @@
+require 'helper'
+
+class TestEntityDefaults < Test::Unit::TestCase
+
+  class Bar < Remodel::Entity
+    property :simple, :default => 123
+    property :array, :default => [1]
+    property :hash, :default => { :foo => 1 }
+  end
+
+  context "[default values]" do
+    should "be returned for missing properties" do
+      bar = Bar.new('cx')
+      assert_equal 123, bar.simple
+    end
+
+    should "be returned for properties that are nil" do
+      bar = Bar.new('cx', :simple => 'cool')
+      bar.simple = nil
+      assert_equal 123, bar.simple
+    end
+
+    should "not be returned for given properties" do
+      bar = Bar.new('cx', :simple => 'cool')
+      assert_equal 'cool', bar.simple
+    end
+
+    should "not be stored" do
+      bar = Bar.create('cx')
+      assert !(/123/ =~ redis.hget('cx', bar.key))
+    end
+
+    should "be returned by as_json" do
+      bar = Bar.new('cx')
+      assert_equal 123, bar.as_json[:simple]
+    end
+  end
+
+  context "[collections]" do
+    setup do
+      @bar, @baz = Bar.new('cx'), Bar.new('cx')
+    end
+
+    should "not share arrays" do
+      @bar.array[0] += 1
+      assert_equal [1], @baz.array
+    end
+
+    should "not share hashes" do
+      @bar.hash[:foo] = 42
+      assert_equal 1, @baz.hash[:foo]
+    end
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
-  version: 0.2.8
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - Tim Lossen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +02:00
+date: 2011-04-18 00:00:00 +02:00
 default_executable: redis-monitor.rb
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - remodel-h.gemspec
 - test/helper.rb
 - test/test_entity.rb
+- test/test_entity_defaults.rb
 - test/test_entity_delete.rb
 - test/test_many_to_many.rb
 - test/test_many_to_one.rb
@@ -85,6 +86,7 @@ summary: remodel variant which uses hashes
 test_files: 
 - test/helper.rb
 - test/test_entity.rb
+- test/test_entity_defaults.rb
 - test/test_entity_delete.rb
 - test/test_many_to_many.rb
 - test/test_many_to_one.rb