hanami-model 1.2.0 → 1.3.3

data/lib/hanami/model/sql/consoles/sqlite.rb

@@ -1,5 +1,7 @@
-require_relative 'abstract'
-require 'shellwords'
+# frozen_string_literal: true
+
+require_relative "abstract"
+require "shellwords"
 
 module Hanami
   module Model
@@ -12,12 +14,12 @@ module Hanami
         class Sqlite < Abstract
           # @since 0.7.0
           # @api private
-          COMMAND = 'sqlite3'.freeze
+          COMMAND = "sqlite3"
 
           # @since 0.7.0
           # @api private
           def connection_string
-            concat(command, ' ', host, database)
+            concat(command, " ", host, database)
           end
 
           private

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

@@ -1,6 +1,8 @@
-require 'hanami/entity/schema'
-require 'hanami/model/types'
-require 'hanami/model/association'
+# frozen_string_literal: true
+
+require "hanami/entity/schema"
+require "hanami/model/types"
+require "hanami/model/association"
 
 module Hanami
   module Model
@@ -52,7 +54,7 @@ module Hanami
 
           # @since 1.0.1
           # @api private
-          alias [] call
+          alias_method :[], :call
 
           # Check if the attribute is known
           #

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

@@ -1,5 +1,7 @@
-require 'hanami/model/types'
-require 'rom/types'
+# frozen_string_literal: true
+
+require "hanami/model/types"
+require "rom/types"
 
 module Hanami
   module Model
@@ -14,7 +16,7 @@ module Hanami
         #
         # @since 0.7.0
         module Schema
-          require 'hanami/model/sql/types/schema/coercions'
+          require "hanami/model/sql/types/schema/coercions"
 
           String   = Types::Optional::Coercible::String
 
@@ -36,26 +38,26 @@ module Hanami
           # @since 0.7.0
           # @api private
           MAPPING = {
-            Types::String.pristine            => Schema::String,
-            Types::Int.pristine               => Schema::Int,
-            Types::Float.pristine             => Schema::Float,
-            Types::Decimal.pristine           => Schema::Decimal,
-            Types::Bool.pristine              => Schema::Bool,
-            Types::Date.pristine              => Schema::Date,
-            Types::DateTime.pristine          => Schema::DateTime,
-            Types::Time.pristine              => Schema::Time,
-            Types::Array.pristine             => Schema::Array,
-            Types::Hash.pristine              => Schema::Hash,
-            Types::String.optional.pristine   => Schema::String,
-            Types::Int.optional.pristine      => Schema::Int,
-            Types::Float.optional.pristine    => Schema::Float,
-            Types::Decimal.optional.pristine  => Schema::Decimal,
-            Types::Bool.optional.pristine     => Schema::Bool,
-            Types::Date.optional.pristine     => Schema::Date,
+            Types::String.pristine => Schema::String,
+            Types::Int.pristine => Schema::Int,
+            Types::Float.pristine => Schema::Float,
+            Types::Decimal.pristine => Schema::Decimal,
+            Types::Bool.pristine => Schema::Bool,
+            Types::Date.pristine => Schema::Date,
+            Types::DateTime.pristine => Schema::DateTime,
+            Types::Time.pristine => Schema::Time,
+            Types::Array.pristine => Schema::Array,
+            Types::Hash.pristine => Schema::Hash,
+            Types::String.optional.pristine => Schema::String,
+            Types::Int.optional.pristine => Schema::Int,
+            Types::Float.optional.pristine => Schema::Float,
+            Types::Decimal.optional.pristine => Schema::Decimal,
+            Types::Bool.optional.pristine => Schema::Bool,
+            Types::Date.optional.pristine => Schema::Date,
             Types::DateTime.optional.pristine => Schema::DateTime,
-            Types::Time.optional.pristine     => Schema::Time,
-            Types::Array.optional.pristine    => Schema::Array,
-            Types::Hash.optional.pristine     => Schema::Hash
+            Types::Time.optional.pristine => Schema::Time,
+            Types::Array.optional.pristine => Schema::Array,
+            Types::Hash.optional.pristine => Schema::Hash
           }.freeze
 
           # Convert given type into coercible
@@ -86,17 +88,15 @@ module Hanami
           # @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
+              hash[type] = (ROM::SQL::Types::PG.const_get(type).pristine if defined?(ROM::SQL::Types::PG))
             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]
+            pristine == pg_json_pristines["JSONB"] || # rubocop:disable Style/MultipleComparison
+              pristine == pg_json_pristines["JSON"]
           end
 
           private_class_method :pg_json?

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

@@ -1,5 +1,7 @@
-require 'hanami/utils/string'
-require 'hanami/utils/hash'
+# frozen_string_literal: true
+
+require "hanami/utils/string"
+require "hanami/utils/hash"
 
 module Hanami
   module Model
@@ -12,7 +14,6 @@ module Hanami
           # @api private
           #
           # rubocop:disable Metrics/ModuleLength
-          # rubocop:disable Metrics/MethodLength
           module Coercions
             # Coerces given argument into Integer
             #
@@ -215,7 +216,7 @@ module Hanami
               end
             end
           end
-          # rubocop:enable Metrics/MethodLength
+
           # rubocop:enable Metrics/ModuleLength
         end
       end

data/lib/hanami/model/types.rb

@@ -1,4 +1,6 @@
-require 'rom/types'
+# frozen_string_literal: true
+
+require "rom/types"
 
 module Hanami
   module Model
