deface 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 502de62f408e71f17bd0754e127f96fffbe75972
-  data.tar.gz: 279f46ffaf3840eba89f84b4523e67df977656c4
+  metadata.gz: 937f69c6ba33fac6bceb0447b96ba785a8e91052
+  data.tar.gz: d630926e26e6a795e4756b8acf5e029e4d503b59
 SHA512:
-  metadata.gz: d7601eb9876b5731d7c1742a79b509f2fc03e3e670ce31283f8e642f4e7a6f77840c3f6ffdc68955517c548723768ce2b5f1a607eca39be63af813150ab8e4c9
-  data.tar.gz: d74468452500ad67931db222bf4eb4697cab2a6530471e6e10e46dbda1e9d3bc78f00956588457e8091be186ff4a290b961931820a5e10b2fc17581c229667c5
+  metadata.gz: 9a18ff66d387178239b92e2bbd9e5a9de610fd1bebab2f2d2d77bfb7190e3c6bf37216799fc1f1e2d7036877a0b75bef2be6c95f43ee1b5a4c3ed235c801dd9c
+  data.tar.gz: 7064fed47ace50841d4b4706fe9c08f56baa0345f4c378ac53ff0cbe1d5d130f020c7191751990124acb041556ef573bfc65ab8690508343c76577d3106115e7

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.1.0"
+  s.version = "1.2.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."
@@ -15,12 +15,13 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = "Deface is a library that allows you to customize ERB, Haml and Slim views in Rails"
 
-  s.add_dependency('nokogiri', '~> 1.6.0')
+  s.add_dependency('nokogiri', '~> 1.6')
   s.add_dependency('rails', '>= 4.1')
-  s.add_dependency('colorize', '>= 0.5.8')
+  s.add_dependency('rainbow', '>= 2.1.0')
   s.add_dependency('polyglot')
 
   s.add_development_dependency('appraisal')
+  s.add_development_dependency('erubis')
   s.add_development_dependency('rspec', '>= 3.1.0')
   s.add_development_dependency('haml', '~> 4.0')
   s.add_development_dependency('slim', '~> 3.0')

data/lib/deface.rb

@@ -36,7 +36,6 @@ require "deface/matchers/element"
 require "deface/matchers/range"
 require "deface/environment"
 require "deface/precompiler"
-require "colorize"
 
 module Deface
   if defined?(Rails)

data/lib/deface/slim_converter.rb

@@ -8,8 +8,24 @@ module Deface
     end
 
     def result
-      ::Slim::ERBConverter.new.call(@template).gsub /<%\s*%>/, ''
+      conv = defined?(Slim::RailsTemplate) ? rails_converter : generic_converter
+      conv.call(@template).gsub(/<%\s*%>/, '')
     end
 
+    private
+
+    def rails_converter
+      slim_erb_converter.new(
+        Temple::OptionMap.new(Slim::RailsTemplate.options.to_h.except(:engine))
+      )
+    end
+
+    def generic_converter
+      slim_erb_converter.new
+    end
+
+    def slim_erb_converter
+      ::Slim::ERBConverter
+    end
   end
 end

data/lib/deface/utils/failure_finder.rb

@@ -1,3 +1,5 @@
+require 'rainbow'
+
 module Deface
   module Utils
     module FailureFinder
@@ -28,9 +30,9 @@ module Deface
 
         fails.each do |override|
           if override.failure.nil?
-            puts " '#{override.name}' reported no failures".green
+            puts Rainbow(" '#{override.name}' reported no failures").green
           else
-            puts " '#{override.name}' #{override.failure}".red
+            puts Rainbow(" '#{override.name}' #{override.failure}").red
           end
         end
 

data/spec/deface/slim_converter_spec.rb

@@ -26,6 +26,13 @@ module Deface
             li = link_to 'Log out', logout_path
 })).to eq("<nav id=\"top-nav-bar\"><ul class=\"inline\" data-hook=\"\" id=\"nav-bar\"><% if true %><div class=\"nav-links high_res\"><li class=\"dropdown\"><div class=\"welcome\">Welcome <%= ::Temple::Utils.escape_html_safe((Spree::User.first.email)) %> &#9662;</div><ul class=\"dropdown\"><li><%= ::Temple::Utils.escape_html_safe((link_to 'Account', account_path)) %></li><li><%= ::Temple::Utils.escape_html_safe((link_to 'Log out', logout_path)) %></li></ul></li></div><% end %></ul></nav>")
       end
+
+      it "should handle Rails capturing" do
+        expect(slim_to_erb(%q{#wishlist-form
+	= form_for Spree::WishedProduct.new do |f|
+		= f.submit 'Save'
+})).to eq("<div id=\"wishlist-form\"><% _slim_controls1 = form_for Spree::WishedProduct.new do |f| %><%= ::Temple::Utils.escape_html_safe((f.submit 'Save')) %><% end %><%= ::Temple::Utils.escape_html_safe((_slim_controls1)) %></div>")
+      end
     end
 
   end

data/tasks/utils.rake

@@ -1,6 +1,6 @@
 require 'deface'
 require 'deface/utils/failure_finder'
-require 'colorize'
+require 'rainbow'
 
 namespace :deface do
   include Deface::TemplateHelper
@@ -68,10 +68,10 @@ namespace :deface do
     end
 
     if fail_count == 0
-      puts "\nEverything's looking good!".green
+      puts Rainbow("\nEverything's looking good!").green
       exit(0)
     else
-      puts "\nYou had a total of #{fail_count} failures.".red
+      puts Rainbow("\nYou had a total of #{fail_count} failures.").red
       exit(1)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.8
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: polyglot
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -282,7 +296,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Deface is a library that allows you to customize ERB, Haml and Slim views