Utilize activesupport lazy load hooks

cortiz · Sep 12, 2024 · 4d678a3 · 4d678a3
1 parent 1a6731d
commit 4d678a3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 * `Unreleased` - [View Diff](https://github.com/cortiz/prawn-rails/compare/v1.4.2...master)
+  - [#52](https://github.com/cortiz/prawn-rails/pull/52) - Add active_support as a dependency and use the active_support lazy load hooks
   - Remove unnecessary method `get_metadata` from `PrawnRailsHelper` which was getting included into `ActionView::Base`
   - Remove unnecessary rescue in `PrawnRails.config`
   - Remove redundant method `PrawnRails::Document.extensions`

diff --git a/lib/prawn-rails.rb b/lib/prawn-rails.rb
@@ -3,15 +3,19 @@
 require "prawn-rails/version"
 require "prawn-rails/config"
 
-require "prawn-rails/rails_helper"
-require "prawn-rails/renderer"
+require 'active_support/lazy_load_hooks'
 
-ActionView::Base.send(:include, PrawnRails::RailsHelper)
-ActionView::Template.register_template_handler(:prawn, PrawnRails::Renderer)
-
-unless Mime::Type.lookup_by_extension(:pdf)
-  Mime::Type.register_alias("application/pdf", :pdf)
+module PrawnRails
 end
 
-module PrawnRails
+ActiveSupport.on_load(:action_view) do
+  unless Mime::Type.lookup_by_extension(:pdf)
+    Mime::Type.register_alias("application/pdf", :pdf)
+  end
+
+  require "prawn-rails/rails_helper"
+  require "prawn-rails/renderer"
+
+  ActionView::Base.send(:include, PrawnRails::RailsHelper)
+  ActionView::Template.register_template_handler(:prawn, PrawnRails::Renderer)
 end
diff --git a/prawn-rails.gemspec b/prawn-rails.gemspec
@@ -20,17 +20,15 @@ Gem::Specification.new do |s|
   s.add_dependency "prawn"
   s.add_dependency "prawn-table"
   s.add_dependency "actionview", ">= 3.1.0"
+  s.add_dependency "activesupport", ">= 3.1.0"
 
   s.add_development_dependency "pdf-reader"
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'warning'
 
   if RUBY_VERSION.to_f >= 3.1
     s.add_development_dependency 'matrix'
   end
-
-  if RUBY_VERSION.to_f >= 2.4
-    s.add_development_dependency 'warning'
-  end
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,18 +1,14 @@
 ENV["RAILS_ENV"] = "test"
 
-begin
-  require 'warning'
+require 'warning'
 
-  Warning.ignore(
-    %r{mail/parsers/address_lists_parser}, ### Hide mail gem warnings
-  )
+Warning.ignore(
+  %r{mail/parsers/address_lists_parser}, ### Hide mail gem warnings
+)
 
-  Warning.ignore(
-    %r{pdf/reader/font.* assigned but unused variable}, ### Hide pdf/reader gem warnings
-  )
-rescue LoadError
-  # Do nothing
-end
+Warning.ignore(
+  %r{pdf/reader/font.* assigned but unused variable}, ### Hide pdf/reader gem warnings
+)
 
 if RUBY_VERSION.to_f >= 3.1
   require "matrix"

diff --git a/test/unit/rails_helpers_test.rb b/test/unit/rails_helpers_test.rb
@@ -1,5 +1,7 @@
 require 'test_helper'
 
+require "prawn-rails/rails_helper"
+
 class RailsHelperTest < ActiveSupport::TestCase
   include PrawnRails::RailsHelper