deface 0.9.1 → 1.0.0.rc1

data/spec/deface/dsl/context_spec.rb

@@ -3,15 +3,13 @@ require 'spec_helper'
 require 'deface/dsl/context'
 
 describe Deface::DSL::Context do
-  include_context "mock Rails"
+  include_context "mock Rails.application"
 
   context '#create_override' do
     subject { context = Deface::DSL::Context.new('sample_name') }
 
     def override_should_be_created_with(expected_hash)
-      Deface::Override.should_receive(:new).with(hash_including(
-        :name => 'sample_name'
-      ))
+      Deface::Override.should_receive(:new).with hash_including(expected_hash.reverse_merge(:name => 'sample_name'))
 
       subject.create_override
     end
@@ -27,7 +25,8 @@ describe Deface::DSL::Context do
     end
 
     context 'actions' do
-      Deface::Override.actions.each do |action|
+      Deface::DEFAULT_ACTIONS.each do |action|
+        action = action.to_sym
         it "should use value set with ##{action}" do
           subject.send(action, "#{action}/selector")
 
@@ -37,7 +36,7 @@ describe Deface::DSL::Context do
 
       it 'should generate a warning if two action values are specified' do
         subject.insert_top('selector')
-        
+
         logger = mock('logger')
         Rails.should_receive(:logger).and_return(logger)
         logger.should_receive(:error).with("\e[1;32mDeface: [WARNING]\e[0m Multiple action methods have been called. The last one will be used.")
@@ -56,7 +55,8 @@ describe Deface::DSL::Context do
     end
 
     context 'sources' do
-      Deface::Override.sources.each do |source|
+      Deface::DEFAULT_SOURCES.each do |source|
+        source = source.to_sym
         it "should use value set with ##{source}" do
           subject.send(source, "#{source} value")
 
@@ -145,5 +145,12 @@ describe Deface::DSL::Context do
 
       override_should_be_created_with(:disabled => false)
     end
+
+    it "should automatically namespace the override's name when namespaced is called" do
+      subject.namespaced
+
+      override_should_be_created_with(:namespaced => true)
+    end
+
   end
 end

data/spec/deface/dsl/loader_spec.rb

@@ -138,14 +138,14 @@ describe Deface::DSL::Loader do
     it 'should work in the simplest case' do
       example = "<!-- test 'command' --><h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "test 'command'\n"
+      dsl_commands.should == "\ntest 'command'"
       the_rest.should == "<h1>Wow!</h1>"
     end
 
     it 'should combine multiple comments' do
       example = "<!-- test 'command' --><!-- another 'command' --><h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "test 'command'\nanother 'command'\n"
+      dsl_commands.should == "\ntest 'command'\nanother 'command'"
       the_rest.should == "<h1>Wow!</h1>"
     end
 
@@ -159,16 +159,24 @@ describe Deface::DSL::Loader do
     it 'should work with comments on own lines' do
       example = "<!-- test 'command' -->\n<!-- another 'command' -->\n<h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "test 'command'\nanother 'command'\n"
+      dsl_commands.should == "\ntest 'command'\nanother 'command'"
       the_rest.should == "\n<h1>Wow!</h1>"
     end
 
     it 'should work with newlines inside the comment' do
       example = "<!--\n test 'command'\nanother 'command'\n -->\n<h1>Wow!</h1>"
       dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
-      dsl_commands.should == "test 'command'\nanother 'command'\n"
+      dsl_commands.should == "\ntest 'command'\nanother 'command'"
       the_rest.should == "\n<h1>Wow!</h1>"
     end
+
+    it 'should work with multiple commands on one line' do
+      example = %q{<!-- replace_contents 'h1 .title' closing_selector "div#intro" disabled namespaced --><h1>Wow!</h1>}
+      dsl_commands, the_rest = Deface::DSL::Loader.extract_dsl_commands_from_erb(example)
+      dsl_commands.should == "\nreplace_contents 'h1 .title'\nclosing_selector \"div#intro\"\ndisabled\nnamespaced"
+      the_rest.should == "<h1>Wow!</h1>"
+    end
+
   end
 
   context '.extract_dsl_commands_from_haml' do

data/spec/deface/override_spec.rb

@@ -17,7 +17,7 @@ module Deface
     end
 
     it "should have a sources method" do
-      Deface::Override.sources.should include(:text)
+      Deface::DEFAULT_SOURCES.map(&:to_sym).should include(:text)
     end
 
     it "should return correct selector" do
@@ -268,6 +268,29 @@ module Deface
       end
     end
 
+    describe "with :namespaced" do
+      before(:each) do
+        Deface::Override.current_railtie = 'SpreeEngine'
+        @override = Deface::Override.new(:virtual_path => 'sample_path', :name => 'sample_name', :replace => 'h1', :namespaced => true)
+      end
+
+      it "should namespace the override's name" do
+        @override.name.should == 'spree_engine_sample_name'
+      end
+    end
+
+    describe "with global namespaced option set to true" do
+      before(:each) do
+        Deface::Override.current_railtie = 'SpreeEngine'
+        Rails.application.config.deface.namespaced = true
+        @override = Deface::Override.new(:virtual_path => 'sample_path', :name => 'sample_name', :replace => 'h1')
+      end
+
+      it "should namespace the override's name" do
+        @override.name.should == 'spree_engine_sample_name'
+      end
+    end
+
     describe "#source_element" do
       before(:each) do
         @override = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :replace => "h1", :text => "<%= method :opt => 'x' & 'y' %>")
@@ -322,9 +345,9 @@ module Deface
         ActionController::Base.stub(:view_paths).and_return([File.join(File.dirname(__FILE__), '..', "assets")])
 
         Rails.application.config.deface.overrides.all.clear
-        @override    = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :partial => "shared/post", :replace => "h1")
+        @override    = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :partial => "shared/post", :replace => "h1", :text => "<span>I'm text</span>")
         expect {
-          @replacement = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :text => "<p>I do be a pirate!</p>")
+          @replacement = Deface::Override.new(:virtual_path => "posts/index", :name => "Posts#index", :erb => "<p>I do be a pirate!</p>")
         }.to change{Rails.application.config.deface.overrides.all.size}.by(0)
       end
 

data/spec/deface/template_helper_spec.rb

@@ -76,5 +76,16 @@ module Deface
       end
 
     end
+
+    describe "element_source" do
+      it "should return array of matches elements" do
+        element_source('<div><p class="pirate">Arrgh!</p><img src="/some/image.jpg"></div>', 'p.pirate').should == ["<p class=\"pirate\">Arrgh!</p>\n"]
+        element_source('<div><p class="pirate">Arrgh!</p><p>No pirates here...</p></div>', 'p').should ==  ["<p class=\"pirate\">Arrgh!</p>\n", "<p>No pirates here...</p>"]
+      end
+
+      it "should return empty array for no matches" do
+        element_source('<div><p class="pirate">Arrgh!</p><img src="/some/image.jpg"></div>', 'span').should == []
+      end
+    end
   end
 end

data/spec/deface/utils/failure_finder_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+require 'deface/utils/failure_finder'
+
+module Deface
+  module Utils
+    describe FailureFinder do
+      include Deface::Utils::FailureFinder
+      include Deface::TemplateHelper
+      include_context "mock Rails.application"
+
+      before do
+        #stub view paths to be local spec/assets directory
+        ActionController::Base.stub(:view_paths).and_return([File.join(File.dirname(__FILE__), '../..', "assets")])
+      end
+
+      context "given failing overrides" do
+        before do
+          Deface::Override.new(:virtual_path => "shared/_post", :name => "good", :remove => "p")
+          Deface::Override.new(:virtual_path => "shared/_post", :name => "bad", :remove => "img")
+        end
+
+        context "overrides_by_virtual_path" do
+          it "should load template and apply overrides" do
+            fails = overrides_by_virtual_path('shared/_post')
+            count = fails.group_by{ |o| !o.failure.nil? }
+
+            count[true].size.should == 1
+            count[true].first.name.should == 'bad'
+            count[false].size.should == 1
+            count[false].first.name.should == 'good'
+          end
+
+          it "should return nil for path virtual_path value" do
+            silence_stream(STDOUT) do
+              overrides_by_virtual_path('shared/_poster').should be_nil
+            end
+          end
+        end
+
+        context "output_results_by_virtual_path" do
+          it "should return count of failed overrides for given path" do
+            silence_stream(STDOUT) do
+              output_results_by_virtual_path('shared/_post').should == 1
+            end
+          end
+        end
+      end
+
+      context "given no failing overrides" do
+        before do
+          Deface::Override.new(:virtual_path => "shared/_post", :name => "good", :remove => "p")
+        end
+
+        context "overrides_by_virtual_path" do
+          it "should load template and apply overrides" do
+            fails = overrides_by_virtual_path('shared/_post')
+            count = fails.group_by{ |o| !o.failure.nil? }
+
+            count.key?('true').should be_false 
+            count[false].size.should == 1
+            count[false].first.name.should == 'good'
+          end
+
+        end
+
+        context "output_results_by_virtual_path" do
+          it "should return count of failed overrides for given path" do
+            silence_stream(STDOUT) do
+              output_results_by_virtual_path('shared/_post').should == 0
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require 'rubygems'
+require 'simplecov'
+SimpleCov.start 'rails'
 require 'rspec'
 require 'action_view'
 require 'action_controller'
@@ -9,7 +10,10 @@ require 'haml'
 require 'deface/haml_converter'
 require 'time'
 
-Haml.init_rails(nil)
+if defined?(Haml::Options)
+  # Haml 3.2 changes the default output format to HTML5
+  Haml::Options.defaults[:format] = :xhtml
+end
 
 RSpec.configure do |config|
   config.mock_framework = :rspec
@@ -47,6 +51,8 @@ shared_context "mock Rails" do
 
     Time.stub :zone => mock('zone')
     Time.zone.stub(:now).and_return Time.parse('1979-05-25')
+
+    require "haml/template/plugin"
   end
 end
 
@@ -58,3 +64,16 @@ shared_context "mock Rails.application" do
     Rails.application.config.deface.haml_support = true
   end
 end
+
+# Dummy Deface instance for testing actions / applicator
+class Dummy
+  extend Deface::Applicator::ClassMethods
+  extend Deface::Search::ClassMethods
+
+  attr_reader :parsed_document
+
+  def self.all
+    Rails.application.config.deface.overrides.all
+  end
+end
+

data/tasks/utils.rake

@@ -1,7 +1,10 @@
 require 'deface'
+require 'deface/utils/failure_finder'
+require 'colorize'
 
 namespace :deface do
   include Deface::TemplateHelper
+  include Deface::Utils::FailureFinder
 
   desc 'Applies selectors to given partial/template, and returns match(s) source.'
   task :test_selector, [:virtual_path, :selector] => [:environment] do |t, args|
@@ -56,4 +59,25 @@ namespace :deface do
 
   end
 
+  desc 'Load and apply all overrides, and output results'
+  task :test_all => [:environment] do |t|
+    fail_count = Deface::Override.all.keys.map(&:to_s).inject(0) do |failed, virtual_path|
+      result = output_results_by_virtual_path(virtual_path)
+
+      failed += result
+    end
+
+    if fail_count == 0
+      puts "\nEverything's looking good!".green
+      exit(0)
+    else
+      puts "\nYou had a total of #{fail_count} failures.".red
+      exit(1)
+    end
+  end
+
+  desc 'Report on failing overrides for a partial/template'
+  task :failures_by_virtual_path, [:virtual_path] => [:environment] do |t,args|
+    output_results_by_virtual_path(args[:virtual_path])
+  end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 0.9.1
-  prerelease: 
+  version: 1.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70312328789300 !ruby/object:Gem::Requirement
+  requirement: &70318167536000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70312328789300
+  version_requirements: *70318167536000
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70312328788820 !ruby/object:Gem::Requirement
+  requirement: &70318167534880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,32 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70312328788820
+  version_requirements: *70318167534880
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: &70318167534080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.8
+  type: :runtime
+  prerelease: false
+  version_requirements: *70318167534080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70312328804600 !ruby/object:Gem::Requirement
+  requirement: &70318167533180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70312328804600
+  version_requirements: *70318167533180
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70312328803660 !ruby/object:Gem::Requirement
+  requirement: &70318167532080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,18 @@ dependencies:
         version: 3.1.4
   type: :development
   prerelease: false
-  version_requirements: *70312328803660
+  version_requirements: *70318167532080
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70318167531080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *70318167531080
 description: Deface is a library that allows you to customize ERB & HAML views in
   a Rails application without editing the underlying view.
 email: brian@spreecommerce.com
@@ -64,28 +86,57 @@ extra_rdoc_files:
 - README.markdown
 files:
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
 - MIT-LICENSE
 - README.markdown
 - Rakefile
 - deface.gemspec
+- gemfiles/haml3_2.gemfile
 - gemfiles/rails3_1.gemfile
 - gemfiles/rails3_2.gemfile
 - init.rb
 - lib/deface.rb
 - lib/deface/action_view_extensions.rb
+- lib/deface/actions/action.rb
+- lib/deface/actions/add_to_attributes.rb
+- lib/deface/actions/attribute_action.rb
+- lib/deface/actions/element_action.rb
+- lib/deface/actions/insert_after.rb
+- lib/deface/actions/insert_before.rb
+- lib/deface/actions/insert_bottom.rb
+- lib/deface/actions/insert_top.rb
+- lib/deface/actions/remove.rb
+- lib/deface/actions/remove_from_attributes.rb
+- lib/deface/actions/replace.rb
+- lib/deface/actions/replace_contents.rb
+- lib/deface/actions/set_attributes.rb
+- lib/deface/actions/surround.rb
+- lib/deface/actions/surround_action.rb
+- lib/deface/actions/surround_contents.rb
 - lib/deface/applicator.rb
 - lib/deface/dsl/context.rb
 - lib/deface/dsl/loader.rb
 - lib/deface/environment.rb
 - lib/deface/haml_converter.rb
+- lib/deface/matchers/element.rb
+- lib/deface/matchers/range.rb
 - lib/deface/original_validator.rb
 - lib/deface/override.rb
 - lib/deface/parser.rb
 - lib/deface/railtie.rb
 - lib/deface/search.rb
+- lib/deface/sources/copy.rb
+- lib/deface/sources/cut.rb
+- lib/deface/sources/erb.rb
+- lib/deface/sources/haml.rb
+- lib/deface/sources/partial.rb
+- lib/deface/sources/source.rb
+- lib/deface/sources/template.rb
+- lib/deface/sources/text.rb
 - lib/deface/template_helper.rb
+- lib/deface/utils/failure_finder.rb
 - spec/assets/admin/posts/index.html.erb
 - spec/assets/dummy_app/overrides/posts/index/app_override.html.erb.deface
 - spec/assets/dummy_engine/overrides/users/index/engine_override.html.erb.deface
@@ -94,6 +145,18 @@ files:
 - spec/assets/shared/person.html.erb
 - spec/assets/shared/pirate.html.haml
 - spec/deface/action_view_template_spec.rb
+- spec/deface/actions/add_to_attributes_spec.rb
+- spec/deface/actions/insert_after_spec.rb
+- spec/deface/actions/insert_before_spec.rb
+- spec/deface/actions/insert_bottom_spec.rb
+- spec/deface/actions/insert_top_spec.rb
+- spec/deface/actions/remove_from_attributes_spec.rb
+- spec/deface/actions/remove_spec.rb
+- spec/deface/actions/replace_contents_spec.rb
+- spec/deface/actions/replace_spec.rb
+- spec/deface/actions/set_attributes_spec.rb
+- spec/deface/actions/surround_contents_spec.rb
+- spec/deface/actions/surround_spec.rb
 - spec/deface/applicator_spec.rb
 - spec/deface/dsl/context_spec.rb
 - spec/deface/dsl/loader_spec.rb
@@ -103,6 +166,7 @@ files:
 - spec/deface/parser_spec.rb
 - spec/deface/search_spec.rb
 - spec/deface/template_helper_spec.rb
+- spec/deface/utils/failure_finder_spec.rb
 - spec/spec_helper.rb
 - tasks/precompile.rake
 - tasks/utils.rake
@@ -122,9 +186,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15
@@ -140,6 +204,18 @@ test_files:
 - spec/assets/shared/person.html.erb
 - spec/assets/shared/pirate.html.haml
 - spec/deface/action_view_template_spec.rb
+- spec/deface/actions/add_to_attributes_spec.rb
+- spec/deface/actions/insert_after_spec.rb
+- spec/deface/actions/insert_before_spec.rb
+- spec/deface/actions/insert_bottom_spec.rb
+- spec/deface/actions/insert_top_spec.rb
+- spec/deface/actions/remove_from_attributes_spec.rb
+- spec/deface/actions/remove_spec.rb
+- spec/deface/actions/replace_contents_spec.rb
+- spec/deface/actions/replace_spec.rb
+- spec/deface/actions/set_attributes_spec.rb
+- spec/deface/actions/surround_contents_spec.rb
+- spec/deface/actions/surround_spec.rb
 - spec/deface/applicator_spec.rb
 - spec/deface/dsl/context_spec.rb
 - spec/deface/dsl/loader_spec.rb
@@ -149,4 +225,5 @@ test_files:
 - spec/deface/parser_spec.rb
 - spec/deface/search_spec.rb
 - spec/deface/template_helper_spec.rb
+- spec/deface/utils/failure_finder_spec.rb
 - spec/spec_helper.rb