remodel-h 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/example/book.rb

@@ -4,6 +4,7 @@ class Book < Remodel::Entity
   has_many :chapters, :class => 'Chapter', :reverse => :book
   property :title, :class => 'String'
   property :year, :class => 'Integer'
+  property :author, :class => 'String', :default => '(anonymous)'
 end
 
 class Chapter < Remodel::Entity

data/lib/remodel/entity.rb

@@ -8,7 +8,6 @@ module Remodel
       @context = context
       @attributes = {}
       @key = key
-      attributes = self.class.default_values.merge(attributes) if key.nil?
       attributes.each do |name, value|
         send("#{name}=", value) if respond_to? "#{name}="
       end
@@ -47,7 +46,7 @@ module Remodel
     end
 
     def as_json
-      { :id => id }.merge(@attributes)
+      { :id => id }.merge(attributes)
     end
 
     def to_json
@@ -55,7 +54,7 @@ module Remodel
     end
 
     def inspect
-      properties = @attributes.map { |name, value| "#{name}: #{value.inspect}" }.join(', ')
+      properties = attributes.map { |name, value| "#{name}: #{value.inspect}" }.join(', ')
       "\#<#{self.class.name}(#{context}, #{id}) #{properties}>"
     end
 
@@ -82,8 +81,8 @@ module Remodel
     def self.property(name, options = {})
       name = name.to_sym
       mapper[name] = Remodel.mapper_for(options[:class])
-      default_values[name] = options[:default] if options.has_key?(:default)
-      define_method(name) { @attributes[name] }
+      default_value = options[:default]
+      define_method(name) { @attributes[name].nil? ? default_value : @attributes[name] }
       define_method("#{name}=") { |value| @attributes[name] = value }
     end
 
@@ -152,6 +151,14 @@ module Remodel
 
   private # --- Helper methods ---
 
+    def attributes
+      result = {}
+      self.class.mapper.keys.each do |name|
+        result[name] = send(name)
+      end
+      result
+    end
+
     def self.fetch(context, key)
       Remodel.redis.hget(context, key) || raise(EntityNotFound, "no #{name} with key #{key} in context #{context}")
     end
@@ -193,10 +200,6 @@ module Remodel
       @mapper ||= {}
     end
 
-    def self.default_values
-      @default_values ||= {}
-    end
-
   end
 
 end

data/remodel-h.gemspec

@@ -1,70 +1,68 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{remodel-h}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Lossen"]
-  s.date = %q{2010-12-08}
+  s.date = %q{2011-02-01}
   s.default_executable = %q{redis-monitor.rb}
   s.description = %q{persist your objects to redis hashes.}
   s.email = %q{tim@lossen.de}
   s.executables = ["redis-monitor.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.md"
+    "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "bin/redis-monitor.rb",
-     "docs/docco.css",
-     "docs/remodel.html",
-     "example/book.rb",
-     "lib/remodel-h.rb",
-     "lib/remodel/entity.rb",
-     "lib/remodel/has_many.rb",
-     "lib/remodel/mapper.rb",
-     "remodel-h.gemspec",
-     "test/helper.rb",
-     "test/test_entity.rb",
-     "test/test_entity_delete.rb",
-     "test/test_many_to_many.rb",
-     "test/test_many_to_one.rb",
-     "test/test_mappers.rb",
-     "test/test_monkeypatches.rb",
-     "test/test_one_to_many.rb",
-     "test/test_one_to_one.rb"
+    "LICENSE",
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "bin/redis-monitor.rb",
+    "docs/docco.css",
+    "docs/remodel.html",
+    "example/book.rb",
+    "lib/remodel-h.rb",
+    "lib/remodel/entity.rb",
+    "lib/remodel/has_many.rb",
+    "lib/remodel/mapper.rb",
+    "remodel-h.gemspec",
+    "test/helper.rb",
+    "test/test_entity.rb",
+    "test/test_entity_delete.rb",
+    "test/test_many_to_many.rb",
+    "test/test_many_to_one.rb",
+    "test/test_mappers.rb",
+    "test/test_monkeypatches.rb",
+    "test/test_one_to_many.rb",
+    "test/test_one_to_one.rb"
   ]
   s.homepage = %q{http://github.com/tlossen/remodel}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{remodel variant which uses hashes}
   s.test_files = [
     "test/helper.rb",
-     "test/test_entity.rb",
-     "test/test_entity_delete.rb",
-     "test/test_many_to_many.rb",
-     "test/test_many_to_one.rb",
-     "test/test_mappers.rb",
-     "test/test_monkeypatches.rb",
-     "test/test_one_to_many.rb",
-     "test/test_one_to_one.rb"
+    "test/test_entity.rb",
+    "test/test_entity_delete.rb",
+    "test/test_many_to_many.rb",
+    "test/test_many_to_one.rb",
+    "test/test_mappers.rb",
+    "test/test_monkeypatches.rb",
+    "test/test_one_to_many.rb",
+    "test/test_one_to_one.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/test_entity.rb

@@ -11,6 +11,34 @@ 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)
@@ -32,18 +60,8 @@ class TestEntity < Test::Unit::TestCase
       foo = Foo.new('cx', :x => 23)
       assert_equal nil, foo.id
     end
-
-    should "use default values for missing properties" do
-      bar = Bar.new('cx')
-      assert_equal 123, bar.d
-    end
-
-    should "not use default values for given properties" do
-      bar = Bar.new('cx', :d => 'cool')
-      assert_equal 'cool', bar.d
-    end
   end
-
+  
   context "create" do
     setup do
       redis.flushdb
@@ -82,16 +100,6 @@ class TestEntity < Test::Unit::TestCase
       foo = Foo.create('cx', :x => 'hello', :y => false)
       assert !(/f:1/ =~ redis.hget('cx', foo.key))
     end
-
-    should "use default values for missing properties" do
-      bar = Bar.create('cx')
-      assert_equal 123, bar.d
-    end
-
-    should "not use default values for given properties" do
-      bar = Bar.create('cx', :d => 'cool')
-      assert_equal 'cool', bar.d
-    end
   end
 
   context "save" do
@@ -222,7 +230,7 @@ class TestEntity < Test::Unit::TestCase
     end
 
     should "reject a key which does not exist" do
-      assert_raise(Remodel::EntityNotFound) { Foo.find('cx', 'x:66') }
+      assert_raise(Remodel::EntityNotFound) { Foo.find('cx', 'x66') }
     end
 
     should "reject an id which does not exist" do

data/test/test_entity_delete.rb

@@ -23,6 +23,7 @@ class TestEntityDelete < Test::Unit::TestCase
       @group.members.create(:name => 'Tim')
       @group.members.create(:name => 'Ben')
       @group.room = Room.create(:name => 'some office')
+      # TODO: @group.reload
     end
 
     should "ensure that the entity is persistent" do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: remodel-h
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Tim Lossen
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-08 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: redis-monitor.rb
 dependencies: []
 
@@ -23,7 +28,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files: 
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile
@@ -51,26 +55,30 @@ homepage: http://github.com/tlossen/remodel
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: remodel variant which uses hashes

data/.gitignore

@@ -1,2 +0,0 @@
-dump.rdb
-pkg/*