lotus-rethinkdb 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd4f3f3377f4a03062e673ee934296589c1ff1e
-  data.tar.gz: dcedbcd89c9aa0685e8d2a2c181006099c7057a2
+  metadata.gz: 2a1666d3a75f836b580a1b76e08d802766b0240b
+  data.tar.gz: a6e175bfe43389dc2a9fe7aef182db515645c1e5
 SHA512:
-  metadata.gz: 643f2c1c4600ace72f144c2ff8788e27c21a069618e2cabede36988047278fb642e2bf3c1993a79deb473aaaddb36ab96b209c824c77a269d7db59ecd5bb1cce
-  data.tar.gz: 20455fed86bdb86691d7568b06db69fb82f8228f925374ee6c90dc8e06a485695c44f5f790ef34c0d7ada708d7d6e8481d281bd4599e58643cc5859ecc05486e
+  metadata.gz: 74879f3560374914edb0d4b7e11724cd608cde44d817a45236e6e4028244a8974a078dec33651f9b5943f62dd0b8bdb6b736fce513feb017c7c48d8e0b37c536
+  data.tar.gz: 596545455271f3de443bdd47677f19190130d16d763c939bd2f09916e91af288be51544bb783f1bf5e8e505e7ce6dba0c1335382aeb2dc4d90adc1c3eef96060

data/lib/lotus/model/adapters/rethinkdb/collection.rb

@@ -42,11 +42,15 @@ module Lotus
           # @api private
           # @since 0.1.0
           def insert(entity)
+            serialized_entity = _serialize(entity)
+
             response = _run do
-              super(_serialize(entity))
+              super(serialized_entity)
             end
 
-            response['generated_keys'].first
+            serialized_entity[_identity] = response['generated_keys'].first
+
+            _deserialize([serialized_entity]).first
           end
 
           # Updates the document corresponding to the given entity.
@@ -276,6 +280,16 @@ module Lotus
             )
           end
 
+          # Name of the identity field in database.
+          #
+          # @return [Symbol] the identity name
+          #
+          # @api private
+          # @since 0.2.1
+          def _identity
+            @mapped_collection.identity
+          end
+
           # Returns a collection with the connection automatically included.
           #
           # @return [Lotus::Model::Adapters::Rethinkdb::Collection]

data/lib/lotus/model/adapters/rethinkdb_adapter.rb

@@ -70,10 +70,9 @@ module Lotus
         # @api private
         # @since 0.1.0
         def create(collection, entity)
-          entity.id = command(
-                        query(collection)
-                      ).create(entity)
-          entity
+          command(
+            query(collection)
+          ).create(entity)
         end
 
         # Updates a document in the database corresponding to the given entity.

data/lib/lotus/rethinkdb/version.rb

@@ -7,6 +7,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

data/test/model/adapters/rethinkdb_adapter_test.rb

@@ -62,8 +62,8 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
       user   = TestUser.new
       device = TestDevice.new
 
-      @adapter.create(:test_users, user)
-      @adapter.create(:test_devices, device)
+      user   = @adapter.create(:test_users, user)
+      device = @adapter.create(:test_devices, device)
 
       @adapter.all(:test_users).must_equal [user]
       @adapter.all(:test_devices).must_equal [device]
@@ -75,30 +75,30 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
       let(:entity) { TestUser.new }
 
       it 'stores the document and assigns an id' do
-        @adapter.persist(collection, entity)
+        result = @adapter.persist(collection, entity)
 
-        entity.id.wont_be_nil
+        result.id.wont_be_nil
 
-        @adapter.find(collection, entity.id).must_equal entity
+        @adapter.find(collection, result.id).must_equal result
       end
     end
 
     describe 'when the given entity is persisted' do
       before do
-        @adapter.create(collection, entity)
+        @entity = @adapter.create(collection, entity)
       end
 
       let(:entity) { TestUser.new }
 
       it 'updates the document and leaves untouched the id' do
-        id = entity.id
+        id = @entity.id
         id.wont_be_nil
 
-        entity.name = 'L'
-        @adapter.persist(collection, entity)
+        @entity.name = 'L'
+        @adapter.persist(collection, @entity)
 
-        entity.id.must_equal id
-        @adapter.find(collection, entity.id).name.must_equal entity.name
+        @entity.id.must_equal id
+        @adapter.find(collection, @entity.id).name.must_equal @entity.name
       end
     end
   end
@@ -107,29 +107,29 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
     let(:entity) { TestUser.new }
 
     it 'stores the document and assigns an id' do
-      @adapter.create(collection, entity)
+      result = @adapter.create(collection, entity)
 
-      entity.id.wont_be_nil
+      result.id.wont_be_nil
 
-      @adapter.find(collection, entity.id).must_equal entity
+      @adapter.find(collection, result.id).must_equal result
     end
   end
 
   describe '#update' do
     before do
-      @adapter.create(collection, entity)
+      @entity = @adapter.create(collection, entity)
     end
 
     let(:entity) { TestUser.new(id: nil, name: 'L') }
 
     it 'stores the changes and leave the id untouched' do
-      id = entity.id
+      id = @entity.id
 
-      entity.name = 'MG'
-      @adapter.update(collection, entity)
+      @entity.name = 'MG'
+      @adapter.update(collection, @entity)
 
-      entity.id.must_equal id
-      @adapter.find(collection, entity.id).name.must_equal entity.name
+      @entity.id.must_equal id
+      @adapter.find(collection, @entity.id).name.must_equal @entity.name
     end
   end
 
@@ -160,26 +160,26 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
     describe 'when some documents are persisted' do
       before do
         @adapter.clear(collection)
-        @adapter.create(collection, entity)
+        @entity = @adapter.create(collection, entity)
       end
 
       let(:entity) { TestUser.new }
 
       it 'returns all of them' do
