hanami-model 1.1.0.rc1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac1d93bb8d958c05f22b8a5f14e0072c0c7df823
-  data.tar.gz: 369794a0d62a1e06d55181564bc15693e4b0ab46
+  metadata.gz: baa67e9dd75be68366898314a21f009c72516403
+  data.tar.gz: 25c3f3892d14131966a71dbe18a9339b5b3c1b69
 SHA512:
-  metadata.gz: e01d7c581d03cecc7eeee81cef39abd574581e015d677ce623ddf0339a336b98f434995583b6008a9fabd275fe41a764ea4c872309c66b2148ff6aef134a102e
-  data.tar.gz: '08df89ae8621493379cd07cd7c5f78d7ac380319b7312d33d8f26d57eaa5065549773ed6bf5cbbb965838235fc93c2d9b41cac96c98124e9fbd74ad1157c6815'
+  metadata.gz: 9244838d4936d70bd1a24d4e8cce9944b91527d96999dee94eb0d5a2bf8d39b62350197cd4ff8f0bd0d10e154687850401b2c92aa89ae54d1a506aa6d069a8f3
+  data.tar.gz: 80b5cef9d91ea29db8312eae0a7659b03333cf49a34a35d0b5e08086af020f1ea0a49f29aa8517aac5716c252edea6ad35f1ad23b0dd1fec0c0e5b1a3945234d

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::Model
 A persistence layer for Hanami
 
+## v1.1.0 - 2017-10-25
+### Fixed
+- [Luca Guidi] Ensure associations to always accept objects that are serializable into `::Hash`
+
 ## v1.1.0.rc1 - 2017-10-16
 ### Added
 - [Marcello Rocha] Added support for associations aliasing via `:as` option (`has_many :users, through: :comments, as: :authors`)
@@ -28,7 +32,7 @@ A persistence layer for Hanami
 
 ## v1.0.4 - 2017-10-14
 ### Fixed
-- [Nikita Shilnikov] Keep the dependency on `dry-sql` at `~> 1.3`, which is compatible with `dry-types` `~> 0.11.0`
+- [Nikita Shilnikov] Keep the dependency on `rom-sql` at `~> 1.3`, which is compatible with `dry-types` `~> 0.11.0`
 - [Nikita Shilnikov] Ensure to write Postgres JSON (`PGJSON`) type for nested associated records
 - [Nikita Shilnikov] Ensure `Repository#select` to work with `Hanami::Model::MappedRelation`
 

data/hanami-model.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_runtime_dependency 'hanami-utils',    '1.1.0.rc1'
-  spec.add_runtime_dependency 'rom',             '~> 3.3', '>= 3.3.2'
+  spec.add_runtime_dependency 'hanami-utils',    '~> 1.1'
+  spec.add_runtime_dependency 'rom',             '~> 3.3', '>= 3.3.3'
   spec.add_runtime_dependency 'rom-sql',         '~> 1.3', '>= 1.3.5'
   spec.add_runtime_dependency 'rom-repository',  '~> 1.4'
   spec.add_runtime_dependency 'dry-types',       '~> 0.11.0'
@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake',  '~> 12'
-  spec.add_development_dependency 'rspec', '~> 3.6'
+  spec.add_development_dependency 'rspec', '~> 3.7'
 end

data/lib/hanami/model/associations/has_many.rb

@@ -50,7 +50,7 @@ module Hanami
         # @api private
         def create(data)
           entity.new(command(:create, aggregate(target), use: [:timestamps])
-            .call(data))
+            .call(serialize(data)))
         rescue => e
           raise Hanami::Model::Error.for(e)
         end
@@ -59,7 +59,7 @@ module Hanami
         # @api private
         def add(data)
           command(:create, relation(target), use: [:timestamps])
-            .call(associate(data))
+            .call(associate(serialize(data)))
         rescue => e
           raise Hanami::Model::Error.for(e)
         end
@@ -202,6 +202,10 @@ module Hanami
         def __new__(new_scope)
           self.class.new(repository, source, target, subject, new_scope)
         end
+
+        def serialize(data)
+          Utils::Hash.deep_serialize(data)
+        end
       end
     end
   end

data/lib/hanami/model/associations/has_one.rb

@@ -1,3 +1,5 @@
+require "hanami/utils/hash"
+
 module Hanami
   module Model
     module Associations
@@ -49,14 +51,14 @@ module Hanami
 
         def create(data)
           entity.new(
-            command(:create, aggregate(target), use: [:timestamps]).call(data)
+            command(:create, aggregate(target), use: [:timestamps]).call(serialize(data))
           )
         rescue => e
           raise Hanami::Model::Error.for(e)
         end
 
         def add(data)
-          command(:create, relation(target), use: [:timestamps]).call(associate(data))
+          command(:create, relation(target), use: [:timestamps]).call(associate(serialize(data)))
         rescue => e
           raise Hanami::Model::Error.for(e)
         end
@@ -65,7 +67,7 @@ module Hanami
           command(:update, relation(target), use: [:timestamps])
             .by_pk(
               one.public_send(relation(target).primary_key)
-            ).call(data)
+            ).call(serialize(data))
         rescue => e
           raise Hanami::Model::Error.for(e)
         end
@@ -78,7 +80,7 @@ module Hanami
         def replace(data)
           repository.transaction do
             delete
-            add(data)
+            add(serialize(data))
           end
         end
 
@@ -151,6 +153,12 @@ module Hanami
           result = result.where(foreign_key => subject.fetch(primary_key)) unless subject.nil?
           result.as(Model::MappedRelation.mapper_name)
         end
+
+        # @since 1.1.0
+        # @api private
+        def serialize(data)
+          Utils::Hash.deep_serialize(data)
+        end
       end
     end
   end

data/lib/hanami/model/associations/many_to_many.rb

@@ -1,3 +1,5 @@
+require "hanami/utils/hash"
+
 module Hanami
   module Model
     module Associations
@@ -5,7 +7,7 @@ module Hanami
       #
       # @since 0.7.0
       # @api private
-      class ManyToMany
+      class ManyToMany # rubocop:disable Metrics/ClassLength
         # @since 0.7.0
         # @api private
         def self.schema_type(entity)
@@ -67,12 +69,13 @@ module Hanami
           __new__(scope.where(condition))
         end
 
+        # Return the association table object. Would need an aditional query to return the entity
+        #
         # @since 1.1.0
         # @api private
-        # Return the association table object. Would need an aditional query to return the entity
         def add(*data)
           command(:create, relation(through), use: [:timestamps])
-            .call(associate(data.map(&:to_h)))
+            .call(associate(serialize(data)))
         rescue => e
           raise Hanami::Model::Error.for(e)
         end
@@ -186,6 +189,14 @@ module Hanami
         def __new__(new_scope)
           self.class.new(repository, source, target, subject, new_scope)
         end
+
+        # @since 1.1.0
+        # @api private
+        def serialize(data)
+          data.map do |d|
+            Utils::Hash.deep_serialize(d)
+          end
+        end
       end
     end
   end

data/lib/hanami/model/version.rb

@@ -3,6 +3,6 @@ module Hanami
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.1.0.rc1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hanami-model
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 3.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: rom-sql
   requirement: !ruby/object:Gem::Requirement
@@ -140,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.7'
 description: A persistence framework with entities and repositories
 email:
 - me@lucaguidi.com
@@ -215,9 +215,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13