rom-sql 3.1.0 → 3.2.0

data/lib/rom/sql/relation/writing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     class Relation < ROM::Relation

data/lib/rom/sql/restriction_dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/dsl'
 
 module ROM
@@ -6,7 +8,13 @@ module ROM
     class RestrictionDSL < DSL
       # @api private
       def call(&block)
-        instance_exec(select_relations(block.parameters), &block)
+        arg, kwargs = select_relations(block.parameters)
+
+        if kwargs.nil?
+          instance_exec(arg, &block)
+        else
+          instance_exec(**kwargs, &block)
+        end
       end
 
       private

data/lib/rom/sql/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/schema'
 
 require 'rom/sql/schema/dsl'
@@ -142,7 +144,7 @@ module ROM
       # Finalize all attributes by qualifying them and initializing primary key names
       #
       # @api private
-      def finalize_attributes!(options = EMPTY_HASH)
+      def finalize_attributes!(**options)
         super do
           @attributes = map(&:qualified)
         end

data/lib/rom/sql/schema/attributes_inferrer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/core/class_attributes'
 
 module ROM
@@ -22,8 +24,8 @@ module ROM
 
           columns = filter_columns(gateway.connection.schema(dataset))
 
-          inferred = columns.map do |(name, definition)|
-            type = type_builder.(definition)
+          inferred = columns.map do |name, definition|
+            type = type_builder.(**definition)
 
             attr_class.new(type.meta(source: schema.name), name: name) if type
           end.compact
@@ -42,7 +44,7 @@ module ROM
 
         # @api private
         def filter_columns(schema)
-          schema.reject { |(_, definition)| definition[:db_type] == CONSTRAINT_DB_TYPE }
+          schema.reject { |_, definition| definition[:db_type] == CONSTRAINT_DB_TYPE }
         end
       end
     end

data/lib/rom/sql/schema/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/schema/index_dsl'
 
 module ROM
@@ -15,7 +17,7 @@ module ROM
         #
         # @api public
         def indexes(&block)
-          @index_dsl = IndexDSL.new(options, &block)
+          @index_dsl = IndexDSL.new(**options, &block)
         end
 
         private

data/lib/rom/sql/schema/index_dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 module ROM
@@ -19,6 +21,7 @@ module ROM
 
           instance_exec(&block)
         end
+        ruby2_keywords(:initialize) if respond_to?(:ruby2_keywords, true)
 
         # @api public
         def index(*attributes, **options)
@@ -28,7 +31,7 @@ module ROM
         # @api private
         def call(schema_name, attrs)
           attributes = attrs.map do |attr|