@@ -17,7 +19,6 @@ module Hanami
       # Class level interface
       #
       # @since 0.7.0
-      # rubocop:disable Naming/MethodName
       module ClassMethods
         # Define an entity of the given type
         #
@@ -77,7 +78,6 @@ module Hanami
           Types::Array.member(type)
         end
       end
-      # rubocop:enable Naming/MethodName
 
       # Types for schema definitions
       #
@@ -101,7 +101,7 @@ module Hanami
           def call(value)
             return if value.nil?
 
-            if valid?(value) # rubocop:disable Style/GuardClause
+            if valid?(value)
               coerce(value)
             else
               raise TypeError.new("#{value.inspect} must be coercible into #{object}")

data/lib/hanami/model/version.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Hanami
   module Model
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '1.2.0'.freeze
+    VERSION = "1.3.3"
   end
 end

data/lib/hanami/repository.rb

@@ -1,12 +1,14 @@
-require 'rom-repository'
-require 'hanami/model/entity_name'
-require 'hanami/model/relation_name'
-require 'hanami/model/mapped_relation'
-require 'hanami/model/associations/dsl'
-require 'hanami/model/association'
-require 'hanami/utils/class'
-require 'hanami/utils/class_attribute'
-require 'hanami/utils/io'
+# frozen_string_literal: true
+
+require "rom-repository"
+require "hanami/model/entity_name"
+require "hanami/model/relation_name"
+require "hanami/model/mapped_relation"
+require "hanami/model/associations/dsl"
+require "hanami/model/association"
+require "hanami/utils/class"
+require "hanami/utils/class_attribute"
+require "hanami/utils/io"
 
 module Hanami
   # Mediates between the entities and the persistence layer, by offering an API
@@ -107,7 +109,7 @@ module Hanami
   # @see Hanami::Entity
   # @see http://martinfowler.com/eaaCatalog/repository.html
   # @see http://en.wikipedia.org/wiki/Dependency_inversion_principle
-  class Repository < ROM::Repository::Root # rubocop:disable Metrics/ClassLength
+  class Repository < ROM::Repository::Root
     # Plugins for database commands
     #
     # @since 0.7.0
@@ -155,7 +157,6 @@ module Hanami
     def command(*args, **opts, &block)
       opts[:use] = COMMAND_PLUGINS | Array(opts[:use])
       opts[:mapper] = opts.fetch(:mapper, Model::MappedRelation.mapper_name)
-
       super(*args, **opts, &block)
     end
 
@@ -167,8 +168,6 @@ module Hanami
     # @since 0.7.0
     # @api private
     #
-    # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Metrics/AbcSize
     def self.define_relation
       a = @associations
       s = @schema
@@ -191,8 +190,6 @@ module Hanami
         end
       }, __FILE__, __LINE__ - 4
     end
-    # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/MethodLength
 
     # Defines the mapping between a database table and an entity.
     #
@@ -201,8 +198,6 @@ module Hanami
     # @since 0.7.0
     # @api private
     #
-    # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Metrics/AbcSize
     def self.define_mapping
       self.entity = Utils::Class.load!(entity_name)
       e = entity
@@ -219,8 +214,6 @@ module Hanami
       configuration.define_mappings(root, &blk)
       configuration.register_entity(relation, entity_name.underscore, e)
     end
-    # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/MethodLength
 
     # It defines associations, by adding relations to the repository
     #
@@ -302,8 +295,6 @@ module Hanami
     # @since 0.7.0
     # @api private
     #
-    # rubocop:disable Metrics/MethodLength
-    # rubocop:disable Metrics/AbcSize
     def self.inherited(klass)
       klass.class_eval do
         include Utils::ClassAttribute
@@ -332,8 +323,6 @@ module Hanami
 
       Hanami::Model.repositories << klass
     end
-    # rubocop:enable Metrics/AbcSize
-    # rubocop:enable Metrics/MethodLength
 
     # Extend commands from ROM::Repository with error management
     #
@@ -358,8 +347,8 @@ module Hanami
       #   entity.id # => nil - It doesn't mutate original entity
       def create(*args)
         super
-      rescue => e
-        raise Hanami::Model::Error.for(e)
+      rescue => exception
+        raise Hanami::Model::Error.for(exception)
       end
 
       # Update a record
@@ -387,8 +376,8 @@ module Hanami
       #   entity.id # => nil - It doesn't mutate original entity
       def update(*args)
         super
-      rescue => e
-        raise Hanami::Model::Error.for(e)
+      rescue => exception
+        raise Hanami::Model::Error.for(exception)
       end
 
       # Delete a record
@@ -406,8 +395,8 @@ module Hanami
       #   user       = repository.delete(user.id)
       def delete(*args)
         super
-      rescue => e
-        raise Hanami::Model::Error.for(e)
+      rescue => exception
+        raise Hanami::Model::Error.for(exception)
       end
     end
 
@@ -436,8 +425,8 @@ module Hanami
     #   user       = repository.find(user.id)
     def find(id)
       root.by_pk(id).as(:entity).one
-    rescue => e
-      raise Hanami::Model::Error.for(e)
+    rescue => exception
+      raise Hanami::Model::Error.for(exception)
     end
 
     # Return all the records for the relation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-model
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.3
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2021-05-22 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: dry-logic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -106,20 +126,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +188,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.81'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '0.81'
 description: A persistence framework with entities and repositories
 email:
 - me@lucaguidi.com
@@ -213,14 +267,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.3.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.2
 signing_key: 
 specification_version: 4
 summary: A persistence layer for Hanami