dry-rails 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 315efa0b4975c1afe8c02e36ad325eda687c505cbeec76329eaf330f229d21f2
-  data.tar.gz: 0ee2ec74bafce16a2cee710fb90c10bb483b672f1178fbd76a4518c7d12d98ea
+  metadata.gz: ff456104e9451dc6e15a13351762d90a41a1e295910dadb7cca4fb231fbab7b1
+  data.tar.gz: 819517fa2d3847bbe70af131583ebf0363117f7c4c86bc6f350c4583442f4184
 SHA512:
-  metadata.gz: acd9f6bda792c65ee94b92d6e62ba286f33c2f3b4d7c01fa7f2b7818954fa61c52705686fa919091174ef6de8172d2dfb9b68077bf6f8a866a8fd19e10129290
-  data.tar.gz: 8001793ca368b1dc0388cacd2610441082a22163ec209169194be1d84aaa1ad5b83b8b6d3d45ea395eac29b5e1bb532296a425dac1664de91675f74a47794a7b
+  metadata.gz: a9a73cbde77855ff662285c17d9edd57e5a31b1c93ba38fbde092d6b65a883d51badcd18978d8e54e8fd45893c457ecef1fbd31ff1816a3c7e3285b7c6ebc692
+  data.tar.gz: 2b6eac3c402435b0fa9ed3395b739186b8d57056ac13416864e8ce09594d6220dad66471bac2813d9e6d64eacab96cfa93a2e964bc38bc2252c8b3e549576b18

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.6.0 2022-10-20
+
+
+### Changed
+
+- Upgrade to zeitwerkified dry-rb deps (issue #55 fixed via #56) (@solnic)
+
+[Compare v0.5.0...v0.6.0](https://github.com/dry-rb/dry-rails/compare/v0.5.0...v0.6.0)
+
+## 0.5.0 2022-02-11
+
+
+### Changed
+
+- dry-system dependency was bumped to >= 0.23 (via #52) (@solnic)
+
+[Compare v0.4.0...v0.5.0](https://github.com/dry-rb/dry-rails/compare/v0.4.0...v0.5.0)
+
 ## 0.4.0 2021-12-23
 
 This is a big update - please also read dry-system [CHANGELOG](https://github.com/dry-rb/dry-system/blob/master/CHANGELOG.md) versions 0.20 and 0.21.
@@ -15,6 +33,7 @@ This is a big update - please also read dry-system [CHANGELOG](https://github.co
 ### Changed
 
 - Updated to work with dry-system 0.21 (via #48 and #50) (@zlw + @solnic)
+- dry-system dependency was bumped to >= 0.23 (via #52) (@solnic)
 
 [Compare v0.3.0...v0.4.0](https://github.com/dry-rb/dry-rails/compare/v0.3.0...v0.4.0)
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -8,10 +8,10 @@
 # dry-rails [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/dry-rails.svg)][gem]
-[![CI Status](https://github.com/dry-rb/dry-rails/workflows/CI/badge.svg)][actions]
+[![CI Status](https://github.com/dry-rb/dry-rails/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/d4677ea0c4c2497bb1af1b3ac31552f4)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/d4677ea0c4c2497bb1af1b3ac31552f4)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-rails.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-rails.svg?branch=main)][inchpages]
 
 ## Links
 
@@ -22,8 +22,8 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.6.0`
-* jruby `>= 9.3`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-rails.gemspec

@@ -22,16 +22,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-rails/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-rails/blob/main/CHANGELOG.md"
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-rails"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-rails/issues"
 
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "dry-schema", "~> 1.7"
-  spec.add_runtime_dependency "dry-system", "~> 0.21"
-  spec.add_runtime_dependency "dry-validation", "~> 1.5"
+  spec.add_runtime_dependency "dry-schema", "~> 1.11", ">= 1.11.2"
+  spec.add_runtime_dependency "dry-system", "~> 0.27", ">= 0.27.2"
+  spec.add_runtime_dependency "dry-validation", "~> 1.9", ">= 1.9.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/rails/auto_registrars/app.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/system/auto_registrar"
+require "dry/system"
 
 module Dry
   module Rails

data/lib/dry/rails/boot/application_contract.rb

@@ -1,18 +1,19 @@
 # frozen_string_literal: true
 
-Dry::System.register_component(:application_contract, provider: :rails) do
-  init do
+Dry::System.register_provider_source(:application_contract, group: :rails) do
+  prepare do
     require "dry/rails/features/application_contract"
+    @railtie = target_container[:railtie]
   end
 
   start do
-    railtie.set_or_reload(
+    @railtie.set_or_reload(
       :ApplicationContract,
-      Class.new(Dry::Rails::Features::ApplicationContract).finalize!(railtie)
+      Class.new(Dry::Rails::Features::ApplicationContract).finalize!(@railtie)
     )
   end
 
   stop do
-    railtie.remove_constant(:ApplicationContract)
+    @railtie.remove_constant(:ApplicationContract)
   end
 end

data/lib/dry/rails/boot/controller_helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-Dry::System.register_component(:controller_helpers, provider: :rails) do
-  init do
+Dry::System.register_provider_source(:controller_helpers, group: :rails) do
+  prepare do
     require "dry/rails/features/controller_helpers"
   end
 

data/lib/dry/rails/boot/safe_params.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-Dry::System.register_component(:safe_params, provider: :rails) do
-  init do
+Dry::System.register_provider_source(:safe_params, group: :rails) do
+  prepare do
     require "dry/rails/features/safe_params"
   end
 

data/lib/dry/rails/container.rb

@@ -2,9 +2,7 @@
 
 require "rails/version"
 
-require "dry/system/container"
-require "dry/system/components"
-
+require "dry/system"
 require "dry/rails/auto_registrars/app"
 
 module Dry
@@ -59,15 +57,13 @@ module Dry
       config.auto_registrar = Rails::AutoRegistrars::App
 
       class << self
-        # Return if a given component was booted
+        # Return if a given component was started
         #
         # @return [Boolean]
         #
         # @api private
-        #
-        # TODO: this should be moved to dry-system
-        def booted?(name)
-          booter.booted.map(&:name).include?(name)
+        def started?(name)
+          providers[name].started?
         end
 
         # TODO: confirm that this is really needed
@@ -83,9 +79,9 @@ module Dry
         # @return [self]
         #
         # @api private
-        def refresh_boot_files
-          booter.boot_files.each do |boot_file|
-            load(boot_file)
+        def refresh_provider_files
+          providers.provider_files.each do |boot_file|
+            ::Kernel.load(boot_file)
           end
           self
         end

data/lib/dry/rails/features/application_contract.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/validation/contract"
+require "dry/validation"
 
 module Dry
   module Rails

data/lib/dry/rails/features/safe_params.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "dry/schema/params"
+require "dry/schema"
 
 module Dry
   module Rails

data/lib/dry/rails/railtie.rb

@@ -34,8 +34,7 @@ module Dry
         container = Dry::Rails.create_container(
           root: root_path,
           inflector: default_inflector,
-          system_dir: root_path.join("config/system"),
-          bootable_dirs: [root_path.join("config/system/boot")]
+          provider_dirs: [root_path.join("config/system/boot")]
         )
 
         # Enable :env plugin by default because it is a very common requirement
@@ -57,10 +56,10 @@ module Dry
         set_or_reload(container.auto_inject_constant, container.injector)
 
         container.features.each do |feature|
-          container.boot(feature, from: :rails)
+          container.register_provider(feature, from: :rails)
         end
 
-        container.refresh_boot_files if reloading?
+        container.refresh_provider_files if reloading?
 
         container.finalize!(freeze: !::Rails.env.test?)
       end
@@ -76,7 +75,7 @@ module Dry
       # @api public
       def stop_features
         container.features.each do |feature|
-          container.stop(feature) if container.booted?(feature)
+          container.stop(feature) if container.started?(feature)
         end
       end
 

data/lib/dry/rails/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Rails
-    VERSION = "0.4.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/dry/rails.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require "dry/system"
 require "dry/rails/railtie"
 require "dry/rails/container"
-require "dry/rails/components"
 
 module Dry
+  Dry::System.register_provider_sources(Pathname(__dir__).join("rails/boot").realpath)
+
   # Initializer interface
   #
   # @example set up a container with auto-registration paths

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-schema
@@ -16,42 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: dry-system
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.27'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.27.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.27'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.27.2
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +130,6 @@ files:
 - lib/dry/rails/boot/application_contract.rb
 - lib/dry/rails/boot/controller_helpers.rb
 - lib/dry/rails/boot/safe_params.rb
-- lib/dry/rails/components.rb
 - lib/dry/rails/container.rb
 - lib/dry/rails/features/application_contract.rb
 - lib/dry/rails/features/controller_helpers.rb
@@ -124,7 +141,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-rails/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-rails/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-rails
   bug_tracker_uri: https://github.com/dry-rb/dry-rails/issues
 post_install_message: 
@@ -135,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/dry/rails/components.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/system"
-
-Dry::System.register_provider(
-  :rails,
-  boot_path: Pathname(__dir__).join("boot").realpath
-)