-            attr_class.new(attr[:type], attr[:options] || {}).meta(source: schema_name)
+            attr_class.new(attr[:type], **(attr[:options] || {})).meta(source: schema_name)
           end
 
           registry.map { |attr_names, options|
@@ -44,7 +47,7 @@ module ROM
             attributes.find { |a| a.name == name }.unwrap
           end
 
-          Index.new(index_attributes, options)
+          Index.new(index_attributes, **options)
         end
       end
     end

data/lib/rom/sql/schema/inferrer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 require 'rom/sql/schema/type_builder'
@@ -32,9 +34,9 @@ module ROM
         # @api private
         def call(schema, gateway)
           if enabled?
-            infer_from_database(gateway, schema, super)
+            infer_from_database(gateway, schema, **super)
           else
-            infer_from_attributes(gateway, schema, super)
+            infer_from_attributes(gateway, schema, **super)
           end
         rescue Sequel::Error => error
           on_error(schema.name, error)
@@ -54,7 +56,7 @@ module ROM
         end
 
         # @api private
-        def infer_from_attributes(gateway, schema, attributes:, **rest)
+        def infer_from_attributes(_gateway, schema, attributes:, **rest)
           indexes = schema.indexes | indexes_from_attributes(attributes)
           foreign_keys = foreign_keys_from_attributes(attributes)
 
@@ -69,7 +71,8 @@ module ROM
           if gateway.connection.respond_to?(:indexes)
             dataset = schema.name.dataset
 
-            gateway.connection.indexes(dataset).map { |index_name, columns:, unique:, **rest|
+            gateway.connection.indexes(dataset).map { |index_name, definition|
+              columns, unique = definition.values_at(:columns, :unique)
               attrs = columns.map { |name| attributes[name] }
 
               SQL::Index.new(attrs, name: index_name, unique: unique)
@@ -83,7 +86,8 @@ module ROM
         def foreign_keys_from_database(gateway, schema, attributes)
           dataset = schema.name.dataset
 
-          gateway.connection.foreign_key_list(dataset).map { |columns:, table:, key:, **rest|
+          gateway.connection.foreign_key_list(dataset).map { |definition|
+            columns, table, key = definition.values_at(:columns, :table, :key)
             attrs = columns.map { |name| attributes[name] }
 
             SQL::ForeignKey.new(attrs, table, parent_keys: key)
@@ -147,9 +151,9 @@ module ROM
             raise e
           elsif !silent
             warn "[#{dataset}] failed to infer schema. " \
-                 "Make sure tables exist before ROM container is set up. " \
-                 "This may also happen when your migration tasks load ROM container, " \
-                 "which is not needed for migrations as only the connection is required " \
+                 'Make sure tables exist before ROM container is set up. ' \
+                 'This may also happen when your migration tasks load ROM container, ' \
+                 'which is not needed for migrations as only the connection is required ' \
                  "(#{e.message})"
           end
         end

data/lib/rom/sql/schema/type_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     class Schema
@@ -37,9 +39,9 @@ module ROM
 
         def call(primary_key:, db_type:, type:, allow_null:, **rest)
           if primary_key
-            map_pk_type(type, db_type, rest)
+            map_pk_type(type, db_type, **rest)
           else
-            mapped_type = map_type(type, db_type, rest)
+            mapped_type = map_type(type, db_type, **rest)
 
             if mapped_type
               read_type = mapped_type.meta[:read]

data/lib/rom/sql/spec/support.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined? JRUBY_VERSION
   USING_JRUBY = true
 else
@@ -5,15 +7,15 @@ else
 end
 
 if USING_JRUBY
-  SEQUEL_TEST_DB_URI = "jdbc:sqlite::memory:"
+  SEQUEL_TEST_DB_URI = 'jdbc:sqlite::memory:'
 else
-  SEQUEL_TEST_DB_URI = "sqlite::memory"
+  SEQUEL_TEST_DB_URI = 'sqlite::memory'
 end
 
 DB = Sequel.connect(SEQUEL_TEST_DB_URI)
 
 def seed(db = DB)
-  db.run("CREATE TABLE users (id INTEGER PRIMARY KEY, name STRING)")
+  db.run('CREATE TABLE users (id INTEGER PRIMARY KEY, name STRING)')
 
   db[:users].insert(id: 1, name: 'Jane')
   db[:users].insert(id: 2, name: 'Joe')

data/lib/rom/sql/tasks/migration_tasks.rake

@@ -1,5 +1,7 @@
-require "pathname"
-require "fileutils"
+# frozen_string_literal: true
+
+require 'pathname'
+require 'fileutils'
 
 module ROM
   module SQL
@@ -27,7 +29,10 @@ module ROM
         def gateway
           if env.nil?
             Gateway.instance ||
-              raise(MissingEnv, "Set up a configuration with ROM::SQL::RakeSupport.env= in the db:setup task")
+              raise(
+                MissingEnv,
+                'Set up a configuration with ROM::SQL::RakeSupport.env= in the db:setup task'
+              )
           else
             env.gateways[:default]
           end
@@ -41,36 +46,36 @@ end
 
 namespace :db do
   task :rom_configuration do
-    Rake::Task["db:setup"].invoke
+    Rake::Task['db:setup'].invoke
   end
 
-  desc "Perform migration reset (full erase and migration up)"
+  desc 'Perform migration reset (full erase and migration up)'
   task reset: :rom_configuration do
     ROM::SQL::RakeSupport.run_migrations(target: 0)
     ROM::SQL::RakeSupport.run_migrations
-    puts "<= db:reset executed"
+    puts '<= db:reset executed'
   end
 
-  desc "Migrate the database (options [version_number])]"
+  desc 'Migrate the database (options [version_number])]'
   task :migrate, [:version] => :rom_configuration do |_, args|
     version = args[:version]
 
     if version.nil?
       ROM::SQL::RakeSupport.run_migrations
-      puts "<= db:migrate executed"
+      puts '<= db:migrate executed'
     else
       ROM::SQL::RakeSupport.run_migrations(target: version.to_i)
       puts "<= db:migrate version=[#{version}] executed"
     end
   end
 
-  desc "Perform migration down (erase all data)"
+  desc 'Perform migration down (erase all data)'
   task clean: :rom_configuration do
     ROM::SQL::RakeSupport.run_migrations(target: 0)
-    puts "<= db:clean executed"
+    puts '<= db:clean executed'
   end
 
-  desc "Create a migration (parameters: NAME, VERSION)"
+  desc 'Create a migration (parameters: NAME, VERSION)'
   task :create_migration, [:name, :version] => :rom_configuration do |_, args|
     name, version = args.values_at(:name, :version)
 

data/lib/rom/sql/transaction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     # @api private

data/lib/rom/sql/type_dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     # Type DSL used by Types.define method

data/lib/rom/sql/type_extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
     # Type-specific methods

data/lib/rom/sql/type_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dry/core/class_attributes'
 
 module ROM

data/lib/rom/sql/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'sequel/core'
 require 'sequel/sql'
 

data/lib/rom/sql/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module ROM
   module SQL
-    VERSION = '3.1.0'.freeze
+    VERSION = '3.2.0'.freeze
   end
 end

data/lib/rom/sql/wrap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/relation/wrap'
 
 module ROM

data/lib/rom/types/values.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rom/sql/types'
 
 module ROM

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -72,20 +72,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM