hanami-model 1.3.2 → 1.3.3

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

@@ -1,6 +1,8 @@
-require 'pathname'
-require 'hanami/utils'
-require 'English'
+# frozen_string_literal: true
+
+require "pathname"
+require "hanami/utils"
+require "English"
 
 module Hanami
   module Model
@@ -71,7 +73,7 @@ module Hanami
         # @api private
         def path
           root.join(
-            @connection.uri.sub(/\A(jdbc:sqlite:\/\/|sqlite:\/\/)/, '')
+            @connection.uri.sub(/\A(jdbc:sqlite:\/\/|sqlite:\/\/)/, "")
           )
         end
 
@@ -104,13 +106,11 @@ module Hanami
         # @since 0.4.0
         # @api private
         #
-        # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/MethodLength
         def dump_migrations_data
           execute "sqlite3 #{escape(path)} .dump" do |stdout|
             begin
               contents = stdout.read.split($INPUT_RECORD_SEPARATOR)
-              contents = contents.grep(/^INSERT INTO "#{migrations_table}"/)
+              contents = contents.grep(/^INSERT INTO "?#{migrations_table}"?/)
 
               ::File.open(schema, ::File::CREAT | ::File::BINARY | ::File::WRONLY | ::File::APPEND) do |file|
                 file.write(contents.join($INPUT_RECORD_SEPARATOR))
@@ -120,8 +120,6 @@ module Hanami
             end
           end
         end
-        # rubocop:enable Metrics/MethodLength
-        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/hanami/model/plugins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Model
     # Plugins to extend read/write operations from/to the database
@@ -17,9 +19,9 @@ module Hanami
         end
       end
 
-      require 'hanami/model/plugins/mapping'
-      require 'hanami/model/plugins/schema'
-      require 'hanami/model/plugins/timestamps'
+      require "hanami/model/plugins/mapping"
+      require "hanami/model/plugins/schema"
+      require "hanami/model/plugins/timestamps"
     end
   end
 end

data/lib/hanami/model/plugins/mapping.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Model
     module Plugins

data/lib/hanami/model/plugins/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Model
     module Plugins

data/lib/hanami/model/plugins/timestamps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Model
     module Plugins

data/lib/hanami/model/relation_name.rb

@@ -1,5 +1,7 @@
-require_relative 'entity_name'
-require 'hanami/utils/string'
+# frozen_string_literal: true
+
+require_relative "entity_name"
+require "hanami/utils/string"
 
 module Hanami
   module Model

data/lib/hanami/model/sql.rb

@@ -1,12 +1,14 @@
-require 'rom-sql'
-require 'hanami/utils'
+# frozen_string_literal: true
+
+require "rom-sql"
+require "hanami/utils"
 
 module Hanami
   # Hanami::Model migrations
   module Model
-    require 'hanami/model/error'
-    require 'hanami/model/association'
-    require 'hanami/model/migration'
+    require "hanami/model/error"
+    require "hanami/model/association"
+    require "hanami/model/migration"
 
     # Define a migration
     #
@@ -53,8 +55,8 @@ module Hanami
     #
     # @since 0.7.0
     module Sql
-      require 'hanami/model/sql/types'
-      require 'hanami/model/sql/entity/schema'
+      require "hanami/model/sql/types"
+      require "hanami/model/sql/entity/schema"
 
       # Returns a SQL fragment that references a database function by the given name
       # This is useful for database migrations

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

@@ -1,4 +1,6 @@
-require 'uri'
+# frozen_string_literal: true
+
+require "uri"
 
 module Hanami
   module Model
@@ -24,16 +26,16 @@ module Hanami
 
         # @since 0.7.0
         # @api private
-        def console # rubocop:disable Metrics/MethodLength
+        def console
           case @uri.scheme
-          when 'sqlite'
-            require 'hanami/model/sql/consoles/sqlite'
+          when "sqlite"
+            require "hanami/model/sql/consoles/sqlite"
             Sql::Consoles::Sqlite.new(@uri)
-          when 'postgres', 'postgresql'
-            require 'hanami/model/sql/consoles/postgresql'
+          when "postgres", "postgresql"
+            require "hanami/model/sql/consoles/postgresql"
             Sql::Consoles::Postgresql.new(@uri)
-          when 'mysql', 'mysql2'
-            require 'hanami/model/sql/consoles/mysql'
+          when "mysql", "mysql2"
+            require "hanami/model/sql/consoles/mysql"
             Sql::Consoles::Mysql.new(@uri)
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Hanami
   module Model
     module Sql
@@ -18,7 +20,7 @@ module Hanami
           # @since 0.7.0
           # @api private
           def database_name
-            @uri.path.sub(/^\//, '')
+            @uri.path.sub(/^\//, "")
           end
 
           # @since 0.7.0

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

@@ -1,4 +1,6 @@
-require_relative 'abstract'
+# frozen_string_literal: true
+
+require_relative "abstract"
 
 module Hanami
   module Model
@@ -11,7 +13,7 @@ module Hanami
         class Mysql < Abstract
           # @since 0.7.0
           # @api private
-          COMMAND = 'mysql'.freeze
+          COMMAND = "mysql"
 
           # @since 0.7.0
           # @api private

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

@@ -1,5 +1,7 @@
-require_relative 'abstract'
-require 'cgi'
+# frozen_string_literal: true
+
+require_relative "abstract"
+require "cgi"
 
 module Hanami
   module Model
@@ -12,11 +14,11 @@ module Hanami
         class Postgresql < Abstract
           # @since 0.7.0
           # @api private
-          COMMAND = 'psql'.freeze
+          COMMAND = "psql"
 
           # @since 0.7.0
           # @api private
-          PASSWORD = 'PGPASSWORD'.freeze
+          PASSWORD = "PGPASSWORD"
 
           # @since 0.7.0
           # @api private
@@ -48,22 +50,22 @@ module Hanami
           # @since 0.7.0
           # @api private
           def port
-            port = query['port'] || @uri.port
+            port = query["port"] || @uri.port
             " -p #{port}" if port
           end
 
           # @since 0.7.0
           # @api private
           def username
-            username = query['user'] || @uri.user
+            username = query["user"] || @uri.user
             " -U #{username}" if username
           end
 
           # @since 0.7.0
           # @api private
           def configure_password
-            password = query['password'] || @uri.password
-            ENV[PASSWORD] = CGI.unescape(query['password'] || @uri.password) if password
+            password = query["password"] || @uri.password
+            ENV[PASSWORD] = CGI.unescape(query["password"] || @uri.password) if password
           end
 
           # @since 1.1.0

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
 
@@ -93,8 +95,8 @@ module Hanami
           # @since 1.0.2
           # @api private
           def self.pg_json?(pristine)
-            pristine == pg_json_pristines['JSONB'.freeze] || # rubocop:disable Style/MultipleComparison
-              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.3.2'.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