Merge pull request mbleigh#58 from brian4d/fix_for_rails5

Fix for rails5
mustmodify · Jul 31, 2017 · 1554f41 · 1554f41
2 parents 3878624 + 3096479
commit 1554f41
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/princely/pdf_helper.rb b/lib/princely/pdf_helper.rb
@@ -8,6 +8,11 @@ def self.included(base)
       base.send :alias_method, :render, :render_with_princely
     end
 
+    def self.prepended(base)
+      base.send :alias_method, :render_without_princely, :render
+      base.send :alias_method, :render, :render_with_princely
+    end
+
     def render_with_princely(options = nil, *args, &block)
       if options.is_a?(Hash) && options.has_key?(:pdf)
         options[:name] ||= options.delete(:pdf)

diff --git a/lib/princely/rails.rb b/lib/princely/rails.rb
@@ -7,6 +7,7 @@
 if defined?(Rails)
   if Rails::VERSION::MAJOR >= 5
     ActionController::Base.send(:prepend, Princely::PdfHelper)
+    ActionController::Base.send(:include, Princely::AssetSupport)
   else
     ActionController::Base.send(:include, Princely::PdfHelper)
   end