remodel 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/remodel.rb

@@ -109,6 +109,11 @@ module Remodel
       _add_to_reverse_association_of(entity) if @reverse
       _add(entity)
     end
+    
+    def remove(entity)
+      _remove_from_reverse_association_of(entity) if @reverse
+      _remove(entity)
+    end
 
   private
 
@@ -119,8 +124,9 @@ module Remodel
     end
 
     def _remove(entity)
-      delete_if { |x| x.key = entity.key }
+      delete_if { |x| x.key == entity.key }
       Remodel.redis.lrem(@key, 0, entity.key)
+      entity
     end
 
     def _add_to_reverse_association_of(entity)
@@ -130,6 +136,14 @@ module Remodel
         entity.send("_#{@reverse}=", @this)
       end
     end
+    
+    def _remove_from_reverse_association_of(entity)
+      if entity.send(@reverse).is_a? HasMany
+        entity.send(@reverse).send(:_remove, @this)
+      else
+        entity.send("_#{@reverse}=", nil)
+      end
+    end
 
     def _fetch(clazz, key)
       keys = Remodel.redis.lrange(key, 0, -1)
@@ -149,6 +163,7 @@ module Remodel
     def initialize(attributes = {}, key = nil)
       @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
@@ -183,6 +198,10 @@ module Remodel
       Remodel.redis.del(@key)
     end
 
+    def as_json
+      { :id => id }.merge(@attributes)
+    end
+
     def to_json
       JSON.generate(self.class.pack(@attributes))
     end
@@ -225,6 +244,7 @@ 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] }
       define_method("#{name}=") { |value| @attributes[name] = value }
     end
@@ -337,6 +357,11 @@ module Remodel
     def self.mapper
       @mapper ||= {}
     end
+    
+    def self.default_values
+      @default_values ||= {}
+    end
+    
   end
     
 end

data/remodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remodel}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tim Lossen"]
-  s.date = %q{2010-04-28}
+  s.date = %q{2010-04-30}
   s.default_executable = %q{redis-monitor.rb}
   s.description = %q{build your domain model in ruby, persist your objects to redis.}
   s.email = %q{tim@lossen.de}

data/test/test_entity.rb

@@ -5,7 +5,9 @@ class Foo < Remodel::Entity
   property :y
 end
 
-class Bar < Remodel::Entity; end
+class Bar < Remodel::Entity
+  property :d, :default => 123
+end
 
 class TestEntity < Test::Unit::TestCase
 
@@ -28,7 +30,17 @@ class TestEntity < Test::Unit::TestCase
     
     should "not set the id" do
       foo = Foo.new :x => 23
-      assert_equal nil, foo.id      
+      assert_equal nil, foo.id
+    end
+    
+    should "use default values for missing properties" do
+      bar = Bar.new
+      assert_equal 123, bar.d
+    end
+    
+    should "not use default values for given properties" do
+      bar = Bar.new :d => 'cool'
+      assert_equal 'cool', bar.d
     end
   end
   
@@ -69,7 +81,17 @@ class TestEntity < Test::Unit::TestCase
     should "not store the key as a property" do
       foo = Foo.create :x => 'hello', :y => false
       assert !(/f:1/ =~ redis.get(foo.key))
-    end    
+    end
+
+    should "use default values for missing properties" do
+      bar = Bar.create
+      assert_equal 123, bar.d
+    end
+    
+    should "not use default values for given properties" do
+      bar = Bar.create :d => 'cool'
+      assert_equal 'cool', bar.d
+    end
   end
   
   context "save" do
@@ -167,6 +189,22 @@ class TestEntity < Test::Unit::TestCase
     end
   end
   
+  context "to_json" do
+    should "serialize to json" do
+      foo = Foo.new :x => 42, :y => true
+      assert_match /"x":42/, foo.to_json
+      assert_match /"y":true/, foo.to_json
+    end
+  end
+  
+  context "as_json" do
+    should "serialize into a hash" do
+      foo = Foo.create :x => 42, :y => true
+      expected = { :id => foo.id, :x => 42, :y => true }
+      assert_equal expected, foo.as_json
+    end
+  end
+  
   context "#set_key_prefix" do
     should "use the given key prefix" do
       class Custom < Remodel::Entity; set_key_prefix 'my'; end
@@ -180,11 +218,11 @@ class TestEntity < Test::Unit::TestCase
     end
   end
     
-  context "find" do
+  context "#find" do
     setup do
       redis.flushdb
       @foo = Foo.create :x => 'hello', :y => 123
-      @bar = Foo.create :x => 'hallo', :y => 124
+      Foo.create :x => 'hallo', :y => 124
     end
     
     should "find and load an entity by key" do
@@ -208,7 +246,7 @@ class TestEntity < Test::Unit::TestCase
     end
   end
   
-  context "all" do
+  context "#all" do
     setup do
       redis.flushdb
       17.times { |i| Foo.create :x => 'hello', :y => i }
@@ -275,15 +313,7 @@ class TestEntity < Test::Unit::TestCase
     end
   end
   
-  context "json" do
-    should "serialize to json" do
-      foo = Foo.new :x => 42, :y => true
-      assert_match /"x":42/, foo.to_json
-      assert_match /"y":true/, foo.to_json
-    end
-  end
-  
-  context "restore" do
+  context "#restore" do
     should "restore an entity from json" do
       before = Foo.create :x => 42, :y => true
       after = Foo.restore(before.key, before.to_json)

data/test/test_many_to_many.rb

@@ -41,13 +41,37 @@ class TestManyToMany < Test::Unit::TestCase
       should "add a new group to both associations" do
         @tim.groups.add(@rugb)
         assert_equal [@tim], @rugb.members
+        assert_equal [@rugb], @tim.groups
       end
       
       should "add a new person to both associations" do
         @rugb.members.add(@tim)
+        assert_equal [@tim], @rugb.members
         assert_equal [@rugb], @tim.groups
       end
     end
+    
+    context "remove" do
+      setup do
+        @tim = Person.create :name => 'tim'
+        @rugb = @tim.groups.create(:name => 'rug-b')
+        @erlang = @tim.groups.create(:name => 'erlang')
+        @aws = @tim.groups.create(:name => 'aws')
+      end
+      
+      should "remove a group from both associations" do
+        @tim.groups.remove(@erlang)
+        assert_equal [@rugb, @aws], @tim.groups
+        assert_equal [], @erlang.members
+      end
+      
+      should "remove a person from both associations" do
+        @erlang.members.remove(@tim)
+        assert_equal [@rugb, @aws], @tim.groups
+        assert_equal [], @erlang.members
+      end
+      
+    end
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remodel
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tim Lossen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +02:00
+date: 2010-04-30 00:00:00 +02:00
 default_executable: redis-monitor.rb
 dependencies: []