deface 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44620268997d5e65befca4180c45dc73b0ecf46d5fbbd1fc38862c595d6e3f23
-  data.tar.gz: 1a79c921115393d0907578ac97798e14de5fa65ac440e540c8c70723f1c0bbba
+  metadata.gz: 80eb048a1dff74ccee030287645cc8996e1a338769a951c1eb5531b21fe52cb1
+  data.tar.gz: 96dc49e08d2dafebe2fc5863c4dd19eec5bde80578f8233c6d58b06d7c186f81
 SHA512:
-  metadata.gz: 50113476bc070b1392cf90839ea872f59e423cf0945b4d983b1e83c7b2cbe4336e0480dbe97028f8e3eeb3994409690fb3fb842d28c015dc513a716cc84ae091
-  data.tar.gz: a2ea2e19e0d31745e9e27ff981ac46e723692f61267f570636a1fa692f9ac610599a96f33d237bd8edbf77d3b8f61809f62abe84123886b91279e5cf07a92e4e
+  metadata.gz: 676d9b569fa4bdef9fc3c4c41024b94ddcbae98f15bbaf6709d7b0f35361ff4f47a567806bc0afe8a1fdd8ac111e95f86fb36c6f7098a8d3b53dd51980098ee4
+  data.tar.gz: 560df8c020a27ba1f48aea7fc8059c87b99fe3e83985d9bd24e907557e0d1068c3fa0aad3657fda99e04fbf76084b98d12cbf80ee308280797c78c864889ab84

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.5.0"
+  s.version = "1.5.1"
 
   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,9 +28,9 @@ ActionView::Template.class_eval do
   #
   def render(view, locals, buffer=nil, &block)
 
-    if Rails.version < "6.0.0.beta1" && view.is_a?(ActionView::CompiledTemplates)
+    if Gem.loaded_specs["rails"].version < Gem::Version.new("6.0.0.beta1") && view.is_a?(ActionView::CompiledTemplates)
       mod = ActionView::CompiledTemplates
-    elsif Rails.version >= "6.0.0.beta1" && view.is_a?(ActionDispatch::DebugView)
+    elsif Gem.loaded_specs["rails"].version >= Gem::Version.new("6.0.0.beta1")  && view.is_a?(ActionDispatch::DebugView)
       mod = ActionDispatch::DebugView
     else
       mod = view.singleton_class

data/lib/deface/haml_converter.rb

@@ -37,6 +37,7 @@ module Deface
       # coverts { attributes into deface compatibily attributes
       def deface_attributes(attrs)
         return if attrs.nil?
+        return attrs if attrs.scan(/\{/).count > 1
 
         attrs.gsub! /\{|\}/, ''
 

data/lib/deface/override.rb

@@ -214,18 +214,18 @@ module Deface
       # check if method is compiled for the current virtual path
       #
       def expire_compiled_template
-        if Rails.version < "6.0.0.beta1"
+        if Gem.loaded_specs["rails"].version < Gem::Version.new("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_]/, '_')}/ }  
+          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

data/spec/deface/haml_converter_spec.rb

@@ -28,6 +28,16 @@ module Deface
         expect(haml_to_erb("%p(alt='hello world')Hello World!")).to eq("<p alt='hello world'>Hello World!</p>")
       end
 
+      it "should handle recursive attributes" do
+        expect(haml_to_erb("%div{:data => {:foo => 'bar'}}")).to eq("<div data-foo='bar'></div>")
+        expect(haml_to_erb("%div{:data => {:foo => { :bar => 'baz' }, :qux => 'corge'}}")).to eq("<div data-foo-bar='baz' data-qux='corge'></div>")
+
+        if RUBY_VERSION > "1.9"
+          expect(haml_to_erb("%div{data: {foo: 'bar'}}")).to eq("<div data-foo='bar'></div>")
+          expect(haml_to_erb("%div{data: {foo: { bar: 'baz' }, qux: 'corge'}}")).to eq("<div data-foo-bar='baz' data-qux='corge'></div>")
+        end
+      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' />")

data/spec/deface/override_spec.rb

@@ -561,7 +561,7 @@ module Deface
 
     describe "#expire_compiled_template" do
       it "should remove compiled method when method name matches virtual path but not digest" do
-        if Rails.version < "6.0.0.beta1"
+        if Gem.loaded_specs["rails"].version < Gem::Version.new("6.0.0.beta1")
           instance_methods_count = ActionView::CompiledTemplates.instance_methods.size
 
           module ActionView::CompiledTemplates
@@ -598,7 +598,7 @@ module Deface
       end
 
       it "should not remove compiled method when virtual path and digest matach" do
-        if Rails.version < "6.0.0.beta1"
+        if Gem.loaded_specs["rails"].version < Gem::Version.new("6.0.0.beta1")
           instance_methods_count = ActionView::CompiledTemplates.instance_methods.size
 
           module ActionView::CompiledTemplates

data/spec/spec_helper.rb

@@ -42,7 +42,7 @@ RSpec.configure do |config|
   config.mock_framework = :rspec
 end
 
-if Rails.version < "6.0.0.beta1"
+if Gem.loaded_specs["rails"].version < Gem::Version.new("6.0.0.beta1")
   module ActionView::CompiledTemplates
     #empty module for testing purposes
   end

metadata

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