hanami-model 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70775a4002119bba8febe56e6a61619320d1a832
-  data.tar.gz: d1890cf53c762541f9821eaa4fe7d8ef50aac0dc
+  metadata.gz: bb1fca18a6f84f606883ffab656334c1b8e619f6
+  data.tar.gz: 8d2884fbd3bfda01dc6390b4271280cfffe1abc2
 SHA512:
-  metadata.gz: c49a0c0249cb4e9083bdf0874d654e7cface01ede618be1cecb15a646abb34edab19b4597cdc5532dcf6657a0ec9b9dafba24559d9268dcd3558cb61204211cd
-  data.tar.gz: 661788bbaf06b16872f40c25091c68aa0e67137265df3ba807f458b9118cfe0487890d4f3f268d909920ac10f1e337ec8a37fab496994ea04f220cabcc89654f
+  metadata.gz: 4af0a977d17c5cab779ba6b7fefc91b5e94ffa927324439ed99d45fd468000289f564f151c48e1926e2e603052967077517e055735dbe719152a021ccb2c7282
+  data.tar.gz: f4c30f92ab810dde2c9678d8352bec0787e2c446235e70a078e7a419913bf2fc59d8d0fdcd30727be296085b74f7dc89f300bb57cca463437cf94805ce2b2800

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Hanami::Model
 A persistence layer for Hanami
 
+## v1.0.1 - 2017-06-23
+### Fixed
+- [Kai Kuchenbecker & Marcello Rocha & Luca Guidi] Ensure `Hanami::Entity#initialize` to not serialize (into `Hash`) other entities passed as an argument
+- [Luca Guidi] Let `Hanami::Repository.relation=` to accept strings as an argument
+- [Nikita Shilnikov] Prevent stack-overflow when `Hanami::Repository#update` is called thousand times
+
 ## v1.0.0 - 2017-04-06
 
 ## v1.0.0.rc1 - 2017-03-31

data/hanami-model.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_runtime_dependency 'hanami-utils',    '~> 1.0'
-  spec.add_runtime_dependency 'rom-sql',         '~> 1.2'
+  spec.add_runtime_dependency 'rom-sql',         '~> 1.3'
   spec.add_runtime_dependency 'rom-repository',  '~> 1.3'
-  spec.add_runtime_dependency 'dry-types',       '~> 0.9'
+  spec.add_runtime_dependency 'dry-types',       '~> 0.10'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
 
-  spec.add_development_dependency 'bundler',  '~> 1.6'
-  spec.add_development_dependency 'minitest', '~> 5'
-  spec.add_development_dependency 'rake',     '~> 11'
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake',    '~> 11'
+  spec.add_development_dependency 'rspec',   '~> 3.5'
 end

data/lib/hanami/entity.rb

@@ -19,8 +19,7 @@ module Hanami
   # @example With Hanami::Entity
   #   require 'hanami/model'
   #
-  #   class Person
-  #     include Hanami::Entity
+  #   class Person < Hanami::Entity
   #   end
   #
   # If we expand the code above in **pure Ruby**, it would be:
@@ -183,7 +182,7 @@ module Hanami
     #
     # @since 0.1.0
     def to_h
-      attributes.deep_dup.to_h
+      Utils::Hash.deep_dup(attributes)
     end
 
     # @since 0.7.0

data/lib/hanami/entity/schema.rb

@@ -73,7 +73,7 @@ module Hanami
           if attributes.nil?
             {}
           else
-            attributes.dup
+            Utils::Hash.deep_symbolize(attributes.to_hash.dup)
           end
         end
 
@@ -221,9 +221,9 @@ module Hanami
       # @since 0.7.0
       # @api private
       def call(attributes)
-        Utils::Hash.new(
+        Utils::Hash.deep_symbolize(
           schema.call(attributes)
-        ).deep_symbolize!
+        )
       end
 
       # @since 0.7.0

data/lib/hanami/model.rb

@@ -85,7 +85,7 @@ module Hanami
     # This is useful for reboot applications in production and to ensure that
     # the framework prunes stale connections.
     #
-    # @since x.x.x
+    # @since 1.0.0
     #
     # @example With Full Stack Hanami Project
     #   # config/puma.rb

data/lib/hanami/model/plugins/mapping.rb

@@ -37,8 +37,8 @@ module Hanami
           # @since 0.7.0
           # @api private
           def build(relation, options = {})
-            input(InputWithMapping.new(relation, input))
-            super(relation, options.merge(input: input))
+            wrapped_input = InputWithMapping.new(relation, options.fetch(:input) { input })
+            super(relation, options.merge(input: wrapped_input))
           end
         end
 

data/lib/hanami/model/plugins/schema.rb

@@ -37,8 +37,8 @@ module Hanami
           # @since 0.7.0
           # @api private
           def build(relation, options = {})
-            input(InputWithSchema.new(relation, input))
-            super(relation, options.merge(input: input))
+            wrapped_input = InputWithSchema.new(relation, options.fetch(:input) { input })
+            super(relation, options.merge(input: wrapped_input))
           end
         end
 

data/lib/hanami/model/plugins/timestamps.rb

@@ -100,8 +100,8 @@ module Hanami
                        InputWithUpdateTimestamp
                      end
 
-            input(plugin.new(relation, input))
-            super(relation, options.merge(input: input))
+            wrapped_input = plugin.new(relation, options.fetch(:input) { input })
+            super(relation, options.merge(input: wrapped_input))
           end
         end
 

data/lib/hanami/model/relation_name.rb

@@ -12,12 +12,12 @@ module Hanami
     # @api private
     class RelationName < EntityName
       # @param name [Class,String] the class or its name
-      # @return [Symbol] the relation name
+      # @return [String] the relation name
       #
       # @since 0.7.0
       # @api private
       def self.new(name)
-        Utils::String.new(super).underscore.pluralize.to_sym
+        Utils::String.new(super).underscore.pluralize
       end
     end
   end

data/lib/hanami/model/sql/entity/schema.rb

@@ -38,6 +38,22 @@ module Hanami
             freeze
           end
 
+          # Process attributes
+          #
+          # @param attributes [#to_hash] the attributes hash
+          #
+          # @raise [TypeError] if the process fails
+          #
+          # @since 1.0.1
+          # @api private
+          def call(attributes)
+            schema.call(attributes)
+          end
+
+          # @since 1.0.1
+          # @api private
+          alias [] call
+
           # Check if the attribute is known
           #
           # @param name [Symbol] the attribute name

data/lib/hanami/model/sql/types.rb

@@ -29,31 +29,31 @@ module Hanami
           Time     = Types::Strict::Nil | Types::Time.constructor(Coercions.method(:time))
 
           Array    = Types::Strict::Nil | Types::Array.constructor(Coercions.method(:array))
-          Hash     = Types::Strict::Nil | Types::Array.constructor(Coercions.method(:hash))
+          Hash     = Types::Strict::Nil | Types::Hash.constructor(Coercions.method(:hash))
 
           # @since 0.7.0
           # @api private
           MAPPING = {
-            Types::String.with(meta: {})            => Schema::String,
-            Types::Int.with(meta: {})               => Schema::Int,
-            Types::Float.with(meta: {})             => Schema::Float,
-            Types::Decimal.with(meta: {})           => Schema::Decimal,
-            Types::Bool.with(meta: {})              => Schema::Bool,
-            Types::Date.with(meta: {})              => Schema::Date,
-            Types::DateTime.with(meta: {})          => Schema::DateTime,
-            Types::Time.with(meta: {})              => Schema::Time,
-            Types::Array.with(meta: {})             => Schema::Array,
-            Types::Hash.with(meta: {})              => Schema::Hash,
-            Types::String.optional.with(meta: {})   => Schema::String,
-            Types::Int.optional.with(meta: {})      => Schema::Int,
-            Types::Float.optional.with(meta: {})    => Schema::Float,
-            Types::Decimal.optional.with(meta: {})  => Schema::Decimal,
-            Types::Bool.optional.with(meta: {})     => Schema::Bool,
-            Types::Date.optional.with(meta: {})     => Schema::Date,
-            Types::DateTime.optional.with(meta: {}) => Schema::DateTime,
-            Types::Time.optional.with(meta: {})     => Schema::Time,
-            Types::Array.optional.with(meta: {})    => Schema::Array,
-            Types::Hash.optional.with(meta: {})     => Schema::Hash
+            Types::String.pristine            => Schema::String,
+            Types::Int.pristine               => Schema::Int,
+            Types::Float.pristine             => Schema::Float,
+            Types::Decimal.pristine           => Schema::Decimal,
+            Types::Bool.pristine              => Schema::Bool,
+            Types::Date.pristine              => Schema::Date,
+            Types::DateTime.pristine          => Schema::DateTime,
+            Types::Time.pristine              => Schema::Time,
+            Types::Array.pristine             => Schema::Array,
+            Types::Hash.pristine              => Schema::Hash,
+            Types::String.optional.pristine   => Schema::String,
+            Types::Int.optional.pristine      => Schema::Int,
+            Types::Float.optional.pristine    => Schema::Float,
+            Types::Decimal.optional.pristine  => Schema::Decimal,
+            Types::Bool.optional.pristine     => Schema::Bool,
+            Types::Date.optional.pristine     => Schema::Date,
+            Types::DateTime.optional.pristine => Schema::DateTime,
+            Types::Time.optional.pristine     => Schema::Time,
+            Types::Array.optional.pristine    => Schema::Array,
+            Types::Hash.optional.pristine     => Schema::Hash
           }.freeze
 
           # Convert given type into coercible
@@ -62,8 +62,22 @@ module Hanami
           # @api private
           def self.coercible(attribute)
             return attribute if attribute.constrained?
-            # TODO: figure out a better way of inferring coercions from schema types
-            MAPPING.fetch(attribute.type.with(meta: {}), attribute)
+
+            type      = attribute.type
+            unwrapped = type.optional? ? type.right : type
+
+            # NOTE: In the future rom-sql should be able to always return Ruby
+            # types instead of Sequel types. When that will happen we can get
+            # rid of this logic in the block and to fallback to:
+            #
+            #  MAPPING.fetch(unwrapped.pristine, attribute)
+            MAPPING.fetch(unwrapped.pristine) do
+              if defined?(ROM::SQL::Types::PG::JSONB) && unwrapped.pristine == ROM::SQL::Types::PG::JSONB
+                Schema::Hash
+              else
+                attribute
+              end
+            end
           end
 
           # Coercer for SQL associations target

data/lib/hanami/model/sql/types/schema/coercions.rb

@@ -1,4 +1,5 @@
 require 'hanami/utils/string'
+require 'hanami/utils/hash'
 
 module Hanami
   module Model
@@ -184,7 +185,9 @@ module Hanami
               when ::Hash
                 arg
               when ->(a) { a.respond_to?(:to_hash) }
-                ::Kernel.Hash(arg)
+                Utils::Hash.deep_symbolize(
+                  ::Kernel.Hash(arg)
+                )
               else
                 raise ArgumentError.new("invalid value for Hash(): #{arg.inspect}")
               end

data/lib/hanami/model/version.rb

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

data/lib/hanami/repository.rb

@@ -6,6 +6,7 @@ require 'hanami/model/associations/dsl'
 require 'hanami/model/association'
 require 'hanami/utils/class'
 require 'hanami/utils/class_attribute'
+require 'hanami/utils/io'
 
 module Hanami
   # Mediates between the entities and the persistence layer, by offering an API
@@ -19,8 +20,7 @@ module Hanami
   # @example
   #   require 'hanami/model'
   #
-  #   class Article
-  #     include Hanami::Entity
+  #   class Article < Hanami::Entity
   #   end
   #
   #   # valid
@@ -107,7 +107,7 @@ module Hanami
   # @see Hanami::Entity
   # @see http://martinfowler.com/eaaCatalog/repository.html
   # @see http://en.wikipedia.org/wiki/Dependency_inversion_principle
-  class Repository < ROM::Repository::Root
+  class Repository < ROM::Repository::Root # rubocop:disable Metrics/ClassLength
     # Plugins for database commands
     #
     # @since 0.7.0
@@ -282,13 +282,22 @@ module Hanami
         include Utils::ClassAttribute
         auto_struct true
 
-        class_attribute :entity
+        @associations = nil
+        @mapping      = nil
+        @schema       = nil
 
+        class_attribute :entity
         class_attribute :entity_name
-        self.entity_name = Model::EntityName.new(name)
-
         class_attribute :relation
-        self.relation = Model::RelationName.new(name)
+
+        Hanami::Utils::IO.silence_warnings do
+          def self.relation=(name)
+            @relation = name.to_sym
+          end
+        end
+
+        self.entity_name = Model::EntityName.new(name)
+        self.relation    = Model::RelationName.new(name)
 
         commands :create, update: :by_pk, delete: :by_pk, mapper: Model::MappedRelation.mapper_name, use: COMMAND_PLUGINS
         prepend Commands

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-model
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rom-repository
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '11'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '3.5'
 description: A persistence framework with entities and repositories
 email:
 - me@lucaguidi.com
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: A persistence layer for Hanami