decorators 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6091a1ade1ac5605813292d8bd527d7f4b38aacb9a2109a9c64c19b119d3cf80
-  data.tar.gz: ad9c81250cf2fa82af1b4494efa58a7f9b51c35f419ee94afd81f1948f4dbfab
+  metadata.gz: b9efa7db170a09a587fead6631846e7212ad98fc9b814de4c59845b1ee397163
+  data.tar.gz: 8dc05592f028f78da76e3f2fdb44b78f19960957e8ba5166d43a7101ba0fa2c0
 SHA512:
-  metadata.gz: fdf6cf64ee8d6450c0f5a3b3c1e44d5e9e799774635906265859852819c04d92b97df1f29c28b776a73893536a8e8c5a023e35cf1ee3c6e22900d77d0d4ecf57
-  data.tar.gz: 2b1933cde307d5ce6e5bf9f5a6190e9923e16780f95ba9fb6e9bf83cc6b33a6ec63c077eb9b11ab0377eaba2d90953843516f7a2958fa965be2f1a3a42adb262
+  metadata.gz: 672b0091b73016852f0076508b6145bf64f4bd56ba9ccda823e9b10d30a2e019d3999c84785e63d1b1911aa9c8efb4c1405500eb3513d4c60f0e24709c768a7b
+  data.tar.gz: d04d6dc7df0c86f11e7e808922f013560a72c6023b771347bc9e5ef31140bbf5b8627fdf6d2b91b430a99b01e5374f8c63d024cde8377a49cc6d5e9079771897

data/lib/decorators/paths.rb

@@ -1,9 +1,11 @@
-require 'pathname'
+# frozen_string_literal: true
+
+require "pathname"
 
 module Decorators
   class Paths
-
     attr_reader :registered
+
     def initialize(*args)
       @registered = Array.new(*args)
     end
@@ -11,6 +13,5 @@ module Decorators
     def register!(path)
       @registered << Pathname.new(path)
     end
-
   end
 end

data/lib/decorators/railtie.rb

@@ -1,8 +1,9 @@
-require 'rails'
+# frozen_string_literal: true
+
+require "rails"
 
 module Decorators
   class Railtie < Rails::Railtie
-
     config.before_initialize do |app|
       loader = proc { Decorators.load!(app.config.cache_classes) }
 
@@ -12,6 +13,5 @@ module Decorators
         app.config.to_prepare(&loader)
       end
     end
-
   end
 end

data/lib/decorators.rb

@@ -1,45 +1,69 @@
-module Decorators
-  require 'decorators/paths'
+# frozen_string_literal: true
+
+require "decorators/paths"
+require "decorators/railtie"
 
+module Decorators
   class << self
     def load!(cache_classes)
+      decorators_with_argument_errors = []
       decorators.each do |decorator|
-        if cache_classes
-          require decorator
-        else
-          load decorator
-        end
+        load_decorator(decorator, cache_classes)
+      rescue ArgumentError
+        decorators_with_argument_errors << decorator
+      end
+
+      decorators_with_argument_errors.each do |decorator|
+        load_decorator(decorator, cache_classes)
       end
     end
 
     def decorators
-      paths.registered.map { |path| find_decorators_in_path(path) }.flatten.uniq
+      paths.registered.map(&method(:find_decorators_in_path)).flatten.uniq
     end
 
     def register!(*paths_to_register)
       paths_to_register.flatten.map do |path|
         paths.register! path
+        ignore_in_autoloader(path)
       end
     end
 
-    protected
+    private
+
     def paths
       @paths ||= Paths.new
     end
 
     def apply_decorators_pattern_to_path(path)
-      path.join *pattern
+      path.join(*pattern)
     end
 
     def find_decorators_in_path(path)
       Dir[apply_decorators_pattern_to_path(path)]
     end
 
+    def load_decorator(decorator, cache_classes)
+      if cache_classes
+        require decorator
+      else
+        load decorator
+      end
+    end
+
+    # Decorators are loaded by hand, so Zeitwerk mustn't also manage them. Only
+    # subdirectories of app/decorators hold decorators; files directly inside it
+    # stay autoloadable.
+    def ignore_in_autoloader(path)
+      return unless defined?(Rails.autoloaders) && Rails.application && Rails.autoloaders.zeitwerk_enabled?
+
+      Dir[Pathname(path).join("app", "decorators", "*")].select { |entry| File.directory?(entry) }.each do |directory|
+        Rails.autoloaders.main.ignore(directory)
+      end
+    end
+
     def pattern
-      ['app', 'decorators', '*', '**', '*_decorator.rb']
+      ["app", "decorators", "*", "**", "*_decorator.rb"]
     end
   end
-
 end
-
-require 'decorators/railtie'

data/readme.md

@@ -1,4 +1,4 @@
-# Decorators Plugin [![Build Status](https://secure.travis-ci.org/parndt/decorators.png?branch=master)](http://travis-ci.org/parndt/decorators)
+# Decorators Plugin
 
 This is a very simple plugin that adds support for decorators to your Rails application.
 Effectively all that this does is allow you to register paths in which to search
