deface 1.4.0 → 1.6.0

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 Deface.before_rails_6?
+          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 Deface.before_rails_6?
+          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

@@ -2,13 +2,12 @@ require 'simplecov'
 SimpleCov.start 'rails'
 require 'rspec'
 require 'active_support'
-require 'action_view'
-require 'action_controller'
 require 'deface'
 require 'rails/generators'
 # have to manually require following for testing purposes
 require 'deface/action_view_extensions'
 require 'rails/version'
+require 'pry'
 
 #adding fake class as it's needed by haml 4.0, don't
 #want to have to require the entire rails stack in specs.
@@ -42,6 +41,16 @@ RSpec.configure do |config|
   config.mock_framework = :rspec
 end
 
+if Deface.before_rails_6?
+  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
@@ -59,9 +68,7 @@ shared_context "mock Rails" do
     allow(Rails.application.config).to receive(:deface).and_return ActiveSupport::OrderedOptions.new
     Rails.application.config.deface.enabled = true
 
-    if Rails.version[0..2] >= '3.2'
-      allow(Rails.application.config).to receive(:watchable_dirs).and_return({})
-    end
+    allow(Rails.application.config).to receive(:watchable_dirs).and_return({})
 
     allow(Rails).to receive(:root).and_return Pathname.new('spec/dummy')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Brian D Quinn
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2021-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +170,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Deface is a library that allows you to customize ERB, Haml and Slim views
   in a Rails application without editing the underlying view.
 email: brian@spreecommerce.com
@@ -177,7 +191,6 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.markdown
-- CHANGELOG.markdown
 files:
 - ".gitignore"
 - ".rspec"
@@ -188,13 +201,15 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
+- bin/rails
+- bin/rails-engine
+- bin/rails-sandbox
+- bin/sandbox
+- bin/sandbox-setup
 - deface.gemspec
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
-- init.rb
+- gemfiles/rails_6_1.gemfile
 - lib/deface.rb
 - lib/deface/action_view_extensions.rb
 - lib/deface/actions/action.rb
@@ -218,6 +233,7 @@ files:
 - lib/deface/dsl/context.rb
 - lib/deface/dsl/loader.rb
 - lib/deface/environment.rb
+- lib/deface/errors.rb
 - lib/deface/generators
 - lib/deface/haml_converter.rb
 - lib/deface/matchers/element.rb
@@ -240,6 +256,7 @@ files:
 - lib/deface/sources/text.rb
 - lib/deface/template_helper.rb
 - lib/deface/utils/failure_finder.rb
+- lib/deface/version.rb
 - lib/generators/deface/USAGE
 - lib/generators/deface/override_generator.rb
 - lib/generators/deface/templates/override.html.erb.deface
@@ -286,10 +303,14 @@ files:
 - spec/spec_helper.rb
 - tasks/precompile.rake
 - tasks/utils.rake
-homepage: https://github.com/spree/deface
-licenses: []
-metadata: {}
-post_install_message: 
+homepage: https://github.com/spree/deface#readme
+licenses:
+- MIT
+metadata:
+  homepage_uri: https://github.com/spree/deface#readme
+  source_code_uri: https://github.com/spree/deface
+  changelog_uri: https://github.com/spree/deface/releases
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -298,15 +319,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Deface is a library that allows you to customize ERB, Haml and Slim views
   in Rails

data/gemfiles/rails_5.0.gemfile

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

data/gemfiles/rails_5.1.gemfile

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

data/init.rb

@@ -1 +0,0 @@
-require 'deface'