hanami-model 1.2.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2655d298d2a0a66dd13c2d0f8818b8732feb84a5f5260e3b9ccddb1b6e5969
-  data.tar.gz: d6321500dc644537f9e86051c777f7d6ad37ff4f587fc3f890acb83b0249df04
+  metadata.gz: e39e89062478fa891ec0904add24b1ec30bb93435b178f229cc4328995de9acb
+  data.tar.gz: 0c3190667360fa53e56797c14bac30fdb9fe3ca4266ce4f33dc2a1b941142efb
 SHA512:
-  metadata.gz: 98a2d0bef71b03e6d4bc3998932e1dfbe8be9c45585fc9f96fb4333677ffd824b4d1eb558e0fa36251e12708da560e01f6bd7a0ee7cc737de39bafe65fca857b
-  data.tar.gz: e8a3a99737f647c0ac10dd8d16a2da99dd3f605b6a32660422b675302336530b67a30805e14320aa91444d7102bb0cc2265f0cbdfda2ba16db3a24b1a058d764
+  metadata.gz: 3420b442c9015651d7e0f6bd55861252919604c02784601d3177f28c959c986cd35308fa73db94e452624cec4a85a443fa9472354eafe8c8b5fb78dea46162c9
+  data.tar.gz: 99c9779f14b14484f33bd4789105bb96c83ce6165d1048eb9e0db0a7cc573ead79308ca00f7e135e743f22c506231c4a6f8b348da4c4596da4f23f00784a3121

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 # Hanami::Model
 A persistence layer for Hanami
 
+## v1.3.3 - 2021-05-22
+### Fixed
+- [Sean Collins] Specify dependency on BigDecimal v1.4
+- [Adam Daniels] Use environment variables for PostgreSQL CLI tools
+
+## v1.3.2 - 2019-01-31
+### Fixed
+- [Luca Guidi] Depend on `dry-logic` `~> 0.4.2`, `< 0.5`
+
+## v1.3.1 - 2019-01-18
+### Added
+- [Luca Guidi] Official support for Ruby: MRI 2.6
+- [Luca Guidi] Support `bundler` 2.0+
+
+## v1.3.0 - 2018-10-24
+
+## 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']).`)
+- [Ian Ker-Seymer] Reliably parse query params from connection string
+
 ## v1.2.0 - 2018-04-11
 
 ## v1.2.0.rc2 - 2018-04-06

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright © 2014-2017 Luca Guidi
+Copyright © 2014-2021 Luca Guidi
 
 MIT License
 

data/README.md

@@ -14,12 +14,11 @@ 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)
+[![CI](https://github.com/hanami/model/workflows/ci/badge.svg?branch=master)](https://github.com/hanami/model/actions?query=workflow%3Aci+branch%3Amaster)
+[![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
 
@@ -56,6 +55,7 @@ This class provides a DSL to configure the connection.
 
 ```ruby
 require 'hanami/model'
+require 'hanami/model/sql'
 
 class User < Hanami::Entity
 end
@@ -192,6 +192,8 @@ This is a **huge improvement**, because:
 
 Hanami::Model can **_automap_** columns from relations and entities attributes.
 
+When using a `sql` adapter, you must require `hanami/model/sql` before `Hanami::Model.load!` is called so the relations are loaded correctly.
+
 However, there are cases where columns and attribute names do not match (mainly **legacy databases**).
 
 ```ruby
@@ -234,6 +236,7 @@ If an entity has the following accessors: `:created_at` and `:updated_at`, they
 
 ```ruby
 require 'hanami/model'
+require 'hanami/model/sql'
 
 class User < Hanami::Entity
 end
@@ -291,6 +294,6 @@ __Hanami::Model__ uses [Semantic Versioning 2.0.0](http://semver.org)
 
 ## Copyright
 
-Copyright © 2014-2017 Luca Guidi – Released under MIT License
+Copyright © 2014-2021 Luca Guidi – Released under MIT License
 
 This project was formerly known as Lotus (`lotus-model`).

data/hanami-model.gemspec

@@ -1,31 +1,36 @@
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'hanami/model/version'
+require "hanami/model/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'hanami-model'
+  spec.name          = "hanami-model"
   spec.version       = Hanami::Model::VERSION
-  spec.authors       = ['Luca Guidi']
-  spec.email         = ['me@lucaguidi.com']
-  spec.summary       = 'A persistence layer for Hanami'
-  spec.description   = 'A persistence framework with entities and repositories'
-  spec.homepage      = 'http://hanamirb.org'
-  spec.license       = 'MIT'
+  spec.authors       = ["Luca Guidi"]
+  spec.email         = ["me@lucaguidi.com"]
+  spec.summary       = "A persistence layer for Hanami"
+  spec.description   = "A persistence framework with entities and repositories"
+  spec.homepage      = "http://hanamirb.org"
+  spec.license       = "MIT"
 
   spec.files         = `git ls-files -z -- lib/* CHANGELOG.md EXAMPLE.md LICENSE.md README.md hanami-model.gemspec`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.3.0", "< 3"
 
-  spec.add_runtime_dependency 'hanami-utils',    '~> 1.2'
-  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'
-  spec.add_runtime_dependency 'dry-types',       '~> 0.11.0'
-  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
+  spec.add_runtime_dependency "hanami-utils",    "~> 1.3"
+  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"
+  spec.add_runtime_dependency "dry-types",       "~> 0.11.0"
+  spec.add_runtime_dependency "dry-logic",       "~> 0.4.2", "< 0.5"
+  spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
+  spec.add_runtime_dependency "bigdecimal",      "~> 1.4"
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake',  '~> 12'
-  spec.add_development_dependency 'rspec', '~> 3.7'
+  spec.add_development_dependency "bundler", ">= 1.6", "< 3"
+  spec.add_development_dependency "rake",  "~> 12"
+  spec.add_development_dependency "rspec", "~> 3.7"
+  spec.add_development_dependency "rubocop", "0.81" # rubocop 0.81+ removed support for Ruby 2.3
 end

data/lib/hanami-model.rb

@@ -1 +1,3 @@
-require 'hanami/model' # rubocop:disable Naming/FileName
+# frozen_string_literal: true
+
+require "hanami/model"

data/lib/hanami/entity.rb

@@ -1,4 +1,6 @@
-require 'hanami/model/types'
+# frozen_string_literal: true
+
+require "hanami/model/types"
 
 module Hanami
   # An object that is defined by its identity.
@@ -50,7 +52,7 @@ module Hanami
   #
   # @see Hanami::Repository
   class Entity
-    require 'hanami/entity/schema'
+    require "hanami/entity/schema"
 
     # Syntactic shortcut to reference types in custom schema DSL
     #
@@ -94,6 +96,7 @@ module Hanami
       # @api private
       def schema=(value)
         return if defined?(@attributes)
+
         @schema = value
       end
 
@@ -187,7 +190,7 @@ module Hanami
     end
 
     # @since 0.7.0
-    alias to_hash to_h
+    alias_method :to_hash, :to_h
 
     protected
 

data/lib/hanami/entity/schema.rb

@@ -1,5 +1,7 @@
-require 'hanami/model/types'
-require 'hanami/utils/hash'
+# frozen_string_literal: true
+
+require "hanami/model/types"
+require "hanami/utils/hash"
 
 module Hanami
   class Entity
@@ -165,6 +167,7 @@ module Hanami
         # @api private
         def initialize(type = nil, &blk)
           raise LocalJumpError unless block_given?
+
           @attributes, @schema = Dsl.build(type, &blk)
           @attributes = Hash[@attributes.map { |k, _| [k, true] }]
           freeze
@@ -181,10 +184,10 @@ module Hanami
         # @api private
         def call(attributes)
           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)
+        rescue Dry::Types::SchemaError => exception
+          raise TypeError.new(exception.message)
+        rescue Dry::Types::MissingKeyError, Dry::Types::UnknownKeysError => exception
+          raise ArgumentError.new(exception.message)
         end
 
         # Check if the attribute is known
@@ -242,7 +245,7 @@ module Hanami
 
       # @since 0.7.0
       # @api private
-      alias [] call
+      alias_method :[], :call
 
       # Check if the attribute is known
       #

data/lib/hanami/model.rb

@@ -1,7 +1,9 @@
-require 'rom'
-require 'concurrent'
-require 'hanami/entity'
-require 'hanami/repository'
+# frozen_string_literal: true
+
+require "rom"
+require "concurrent"
+require "hanami/entity"
+require "hanami/repository"
 
 # Hanami
 #
@@ -11,12 +13,12 @@ module Hanami
   #
   # @since 0.1.0
   module Model
-    require 'hanami/model/version'
-    require 'hanami/model/error'
-    require 'hanami/model/configuration'
-    require 'hanami/model/configurator'
-    require 'hanami/model/mapping'
-    require 'hanami/model/plugins'
+    require "hanami/model/version"
+    require "hanami/model/error"
+    require "hanami/model/configuration"
+    require "hanami/model/configurator"
+    require "hanami/model/mapping"
+    require "hanami/model/plugins"
 
     # @api private
     # @since 0.7.0
@@ -33,7 +35,7 @@ module Hanami
 
       # @since 0.7.0
       # @api private
-      alias loaded? loaded
+      alias_method :loaded?, :loaded
     end
 
     # Configure the framework
@@ -70,7 +72,8 @@ module Hanami
     # @since 0.7.0
     # @api private
     def self.container
-      raise 'Not loaded' unless loaded?
+      raise "Not loaded" unless loaded?
+
       @container
     end
 

data/lib/hanami/model/association.rb

@@ -1,8 +1,10 @@
-require 'rom-sql'
-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'
+# frozen_string_literal: true
+
+require "rom-sql"
+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
@@ -24,7 +26,6 @@ module Hanami
       #
       # @since 0.7.0
       # @api private
-      # rubocop:disable Metrics/MethodLength
       def self.lookup(association)
         case association
         when ROM::SQL::Association::ManyToMany
@@ -39,7 +40,6 @@ module Hanami
           raise "Unsupported association: #{association}"
         end
       end
-      # rubocop:enable Metrics/MethodLength
     end
   end
 end

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

@@ -1,4 +1,6 @@
-require 'hanami/model/types'
+# frozen_string_literal: true
+
+require "hanami/model/types"
 
 module Hanami
   module Model

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Model
     module Associations
@@ -6,7 +8,6 @@ module Hanami
       # @since 0.7.0
       # @api private
       #
-      # rubocop:disable Naming/PredicateName
       class Dsl
         # @since 0.7.0
         # @api private
@@ -34,7 +35,6 @@ module Hanami
           @repository.__send__(:relations, Hanami::Utils::String.pluralize(relation).to_sym)
         end
       end
-      # rubocop:enable Naming/PredicateName
     end
   end
 end

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

@@ -1,4 +1,6 @@
-require 'hanami/model/types'
+# frozen_string_literal: true
+
+require "hanami/model/types"
 
 module Hanami
   module Model
@@ -7,7 +9,7 @@ module Hanami
       #
       # @since 0.7.0
       # @api private
-      class HasMany # rubocop:disable Metrics/ClassLength
+      class HasMany
         # @since 0.7.0
         # @api private
         def self.schema_type(entity)
@@ -51,8 +53,8 @@ module Hanami
         def create(data)
           entity.new(command(:create, aggregate(target), mapper: nil, use: [:timestamps])
             .call(serialize(data)))
-        rescue => e
-          raise Hanami::Model::Error.for(e)
+        rescue => exception
+          raise Hanami::Model::Error.for(exception)
         end
 
         # @since 0.7.0
@@ -60,8 +62,8 @@ module Hanami
         def add(data)
           command(:create, relation(target), use: [:timestamps])
             .call(associate(serialize(data)))
-        rescue => e
-          raise Hanami::Model::Error.for(e)
+        rescue => exception
+          raise Hanami::Model::Error.for(exception)
         end
 
         # @since 0.7.0
@@ -113,7 +115,7 @@ module Hanami
         # @since 0.7.0
         # @api private
         def command(target, relation, options = {})
-          repository.command(target => relation, **options)
+          repository.command(target, relation, options)
         end
 
         # @since 0.7.0
@@ -151,7 +153,7 @@ module Hanami
         # @since 0.7.0
         # @api private
         def unassociate
-          { foreign_key => nil }
+          {foreign_key => nil}
         end
 
         # @since 0.7.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "hanami/utils/hash"
 
 module Hanami
@@ -53,14 +55,14 @@ module Hanami
           entity.new(
             command(:create, aggregate(target), mapper: nil).call(serialize(data))
           )
-        rescue => e
-          raise Hanami::Model::Error.for(e)
+        rescue => exception
+          raise Hanami::Model::Error.for(exception)
         end
 
         def add(data)
           command(:create, relation(target), mapper: nil).call(associate(serialize(data)))
-        rescue => e
-          raise Hanami::Model::Error.for(e)
+        rescue => exception
+          raise Hanami::Model::Error.for(exception)
         end
 
         def update(data)
@@ -68,14 +70,14 @@ module Hanami
             .by_pk(
               one.public_send(relation(target).primary_key)
             ).call(serialize(data))
-        rescue => e
-          raise Hanami::Model::Error.for(e)
+        rescue => exception
+          raise Hanami::Model::Error.for(exception)
         end
 
         def delete
           scope.delete
         end
-        alias remove delete
+        alias_method :remove, :delete
 
         def replace(data)
           repository.transaction do