rom-rails 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aab84f6f3a0272e4e3745bace374ef628da306e77ab9c339b28bb320d8ff61dc
-  data.tar.gz: b2b0d450245b3405fad0b2cec2f513032f65fb294c2a47819cc2d503eb986de4
+  metadata.gz: 2b05da5eb835516ae2be2ff5577c763a1a511678e3dc134d6629540c7bc31abe
+  data.tar.gz: dc3a893b7392eadbd7c4cd62b0782a3085db09bc376c26da8818d738d5b45ca6
 SHA512:
-  metadata.gz: 8432e4d4a4f9a9ed2c4da5ae7ba7e95d46d79e424796aedee2fda45fdd2c7b61a4f23203d03a848869e65fe665a8ed9736c8b031515b8103d23710291312dd3b
-  data.tar.gz: abe4967268a5f14621db4c24390c87bebdc1be02baaa1396d361e31c03863a3afd5295760d33697ad6c2dfc681aef02be90c509ad1dcd73f5763629b0ce9064f
+  metadata.gz: 2db3f6f0e334c2b21ad4a37b94bc7c163765d502e8709069395de7db28ed9a440ab646f64649f37c883d745da5b8cd75aeb1df4d49e266d9aa318a900b241d8e
+  data.tar.gz: e92e622115b257e8a6961a883c2454860e44eda32c3cb3636df777ea9fa5d0e34d37d822d3df2c11116faf52cda81806a12a33f5cf8fffcc3c463d61336ace56

data/.github/workflows/ci.yml

@@ -24,25 +24,13 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
+          - '3.1'
+          - '3.0'
           - '2.7'
-          - '2.6'
-          - '2.5'
-          - '2.4'
-          - 'jruby-9.3'
         rails:
+          - "7.0.0"
           - "6.1.0"
           - "6.0.0"
-          - "5.2.0"
-          - "5.1.0"
-          - "5.0.0"
-          - "4.2.0"
-        exclude:
-          - ruby: "2.4"
-            rails: "6.0.0"
-          - ruby: "2.4"
-            rails: "6.1.0"
-          - ruby: "2.7"
-            rails: "4.2.0"
     env:
       APT_DEPS: libsqlite3-dev
       RAILS_VERSION: "${{matrix.rails}}"

data/CHANGELOG.md

@@ -1,11 +1,19 @@
-## v2.3.1 2022-12-07
+## v2.4.0 2023-10-26c
 
 ### Changed
 
-* Add support for namespaced auto loading paths
-* Fix jruby to version 9.3.*
+* Add configuration to allow not trigger reload on each request (alex-lairan)
+* Allow namespace configuration from within an auto_registration path (sasa-b)
 
-[Compare v2.3.0...v2.3.1](https://github.com/rom-rb/rom-rails/compare/v2.3.0...v2.3.1)
+### Added 
+
+* Compatible with Rails 7.0 (nolantait)
+* Compatible with Rails 7.1 (cflipse)
+
+### Removed
+
+* Dropped support for Rails < 6.0
+* Dropped support for Ruby < 2.7
 
 ## v2.3.0 2021-03-20
 

data/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"

data/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 @@ class ApplicationModel < ROM::Struct
     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

data/lib/rom/rails/active_record/configuration.rb

@@ -37,23 +37,20 @@ module ROM
         #
         # @api private
         def call
-          specs = { default: build(default_configuration.symbolize_keys) }
+          specs = {}
 
-          if rails6?
-            configurations.configs_for(env_name: env).each do |config|
-              specs[config.spec_name.to_sym] = build(config.config.symbolize_keys)
+          configurations.configs_for(env_name: env).each do |config|
+            if config.respond_to?(:configuration_hash)
+              name, hash = [config.name, config.configuration_hash]
+            else  # Rails 6.0
+              name, hash = [config.spec_name, config.config]
             end
-          end
-
-          specs
-        end
 
-        def default_configuration
-          if rails6?
-            configurations.default_hash(env)
-          else
-            configurations.fetch(env)
+            specs[:default] ||= hash
+            specs[name.to_sym] = hash
           end
+
+          specs.transform_values { |hash| build hash.symbolize_keys }
         end
 
         # Builds a configuration hash from a flat database config hash.
@@ -77,12 +74,6 @@ module ROM
           uri = uri_builder.build(adapter, uri_options)
           { uri: uri, options: other_options }
         end
-
-        private
-
-        def rails6?
-          ::ActiveRecord::VERSION::MAJOR >= 6
-        end
       end
     end
   end

data/lib/rom/rails/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Rails
-    VERSION = '2.3.1'.freeze
+    VERSION = '2.4.0'.freeze
   end
 end

data/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', '>= 6.0', '< 8.0.0'
+  spec.add_runtime_dependency 'rom', '~> 5.3'
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/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
 

data/spec/dummy/config/application.rb

@@ -7,6 +7,7 @@ Bundler.setup(:default, Rails.env)
 require 'rom-sql'
 require 'rom-rails'
 require 'rspec-rails'
+require 'dry/core/equalizer'
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/lib/rom/test_adapter.rb

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

data/spec/lib/active_record/configuration_spec.rb

@@ -20,7 +20,9 @@ RSpec.describe ROM::Rails::ActiveRecord::Configuration do
     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

data/spec/lib/generators/install_generator_spec.rb

@@ -64,6 +64,7 @@ RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
           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 @@ RSpec.describe ROM::Generators::InstallGenerator, type: :generator do
                   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Chris Flipse
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-07 00:00:00.000000000 Z
+date: 2023-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -31,62 +31,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: dry-equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: rom
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -291,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails