deface 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 937f69c6ba33fac6bceb0447b96ba785a8e91052
-  data.tar.gz: d630926e26e6a795e4756b8acf5e029e4d503b59
+  metadata.gz: cf234b6836f2b2d5bee1e3ae0d73632c048c0fa5
+  data.tar.gz: 1cdc7e44036fb3bf0fc9b5bcfe6ee485d4b8d6fe
 SHA512:
-  metadata.gz: 9a18ff66d387178239b92e2bbd9e5a9de610fd1bebab2f2d2d77bfb7190e3c6bf37216799fc1f1e2d7036877a0b75bef2be6c95f43ee1b5a4c3ed235c801dd9c
-  data.tar.gz: 7064fed47ace50841d4b4706fe9c08f56baa0345f4c378ac53ff0cbe1d5d130f020c7191751990124acb041556ef573bfc65ab8690508343c76577d3106115e7
+  metadata.gz: 893ca0bc578ad92b43c6758583e37c1a712e63737dc0c7d7a0a06efcbe2c107c100fe52a973d65ce6251378f0774384159e1eccf842036618f5157992b8f93a5
+  data.tar.gz: 1b476d0268efbf0d74b6af40a34b1fc1a6cf1be2f8c72eb58d542adf02706c5d86ddb68551139a80aae3051ce857e9bf042e53d763100b220d79a878af7a4eb8

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.2.0"
+  s.version = "1.3.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."
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   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('haml', ['>= 4.0', '< 6'])
   s.add_development_dependency('slim', '~> 3.0')
   s.add_development_dependency('simplecov', '>= 0.6.4')
   s.add_development_dependency('generator_spec', '~> 0.8')

data/lib/deface/haml_converter.rb

@@ -20,7 +20,7 @@ module Deface
     def parse_old_attributes(line)
       attributes_hash, rest, last_line = super(line)
 
-      attributes_hash = deface_attributes(attributes_hash)
+      attributes_hash = "{#{deface_attributes(attributes_hash)}}"
 
       return attributes_hash, rest, last_line
     end
@@ -34,7 +34,6 @@ module Deface
       return attributes, rest, last_line
     end
     private
-
       # coverts { attributes into deface compatibily attributes
       def deface_attributes(attrs)
         return if attrs.nil?

data/lib/deface/override.rb

@@ -26,6 +26,16 @@ module Deface
         return
       end
 
+      # If no name was specified, use the filename and line number of the caller
+      # Including the line number ensure unique names if multiple overrides
+      # are defined in the same file
+      unless args.key? :name
+        parts = caller[0].split(':')
+        file_name = File.basename(parts[0], '.rb')
+        line_number = parts[1]
+        args[:name] = "#{file_name}_#{line_number}"
+      end
+
       raise(ArgumentError, ":name must be defined") unless args.key? :name
       raise(ArgumentError, ":virtual_path must be defined") if args[:virtual_path].blank?
 

data/lib/deface/railtie.rb

@@ -36,7 +36,7 @@ module Deface
     initializer "deface.tweak_eager_loading", :before => :set_load_path do |app|
 
       # application
-      app.config.eager_load_paths.reject! {|path| path.to_s  =~ /app\/overrides\z/ }
+      app.config.eager_load_paths = app.config.eager_load_paths.reject { |path| path.to_s  =~ /app\/overrides\z/ }
 
       # railites / engines / extensions
       railties = if Rails.version >= "4.0"
@@ -47,7 +47,7 @@ module Deface
 
       railties.each do |railtie|
         next unless railtie.respond_to?(:root) && railtie.config.respond_to?(:eager_load_paths)
-        railtie.config.eager_load_paths.reject! {|path| path.to_s  =~ /app\/overrides\z/ }
+        railtie.config.eager_load_paths = railtie.config.eager_load_paths.reject { |path| path.to_s  =~ /app\/overrides\z/ }
       end
     end
 

data/spec/deface/haml_converter_spec.rb

@@ -20,22 +20,22 @@ module Deface
     %h2 Welcome to our site!
     %p= print_information
   .right.column