@@ -26,7 +26,7 @@ The important parts are being inside a sub directory of `app/decorators` and hav
 In your Gemfile, add the gem:
 
 ```ruby
-gem 'decorators', '~> 2.0.3'
+gem 'decorators', '~> 2.1'
 ```
 
 Now, run `bundle install` and the gem should install.
@@ -49,6 +49,13 @@ require 'decorators'
 Decorators.register! Rails.root, Rails.root.join('vendor', 'extensions', 'extension_with_decorators')
 ```
 
+#### Zeitwerk
+
+Decorators loads these files itself, so it tells Zeitwerk to ignore the
+subdirectories of `app/decorators` in every path you register. Register your
+paths before eager loading happens, e.g. from an initializer or a `to_prepare`
+block, not `after_initialize`.
+
 #### Avoiding Rails development mode reloading issues ([example](https://github.com/refinery/refinerycms/issues/2267))
 
 If you are loading this from within a Rails engine definition make sure you require

metadata

@@ -1,40 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: decorators
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Philip Arndt
-autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIEMjCCApqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhnZW1z
-  L0RDPXAvREM9YXJuZHQvREM9aW8wHhcNMTgxMDI5MDk0MjQ5WhcNMTkxMDI5MDk0
-  MjQ5WjAjMSEwHwYDVQQDDBhnZW1zL0RDPXAvREM9YXJuZHQvREM9aW8wggGiMA0G
-  CSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQClF0/voptshDoTILFgUjvkViCOPe3W
-  uuDwfSep+gc5AI83MmrmonN3L/dwm60D3HhZOtVt9el1n5E5b5aPzJngjdF9sFPX
-  OIx3UlYde+WkzbG4iR2U0/8dMZ6DYuz6ijgPEpU1UKodUJVqEmt3Vc+rzDET9zoK
-  TkIALNbSaV2G32ZDhoabeQJoJ0ce/2vjDqhM7awG7CYGRqRq4c0NOKKm0bGh+LOo
-  vQNDvRjXPs0yp5i3keCgf6IcQ26nluqILYGPjuTExJj+k6AKfq6SPWDVtzSqdfiH
-  STs/W85rwrKdLfEzfXxNsHvJ6Ryx+0A0hsNbfTTOhp4dkYm/6fyOejp7Of7qWRw/
-  kJhI/PTq1gqh+Irpr+wUz04xItGE8WglKv1ydTUqBlCz2l9NfVTChtUpYlrk4FvN
-  r7s6fcXH5cNX1ll2D1X2XLxmYEUgbAv5xApspvmpdRY5zlmSXZapi2KbW5iqpOV2
-  luxRjhjfcOKfMugvGrMUFiqDaDi5IXS25KECAwEAAaNxMG8wCQYDVR0TBAIwADAL
-  BgNVHQ8EBAMCBLAwHQYDVR0OBBYEFLzeU7GH0rvnvDchSWtJhceiUDDTMBoGA1Ud
-  EQQTMBGBD2dlbXNAcC5hcm5kdC5pbzAaBgNVHRIEEzARgQ9nZW1zQHAuYXJuZHQu
-  aW8wDQYJKoZIhvcNAQELBQADggGBABMRA737G23Oiy1xBgVJsDW5LgGbeK9JQCC9
-  eRdx22TDyrJ5vviqB22k13+zp/tq5fgeCsrk5iLAt5F/GgcP82p7pPm3qKi1QWip
-  cnQvy5fLKcl+PaIX/+PYGVKUfV/wA+NuP06RSnzvNPepcUvbTJdAr6nQVdIh/ftB
-  64QhOWuk2CuGlt+tLMGbjR65W3SppBkvVd4yYHArbl4Z0qPG+TVrVrj2JEjo82rT
-  jIUDLkdUlQ/FmH5fHhbrtn5PMCXjto414YBC7aQUxQsiNCN2qhsjwiyzVBbBTjnA
-  1sA043YnGOd1XylVtnrARK5eT7DhFGrMGMp/KvOg+T7q19+65jaopvHH4zFXzBcY
-  MxlH/7tMQ5+DdHcqbu3SOAe1/VaaRk28J0CdPZS6Y60YuRqL17Zg2WOODiBkA9WE
-  JjcyzdERZXsSPh+DT5PrllEbTNTZPbBcnAWjqdEWLtBIxD3JpgZHTmYP4I2ExAeu
-  2Oqsxsw30MIZnh2Cw/xLRkc1I50luA==
-  -----END CERTIFICATE-----
-date: 2019-10-02 00:00:00.000000000 Z
+cert_chain: []
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -45,7 +18,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -55,7 +28,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -63,9 +36,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -73,9 +43,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
 description: Manages the process of loading decorators into your Rails application.
 email: gems@p.arndt.io
 executables: []
@@ -91,7 +58,6 @@ homepage: https://github.com/parndt/decorators
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -106,8 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Rails decorators plugin.
 test_files: []

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-f����{����{�oQ�z��c�?xW����C�� �Ѫ>�EjB���jr���\�۟�
-se�f 2m���`ER�K,��+|o��bՉD�@�h|���|6����o[O±?2�G�L� A9��L�;��w�?F㓬3���T	�X��L6]Ao��E�k�ڀwӧ��_�ц�@�1