hanami-model 1.1.0.beta3 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c64dfcdd1616b645a080b12ce2e763be46e5a92
-  data.tar.gz: a9b0a57fd07dcddba9643c2a7cf88f76c30aee7a
+  metadata.gz: ac1d93bb8d958c05f22b8a5f14e0072c0c7df823
+  data.tar.gz: 369794a0d62a1e06d55181564bc15693e4b0ab46
 SHA512:
-  metadata.gz: e43cca5364df05068b20b79f0771bf9212ddd06e0a8a1870d8424bb734e09970ab829c17486807104e896c47e065becff02ae0776c6e35188c262167974f7d10
-  data.tar.gz: e7f9e4fb375d026d86d26f678717eab426574e3f45e667c7034128af2bd065e43bbebd44116720f5991b6f34052d6f1c12220a55986b65adb434905ba6e7d179
+  metadata.gz: e01d7c581d03cecc7eeee81cef39abd574581e015d677ce623ddf0339a336b98f434995583b6008a9fabd275fe41a764ea4c872309c66b2148ff6aef134a102e
+  data.tar.gz: '08df89ae8621493379cd07cd7c5f78d7ac380319b7312d33d8f26d57eaa5065549773ed6bf5cbbb965838235fc93c2d9b41cac96c98124e9fbd74ad1157c6815'

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Hanami::Model
 A persistence layer for Hanami
 
+## 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`)
+- [Luca Guidi] Allow entities to be used as type in entities manual schema (`attribute :owner, Types::Entity(User)`)
+
 ## v1.1.0.beta3 - 2017-10-04
 
 ## v1.1.0.beta2 - 2017-10-03
@@ -21,6 +26,16 @@ A persistence layer for Hanami
 ### Fixed
 - [Sean Collins] Enhanced error message for Postgres `db create` and `db drop` when `createdb` and `dropdb` aren't in `PATH`
 
+## 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] Ensure to write Postgres JSON (`PGJSON`) type for nested associated records
+- [Nikita Shilnikov] Ensure `Repository#select` to work with `Hanami::Model::MappedRelation`
+
+## v1.0.3 - 2017-10-11
+### Fixed
+- [Luca Guidi] Keep the dependency on `dry-types` at `~> 0.11.0`
+
 ## v1.0.2 - 2017-08-04
 ### Fixed
 - [Maurizio De Magnis] URI escape for Postgres password

data/hanami-model.gemspec

@@ -18,10 +18,11 @@ 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.beta3'
-  spec.add_runtime_dependency 'rom-sql',         '~> 1.3'
+  spec.add_runtime_dependency 'hanami-utils',    '1.1.0.rc1'
+  spec.add_runtime_dependency 'rom',             '~> 3.3', '>= 3.3.2'
+  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'
+  spec.add_runtime_dependency 'dry-types',       '~> 0.11.0'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
 
   spec.add_development_dependency 'bundler'

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

@@ -82,15 +82,22 @@ module Hanami
         # @since 1.1.0
         # @api private
         def association_keys
-          relation(source)
-            .associations[target]
+          association
             .__send__(:join_key_map, container.relations)
         end
 
+        # Return the ROM::Associations for the source relation
+        #
+        # @since 1.1.9
+        # @api private
+        def association
+          relation(source).associations[target]
+        end
+
         # @since 1.1.0
         # @api private
         def _build_scope
-          result = relation(target)
+          result = relation(association.target.to_sym)
           result = result.where(foreign_key => subject.fetch(primary_key)) unless subject.nil?
           result.as(Model::MappedRelation.mapper_name)
         end

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

@@ -7,7 +7,7 @@ module Hanami
       #
       # @since 0.7.0
       # @api private
-      class HasMany
+      class HasMany # rubocop:disable Metrics/ClassLength
         # @since 0.7.0
         # @api private
         def self.schema_type(entity)
@@ -177,15 +177,22 @@ module Hanami
         # @since 0.7.0
         # @api private
         def association_keys
-          relation(source)
-            .associations[target]
+          target_association
             .__send__(:join_key_map, container.relations)
         end
 
+        # Returns the targeted association for a given source
+        #
+        # @since 0.7.0
+        # @api private
+        def target_association
+          relation(source).associations[target]
+        end
+
         # @since 0.7.0
         # @api private
         def _build_scope
-          result = relation(target)
+          result = relation(target_association.target.to_sym)
           result = result.where(foreign_key => subject.fetch(primary_key)) unless subject.nil?
           result.as(Model::MappedRelation.mapper_name)
         end

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

@@ -158,11 +158,20 @@ module Hanami
           association_keys[1].last
         end
 
+        # Return the ROM::Associations for the source relation
+        #
         # @since 1.1.0
         # @api private
+        def association
+          relation(source).associations[target]
+        end
+
+        # @since 1.1.0
+        #
+        # @api private
         # rubocop:disable Metrics/AbcSize
         def _build_scope
-          result = relation(target).qualified
+          result = relation(association.target.to_sym).qualified
           unless subject.nil?
             result = result
                      .join(through, target_foreign_key => target_primary_key)

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

@@ -23,7 +23,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           def [](value)
-            @mapping.process(@input[value])
+            @input[@mapping.process(value)]
           end
         end
 

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

@@ -31,7 +31,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           def [](value)
-            return value unless timestamps?
+            return @input[value] unless timestamps?
             _touch(@input[value], Time.now)
           end
 

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

@@ -122,7 +122,7 @@ module Hanami
           # @api private
           def build_associations(registry, associations)
             associations.each_with_object({}) do |(name, association), result|
-              target       = registry.fetch(name)
+              target       = registry.fetch(association.target.to_sym)
               result[name] = Association.lookup(association).schema_type(target)
             end
           end

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

@@ -82,11 +82,21 @@ module Hanami
             end
           end
 
+          # @since 1.0.4
+          # @api private
+          def self.pg_json_pristines
+            @pg_json_pristines ||= ::Hash.new do |hash, type|
+              hash[type] = if defined?(ROM::SQL::Types::PG)
+                             ROM::SQL::Types::PG.const_get(type).pristine
+                           end
+            end
+          end
+
           # @since 1.0.2
           # @api private
           def self.pg_json?(pristine)
-            (defined?(ROM::SQL::Types::PG::JSONB) && pristine == ROM::SQL::Types::PG::JSONB) ||
-              (defined?(ROM::SQL::Types::PG::JSON) && pristine == ROM::SQL::Types::PG::JSON)
+            pristine == pg_json_pristines['JSONB'.freeze] ||
+              pristine == pg_json_pristines['JSON'.freeze]
           end
 
           private_class_method :pg_json?

data/lib/hanami/model/types.rb

@@ -17,15 +17,67 @@ module Hanami
       # Class level interface
       #
       # @since 0.7.0
+      # rubocop:disable Naming/MethodName
       module ClassMethods
+        # Define an entity of the given type
+        #
+        # @param type [Hanami::Entity] an entity
+        #
+        # @since 1.1.0
+        #
+        # @example
+        #   require "hanami/model"
+        #
+        #   class Account < Hanami::Entity
+        #     attributes do
+        #       # ...
+        #       attribute :owner, Types::Entity(User)
+        #     end
+        #   end
+        #
+        #   account = Account.new(owner: User.new(name: "Luca"))
+        #   account.owner.class # => User
+        #   account.owner.name  # => "Luca"
+        #
+        #   account = Account.new(owner: { name: "MG" })
+        #   account.owner.class # => User
+        #   account.owner.name  # => "MG"
+        def Entity(type)
+          type = Schema::CoercibleType.new(type) unless type.is_a?(Dry::Types::Definition)
+          type
+        end
+
         # Define an array of given type
         #
+        # @param type [Object] an object
+        #
         # @since 0.7.0
-        def Collection(type) # rubocop:disable Naming/MethodName
+        #
+        # @example
+        #   require "hanami/model"
+        #
+        #   class Account < Hanami::Entity
+        #     attributes do
+        #       # ...
+        #       attribute :users, Types::Collection(User)
+        #     end
+        #   end
+        #
+        #   account = Account.new(users: [User.new(name: "Luca")])
+        #   user    = account.users.first
+        #   user.class # => User
+        #   user.name  # => "Luca"
+        #
+        #   account = Account.new(users: [{ name: "MG" }])
+        #   user    = account.users.first
+        #   user.class # => User
+        #   user.name  # => "MG"
+        def Collection(type)
           type = Schema::CoercibleType.new(type) unless type.is_a?(Dry::Types::Definition)
           Types::Array.member(type)
         end
       end
+      # rubocop:enable Naming/MethodName
 
       # Types for schema definitions
       #

data/lib/hanami/model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-model
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta3
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -16,14 +16,34 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.1.0.beta3
+        version: 1.1.0.rc1
+- !ruby/object:Gem::Dependency
+  name: rom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: rom-sql
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +61,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rom-repository
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement