rom-rails 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fce2e9329194bb83964a04c19899efea1d3f61e2c38a62f5587440a431deb7f
-  data.tar.gz: cf7aac16519079bec773b5fa2799199212989c8c8b36c4afd7e2d44eee1032ee
+  metadata.gz: 2b05da5eb835516ae2be2ff5577c763a1a511678e3dc134d6629540c7bc31abe
+  data.tar.gz: dc3a893b7392eadbd7c4cd62b0782a3085db09bc376c26da8818d738d5b45ca6
 SHA512:
-  metadata.gz: 846026a514b5aa386cbba31d68e1b643894fb729ef6ee08b3e72dd9b289609b98ca31fe87f431abbfd3cb950c6e42639e89445d96202705c91ed06be14962f4f
-  data.tar.gz: 0b3d2dbeaa5c848b52f8d143b79a191fb2ec0a1a08783c7100720abbb74a36ae840c55a41f8ddddc0cf323045f81d10fc5baa638a7bd07325c31edc9cf3a2690
+  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
         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,3 +1,20 @@
+## v2.4.0 2023-10-26c
+
+### Changed
+
+* Add configuration to allow not trigger reload on each request (alex-lairan)
+* Allow namespace configuration from within an auto_registration path (sasa-b)
+
+### 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
 
 ### Changed

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.4.0, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct)

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/README.md

@@ -1,14 +1,16 @@
 [gem]: https://rubygems.org/gems/rom-rails
 [actions]: https://github.com/rom-rb/rom-rails/actions
 [codeclimate]: https://codeclimate.com/github/rom-rb/rom-rails
+[codeacy]: https://www.codacy.com/gh/rom-rb/rom-rails
 [coveralls]: https://coveralls.io/r/rom-rb/rom-rails
 [inchpages]: http://inch-ci.org/github/rom-rb/rom-rails
 
-# rom-rails
+# rom-rails [![Join the chat at https://rom-rb.zulipchat.com](https://img.shields.io/badge/rom--rb-join%20chat-942283.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/rom-rails.svg)][gem]
 [![CI Status](https://github.com/rom-rb/rom-rails/workflows/ci/badge.svg)][actions]
 [![Code Climate](https://codeclimate.com/github/rom-rb/rom-rails/badges/gpa.svg)][codeclimate]
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/81d5362ea6314dd09432fb238d79f481)][codeacy]
 [![Test Coverage](https://codeclimate.com/github/rom-rb/rom-rails/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/rom-rb/rom-rails.svg?branch=master)][inchpages]
 
@@ -16,9 +18,9 @@ Rails integration for [Ruby Object Mapper](https://github.com/rom-rb/rom) which
 ships with:
 
 * Relation generators
+* Repository generators
 * Mapper generators
 * Command generators
-* Repository generators
 
 ## Tests
 
@@ -37,8 +39,9 @@ You can read more about ROM and Rails on the official website:
 
 ## Community
 
-* [![Gitter chat](https://badges.gitter.im/rom-rb/chat.png)](https://gitter.im/rom-rb/chat)
-* [Discussion Forum](https://discuss.rom-rb.org)
+* [Offical ROM blog](https://rom-rb.org/blog)
+* [Discussion Forum](https://discourse.rom-rb.org)
+* [Chat](https://rom-rb.zulipchat.com)
 
 ## License
 

data/db

@@ -1 +1 @@
-./spec/dummy/db
+spec/dummy/db

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/configuration.rb

@@ -13,6 +13,10 @@ module ROM
       config_accessor :auto_registration_paths do
         ['app']
       end
+
+      config_accessor :reload_on_each_request do
+        true
+      end
     end
   end
 end

data/lib/rom/rails/railtie.rb

@@ -30,7 +30,7 @@ module ROM
       initializer 'rom.adjust_eager_load_paths' do |app|
         paths =
           auto_registration_paths.inject([]) do |result, root_path|
-            result.concat(COMPONENT_DIRS.map { |dir| ::Rails.root.join(root_path, dir).to_s })
+            result.concat(COMPONENT_DIRS.map { |dir| ::Rails.root.join(root_path.is_a?(Hash) ? root_path[:path] : root_path, dir).to_s })
           end
 
         app.config.eager_load_paths -= paths
@@ -40,9 +40,18 @@ module ROM
         load "rom/rails/tasks/db.rake" unless active_record?
       end
 
+      # Load ROM-related application code on startup
+      config.after_initialize do
+        if !::Rails.application.config.rom.reload_on_each_request
+          ROM.env = Railtie.create_container
+        end
+      end
+
       # Reload ROM-related application code on each request.
-      config.to_prepare do |_config|
-        ROM.env = Railtie.create_container
+      config.to_prepare do |prepare_conf|
+        if ::Rails.application.config.rom.reload_on_each_request
+          ROM.env = Railtie.create_container
+        end
       end
 
       console do |_app|
@@ -78,7 +87,11 @@ module ROM
         configuration = create_configuration
 
         auto_registration_paths.each do |root_path|
-          configuration.auto_registration(::Rails.root.join(root_path), namespace: false)
+          if root_path.is_a? Hash
+            configuration.auto_registration(::Rails.root.join(root_path[:path]), namespace: root_path[:namespace])
+          else
+            configuration.auto_registration(::Rails.root.join(root_path), namespace: false)
+          end
         end
 
         ROM.container(configuration)

data/lib/rom/rails/version.rb

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

data/log

@@ -1 +1 @@
-./spec/dummy/log
+spec/dummy/log

data/rom-rails.gemspec

@@ -16,11 +16,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.metadata = {
+    "bug_tracker_uri" => "https://github.com/rom-rb/rom-rails/issues",
+    "changelog_uri"   => "https://github.com/rom-rb/rom-rails/blob/master/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/rom-rb/rom-rails",
+  }
+
   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/config/initializers/rom.rb

@@ -4,4 +4,5 @@ ROM::Rails::Railtie.configure do |config|
   config.gateways[:sql] = [:sql, "#{scheme}://#{Rails.root}/db/#{Rails.env}.sqlite3"]
   config.gateways[:default] = [:test_adapter, foo: :bar]
   config.auto_registration_paths += [Rails.root.join('lib', 'additional_app', 'persistence')]
+  config.auto_registration_paths += [{path: Rails.root.join('lib', 'namespaced_app', 'persistence'), namespace: 'NamespacedApp::Persistence'}]
 end

data/spec/dummy/lib/namespaced_app/persistence/commands/create_additional_task.rb

@@ -0,0 +1,11 @@
+module NamespacedApp
+  module Persistence
+    module Commands
+      class CreateAdditionalTask < ROM::Commands::Create[:sql]
+        relation :tasks
+        register_as :namespaced_additional
+        result :one
+      end
+    end
+  end
+end

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/integration/initializer_spec.rb

@@ -7,7 +7,12 @@ RSpec.describe 'ROM initializer' do
     expect(rom.relations.dummy).to eql(relation)
   end
 
-  it 'loads commands from additionall auto_registration_paths' do
+  it 'loads commands from additional auto_registration_paths' do
     expect(rom.commands.tasks.create_additional).to be_a(CreateAdditionalTask)
   end
+
+  it 'allows namespace configuration on autoload paths' do
+    puts rom.commands.tasks.elements
+    expect(rom.commands.tasks.namespaced_additional).to be_a(NamespacedApp::Persistence::Commands::CreateAdditionalTask)
+  end
 end

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,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rom-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Chris Flipse
 - Piotr Solnica
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-21 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
@@ -143,7 +129,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.50'
-description: 
+description:
 email:
 - cflipse@gmail.com
 - piotr.solnica@gmail.com
@@ -161,6 +147,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - CHANGELOG.md
+- CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
@@ -243,6 +230,7 @@ files:
 - spec/dummy/db/migrate/20150403194906_create_tags.rb
 - spec/dummy/lib/additional_app/persistence/commands/create_additional_task.rb
 - spec/dummy/lib/assets/.keep
+- spec/dummy/lib/namespaced_app/persistence/commands/create_additional_task.rb
 - spec/dummy/lib/rom/test_adapter.rb
 - spec/dummy/lib/tasks/.keep
 - spec/dummy/log/.keep
@@ -270,8 +258,11 @@ files:
 homepage: http://rom-rb.org
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/rom-rb/rom-rails/issues
+  changelog_uri: https://github.com/rom-rb/rom-rails/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/rom-rb/rom-rails
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -286,8 +277,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Integrate Ruby Object Mapper with Rails
 test_files:
@@ -340,6 +331,7 @@ test_files:
 - spec/dummy/db/migrate/20150403194906_create_tags.rb
 - spec/dummy/lib/additional_app/persistence/commands/create_additional_task.rb
 - spec/dummy/lib/assets/.keep
+- spec/dummy/lib/namespaced_app/persistence/commands/create_additional_task.rb
 - spec/dummy/lib/rom/test_adapter.rb
 - spec/dummy/lib/tasks/.keep
 - spec/dummy/log/.keep