-    = render :partial => "sidebar"})).to eq("<div id='content'>  <div class='left column'>    <h2>Welcome to our site!</h2>    <p>    <%= print_information %></p>  </div>  <div class='right column'>    <%= render :partial => \"sidebar\" %>  </div></div>")
+    = render :partial => "sidebar"})).to eq("<div id='content'><div class='left column'><h2>Welcome to our site!</h2><p><%= print_information %></p></div><div class='right column'><%= render :partial => \"sidebar\" %></div></div>")
       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
 
@@ -73,7 +73,7 @@ module Deface
       it "should handle blocks passed to erb loud" do
         expect(haml_to_erb("= form_for Post.new do |f|
   %p
-    = f.text_field :name")).to eq("<%= form_for Post.new do |f| %><p>  <%= f.text_field :name %></p><% end %>")
+    = f.text_field :name")).to eq("<%= form_for Post.new do |f| %><p><%= f.text_field :name %></p><% end %>")
 
       end
 
@@ -81,7 +81,7 @@ module Deface
        it "should handle blocks passed to erb silent" do
         expect(haml_to_erb("- @posts.each do |post|
   %p
-    = post.name")).to eq("<% @posts.each do |post| %><p>  <%= post.name %></p><% end %>")
+    = post.name")).to eq("<% @posts.each do |post| %><p><%= post.name %></p><% end %>")
 
       end
     end

data/spec/deface/override_spec.rb

@@ -100,6 +100,22 @@ module Deface
           Deface::Override.new(:virtual_path => "posts/new", :name => "Posts#new", :replace => "h1", :text => "<h1>argh!</h1>")
         }.to change{Deface::Override.all.size}.by(1)
       end
+
+      it "should default :name when none is given" do
+        override = Deface::Override.new(:virtual_path => "posts/new", :replace => "h1", :text => "<h1>Derp!</h1>")
+        expect(override.name).not_to be_empty
+      end
+
+      it "should default :name to caller's file name and a line number" do
+        override = Deface::Override.new(:virtual_path => "posts/new", :replace => "h1", :text => "<h1>Derp!</h1>")
+        expect(override.name).to match Regexp.new("#{Regexp.escape(File.basename(__FILE__, '.rb'))}_\\d+")
+      end
+
+      it "should use :name argument when given" do
+        name = "Posts#new"
+        override = Deface::Override.new(:virtual_path => "posts/new", :name => name, :replace => "h1", :text => "<h1>Derp!</h1>")
+        expect(override.name).to eq(name)
+      end
     end
 
     describe "with :text" do
@@ -136,7 +152,7 @@ module Deface
       end
 
       it "should return erb converted from haml as source" do
-        expect(@override.source).to eq("<strong class='erb' id='message'><%= 'Hello, World!' %>\n</strong>\n")
+        expect(@override.source).to eq("<strong class='erb' id='message'><%= 'Hello, World!' %></strong>\n")
 
         expect(@override.source_argument).to eq(:haml)
       end

data/spec/deface/template_helper_spec.rb

@@ -17,7 +17,7 @@ module Deface
         end
 
         it "should return converted source for partial containing haml" do
-          expect(load_template_source("shared/hello", true)).to eq "<div class='<%= @some %>' id='message'><%= 'Hello, World!' %>\n</div>\n"
+          expect(load_template_source("shared/hello", true)).to eq "<div class='<%= @some %>' id='message'><%= 'Hello, World!' %></div>\n"
         end
 
         it "should return converted source for partial containing slim" do

data/spec/spec_helper.rb

@@ -78,7 +78,7 @@ shared_context "mock Rails" do
     allow(Time).to receive(:zone).and_return double('zone')
     allow(Time.zone).to receive(:now).and_return Time.parse('1979-05-25')
 
-    require "haml/template/plugin"
+    require "haml/template"
     require 'slim/erb_converter'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -112,16 +112,22 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Deface is a library that allows you to customize ERB, Haml and Slim views