minimapper 0.0.2 → 0.0.3

data/README.md

@@ -63,17 +63,20 @@ mapper.create(user)
 
 # Finding
 user = mapper.find(user.id)
-puts user.name         # -> Joe
-puts mapper.first.name # -> Joe
+puts user.name             # -> Joe
+puts mapper.first.name     # -> Joe
 
 # Updating
 user.name = "Joey"
 mapper.update(user)
-puts mapper.first.name # -> Joey
+puts mapper.first.name    # -> Joey
 
 # Deleting
+old_id = user.id
 mapper.delete(user)
-mapper.find(user)      # raises Minimapper::Common::CanNotFindEntity
+user.id                   # -> nil
+# mapper.find(old_id)     # raises Minimapper::Common::CanNotFindEntity
+mapper.find_by_id(old_id) # -> nil
 
 # Deleting all
 mapper.delete_all
@@ -85,11 +88,13 @@ Or though a repository:
 require "minimapper/repository"
 
 repository = Minimapper::Repository.build({
-  :users    => UserMapper.new,
-  :projects => ProjectMapper.new
+  :users    => UserMapper.new
+  # :projects => ProjectMapper.new
 })
 
-repository.users.find(1)
+user = User.new(:name => "Joe")
+repository.users.create(user)
+puts repository.users.find(user.id).name # -> Joe
 ```
 
 ## Using the ActiveRecord mapper
@@ -111,6 +116,18 @@ mapper = AR::UserMapper.new
 mapper.create(user)
 ```
 
+## Using ActiveModel validation
+
+``` ruby
+user = User.new
+
+mapper = UserMapper.new
+mapper.create(user)
+
+mapper.count              # -> 0
+user.errors.full_messages # Name can't be blank
+```
+
 ## Implementing custom queries
 
 *todo* show how, talk about shared examples.

data/lib/minimapper/ar.rb

@@ -13,6 +13,10 @@ module Minimapper
 
     # Read
     def find(id)
+      entity_for(find_record_safely(id))
+    end
+
+    def find_by_id(id)
       entity_for(find_record(id))
     end
 
@@ -45,10 +49,11 @@ module Minimapper
     # Delete
     def delete(entity)
       delete_by_id(entity.id)
+      entity.id = nil
     end
 
     def delete_by_id(id)
-      find_record(id).delete
+      find_record_safely(id).delete
     end
 
     def delete_all
@@ -74,11 +79,15 @@ module Minimapper
       @entity_klass
     end
 
-    def find_record(id)
-      (id && record_klass.find_by_id(id)) ||
+    def find_record_safely(id)
+      find_record(id) ||
         raise(Common::CanNotFindEntity, :id => id)
     end
 
+    def find_record(id)
+      id && record_klass.find_by_id(id)
+    end
+
     def record_for(entity)
       (entity.id && record_klass.find_by_id(entity.id)) ||
         raise(Common::CanNotFindEntity, entity.inspect)

data/lib/minimapper/memory.rb

@@ -20,7 +20,12 @@ module Minimapper
 
     # Read
     def find(id)
-      find_internal(id).dup
+      find_internal_safely(id).dup
+    end
+
+    def find_by_id(id)
+      entity = find_internal(id)
+      entity && entity.dup
     end
 
     def all
@@ -42,7 +47,7 @@ module Minimapper
     # Update
     def update(entity)
       if entity.valid?
-        known_entity = find_internal(entity.id)
+        known_entity = find_internal_safely(entity.id)
         known_entity.attributes = entity.attributes
         true
       else
@@ -53,10 +58,11 @@ module Minimapper
     # Delete
     def delete(entity)
       delete_by_id(entity.id)
+      entity.id = nil
     end
 
     def delete_by_id(id)
-      entity = find_internal(id)
+      entity = find_internal_safely(id)
       store.delete(entity)
     end
 
@@ -66,11 +72,15 @@ module Minimapper
 
     private
 
-    def find_internal(id)
-      (id && store.find { |e| e.id == id.to_i }) ||
+    def find_internal_safely(id)
+      find_internal(id) ||
         raise(Common::CanNotFindEntity, :id => id)
     end
 
+    def find_internal(id)
+      id && store.find { |e| e.id == id.to_i }
+    end
+
     def next_id
       @last_id += 1
     end

data/lib/minimapper/version.rb

@@ -1,3 +1,3 @@
 module Minimapper
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/support/shared_examples/mapper.rb

@@ -60,6 +60,34 @@ shared_examples :mapper do
     end
   end
 
+  describe "find_by_id" do
+    it "returns an entity matching the id" do
+      entity = build_valid_entity
+      repository.create(entity)
+      found_entity = repository.find_by_id(entity.id)
+      found_entity.name.should == "test"
+      found_entity.id.should == entity.id
+      found_entity.should be_kind_of(Minimapper::Entity)
+    end
+
+    it "supports string ids" do
+      entity = build_valid_entity
+      repository.create(entity)
+      repository.find_by_id(entity.id.to_s)
+    end
+
+    it "does not return the same instance" do
+      entity = build_valid_entity
+      repository.create(entity)
+      repository.find_by_id(entity.id).object_id.should_not == entity.object_id
+      repository.find_by_id(entity.id).object_id.should_not == repository.find_by_id(entity.id).object_id
+    end
+
+    it "returns nil when the an entity can not be found" do
+      repository.find_by_id(-1).should be_nil
+    end
+  end
+
   describe "all" do
     it "returns all entities in undefined order" do
       first_created_entity = build_valid_entity
@@ -174,11 +202,20 @@ shared_examples :mapper do
   describe "delete" do
     it "removes the entity" do
       entity = build_valid_entity
+      removed_entity_id = entity.id
       repository.create(entity)
       repository.create(build_valid_entity)
       repository.delete(entity)
       repository.all.size.should == 1
-      repository.first.id.should_not == entity.id
+      repository.first.id.should_not == removed_entity_id
+    end
+
+    it "clears the entity id" do
+      entity = build_valid_entity
+      repository.create(entity)
+      entity.id.should_not be_nil
+      repository.delete(entity)
+      entity.id.should be_nil
     end
 
     it "fails when the entity does not have an id" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minimapper
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"