Merge branch 'main' into fix

.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby: [ '3.3', '3.2', '3.1', '3.0', '2.7', '2.6', '2.5', '2.4' ]
+      fail-fast: false
+    runs-on: ubuntu-latest
+    name: ${{ matrix.ruby }}
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rspec
+
+    env:
+      BUNDLE_JOBS: 4
+      BUNDLE_PATH: vendor/bundle
+      CI: true

Gemfile

@@ -1,3 +1,7 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
+
+group :development do
+  gem "standard", require: false
+end

certs/parndt.pem

@@ -1,21 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQ0wCwYDVQQDDARnZW1z
+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
-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
+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
-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
+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
+jAtsfxiSgc0fAw==
 -----END CERTIFICATE-----

changelog.md

@@ -0,0 +1,5 @@
+# Decorators Changelog
+## 2.0.6
+
+* Created branch 'main'
+* Updated railties dependency to "railties", ">= 4.0.0", "< 7.2"

decorators.gemspec

@@ -1,28 +1,28 @@
 Gem::Specification.new do |s|
-  s.platform          = Gem::Platform::RUBY
-  s.name              = %q{decorators}
-  s.version           = %q{2.0.4}
-  s.description       = %q{Manages the process of loading decorators into your Rails application.}
-  s.summary           = %q{Rails decorators plugin.}
-  s.email             = %q{[email protected]}
-  s.homepage          = %q{https://github.com/parndt/decorators}
-  s.authors           = ["Philip Arndt"]
-  s.license           = %q{MIT}
-  s.require_paths     = %w(lib)
+  s.platform = Gem::Platform::RUBY
+  s.name = "decorators"
+  s.version = "2.0.6"
+  s.description = "Manages the process of loading decorators into your Rails application."
+  s.summary = "Rails decorators plugin."
+  s.email = "[email protected]"
+  s.homepage = "https://github.com/parndt/decorators"
+  s.authors = ["Philip Arndt"]
+  s.license = "MIT"
+  s.require_paths = %w[lib]
 
-  s.files             = %w[
+  s.files = %w[
     lib/decorators.rb
     lib/decorators/paths.rb
     lib/decorators/railtie.rb
     license.md
     readme.md
   ]
 
-  s.add_dependency             "railties", ">= 4.0.0", "< 6"
+  s.add_dependency "railties", ">= 4.0.0", "< 7.2"
   s.add_development_dependency "rspec", "~> 3.5", ">= 3.5.0"
 
-  s.cert_chain  = ["certs/parndt.pem"]
-  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
+  s.cert_chain = ["certs/parndt.pem"]
+  if $0.end_with?("gem") && ARGV.include?("build") && ARGV.include?(__FILE__)
     s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
   end
 end

lib/decorators.rb

@@ -1,5 +1,5 @@
 module Decorators
-  require 'decorators/paths'
+  require "decorators/paths"
 
   class << self
     def load!(cache_classes)
@@ -35,22 +35,23 @@ def register!(*paths_to_register)
     end
 
     protected
+
     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 pattern
-      ['app', 'decorators', '*', '**', '*_decorator.rb']
+      ["app", "decorators", "*", "**", "*_decorator.rb"]
     end
   end
 end
 
-require 'decorators/railtie'
+require "decorators/railtie"

lib/decorators/paths.rb

@@ -1,16 +1,15 @@
-require 'pathname'
+require "pathname"
 
 module Decorators
   class Paths
-
     attr_reader :registered
+
     def initialize(*args)
       @registered = Array.new(*args)
     end
 
     def register!(path)
       @registered << Pathname.new(path)
     end
-
   end
 end

lib/decorators/railtie.rb

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

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.0.6'
 ```
 
 Now, run `bundle install` and the gem should install.

spec/decorators/path_spec.rb

@@ -1,27 +1,27 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Decorators::Paths do
   context "initialized without arguments" do
-    let(:paths) {Decorators::Paths.new}
+    let(:paths) { Decorators::Paths.new }
 
-    it 'initialize empty array' do
+    it "initialize empty array" do
       expect(paths.registered).to eq([])
     end
 
-    it 'adds path to registered paths' do
+    it "adds path to registered paths" do
       paths.register! "mypath"
       expect(paths.registered).to eq([Pathname.new("mypath")])
     end
   end
 
   context "initialized with arguments" do
-    let(:paths) {Decorators::Paths.new([Pathname("initpath")])}
+    let(:paths) { Decorators::Paths.new([Pathname("initpath")]) }
 
-    it 'initialize array with argument path' do
+    it "initialize array with argument path" do
       expect(paths.registered).to eq([Pathname.new("initpath")])
     end
 
-    it 'adds path to registered paths' do
+    it "adds path to registered paths" do
       paths.register! "mypath"
       expect(paths.registered.count).to eq(2)
       expect(paths.registered.last).to eq(Pathname.new("mypath"))

spec/decorators_spec.rb

@@ -1,20 +1,20 @@
-require 'spec_helper'
-require_relative 'support/decorate_me.rb'
+require "spec_helper"
+require_relative "support/decorate_me"
 
 describe Decorators do
   before do
-    Decorators.register! File.expand_path('../support', __FILE__)
+    Decorators.register! File.expand_path("../support", __FILE__)
     Decorators.load! true
   end
 
   let(:decorated_class) { DecorateMe.new }
-  it 'register decorators' do
+  it "register decorators" do
     decorators = [
-      decorator_path('decorate_me_decorator'),
-      decorator_path('another_decorator')
+      decorator_path("decorate_me_decorator"),
+      decorator_path("another_decorator")
     ]
     bad_decorators = [
-      decorator_path('../do_not_load_this_decorator')
+      decorator_path("../do_not_load_this_decorator")
     ]
     decorators.each do |decorator|
       expect(Decorators.decorators).to include(decorator)
@@ -26,12 +26,11 @@
     end
   end
 
-  it 'decorates class with same file name' do
+  it "decorates class with same file name" do
     expect(decorated_class.kiwi).to eq("parndt")
   end
 
-  it 'decorates class with different file name' do
+  it "decorates class with different file name" do
     expect(decorated_class.am_i_decorated?).to eq(true)
   end
 end
-

spec/spec_helper.rb

@@ -2,7 +2,7 @@
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
-  config.order = 'random'
+  config.order = "random"
 end
 
 def decorator_path(name)
@@ -13,10 +13,9 @@ def decorator_path(name)
 unless Kernel.respond_to?(:require_relative)
   module Kernel
     def require_relative(path)
-      require File.join(File.dirname(caller[0]), path.to_str)
+      require File.join(File.dirname(caller(1..1).first), path.to_str)
     end
   end
 end
 
-require_relative '../lib/decorators'
-
+require_relative "../lib/decorators"