-        @adapter.all(collection).must_equal [entity]
+        @adapter.all(collection).must_equal [@entity]
       end
     end
   end
 
   describe '#find' do
     before do
-      @adapter.create(collection, entity)
+      @entity = @adapter.create(collection, entity)
     end
 
     let(:entity) { TestUser.new }
 
     it 'returns the document by id' do
-      @adapter.find(collection, entity.id).must_equal entity
+      @adapter.find(collection, @entity.id).must_equal @entity
     end
 
     it 'returns nil when the document cannot be found' do
@@ -205,8 +205,8 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
     describe 'when some documents are persisted' do
       before do
         @adapter.clear(:test_users)
-        @adapter.create(collection, entity1)
-        @adapter.create(collection, entity2)
+        @entity1 = @adapter.create(collection, entity1)
+        @entity2 = @adapter.create(collection, entity2)
       end
 
       let(:entity1) { TestUser.new }
@@ -263,7 +263,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
       @adapter.clear(collection)
     end
 
-    let(:user1) { TestUser.new(name: 'L', age: 32) }
+    let(:user1) { TestUser.new(name: 'L', age: '32') }
     let(:user2) { TestUser.new(name: 'MG', age: 31) }
 
     describe 'where' do
@@ -279,54 +279,54 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
 
       describe 'with a filled collection' do
         before do
-          @adapter.create(collection, user1)
-          @adapter.create(collection, user2)
+          @user1 = @adapter.create(collection, user1)
+          @user2 = @adapter.create(collection, user2)
         end
 
         it 'returns selected records' do
-          id = user1.id
+          id = @user1.id
 
           query = proc do
             where(id: id)
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user1]
+          result.must_equal [@user1]
         end
 
         it 'can use multiple where conditions' do
-          id   = user1.id
-          name = user1.name
+          id   = @user1.id
+          name = @user1.name
 
           query = proc do
             where(id: id).where(name: name)
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user1]
+          result.must_equal [@user1]
         end
 
         it 'can use multiple where conditions with "and" alias' do
-          id   = user1.id
-          name = user1.name
+          id   = @user1.id
+          name = @user1.name
 
           query = proc do
             where(id: id).and(name: name)
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user1]
+          result.must_equal [@user1]
         end
 
         it 'can use a block' do
-          age = user1.age
+          age = @user1.age
 
           query = proc do
             where { |user| user['age'].eq(age) }
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user1]
+          result.must_equal [@user1]
         end
 
         it 'raises an error if you dont specify condition or block' do
@@ -482,8 +482,8 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
 
       describe 'with a filled collection' do
         before do
-          @adapter.create(collection, user1)
-          @adapter.create(collection, user2)
+          @user1 = @adapter.create(collection, user1)
+          @user2 = @adapter.create(collection, user2)
         end
 
         it 'returns sorted records' do
@@ -492,7 +492,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user2, user1]
+          result.must_equal [@user2, @user1]
         end
 
         it 'returns sorted records, using multiple columns' do
@@ -501,7 +501,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user2, user1]
+          result.must_equal [@user2, @user1]
         end
 
         it 'returns sorted records, using multiple invokations' do
@@ -510,7 +510,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user1, user2]
+          result.must_equal [@user1, @user2]
         end
       end
     end
@@ -528,8 +528,8 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
 
       describe 'with a filled collection' do
         before do
-          @adapter.create(collection, user1)
-          @adapter.create(collection, user2)
+          @user1 = @adapter.create(collection, user1)
+          @user2 = @adapter.create(collection, user2)
         end
 
         it 'returns sorted records' do
@@ -538,7 +538,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user2, user1]
+          result.must_equal [@user2, @user1]
         end
       end
     end
@@ -556,8 +556,8 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
 
       describe 'with a filled collection' do
         before do
-          @adapter.create(collection, user1)
-          @adapter.create(collection, user2)
+          @user1 = @adapter.create(collection, user1)
+          @user2 = @adapter.create(collection, user2)
         end
 
         it 'returns reverse sorted records' do
@@ -566,7 +566,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user1, user2]
+          result.must_equal [@user1, @user2]
         end
 
         it 'returns sorted records, using multiple columns' do
@@ -575,7 +575,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user1, user2]
+          result.must_equal [@user1, @user2]
         end
 
         it 'returns sorted records, using multiple invokations' do
@@ -584,7 +584,7 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
           end
 
           result = @adapter.query(collection, &query).all
-          result.must_equal [user2, user1]
+          result.must_equal [@user2, @user1]
         end
       end
     end
@@ -602,13 +602,13 @@ describe Lotus::Model::Adapters::RethinkdbAdapter do
 
       describe 'with a filled collection' do
         before do
-          @adapter.create(collection, user1)
-          @adapter.create(collection, user2)
-          @adapter.create(collection, TestUser.new(name: user2.name))
+          @user1 = @adapter.create(collection, user1)
+          @user2 = @adapter.create(collection, user2)
+          @user3 = @adapter.create(collection, TestUser.new(name: user2.name))
         end
 
         it 'returns only the number of requested records' do
-          name = user2.name
+          name = @user2.name
 
           query = proc do
             where(name: name).limit(1)

data/test/version_test.rb

@@ -2,6 +2,6 @@ require 'test_helper'
 
 describe Lotus::Rethinkdb::VERSION do
   it 'returns current version' do
-    Lotus::Rethinkdb::VERSION.must_equal '0.2.0'
+    Lotus::Rethinkdb::VERSION.must_equal '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus-rethinkdb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Angelo Ashmore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-model
@@ -161,4 +161,3 @@ test_files:
 - test/model/adapters/rethinkdb_adapter_test.rb
 - test/test_helper.rb
 - test/version_test.rb
-has_rdoc: