hanami-model 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 396fbb6a95d9e5526ff1e2415246d0bebc3f8413
-  data.tar.gz: 67a3c00a1e9c29ced838ba349082db34262edd1d
+  metadata.gz: 6ef0a3e682c1e1d8b32295f6e14d70ad8a0c9ea7
+  data.tar.gz: ce2eccfc1037fa3a89ea65a44e8f4754a10eba5a
 SHA512:
-  metadata.gz: b47a74240ea4e92273809b248531ce3d06b301b4e6ab5dc9e588f8bd1297157d368b1ee4725281a401f578db1fbf17a698be2a03844718c8f7c73c594e19288b
-  data.tar.gz: 9307402f7125c83e3d9e3e1b1365ffb7cdcb661167bc1348969e52d13658edbf0ba28110e4923b1da4a1461554ee308564a9b6853b2240633ffb4c517975677f
+  metadata.gz: 461e105d7804802a456d77c3518e78aff4369fa88a68585f46f1ed648c99bf602fa41e3faae4f7b6bc941282ba0ddc48ce93f23d263f34adcf2c185b14ee24fd
+  data.tar.gz: e2a85018d9fb67ec84476cb6f69ae1510e3455ef96856a56c69dbdb86c1630d31f077966b70cd487d6e5cabfc9595b2f8ec432d2c6eadcbec4ba4ad82e63de9a

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Hanami::Model
 A persistence layer for Hanami
 
+## v1.0.0.beta2 - 2017-03-02
+### Added
+- [Semyon Pupkov] Allow to define Postgres connection URL as `"postgresql:///mydb?host=localhost&port=6433&user=postgres&password=testpasswd"`
+
+### Fixed
+- [Marcello Rocha] Fixed migrations MySQL detection of username and password
+- [Luca Guidi] Fixed migrations creation/drop of a MySQL database with a dash in the name
+- [Semyon Pupkov] Ensure `db console` to work when Postgres connection URL is defined with `"postgresql://"` scheme
+
 ## v1.0.0.beta1 - 2017-02-14
 ### Added
 - [Luca Guidi] Official support for Ruby: MRI 2.4

data/hanami-model.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_runtime_dependency 'hanami-utils',    '~> 1.0.0.beta'
-  spec.add_runtime_dependency 'rom-sql',         '~> 1.0'
-  spec.add_runtime_dependency 'rom-repository',  '~> 1.0'
+  spec.add_runtime_dependency 'rom-sql',         '~> 1.1'
+  spec.add_runtime_dependency 'rom-repository',  '~> 1.2'
   spec.add_runtime_dependency 'dry-types',       '~> 0.9'
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
 

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

@@ -34,7 +34,7 @@ module Hanami
         # @since 0.5.0
         # @api private
         def host
-          @host ||= parsed_uri.host
+          @host ||= parsed_uri.host || parsed_opt('host')
         end
 
         # Returns DB connection port
@@ -44,7 +44,7 @@ module Hanami
         # @since 0.5.0
         # @api private
         def port
-          @port ||= parsed_uri.port
+          @port ||= parsed_uri.port || parsed_opt('port').to_i.nonzero?
         end
 
         # Returns DB name from conenction
@@ -83,7 +83,7 @@ module Hanami
         # @since 0.5.0
         # @api private
         def user
-          @user ||= parsed_opt('user')
+          @user ||= parsed_opt('user') || parsed_uri.user
         end
 
         # Returns user from DB connection
@@ -93,7 +93,7 @@ module Hanami
         # @since 0.5.0
         # @api private
         def password
-          @password ||= parsed_opt('password')
+          @password ||= parsed_opt('password') || parsed_uri.password
         end
 
         # Returns DB connection URI directly from adapter

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

@@ -19,7 +19,7 @@ module Hanami
         # @since 0.4.0
         # @api private
         def create
-          new_connection(global: true).run %(CREATE DATABASE #{database};)
+          new_connection(global: true).run %(CREATE DATABASE `#{database}`;)
         rescue Sequel::DatabaseError => e
           message = if e.message.match(/database exists/) # rubocop:disable Performance/RedundantMatch
                       DB_CREATION_ERROR
@@ -33,7 +33,7 @@ module Hanami
         # @since 0.4.0
         # @api private
         def drop
-          new_connection(global: true).run %(DROP DATABASE #{database};)
+          new_connection(global: true).run %(DROP DATABASE `#{database}`;)
         rescue Sequel::DatabaseError => e
           message = if e.message.match(/doesn\'t exist/) # rubocop:disable Performance/RedundantMatch
                       "Cannot find database: #{database}"

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

@@ -27,7 +27,7 @@ module Hanami
           when 'sqlite'
             require 'hanami/model/sql/consoles/sqlite'
             Sql::Consoles::Sqlite.new(@uri)
-          when 'postgres'
+          when 'postgres', 'postgresql'
             require 'hanami/model/sql/consoles/postgresql'
             Sql::Consoles::Postgresql.new(@uri)
           when 'mysql', 'mysql2'

data/lib/hanami/model/version.rb

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

data/lib/hanami/repository.rb

@@ -274,9 +274,13 @@ module Hanami
 
     # @since 0.7.0
     # @api private
-    def self.inherited(klass) # rubocop:disable Metrics/MethodLength
+    #
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
+    def self.inherited(klass)
       klass.class_eval do
         include Utils::ClassAttribute
+        auto_struct true
 
         class_attribute :entity
 
@@ -292,6 +296,8 @@ module Hanami
 
       Hanami::Model.repositories << klass
     end
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/MethodLength
 
     # Extend commands from ROM::Repository with error management
     #
@@ -419,7 +425,7 @@ module Hanami
     # @example
     #   UserRepository.new.first
     def first
-      root.as(:entity).first
+      root.as(:entity).limit(1).one
     end
 
     # Returns the last record for the relation
@@ -431,7 +437,7 @@ module Hanami
     # @example
     #   UserRepository.new.last
     def last
-      root.order(Model::Sql.desc(root.primary_key)).as(:entity).first
+      root.as(:entity).limit(1).reverse.one
     end
 
     # Deletes all the records from the relation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanami-model
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Luca Guidi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -32,28 +32,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rom-repository
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement