lotus-model 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2e425209e8c06b8546835d70e26fc450b72ff16
-  data.tar.gz: 85e4168062b4a9482250c8da8e76281b60665760
+  metadata.gz: 672ea74de3e6a010888dbbc8d0289284b6cba6cf
+  data.tar.gz: 9c5504b67e363bb70c258d62a0a77683474caf87
 SHA512:
-  metadata.gz: c701eb730b887a9810364c410b701bc369914b138704b2defc69f32c9be2d0c27708c5b0bf1b9dc4254fd8d9177f08d7bbd4e920f1ac2039aacec914e5574552
-  data.tar.gz: 8dba1937a0132e6e6bdd80f531ca66aef8a4391d2549dbccd4ed11049a134c06187b5d4138e8e752fc61683cdd84bc0fcc4f91fc8f8432114efbbcabbcce1865
+  metadata.gz: 17cc240a81a46c0420dab64e9cd3cb4f82de0c118656558cba64f7bbe0db5331019659e4f78a7657fed7b6454d41ae1b5d913b363c51e8a3690708d846496ead
+  data.tar.gz: 9def5cd833fe45e026744214f3700652a6906a7101d21016aa04997a5e64fb6c0a22125a73a032fa82756e4c2ed04d8fd93df9084dedf006fc4bcbc0919efe68

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Lotus::Model
 A persistence layer for Lotus
 
+## v0.2.2 - 2015-01-18
+### Added
+- [Luca Guidi] Coerce entities when persisted
+
 ## v0.2.1 - 2015-01-12
 ### Added
 - [Luca Guidi] Compatibility between Lotus::Entity and Lotus::Validations

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

@@ -147,8 +147,7 @@ module Lotus
         # @since 0.2.0
         def create(collection, entity)
           _synchronize do
-            super
-            write(collection)
+            super.tap { write(collection) }
           end
         end
 
@@ -163,8 +162,7 @@ module Lotus
         # @since 0.2.0
         def update(collection, entity)
           _synchronize do
-            super
-            write(collection)
+            super.tap { write(collection) }
           end
         end
 

data/lib/lotus/model/adapters/memory/command.rb

@@ -33,9 +33,10 @@ module Lotus
           # @api private
           # @since 0.1.0
           def create(entity)
-            @dataset.create(
-              _serialize(entity)
-            )
+            serialized_entity            = _serialize(entity)
+            serialized_entity[_identity] = @dataset.create(serialized_entity)
+
+            _deserialize(serialized_entity)
           end
 
           # Updates the corresponding record for the given entity.
@@ -47,9 +48,10 @@ module Lotus
           # @api private
           # @since 0.1.0
           def update(entity)
-            @dataset.update(
-              _serialize(entity)
-            )
+            serialized_entity = _serialize(entity)
+            @dataset.update(serialized_entity)
+
+            _deserialize(serialized_entity)
           end
 
           # Deletes the corresponding record for the given entity.
@@ -84,6 +86,26 @@ module Lotus
           def _serialize(entity)
             @collection.serialize(entity)
           end
+
+          # Deserialize the given entity after it was persisted in the database.
+          #
+          # @return [Lotus::Entity] the deserialized entity
+          #
+          # @api private
+          # @since 0.2.2
+          def _deserialize(entity)
+            @collection.deserialize([entity]).first
+          end
+
+          # Name of the identity column in database
+          #
+          # @return [Symbol] the identity name
+          #
+          # @api private
+          # @since 0.2.2
+          def _identity
+            @collection.identity
+          end
         end
       end
     end

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

@@ -50,8 +50,7 @@ module Lotus
         # @since 0.1.0
         def create(collection, entity)
           synchronize do
-            entity.id = command(collection).create(entity)
-            entity
+            command(collection).create(entity)
           end
         end
 

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

@@ -55,7 +55,10 @@ module Lotus
           # @api private
           # @since 0.1.0
           def insert(entity)
-            super _serialize(entity)
+            serialized_entity            = _serialize(entity)
+            serialized_entity[_identity] = super(serialized_entity)
+
+            _deserialize(serialized_entity)
           end
 
           # Filters the current scope with a `limit` directive.
@@ -178,7 +181,10 @@ module Lotus
           # @api private
           # @since 0.1.0
           def update(entity)
-            super _serialize(entity)
+            serialized_entity = _serialize(entity)
+            super(serialized_entity)
+
+            _deserialize(serialized_entity)
           end
 
           # Resolves self by fetching the records from the database and
@@ -202,6 +208,26 @@ module Lotus
           def _serialize(entity)
             @mapped_collection.serialize(entity)
           end
+
+          # Deserialize the given entity after it was persisted in the database.
+          #
+          # @return [Lotus::Entity] the deserialized entity
+          #
+          # @api private
+          # @since 0.2.2
+          def _deserialize(entity)
+            @mapped_collection.deserialize([entity]).first
+          end
+
+          # Name of the identity column in database
+          #
+          # @return [Symbol] the identity name
+          #
+          # @api private
+          # @since 0.2.2
+          def _identity
+            @mapped_collection.identity
+          end
         end
       end
     end

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

@@ -58,10 +58,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 record in the database corresponding to the given entity.

data/lib/lotus/model/mapping/coercer.rb

@@ -58,9 +58,9 @@ module Lotus
           instance_eval %{
             def to_record(entity)
               if entity.id
-                Hash[#{ @collection.attributes.map{|name,(_,mapped)| ":#{mapped},entity.#{name}"}.join(',') }]
+                Hash[#{ @collection.attributes.map{|name,(klass,mapped)| ":#{mapped},Lotus::Model::Mapping::Coercions.#{klass}(entity.#{name})"}.join(',') }]
               else
-                Hash[#{ @collection.attributes.reject{|name,_| name == @collection.identity }.map{|name,(_,mapped)| ":#{mapped},entity.#{name}"}.join(',') }]
+                Hash[#{ @collection.attributes.reject{|name,_| name == @collection.identity }.map{|name,(klass,mapped)| ":#{mapped},Lotus::Model::Mapping::Coercions.#{klass}(entity.#{name})"}.join(',') }]
               end
             end
 

data/lib/lotus/model/version.rb

@@ -3,6 +3,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.2.1'.freeze
+    VERSION = '0.2.2'.freeze
   end
 end

data/lib/lotus/repository.rb

@@ -253,7 +253,6 @@ module Lotus
       #   article.title # => "Launching Lotus::Model"
       def persist(entity)
         @adapter.persist(collection, entity)
-        entity
       end
 
       # Creates a record in the database for the given entity.
@@ -287,8 +286,6 @@ module Lotus
         unless entity.id
           @adapter.create(collection, entity)
         end
-
-        entity
       end
 
       # Updates a record in the database corresponding to the given entity.
@@ -339,8 +336,6 @@ module Lotus
         else
           raise Lotus::Model::NonPersistedEntityError
         end
-
-        entity
       end
 
       # Deletes a record in the database corresponding to the given entity.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus-model
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils