deface 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 20078b241079df4972992b3d1129455d67cc007c
-  data.tar.gz: 46cfa2aca3e676a22139214d5eed1e8acb9e6e7b
+SHA256:
+  metadata.gz: 45c7cd1e4905de8fa0fda34bb4c1bed199d1b7b3544417da3caf6470624150d3
+  data.tar.gz: 0f9750691bc12ff9b1f140c4b9406f7d8b88148151c664205a9abf734925981d
 SHA512:
-  metadata.gz: d894ce9d5363da8fdd94a30131b56961e47255318a1c601408db4ea8d7bcf3c29ebd1c5de79ce6a415250ae9fd912d038b552fcade7d275fe83bcc5134762be8
-  data.tar.gz: 6ae94b0e05669891ca7b0a377003ae376cd39abceab96e5778f2874ddf1f85358355875bb693edc3b81b1fed0cb1d70097682e12d508bd63d467dc3cbcaaba7e
+  metadata.gz: ac8f3a409db476df004e1665ae1583f5d6aa8e4a16d2d6a9a562511efc27c902b573f1557abc101566878f8b20013b3d316082d4ad61c5af7ec2229e0d0c8a44
+  data.tar.gz: 630f4f01132534f6fe7c5807b5615b91a54f9e5f19952a53bf10ab75418bcdf6cb79c82c275291a7d8782ba2623293da9b9bdf777d4d8614919e1e94a15d0ec5

data/.travis.yml

@@ -1,4 +1,9 @@
 script: "bundle exec rake"
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+
 rvm:
   - 2.3.7
   - 2.4.4
@@ -8,7 +13,15 @@ gemfile:
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 notifications:
   email:
     - brian@spreecommerce.com
     - ryan@spreecommerce.com
+
+matrix:
+  exclude:
+  - rvm: 2.3.7
+    gemfile: gemfiles/rails_6.0.gemfile
+  - rvm: 2.4.4
+    gemfile: gemfiles/rails_6.0.gemfile

data/Appraisals

@@ -13,3 +13,7 @@ end
 appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.0'
 end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0.beta3'
+end

data/README.markdown

@@ -203,12 +203,13 @@ Deface scopes overrides by virtual_path (or partial / template file), that means
 
 ### Redefining Overrides
 
-You can redefine an existing override by simply declaring a new override with the same <tt>:virtual_path</tt> and <tt>:name</tt> that was originally used.
+You can redefine an existing override by simply declaring a new override with the same <tt>:virtual_path</tt>, <tt>:name</tt> and [action](#action) that was originally used.
 You do not need to resupply all the values originally used, just the ones you want to change:
 
 ```ruby
 Deface::Override.new(:virtual_path => 'posts/index',
                      :name => 'add_attrs_to_a_link',
+                     :set_attributes => 'a#link',
                      :disabled => true)
 ```
 

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.3.2"
+  s.version = "1.4.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/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0.beta3"
+
+group :test do
+  gem "test-unit"
+  gem "pry"
+  gem "pry-byebug"
+end
+
+gemspec path: "../"

data/lib/deface/action_view_extensions.rb

@@ -6,16 +6,16 @@ ActionView::Template.class_eval do
 
     if Rails.application.config.deface.enabled && should_be_defaced?(syntax)
 
-      processed_source = Deface::Override.apply(source, details, true, syntax)
+      processed_source = Deface::Override.apply(source.to_param, details, true, syntax)
 
       # force change in handler before continuing to original Rails method
       # as we've just converted some other template language into ERB!
       #
-      if [:slim, :haml].include?(syntax) && processed_source != source
+      if [:slim, :haml].include?(syntax) && processed_source != source.to_param
         handler = ActionView::Template::Handlers::ERB
       end
     else
-      processed_source = source
+      processed_source = source.to_param
     end
 
     initialize_without_deface(processed_source, identifier, handler, details)
@@ -28,8 +28,8 @@ ActionView::Template.class_eval do
   #
   def render(view, locals, buffer=nil, &block)
 
-    if view.is_a?(ActionView::CompiledTemplates)
-      mod = ActionView::CompiledTemplates
+    if view.is_a?(ActionView::Base)
+      mod = ActionView::Base
     else
       mod = view.singleton_class
     end

data/lib/deface/applicator.rb

@@ -14,9 +14,9 @@ module Deface
           case syntax
           when :haml
             #convert haml to erb before parsing before
-            source = Deface::HamlConverter.new(source).result
+            source = Deface::HamlConverter.new(source.to_param).result
           when :slim
-            source = Deface::SlimConverter.new(source).result
+            source = Deface::SlimConverter.new(source.to_param).result
           end
 
           doc = Deface::Parser.convert(source)

data/lib/deface/override.rb

@@ -214,13 +214,13 @@ module Deface
       # check if method is compiled for the current virtual path
       #
       def expire_compiled_template
-        if compiled_method_name = ActionView::CompiledTemplates.instance_methods.detect { |name| name =~ /#{args[:virtual_path].gsub(/[^a-z_]/, '_')}/ }
+        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::CompiledTemplates.send :remove_method, compiled_method_name
+            ActionView::Base.send :remove_method, compiled_method_name
           end
         end
 

data/lib/deface/parser.rb

@@ -90,7 +90,11 @@ module Deface
 
       # Tag the source with the default external encoding
       # or the encoding specified in the file
-      source.force_encoding(encoding)
+      if source.frozen?
+        source = source.dup.force_encoding(encoding)
+      else
+        source.force_encoding(encoding)
+      end
 
       unless source.valid_encoding?
         raise ActionView::WrongEncodingError.new(source, encoding)

data/spec/deface/override_spec.rb

@@ -560,16 +560,10 @@ module Deface
     end
 
     describe "#expire_compiled_template" do
-      before do
-        @compiled_templates = ActionView::CompiledTemplates
-
-        ActionView::CompiledTemplates.instance_methods.each do |method_name|
-          ActionView::CompiledTemplates.send :remove_method, method_name
-        end
-      end
-
       it "should remove compiled method when method name matches virtual path but not digest" do
-        module ActionView::CompiledTemplates
+        instance_methods_count = ActionView::Base.instance_methods.size
+
+        ActionView::Base.class_eval do
           def _e235fa404c3c2281d4f6791162b1c638_posts_index_123123123
             true #not a real method
           end
@@ -577,17 +571,17 @@ module Deface
           def _f34556de606cec51d4f6791163fab456_posts_edit_123123123
             true #not a real method
           end
-
         end
 
-        expect(ActionView::CompiledTemplates.instance_methods.size).to eq(2)
+        expect(ActionView::Base.instance_methods.size).to eq(instance_methods_count + 2)
         @override.send(:expire_compiled_template)
-        expect(ActionView::CompiledTemplates.instance_methods.size).to eq(1)
+        expect(ActionView::Base.instance_methods.size).to eq(instance_methods_count + 1)
       end
 
       it "should not remove compiled method when virtual path and digest matach" do
+        instance_methods_count = ActionView::Base.instance_methods.size
 
-        module ActionView::CompiledTemplates
+        ActionView::Base.class_eval do
           def _e235fa404c3c2281d4f6791162b1c638_posts_index_123123123
             true #not a real method
           end
@@ -595,9 +589,9 @@ module Deface
 
         expect(Deface::Override).to receive(:digest).and_return('e235fa404c3c2281d4f6791162b1c638')
 
-        expect(ActionView::CompiledTemplates.instance_methods.size).to eq(1)
+        expect(ActionView::Base.instance_methods.size).to eq(instance_methods_count + 1)
         @override.send(:expire_compiled_template)
-        expect(ActionView::CompiledTemplates.instance_methods.size).to eq(1)
+        expect(ActionView::Base.instance_methods.size).to eq(instance_methods_count + 1)
       end
     end
 

data/spec/deface/parser_spec.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
- 
+
 require 'spec_helper'
 
 module Deface
@@ -11,6 +11,7 @@ module Deface
         expect(Deface::Parser.convert("<h1>Hello</h1>").to_s).to eq("<h1>Hello</h1>")
         expect(Deface::Parser.convert("<title>Hello</title>")).to be_an_instance_of(Nokogiri::HTML::DocumentFragment)
         expect(Deface::Parser.convert("<title>Hello</title>").to_s).to eq("<title>Hello</title>")
+        expect(Deface::Parser.convert("<title>Hello Frozen</title>".freeze).to_s).to eq("<title>Hello Frozen</title>")
       end
 
       it "should parse html document" do

data/spec/spec_helper.rb

@@ -42,10 +42,6 @@ RSpec.configure do |config|
   config.mock_framework = :rspec
 end
 
-module ActionView::CompiledTemplates
-  #empty module for testing purposes
-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.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2019-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -193,6 +193,7 @@ files:
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - init.rb
 - lib/deface.rb
 - lib/deface/action_view_extensions.rb
@@ -304,8 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Deface is a library that allows you to customize ERB, Haml and Slim views