hanami-model 1.2.0 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2655d298d2a0a66dd13c2d0f8818b8732feb84a5f5260e3b9ccddb1b6e5969
-  data.tar.gz: d6321500dc644537f9e86051c777f7d6ad37ff4f587fc3f890acb83b0249df04
+  metadata.gz: 519ae98ba5a6e331ed7bf16fe018c5c860a07693afe1d7654887d99b5b715a14
+  data.tar.gz: c305d077057133bd74f61576cce147397fb8420e875c52bd34c66525e4ef6dad
 SHA512:
-  metadata.gz: 98a2d0bef71b03e6d4bc3998932e1dfbe8be9c45585fc9f96fb4333677ffd824b4d1eb558e0fa36251e12708da560e01f6bd7a0ee7cc737de39bafe65fca857b
-  data.tar.gz: e8a3a99737f647c0ac10dd8d16a2da99dd3f605b6a32660422b675302336530b67a30805e14320aa91444d7102bb0cc2265f0cbdfda2ba16db3a24b1a058d764
+  metadata.gz: d7b17ce6a99b8ad25bd8fdf322f07a5765e25c2ee16d5c67f268b76ec44b9e464e5f3346ef4056ce6f44261a4b851933a2926fb8c7a0dcdc9598fa91e083aa20
+  data.tar.gz: 88e58eb2a11db0c97cddb873711ddc2210afbeb106ae3b07acd097ea6d0aedb76e679eaf20eef63b5efd8a76674c2d38cf02a359c69cc501c6b471f29cb4e885

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::Model
 A persistence layer for Hanami
 
+## v1.3.0.beta1 - 2018-08-08
+### Fixed
+- [Luca Guidi] Print meaningful error message when connection URL is misconfigured (eg. `Unknown database adapter for URL: "". Please check your database configuration (hint: ENV['DATABASE_URL']).`)
+
 ## v1.2.0 - 2018-04-11
 
 ## v1.2.0.rc2 - 2018-04-06

data/README.md

@@ -14,12 +14,12 @@ Like all the other Hanami components, it can be used as a standalone framework o
 
 ## Status
 
-[![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://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)
+[![Gem Version](https://badge.fury.io/rb/hanami-model.svg)](https://badge.fury.io/rb/hanami-model)
+[![TravisCI](https://travis-ci.org/hanami/model.svg?branch=master)](https://travis-ci.org/hanami/model)
+[![CircleCI](https://circleci.com/gh/hanami/model/tree/master.svg?style=svg)](https://circleci.com/gh/hanami/model/tree/master)
+[![Test Coverage](https://codecov.io/gh/hanami/model/branch/master/graph/badge.svg)](https://codecov.io/gh/hanami/model)
+[![Depfu](https://badges.depfu.com/badges/3a5d3f9e72895493bb6f39402ac4f129/overview.svg)](https://depfu.com/github/hanami/model?project=Bundler)
+[![Inline Docs](http://inch-ci.org/github/hanami/model.svg)](http://inch-ci.org/github/hanami/model)
 
 ## Contact
 

data/hanami-model.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
 
-  spec.add_runtime_dependency 'hanami-utils',    '~> 1.2'
+  spec.add_runtime_dependency 'hanami-utils',    '~> 1.3.beta'
   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'

data/lib/hanami-model.rb

@@ -1 +1 @@
-require 'hanami/model' # rubocop:disable Naming/FileName
+require 'hanami/model'

data/lib/hanami/model/configuration.rb

@@ -47,6 +47,9 @@ module Hanami
 
       # NOTE: This must be changed when we want to support several adapters at the time
       #
+      # @raise [Hanami::Model::UnknownDatabaseAdapterError] if `url` is blank,
+      #   or it uses an unknown adapter.
+      #
       # @since 0.7.0
       # @api private
       def connection
@@ -55,6 +58,9 @@ module Hanami
 
       # NOTE: This must be changed when we want to support several adapters at the time
       #
+      # @raise [Hanami::Model::UnknownDatabaseAdapterError] if `url` is blank,
+      #   or it uses an unknown adapter.
+      #
       # @since 0.7.0
       # @api private
       def gateway
@@ -122,12 +128,21 @@ module Hanami
         gateway.use_logger(@logger = value)
       end
 
+      # @raise [Hanami::Model::UnknownDatabaseAdapterError] if `url` is blank,
+      #   or it uses an unknown adapter.
+      #
       # @since 1.0.0
       # @api private
       def rom
         @rom ||= ROM::Configuration.new(@backend, @url, infer_relations: false)
+      rescue => e
+        raise UnknownDatabaseAdapterError.new(@url) if e.message =~ /adapters/
+        raise e
       end
 
+      # @raise [Hanami::Model::UnknownDatabaseAdapterError] if `url` is blank,
+      #   or it uses an unknown adapter.
+      #
       # @since 1.0.0
       # @api private
       def load!(repositories, &blk) # rubocop:disable Metrics/AbcSize

data/lib/hanami/model/error.rb

@@ -118,5 +118,14 @@ module Hanami
     # @since 1.2.0
     class UnknownAttributeError < Error
     end
+
+    # Unknown database adapter error
+    #
+    # @since 1.2.1
+    class UnknownDatabaseAdapterError < Error
+      def initialize(url)
+        super("Unknown database adapter for URL: #{url.inspect}. Please check your database configuration (hint: ENV['DATABASE_URL']).")
+      end
+    end
   end
 end

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

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module Hanami
   module Model
     class Migrator
@@ -153,8 +155,11 @@ module Hanami
         #
         # @since 0.5.0
         # @api private
-        def parsed_opt(option)
-          parsed_uri.to_s.match(/[\?|\&]#{ option }=(\w+)\&?/).to_a.last
+        def parsed_opt(option, query: parsed_uri.query)
+          return if query.nil?
+
+          @parsed_query_opts ||= CGI.parse(query)
+          @parsed_query_opts[option].to_a.last
         end
       end
     end

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

@@ -95,7 +95,7 @@ module Hanami
           # @since 1.0.2
           # @api private
           def self.pg_json?(pristine)
-            pristine == pg_json_pristines['JSONB'.freeze] ||
+            pristine == pg_json_pristines['JSONB'.freeze] || # rubocop:disable Style/MultipleComparison
               pristine == pg_json_pristines['JSON'.freeze]
           end
 

data/lib/hanami/model/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-model
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.beta1
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hanami-utils
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.beta
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
@@ -215,12 +215,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.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A persistence layer for Hanami