hanami-model 1.0.4 → 1.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a4972da9eec643eb9b1ff52fe1d2f6a626aba4b
-  data.tar.gz: 8dc59827cda2726dd50fb02c0ef3cc3488943613
+  metadata.gz: 8c17cc417f16015bc4dafe69467c74e94198a10a
+  data.tar.gz: f18523f952dce748ae2eeba9c6cd4c206236d1cb
 SHA512:
-  metadata.gz: 1418bf7590d149a90abbd463e728f5a20ab3417fddbfe4fc8a46f61205700224de6fa2a0c685a102575727a6fca821067dd3b739c93fba8d9886f71afa6de8f2
-  data.tar.gz: 2de56a5ddd4f1705b553a953ac47c1fe862217e553fb9a2158492f426f234ac6959895403517343d4558fd8c220c57dc8a58106e56e0502278919f57c76aaada
+  metadata.gz: d7ef2340e7ccd94518079de9aef5ab122fcda34c6daaa7f557bd3f982c4c7b62b36614433af0c4c43935e09677a5d075ab1d7bf005ae656e3e2221c0851235e8
+  data.tar.gz: 511fdf9ee9753b367cc8f03e6f13e8e7058f15f64fbb0ab9e1728d4dfc831b1a4cca0916872159ec33e5bc0dccf408da12463b6bb77daeb5976ab4013cca6a6a

data/CHANGELOG.md

@@ -1,15 +1,15 @@
 # Hanami::Model
 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] Ensure to write Postgres JSON (`PGJSON`) type for nested associated records
-- [Nikita Shilnikov] Ensure `Repository#select` to work with `Hanami::Model::MappedRelation`
+## v1.1.0.beta1 - 2017-08-11
+### Added
+- [Marcello Rocha] One-To-Many association (aka `belongs_to`)
+- [Marcello Rocha] One-To-One association (aka `has_one`)
+- [Marcello Rocha] Many-To-Many association (aka `has_many :through`)
+- [Luca Guidi] Introduced new extra behaviors for entity manual schema: `:schema` (default), `:strict`, `:weak`, and `:permissive`
 
-## v1.0.3 - 2017-10-11
 ### Fixed
-- [Luca Guidi] Keep the dependency on `dry-types` at `~> 0.11.0`
+- [Sean Collins] Enhanced error message for Postgres `db create` and `db drop` when `createdb` and `dropdb` aren't in `PATH`
 
 ## v1.0.2 - 2017-08-04
 ### Fixed

data/README.md

