Merge pull request #130 from nolantait/rails-7-nt

Rails 7

Author: cflipse

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-RAILS_VERSION = ENV.fetch("RAILS_VERSION", '6.1.1').freeze
+RAILS_VERSION = ENV.fetch("RAILS_VERSION", '7.0.4').freeze
 
 %w(railties actionview actionpack activerecord).each do |name|
   gem name, "~> #{RAILS_VERSION}"
@@ -11,8 +11,6 @@ end
 gem 'byebug', platforms: :mri
 gem 'sqlite3', platforms: [:mri, :rbx]
 
-
-
 if ENV["USE_ROM_MASTER"].eql?("true")
   gem 'rom', git: 'https://github.com/rom-rb/rom', branch: 'master' do
     gem 'rom-core'
@@ -33,6 +31,7 @@ platforms :jruby do
 end
 
 group :test do
+  gem 'debug'
   gem 'capybara'
   gem 'codeclimate-test-reporter', require: nil
   gem 'database_cleaner', "~> 1.8.1"

lib/generators/rom/install/templates/application_model.rb

@@ -1,4 +1,5 @@
 require "types"
+require "dry/core/equalizer"
 
 class ApplicationModel < ROM::Struct
   def self.inherited(base)
@@ -9,7 +10,7 @@ def self.inherited(base)
     base.extend ActiveModel::Naming
     base.include ActiveModel::Conversion
 
-    base.include Dry::Equalizer(:id)
+    base.include Dry::Core::Equalizer.new(:id)
 
     base.attribute :id, Types::ID
   end

lib/rom/rails/active_record/configuration.rb

@@ -37,11 +37,11 @@ def initialize(env: ::Rails.env, root: ::Rails.root, configurations: ::ActiveRec
         #
         # @api private
         def call
-          specs = { default: build(default_configuration.symbolize_keys) }
+          specs = { default: build(default_configuration.configuration_hash) }
 
           if rails6?
             configurations.configs_for(env_name: env).each do |config|
-              specs[config.spec_name.to_sym] = build(config.config.symbolize_keys)
+              specs[config.name.to_sym] = build(config.configuration_hash)
             end
           end
 
@@ -50,7 +50,7 @@ def call
 
         def default_configuration
           if rails6?
-            configurations.default_hash(env)
+            configurations.configs_for(env_name: env).first
           else
             configurations.fetch(env)
           end

rom-rails.gemspec

@@ -23,10 +23,9 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_runtime_dependency 'addressable', '~> 2.3'
-  spec.add_runtime_dependency 'dry-core', '~> 0.4'
-  spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'railties', '>= 3.0', '< 6.2'
-  spec.add_runtime_dependency 'rom', '~> 5.2'
+  spec.add_runtime_dependency 'dry-core', '~> 1.0'
+  spec.add_runtime_dependency 'railties', '>= 3.0', '<= 7.0.4'
+  spec.add_runtime_dependency 'rom', '~> 5.3'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

spec/dummy/app/models/user.rb

@@ -1,5 +1,5 @@
 class User
-  include Dry::Equalizer(:id, :name, :email)
+  include Dry::Core::Equalizer.new(:id, :name, :email)
 
   attr_reader :id, :name, :email
 

spec/dummy/config/application.rb

@@ -7,6 +7,7 @@
 require 'rom-sql'
 require 'rom-rails'
 require 'rspec-rails'
+require 'dry/core/equalizer'
 
 module Dummy
   class Application < Rails::Application

spec/dummy/lib/rom/test_adapter.rb

@@ -5,7 +5,7 @@ class Relation < ROM::Relation
     end
 
     class Gateway < ROM::Gateway
-      include Dry::Equalizer(:args)
+      include Dry::Core::Equalizer.new(:args)
       adapter :test_adapter
 
       attr_reader :args, :datasets

spec/lib/active_record/configuration_spec.rb

@@ -20,7 +20,9 @@ def parse(uri)
     URI.parse(uri.gsub(/^jdbc:/, ''))
   end
 
-  it 'raises an error without specifying a database'
+  it 'raises an error without specifying a database' do
+    expect { read({}) }.to raise_error KeyError
+  end
 
   context 'with postgresql adapter' do
     it 'rewrites the scheme' do

spec/lib/generators/install_generator_spec.rb

@@ -64,6 +64,7 @@ module Types
           file "application_model.rb" do
             contains <<-CONTENT.strip_heredoc
               require "types"
+              require "dry/core/equalizer"
 
               class ApplicationModel < ROM::Struct
                 def self.inherited(base)
@@ -74,7 +75,7 @@ def self.inherited(base)
                   base.extend ActiveModel::Naming
                   base.include ActiveModel::Conversion
 
-                  base.include Dry::Equalizer(:id)
+                  base.include Dry::Core::Equalizer.new(:id)
 
                   base.attribute :id, Types::ID
                 end