hanami-model 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919b36ea881919a3c6bba3cee7fa026bde46df57d62bc0d9f63bc08a6f2a4e32
-  data.tar.gz: ac679f8031a4d47e0c5a633f70ade7c8390aff56da8b1dff3231612273e097ef
+  metadata.gz: e39e89062478fa891ec0904add24b1ec30bb93435b178f229cc4328995de9acb
+  data.tar.gz: 0c3190667360fa53e56797c14bac30fdb9fe3ca4266ce4f33dc2a1b941142efb
 SHA512:
-  metadata.gz: 243f59fbe8c436e2e36bfe4979d34d9eaf2a5ea3c53dacb026d2f04b62a6764a84d88a744c24e734ee8a57599890ed7c260dd798da0eb510adda7fbdeaec512a
-  data.tar.gz: 683516b7122cc953796c25e1be8144242b60fcb125c810061789e6ced6aff4aa5a3032a5fe3ef919f886ab5dc6a5ecce0111c5f0666bffa272ad30e149e054ec
+  metadata.gz: 3420b442c9015651d7e0f6bd55861252919604c02784601d3177f28c959c986cd35308fa73db94e452624cec4a85a443fa9472354eafe8c8b5fb78dea46162c9
+  data.tar.gz: 99c9779f14b14484f33bd4789105bb96c83ce6165d1048eb9e0db0a7cc573ead79308ca00f7e135e743f22c506231c4a6f8b348da4c4596da4f23f00784a3121

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 # 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`

data/LICENSE.md

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

data/README.md

@@ -15,8 +15,7 @@ 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)](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)
+[![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)
@@ -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,32 +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.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 "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', '>= 1.6', '< 3'
-  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'
+# 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
     #
@@ -188,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
@@ -182,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
@@ -243,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,7 @@ 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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "hanami/utils/hash"
 
 module Hanami
@@ -7,7 +9,7 @@ module Hanami
       #
       # @since 0.7.0
       # @api private
-      class ManyToMany # rubocop:disable Metrics/ClassLength
+      class ManyToMany
         # @since 0.7.0
         # @api private
         def self.schema_type(entity)
@@ -76,8 +78,8 @@ module Hanami
         def add(*data)
           command(:create, relation(through), use: [:timestamps])
             .call(associate(serialize(data)))
-        rescue => e
-          raise Hanami::Model::Error.for(e)
+        rescue => exception
+          raise Hanami::Model::Error.for(exception)
         end
 
         # @since 1.1.0
@@ -88,18 +90,16 @@ module Hanami
 
         # @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
+            .where(target_foreign_key => target_id, source_foreign_key => subject.fetch(source_primary_key))
+            .one
 
           return if association_record.nil?
 
           ar_id = association_record.public_send relation(through).primary_key
           command(:delete, relation(through)).by_pk(ar_id).call
         end
-        # rubocop:enable Metrics/AbcSize
 
         private
 
@@ -172,17 +172,15 @@ module Hanami
         # @since 1.1.0
         #
         # @api private
-        # rubocop:disable Metrics/AbcSize
         def _build_scope
           result = relation(association.target.to_sym).qualified
           unless subject.nil?
             result = result
-                     .join(through, target_foreign_key => target_primary_key)
-                     .where(source_foreign_key => subject.fetch(source_primary_key))
+              .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