@@ -16,7 +16,7 @@ Like all the other Hanami components, it can be used as a standalone framework o
 
 [![Gem Version](https://badge.fury.io/rb/hanami-model.svg)](http://badge.fury.io/rb/hanami-model)
 [![Build Status](https://secure.travis-ci.org/hanami/model.svg?branch=master)](http://travis-ci.org/hanami/model?branch=master)
-[![Coverage](https://coveralls.io/repos/github/hanami/model/badge.svg?branch=master)](https://coveralls.io/github/hanami/model?branch=master)
+[![Coverage](https://codecov.io/gh/hanami/model/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/model)
 [![Code Climate](https://codeclimate.com/github/hanami/model/badges/gpa.svg)](https://codeclimate.com/github/hanami/model)
 [![Dependencies](https://gemnasium.com/hanami/model.svg)](https://gemnasium.com/hanami/model)
 [![Inline docs](http://inch-ci.org/github/hanami/model.png)](http://inch-ci.org/github/hanami/model)

data/hanami-model.gemspec

@@ -20,11 +20,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_runtime_dependency 'hanami-utils',    '~> 1.0'
-  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 'hanami-utils',    '1.1.0.beta1'
+  spec.add_runtime_dependency 'rom-sql',         '~> 1.3'
   spec.add_runtime_dependency 'rom-repository',  '~> 1.4'
-  spec.add_runtime_dependency 'dry-types',       '~> 0.11.0'
+  spec.add_runtime_dependency 'dry-types',       '~> 0.11'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/lib/hanami/entity.rb

@@ -33,7 +33,7 @@ module Hanami
   #     end
   #   end
   #
-  # **Hanami::Model** ships `Hanami::Entity` for developers' convenience.
+  # **Hanami::Model** ships `Hanami::Entity` for developers's convenience.
   #
   # **Hanami::Model** depends on a narrow and well-defined interface for an
   # Entity - `#id`, `#id=`, `#initialize(attributes={})`.If your object
@@ -75,13 +75,14 @@ module Hanami
       # attributes via this DSL. If you don't do any setup, the entity accepts all
       # the given attributes.
       #
+      # @param type [Symbol] the type of schema to build
       # @param blk [Proc] the block that defines the attributes
       #
       # @since 0.7.0
       #
       # @see Hanami::Entity
-      def attributes(&blk)
-        self.schema = Schema.new(&blk)
+      def attributes(type = nil, &blk)
+        self.schema = Schema.new(type, &blk)
         @attributes = true
       end
 

data/lib/hanami/entity/schema.rb

@@ -93,11 +93,22 @@ module Hanami
         #
         # @since 0.7.0
         class Dsl
+          # @since 1.1.0
+          # @api private
+          TYPES = [:schema, :strict, :weak, :permissive, :strict_with_defaults, :symbolized].freeze
+
+          # @since 1.1.0
+          # @api private
+          DEFAULT_TYPE = TYPES.first
+
           # @since 0.7.0
           # @api private
-          def self.build(&blk)
+          def self.build(type, &blk)
+            type ||= DEFAULT_TYPE
+            raise Hanami::Model::Error.new("Unknown schema type: `#{type.inspect}'") unless TYPES.include?(type)
+
             attributes = new(&blk).to_h
-            [attributes, Hanami::Model::Types::Coercible::Hash.schema(attributes)]
+            [attributes, Hanami::Model::Types::Coercible::Hash.__send__(type, attributes)]
           end
 
           # @since 0.7.0
@@ -152,9 +163,9 @@ module Hanami
         #
         # @since 0.7.0
         # @api private
-        def initialize(&blk)
+        def initialize(type = nil, &blk)
           raise LocalJumpError unless block_given?
-          @attributes, @schema = Dsl.build(&blk)
+          @attributes, @schema = Dsl.build(type, &blk)
           @attributes = Hash[@attributes.map { |k, _| [k, true] }]
           freeze
         end
@@ -164,6 +175,7 @@ module Hanami
         # @param attributes [#to_hash] the attributes hash
         #
         # @raise [TypeError] if the process fails
+        # @raise [ArgumentError] if data is missing, or unknown keys are given
         #
         # @since 0.7.0
         # @api private
@@ -171,6 +183,8 @@ module Hanami
           schema.call(attributes)
         rescue Dry::Types::SchemaError => e
           raise TypeError.new(e.message)
+        rescue Dry::Types::MissingKeyError, Dry::Types::UnknownKeysError => e
+          raise ArgumentError.new(e.message)
         end
 
         # Check if the attribute is known
@@ -204,9 +218,9 @@ module Hanami
       #
       # @since 0.7.0
       # @api private
-      def initialize(&blk)
+      def initialize(type = nil, &blk)
         @schema = if block_given?
-                    Definition.new(&blk)
+                    Definition.new(type, &blk)
                   else
                     Schemaless.new
                   end

data/lib/hanami/model.rb

@@ -82,7 +82,7 @@ module Hanami
 
     # Disconnect from the database
     #
-    # This is useful for rebooting applications in production and to ensure that
+    # This is useful for reboot applications in production and to ensure that
     # the framework prunes stale connections.
     #
     # @since 1.0.0

data/lib/hanami/model/association.rb

@@ -1,6 +1,8 @@
 require 'rom-sql'
-require 'hanami/model/associations/has_many'
 require 'hanami/model/associations/belongs_to'
+require 'hanami/model/associations/has_many'
+require 'hanami/model/associations/has_one'
+require 'hanami/model/associations/many_to_many'
 
 module Hanami
   module Model
@@ -22,8 +24,13 @@ module Hanami
       #
       # @since 0.7.0
       # @api private
+      # rubocop:disable Metrics/MethodLength
       def self.lookup(association)
         case association
+        when ROM::SQL::Association::ManyToMany
+          Associations::ManyToMany
+        when ROM::SQL::Association::OneToOne
+          Associations::HasOne
         when ROM::SQL::Association::OneToMany
           Associations::HasMany
         when ROM::SQL::Association::ManyToOne
@@ -32,6 +39,7 @@ module Hanami
           raise "Unsupported association: #{association}"
         end
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

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

@@ -5,14 +5,95 @@ module Hanami
     module Associations
       # Many-To-One association
       #
-      # @since 0.7.0
+      # @since 1.1.0
       # @api private
       class BelongsTo
-        # @since 0.7.0
+        # @since 1.1.0
         # @api private
         def self.schema_type(entity)
           Sql::Types::Schema::AssociationType.new(entity)
         end
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :repository
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :source
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :target
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :subject
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :scope
+
+        # @since 1.1.0
+        # @api private
+        def initialize(repository, source, target, subject, scope = nil)
+          @repository = repository
+          @source     = source
+          @target     = target
+          @subject    = subject.to_hash unless subject.nil?
+          @scope      = scope || _build_scope
+          freeze
+        end
+
+        # @since 1.1.0
+        # @api private
+        def one
+          scope.one
+        end
+
+        private
+
+        # @since 1.1.0
+        # @api private
+        def container
+          repository.container
+        end
+
+        # @since 1.1.0
+        # @api private
+        def primary_key
+          association_keys.first
+        end
+
+        # @since 1.1.0
+        # @api private
+        def relation(name)
+          repository.relations[Hanami::Utils::String.pluralize(name)]
+        end
+
+        # @since 1.1.0
+        # @api private
+        def foreign_key
+          association_keys.last
+        end
+
+        # Returns primary key and foreign key
+        #
+        # @since 1.1.0
+        # @api private
+        def association_keys
+          relation(source)
+            .associations[target]
+            .__send__(:join_key_map, container.relations)
+        end
+
+        # @since 1.1.0
+        # @api private
+        def _build_scope
+          result = relation(target)
+          result = result.where(foreign_key => subject.fetch(primary_key)) unless subject.nil?
+          result.as(Model::MappedRelation.mapper_name)
+        end
       end
     end
   end

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

@@ -15,13 +15,19 @@ module Hanami
 
         # @since 0.7.0
         # @api private
-        def has_many(relation, *)
+        def has_many(relation, **args)
           @repository.__send__(:relations, relation)
+          @repository.__send__(:relations, args[:through]) if args[:through]
         end
 
-        # @since 0.7.0
+        def has_one(relation, *)
+          @repository.__send__(:relations, Hanami::Utils::String.pluralize(relation).to_sym)
+        end
+
+        # @since 1.1.0
         # @api private
-        def belongs_to(*)
+        def belongs_to(relation, *)
+          @repository.__send__(:relations, Hanami::Utils::String.pluralize(relation).to_sym)
         end
       end
     end

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

@@ -49,10 +49,10 @@ module Hanami
         # @since 0.7.0
         # @api private
         def create(data)
-          entity.new(
-            command(:create, aggregate(target), use: [:timestamps])
-              .call(data)
-          )
+          entity.new(command(:create, aggregate(target), use: [:timestamps])
+            .call(data))
+        rescue => e
+          raise Hanami::Model::Error.for(e)
         end
 
         # @since 0.7.0
@@ -60,6 +60,8 @@ module Hanami
         def add(data)
           command(:create, relation(target), use: [:timestamps])
             .call(associate(data))
+        rescue => e
+          raise Hanami::Model::Error.for(e)
         end
 
         # @since 0.7.0

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

@@ -0,0 +1,157 @@
+module Hanami
+  module Model
+    module Associations
+      # Many-To-One association
+      #
+      # @since 1.1.0
+      # @api private
+      class HasOne
+        # @since 1.1.0
+        # @api private
+        def self.schema_type(entity)
+          Sql::Types::Schema::AssociationType.new(entity)
+        end
+        #
+        # @since 1.1.0
+        # @api private
+        attr_reader :repository
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :source
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :target
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :subject
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :scope
+
+        # @since 1.1.0
+        # @api private
+        def initialize(repository, source, target, subject, scope = nil)
+          @repository = repository
+          @source     = source
+          @target     = target
+          @subject    = subject.to_hash unless subject.nil?
+          @scope      = scope || _build_scope
+          freeze
+        end
+
+        def one
+          scope.one
+        end
+
+        def create(data)
+          entity.new(
+            command(:create, aggregate(target), use: [:timestamps]).call(data)
+          )
+        rescue => e
+          raise Hanami::Model::Error.for(e)
+        end
+
+        def add(data)
+          command(:create, relation(target), use: [:timestamps]).call(associate(data))
+        rescue => e
+          raise Hanami::Model::Error.for(e)
+        end
+
+        def update(data)
+          command(:update, relation(target), use: [:timestamps])
+            .by_pk(
+              one.public_send(relation(target).primary_key)
+            ).call(data)
+        rescue => e
+          raise Hanami::Model::Error.for(e)
+        end
+
+        def delete
+          scope.delete
+        end
+        alias remove delete
+
+        def replace(data)
+          repository.transaction do
+            delete
+            add(data)
+          end
+        end
+
+        private
+
+        # @since 1.1.0
+        # @api private
+        def entity
+          repository.class.entity
+        end
+
+        # @since 1.1.0
+        # @api private
+        def aggregate(name)
+          repository.aggregate(name)
+        end
+
+        # @since 1.1.0
+        # @api private
+        def command(target, relation, options = {})
+          repository.command(target, relation, options)
+        end
+
+        # @since 1.1.0
+        # @api private
+        def relation(name)
+          repository.relations[Hanami::Utils::String.pluralize(name)]
+        end
+
+        # @since 1.1.0
+        # @api private
+        def container
+          repository.container
+        end
+
+        # @since 1.1.0
+        # @api private
+        def primary_key
+          association_keys.first
+        end
+
+        # @since 1.1.0
+        # @api private
+        def foreign_key
+          association_keys.last
+        end
+
+        # @since 1.1.0
+        # @api private
+        def associate(data)
+          relation(source)
+            .associations[target]
+            .associate(container.relations, data, subject)
+        end
+
+        # Returns primary key and foreign key
+        #
+        # @since 1.1.0
+        # @api private
+        def association_keys
+          relation(source)
+            .associations[target]
+            .__send__(:join_key_map, container.relations)
+        end
+
+        # @since 1.1.0
+        # @api private
+        def _build_scope
+          result = relation(target)
+          result = result.where(foreign_key => subject.fetch(primary_key)) unless subject.nil?
+          result.as(Model::MappedRelation.mapper_name)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,182 @@
+module Hanami
+  module Model
+    module Associations
+      # Many-To-Many association
+      #
+      # @since 0.7.0
+      # @api private
+      class ManyToMany
+        # @since 0.7.0
+        # @api private
+        def self.schema_type(entity)
+          type = Sql::Types::Schema::AssociationType.new(entity)
+          Types::Strict::Array.member(type)
+        end
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :repository
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :source
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :target
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :subject
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :scope
+
+        # @since 1.1.0
+        # @api private
+        attr_reader :through
+
+        def initialize(repository, source, target, subject, scope = nil)
+          @repository = repository
+          @source     = source
+          @target     = target
+          @subject    = subject.to_hash unless subject.nil?
+          @through    = relation(source).associations[target].through.to_sym
+          @scope      = scope || _build_scope
+          freeze
+        end
+
+        def to_a
+          scope.to_a
+        end
+
+        def map(&blk)
+          to_a.map(&blk)
+        end
+
+        def each(&blk)
+          scope.each(&blk)
+        end
+
+        def count
+          scope.count
+        end
+
+        def where(condition)
+          __new__(scope.where(condition))
+        end
+
+        # @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)))
+        rescue => e
+          raise Hanami::Model::Error.for(e)
+        end
+
+        # @since 1.1.0
+        # @api private
+        def delete
+          relation(through).where(source_foreign_key => subject.fetch(source_primary_key)).delete
+        end
+
+        # @since 1.1.0
+        # @api private
+        # rubocop:disable Metrics/AbcSize
+        def remove(target_id)
+          association_record = relation(through)
+                               .where(target_foreign_key => target_id, source_foreign_key => subject.fetch(source_primary_key))
+                               .one
+          if association_record
+            ar_id = association_record.public_send relation(through).primary_key
+            command(:delete, relation(through)).by_pk(ar_id).call
+          end
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        private
+
+        # @since 1.1.0
+        # @api private
+        def container
+          repository.container
+        end
+
+        # @since 1.1.0
+        # @api private
+        def relation(name)
+          repository.relations[name]
+        end
+
+        # @since 1.1.0
+        # @api private
+        def command(target, relation, options = {})
+          repository.command(target, relation, options)
+        end
+
+        # @since 1.1.0
+        # @api private
+        def associate(data)
+          relation(target)
+            .associations[source]
+            .associate(container.relations, data, subject)
+        end
+
+        # @since 1.1.0
+        # @api private
+        def source_primary_key
+          association_keys[0].first
+        end
+
+        # @since 1.1.0
+        # @api private
+        def source_foreign_key
+          association_keys[0].last
+        end
+
+        # @since 1.1.0
+        # @api private
+        def association_keys
+          relation(source)
+            .associations[target]
+            .__send__(:join_key_map, container.relations)
+        end
+
+        # @since 1.1.0
+        # @api private
+        def target_foreign_key
+          association_keys[1].first
+        end
+
+        # @since 1.1.0
+        # @api private
+        def target_primary_key
+          association_keys[1].last
+        end
+
+        # @since 1.1.0
+        # @api private
+        # rubocop:disable Metrics/AbcSize
+        def _build_scope
+          result = relation(target).qualified
+          unless subject.nil?
+            result = result
+                     .join(through, target_foreign_key => target_primary_key)
+                     .where(source_foreign_key => subject.fetch(source_primary_key))
+          end
+          result.as(Model::MappedRelation.mapper_name)
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        # @since 1.1.0
+        # @api private
+        def __new__(new_scope)
+          self.class.new(repository, source, target, subject, new_scope)
+        end
+      end
+    end
+  end
+end

data/lib/hanami/model/entity_name.rb

@@ -24,7 +24,7 @@ module Hanami
       # @since 0.7.0
       # @api private
       def underscore
-        Utils::String.new(@name).underscore.to_sym
+        Utils::String.underscore(@name).to_sym
       end
 
       # @since 0.7.0

data/lib/hanami/model/error.rb

@@ -60,7 +60,7 @@ module Hanami
     # Error for Unique Constraint Violation
     #
     # @since 0.6.1
-    class UniqueConstraintViolationError < Error
+    class UniqueConstraintViolationError < ConstraintViolationError
       # @since 0.6.1
       # @api private
       def initialize(message = 'Unique constraint has been violated')
@@ -71,7 +71,7 @@ module Hanami
     # Error for Foreign Key Constraint Violation
     #
     # @since 0.6.1
-    class ForeignKeyConstraintViolationError < Error
+    class ForeignKeyConstraintViolationError < ConstraintViolationError
       # @since 0.6.1
       # @api private
       def initialize(message = 'Foreign key constraint has been violated')
@@ -82,7 +82,7 @@ module Hanami
     # Error for Not Null Constraint Violation
     #
     # @since 0.6.1
-    class NotNullConstraintViolationError < Error
+    class NotNullConstraintViolationError < ConstraintViolationError
       # @since 0.6.1
       # @api private
       def initialize(message = 'NOT NULL constraint has been violated')
@@ -93,7 +93,7 @@ module Hanami
     # Error for Check Constraint Violation raised by Sequel
     #
     # @since 0.6.1
-    class CheckConstraintViolationError < Error
+    class CheckConstraintViolationError < ConstraintViolationError
       # @since 0.6.1
       # @api private
       def initialize(message = 'Check constraint has been violated')

data/lib/hanami/model/mapped_relation.rb

@@ -2,7 +2,7 @@ module Hanami
   module Model
     # Mapped proxy for ROM relations.
     #
-    # It eliminates the need to use #as for repository queries
+    # It eliminates the need of use #as for repository queries
     #
     # @since 1.0.0
     # @api private

data/lib/hanami/model/migrator.rb

@@ -116,7 +116,7 @@ module Hanami
       #   # Reads all files from "db/migrations" and apply them
       #   Hanami::Model::Migrator.migrate
       #
-      #   # Migrate to a specific version
+      #   # Migrate to a specifiy version
       #   Hanami::Model::Migrator.migrate(version: "20150610133853")
       #
       # NOTE: Class level interface SHOULD be removed in Hanami 2.0
@@ -189,7 +189,7 @@ module Hanami
       #     migrations 'db/migrations'
       #   end
       #
-      #   Hanami::Model::Migrator.prepare # => creates `foo' and runs migrations
+      #   Hanami::Model::Migrator.prepare # => creates `foo' and run migrations
       #
       # @example Prepare Database (with schema dump)
       #   require 'hanami/model'

data/lib/hanami/model/migrator/adapter.rb

@@ -123,10 +123,10 @@ module Hanami
         # Returns a database connection
         #
         # Given a DB connection URI we can connect to a specific database or not, we need this when creating
-        # or dropping a database. Important to notice that we can't always open a _global_ DB connection,
+        # or droping a database. Important to notice that we can't always open a _global_ DB connection,
         # because most of the times application's DB user has no rights to do so.
         #
-        # @param global [Boolean] determine whether or not a connection should specify a database.
+        # @param global [Boolean] determine whether or not a connection should specify an database.
         #
         # @since 0.5.0
         # @api private

data/lib/hanami/model/migrator/postgres_adapter.rb

@@ -33,15 +33,7 @@ module Hanami
         def create
           set_environment_variables
 
-          call_db_command('createdb') do |error_message|
-            message = if error_message.match(/already exists/) # rubocop:disable Performance/RedundantMatch
-                        DB_CREATION_ERROR
-                      else
-                        error_message
-                      end
-
-            raise MigrationError.new(message)
-          end
+          call_db_command('createdb')
         end
 
         # @since 0.4.0
@@ -49,15 +41,7 @@ module Hanami
         def drop
           set_environment_variables
 
-          call_db_command('dropdb') do |error_message|
-            message = if error_message.match(/does not exist/) # rubocop:disable Performance/RedundantMatch
-                        "Cannot find database: #{database}"
-                      else
-                        error_message
-                      end
-
-            raise MigrationError.new(message)
-          end
+          call_db_command('dropdb')
         end
 
         # @since 0.4.0
@@ -112,10 +96,27 @@ module Hanami
 
           begin
             Open3.popen3(command, database) do |_stdin, _stdout, stderr, wait_thr|
-              yield stderr.read unless wait_thr.value.success? # wait_thr.value is the exit status
+              unless wait_thr.value.success? # wait_thr.value is the exit status
+                raise MigrationError.new(modified_message(stderr.read))
+              end
             end
           rescue SystemCallError => e
-            yield e.message
+            raise MigrationError.new(modified_message(e.message))
+          end
+        end
+
+        # @since 1.1.0
+        # @api private
+        def modified_message(original_message)
+          case original_message
+          when /already exists/
+            DB_CREATION_ERROR
+          when /does not exist/
+            "Cannot find database: #{database}"
+          when /No such file or directory/
+            "Could not find executable in your PATH: `#{original_message.split.last}`"
+          else
+            original_message
           end
         end
       end

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

@@ -23,7 +23,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           def [](value)
-            @input[@mapping.process(value)]
+            @mapping.process(@input[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 @input[value] unless timestamps?
+            return value unless timestamps?
             _touch(@input[value], Time.now)
           end
 

data/lib/hanami/model/relation_name.rb

@@ -17,7 +17,7 @@ module Hanami
       # @since 0.7.0
       # @api private
       def self.new(name)
-        Utils::String.new(super).underscore.pluralize
+        Utils::String.transform(super, :underscore, :pluralize)
       end
     end
   end

data/lib/hanami/model/sql.rb

@@ -110,7 +110,7 @@ module Hanami
       #     end
       #
       #     down do
-      #       drop_table :items
+      #       drop_table :itmes
       #       execute 'DROP TYPE inventory_item'
       #     end
       #   end

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

@@ -22,7 +22,7 @@ module Hanami
           # associations and potentially to mapping defined by the repository.
           #
           # @param registry [Hash] a registry that keeps reference between
-          #   entities class and their underscored names
+          #   entities klass and their underscored names
           # @param relation [ROM::Relation] the database relation
           # @param mapping [Hanami::Model::Mapping] the optional repository
           #   mapping
@@ -75,7 +75,7 @@ module Hanami
           # Build the schema
           #
           # @param registry [Hash] a registry that keeps reference between
-          #   entities class and their underscored names
+          #   entities klass and their underscored names
           # @param relation [ROM::Relation] the database relation
           # @param mapping [Hanami::Model::Mapping] the optional repository
           #   mapping
@@ -112,7 +112,7 @@ module Hanami
           # Merge attributes and associations
           #
           # @param registry [Hash] a registry that keeps reference between
-          #   entities class and their underscored names
+          #   entities klass and their underscored names
           # @param associations [ROM::AssociationSet] a set of associations for
           #   the current relation
           #

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

@@ -70,7 +70,7 @@ module Hanami
 
             # 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 fall back to:
+            # rid of this logic in the block and to fallback to:
             #
             #  MAPPING.fetch(unwrapped.pristine, attribute)
             MAPPING.fetch(unwrapped.pristine) do
@@ -82,21 +82,11 @@ 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)
-            pristine == pg_json_pristines['JSONB'.freeze] ||
-              pristine == pg_json_pristines['JSON'.freeze]
+            (defined?(ROM::SQL::Types::PG::JSONB) && pristine == ROM::SQL::Types::PG::JSONB) ||
+              (defined?(ROM::SQL::Types::PG::JSON) && pristine == ROM::SQL::Types::PG::JSON)
           end
 
           private_class_method :pg_json?

data/lib/hanami/model/types.rb

@@ -47,6 +47,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           def call(value)
+            return if value.nil?
             if valid?(value)
               coerce(value)
             else
@@ -57,7 +58,7 @@ module Hanami
           # Check if value can be coerced
           #
           # It is true if value is an instance of `object` type or if value
-          # responds to `#to_hash`.
+          # respond to `#to_hash`.
           #
           # @param value [Object] the value
           #

data/lib/hanami/model/version.rb

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

data/lib/hanami/repository.rb

@@ -54,7 +54,7 @@ module Hanami
   #
   # All the queries and commands are private.
   # This decision forces developers to define intention revealing API, instead
-  # of leaking storage API details outside of a repository.
+  # leak storage API details outside of a repository.
   #
   # @example
   #   require 'hanami/model'
@@ -87,7 +87,7 @@ module Hanami
   #   #  * It expresses a clear intent.
   #   #
   #   #  * The caller can be easily tested in isolation.
-  #   #    It's just a matter of stubbing this method.
+  #   #    It's just a matter of stub this method.
   #   #
   #   #  * If we change the storage, the callers aren't affected.
   #
@@ -167,7 +167,7 @@ module Hanami
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
 
-    # Defines the mapping between a database table and an entity.
+    # Defines the ampping between a database table and an entity.
     #
     # It's also responsible to associate table columns to entity attributes.
     #
@@ -314,7 +314,7 @@ module Hanami
     module Commands
       # Create a new record
       #
-      # @return [Hanami::Entity] a new created entity
+      # @return [Hanami::Entity] an new created entity
       #
       # @raise [Hanami::Model::Error] an error in case the command fails
       #

metadata

@@ -1,49 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hanami-model
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-14 00:00:00.000000000 Z
+date: 2017-08-11 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.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !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
+        version: 1.1.0.beta1
   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
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: rom-sql
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +31,6 @@ 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
@@ -61,9 +38,6 @@ 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
@@ -84,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +141,8 @@ files:
 - lib/hanami/model/associations/belongs_to.rb
 - lib/hanami/model/associations/dsl.rb
 - lib/hanami/model/associations/has_many.rb
+- lib/hanami/model/associations/has_one.rb
+- lib/hanami/model/associations/many_to_many.rb
 - lib/hanami/model/configuration.rb
 - lib/hanami/model/configurator.rb
 - lib/hanami/model/entity_name.rb
@@ -213,12 +189,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A persistence layer for Hanami