deface 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c7cd1e4905de8fa0fda34bb4c1bed199d1b7b3544417da3caf6470624150d3
-  data.tar.gz: 0f9750691bc12ff9b1f140c4b9406f7d8b88148151c664205a9abf734925981d
+  metadata.gz: 44620268997d5e65befca4180c45dc73b0ecf46d5fbbd1fc38862c595d6e3f23
+  data.tar.gz: 1a79c921115393d0907578ac97798e14de5fa65ac440e540c8c70723f1c0bbba
 SHA512:
-  metadata.gz: ac8f3a409db476df004e1665ae1583f5d6aa8e4a16d2d6a9a562511efc27c902b573f1557abc101566878f8b20013b3d316082d4ad61c5af7ec2229e0d0c8a44
-  data.tar.gz: 630f4f01132534f6fe7c5807b5615b91a54f9e5f19952a53bf10ab75418bcdf6cb79c82c275291a7d8782ba2623293da9b9bdf777d4d8614919e1e94a15d0ec5
+  metadata.gz: 50113476bc070b1392cf90839ea872f59e423cf0945b4d983b1e83c7b2cbe4336e0480dbe97028f8e3eeb3994409690fb3fb842d28c015dc513a716cc84ae091
+  data.tar.gz: a2ea2e19e0d31745e9e27ff981ac46e723692f61267f570636a1fa692f9ac610599a96f33d237bd8edbf77d3b8f61809f62abe84123886b91279e5cf07a92e4e

data/README.markdown

@@ -1,6 +1,6 @@
 <p style="float:right;">
   <a href="http://secure.travis-ci.org/spree/deface">
-    <img src="https://secure.travis-ci.org/spree/deface.png?branch=master">
+    <img src="https://secure.travis-ci.org/spree/deface.svg?branch=master">
   </a>
 </p>
 
@@ -116,7 +116,7 @@ You should save your overrides in the ````app/overrides````, normally one overri
 * <tt>:sequence</tt> - Used to order the application of an override for a specific virtual path, helpful when an override depends on another override being applied first, supports:
   * <tt>:sequence => n</tt> - where n is a positive or negative integer (lower numbers get applied first, default 100).
   * <tt>:sequence => {:before => "*override_name*"}</tt> - where "*override_name*" is the name of an override defined for the 
-                                              same virutal_path, the current override will be appplied before 
+                                              same virtual_path, the current override will be appplied before 
                                               the named override passed.
   * <tt>:sequence => {:after => "*override_name*"}</tt> - the current override will be applied after the named override passed.
 

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.4.0"
+  s.version = "1.5.0"
 
   s.authors = ["Brian D Quinn"]
   s.description = "Deface is a library that allows you to customize ERB, Haml and Slim views in a Rails application without editing the underlying view."

data/lib/deface/action_view_extensions.rb

@@ -28,8 +28,10 @@ ActionView::Template.class_eval do
   #
   def render(view, locals, buffer=nil, &block)
 
-    if view.is_a?(ActionView::Base)
-      mod = ActionView::Base
+    if Rails.version < "6.0.0.beta1" && view.is_a?(ActionView::CompiledTemplates)
+      mod = ActionView::CompiledTemplates
+    elsif Rails.version >= "6.0.0.beta1" && view.is_a?(ActionDispatch::DebugView)
+      mod = ActionDispatch::DebugView
     else
       mod = view.singleton_class
     end
@@ -74,6 +76,26 @@ ActionView::Template.class_eval do
     end
 end
 
+# Rails 6 fix
+# https://github.com/rails/rails/commit/ec5c946138f63dc975341d6521587adc74f6b441
+# https://github.com/rails/rails/commit/ccfa01c36e79013881ffdb7ebe397cec733d15b2#diff-dfb6e0314ad9639bab460ea64871aa47R27
+if defined?( ActionView::Template::Handlers::ERB::Erubi)
+  ActionView::Template::Handlers::ERB::Erubi.class_eval do
+    def initialize(input, properties = {})
+      @newline_pending = 0
+
+      # Dup properties so that we don't modify argument
+      properties = Hash[properties]
+      properties[:preamble]   = "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
+      properties[:postamble]  = "@output_buffer.to_s"
+      properties[:bufvar]     = "@output_buffer"
+      properties[:escapefunc] = ""
+
+      super
+    end
+  end
+end
+
 #fix for Rails 3.1 not setting virutal_path anymore (BOO!)
 if defined?(ActionView::Resolver::Path)
   ActionView::Resolver::Path.class_eval { alias_method :virtual, :to_s }

data/lib/deface/override.rb

@@ -214,16 +214,23 @@ module Deface
       # check if method is compiled for the current virtual path
       #
       def expire_compiled_template
-        if compiled_method_name = ActionView::Base.instance_methods.detect { |name| name =~ /#{args[:virtual_path].gsub(/[^a-z_]/, '_')}/ }
-          #if the compiled method does not contain the current deface digest
-          #then remove the old method - this will allow the template to be
-          #recompiled the next time it is rendered (showing the latest changes)
-
-          unless compiled_method_name =~ /\A_#{self.class.digest(:virtual_path => @args[:virtual_path])}_/
-            ActionView::Base.send :remove_method, compiled_method_name
+        if Rails.version < "6.0.0.beta1"
+          if compiled_method_name = ActionView::CompiledTemplates.instance_methods.detect { |name| name =~ /#{args[:virtual_path].gsub(/[^a-z_]/, '_')}/ }
+            #if the compiled method does not contain the current deface digest
+            #then remove the old method - this will allow the template to be
+            #recompiled the next time it is rendered (showing the latest changes)
+  
+            unless compiled_method_name =~ /\A_#{self.class.digest(:virtual_path => @args[:virtual_path])}_/
+              ActionView::CompiledTemplates.send :remove_method, compiled_method_name
+            end
+          end
+        else
+          if compiled_method_name = ActionDispatch::DebugView.instance_methods.detect { |name| name =~ /#{args[:virtual_path].gsub(/[^a-z_]/, '_')}/ }  
+            unless compiled_method_name =~ /\A_#{self.class.digest(:virtual_path => @args[:virtual_path])}_/
+              ActionDispatch::DebugView.send :remove_method, compiled_method_name
+            end
           end
         end
-
       end
 
   end

data/spec/deface/haml_converter_spec.rb

@@ -24,18 +24,18 @@ module Deface
       end
 
       it "should handle simple haml attributes" do
-        expect(haml_to_erb("%meta{:charset => 'utf-8'}")).to eq("<meta charset='utf-8'>")
+        expect(haml_to_erb("%meta{:charset => 'utf-8'}")).to eq("<meta charset='utf-8' />")
         expect(haml_to_erb("%p(alt='hello world')Hello World!")).to eq("<p alt='hello world'>Hello World!</p>")
       end
 
       it "should handle haml attributes with commas" do
-        expect(haml_to_erb("%meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'}")).to eq("<meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>")
-        expect(haml_to_erb("%meta(http-equiv='X-UA-Compatible' content='IE=edge,chrome=1')")).to eq("<meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible'>")
-        expect(haml_to_erb('%meta{:name => "author", :content => "Example, Inc."}')).to eq("<meta content='Example, Inc.' name='author'>")
-        expect(haml_to_erb('%meta(name="author" content="Example, Inc.")')).to eq("<meta content='Example, Inc.' name='author'>")
+        expect(haml_to_erb("%meta{'http-equiv' => 'X-UA-Compatible', :content => 'IE=edge,chrome=1'}")).to eq("<meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible' />")
+        expect(haml_to_erb("%meta(http-equiv='X-UA-Compatible' content='IE=edge,chrome=1')")).to eq("<meta content='IE=edge,chrome=1' http-equiv='X-UA-Compatible' />")
+        expect(haml_to_erb('%meta{:name => "author", :content => "Example, Inc."}')).to eq("<meta content='Example, Inc.' name='author' />")
+        expect(haml_to_erb('%meta(name="author" content="Example, Inc.")')).to eq("<meta content='Example, Inc.' name='author' />")
 
         if RUBY_VERSION > "1.9"
-          expect(haml_to_erb('%meta{name: "author", content: "Example, Inc."}')).to eq("<meta content='Example, Inc.' name='author'>")
+          expect(haml_to_erb('%meta{name: "author", content: "Example, Inc."}')).to eq("<meta content='Example, Inc.' name='author' />")
         end
       end
 

data/spec/deface/override_spec.rb

@@ -561,37 +561,73 @@ module Deface
 
     describe "#expire_compiled_template" do
       it "should remove compiled method when method name matches virtual path but not digest" do
-        instance_methods_count = ActionView::Base.instance_methods.size
+        if Rails.version < "6.0.0.beta1"
+          instance_methods_count = ActionView::CompiledTemplates.instance_methods.size
 
-        ActionView::Base.class_eval do
-          def _e235fa404c3c2281d4f6791162b1c638_posts_index_123123123
-            true #not a real method
+          module ActionView::CompiledTemplates
+            def _e235fa404c3c2281d4f6791162b1c638_posts_index_123123123
+              true #not a real method
+            end
+
+            def _f34556de606cec51d4f6791163fab456_posts_edit_123123123
+              true #not a real method
+            end
           end
 
-          def _f34556de606cec51d4f6791163fab456_posts_edit_123123123
-            true #not a real method
+          expect(ActionView::CompiledTemplates.instance_methods.size).to eq(instance_methods_count + 2)
+          @override.send(:expire_compiled_template)
+          expect(ActionView::CompiledTemplates.instance_methods.size).to eq(instance_methods_count + 1)
+
+        else
+          instance_methods_count = ActionDispatch::DebugView.instance_methods.size
+
+          class ActionDispatch::DebugView
+            def _e235fa404c3c2281d4f6791162b1c638_posts_index_123123123
+              true #not a real method
+            end
+
+            def _f34556de606cec51d4f6791163fab456_posts_edit_123123123
+              true #not a real method
+            end
           end
-        end
 
-        expect(ActionView::Base.instance_methods.size).to eq(instance_methods_count + 2)
-        @override.send(:expire_compiled_template)
-        expect(ActionView::Base.instance_methods.size).to eq(instance_methods_count + 1)
+          expect(ActionDispatch::DebugView.instance_methods.size).to eq(instance_methods_count + 2)
+          @override.send(:expire_compiled_template)
+          expect(ActionDispatch::DebugView.instance_methods.size).to eq(instance_methods_count + 1)
+        end
       end
 
       it "should not remove compiled method when virtual path and digest matach" do
-        instance_methods_count = ActionView::Base.instance_methods.size
+        if Rails.version < "6.0.0.beta1"
+          instance_methods_count = ActionView::CompiledTemplates.instance_methods.size
 
-        ActionView::Base.class_eval do
-          def _e235fa404c3c2281d4f6791162b1c638_posts_index_123123123
-            true #not a real method
+          module ActionView::CompiledTemplates
+            def _e235fa404c3c2281d4f6791162b1c638_posts_index_123123123
+              true #not a real method
+            end
           end
-        end
 
-        expect(Deface::Override).to receive(:digest).and_return('e235fa404c3c2281d4f6791162b1c638')
+          expect(Deface::Override).to receive(:digest).and_return('e235fa404c3c2281d4f6791162b1c638')
 
-        expect(ActionView::Base.instance_methods.size).to eq(instance_methods_count + 1)
-        @override.send(:expire_compiled_template)
-        expect(ActionView::Base.instance_methods.size).to eq(instance_methods_count + 1)
+          expect(ActionView::CompiledTemplates.instance_methods.size).to eq(instance_methods_count + 1)
+          @override.send(:expire_compiled_template)
+          expect(ActionView::CompiledTemplates.instance_methods.size).to eq(instance_methods_count + 1)
+
+        else
+          instance_methods_count = ActionDispatch::DebugView.instance_methods.size
+
+          class ActionDispatch::DebugView
+            def _e235fa404c3c2281d4f6791162b1c638_posts_index_123123123
+              true #not a real method
+            end
+          end
+
+          expect(Deface::Override).to receive(:digest).and_return('e235fa404c3c2281d4f6791162b1c638')
+
+          expect(ActionDispatch::DebugView.instance_methods.size).to eq(instance_methods_count + 1)
+          @override.send(:expire_compiled_template)
+          expect(ActionDispatch::DebugView.instance_methods.size).to eq(instance_methods_count + 1)
+        end
       end
     end
 

data/spec/spec_helper.rb

@@ -42,6 +42,16 @@ RSpec.configure do |config|
   config.mock_framework = :rspec
 end
 
+if Rails.version < "6.0.0.beta1"
+  module ActionView::CompiledTemplates
+    #empty module for testing purposes
+  end
+else
+  class ActionDispatch::DebugView
+    #empty module for testing purposes
+  end
+end
+
 shared_context "mock Rails" do
   before(:each) do
     rails_version = Rails::VERSION::STRING

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri