deface 1.0.0.rc1 → 1.0.0.rc2

data/spec/deface/precompiler_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+module Deface
+
+  describe Precompiler do
+    include_context "mock Rails.application"
+
+    before do
+      # start with a clean file system
+      FileUtils.rm_rf('spec/dummy/app/compiled_views')
+      environment = Deface::Environment.new
+      overrides = Deface::Environment::Overrides.new
+      overrides.stub(:all => {}) # need to do this before creating an override
+      overrides.stub(:all => {"posts/precompileme".to_sym => {"precompileme".parameterize => Deface::Override.new(:virtual_path => "posts/precompileme", :name => "precompileme", :insert_bottom => 'li', :text => "Added to li!")}})
+      environment.stub(:overrides => overrides)
+
+      Rails.application.config.stub :deface => environment
+
+      #stub view paths to be local spec/assets directory
+      ActionController::Base.stub(:view_paths).and_return([File.join(File.dirname(__FILE__), '..', "assets")])
+
+      Precompiler.precompile()
+    end
+
+    after do
+      # cleanup the file system
+      FileUtils.rm_rf('spec/dummy/app/compiled_views')
+    end
+
+    it "writes precompiles the overrides" do
+
+      filename = 'spec/dummy/app/compiled_views/posts/precompileme.html.erb'
+
+      File.exists?(filename).should be_true
+
+      file = File.open(filename, "rb")
+      contents = file.read
+
+      contents.should =~ /precompile/
+    end
+  end
+end

data/spec/deface/template_helper_spec.rb

@@ -79,8 +79,8 @@ module Deface
 
     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>"]
+        element_source('<div><p class="pirate">Arrgh!</p><img src="/some/image.jpg"></div>', 'p.pirate').map(&:strip).should == ["<p class=\"pirate\">Arrgh!</p>"]
+        element_source('<div><p class="pirate">Arrgh!</p><p>No pirates here...</p></div>', 'p').map(&:strip).should ==  ["<p class=\"pirate\">Arrgh!</p>", "<p>No pirates here...</p>"]
       end
 
       it "should return empty array for no matches" do

data/spec/generators/deface/override_generator_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'generator_spec/test_case'
+
+describe Deface::Generators::OverrideGenerator do
+  include GeneratorSpec::TestCase
+  destination Dir.tmpdir
+
+  before(:all) do
+    prepare_destination
+  end
+
+  context 'using erb' do
+    it "should generate a deface override with the correct path" do
+      run_generator %w(posts/_post add_headline)
+      assert_file 'app/overrides/posts/_post/add_headline.html.erb.deface', "<!-- insert_after 'h1' -->\n<h2>These robots are awesome.</h2>\n"
+    end
+  end
+
+  context 'using haml' do
+    it "should generate a deface override with the correct path" do
+      run_generator %w(posts/_post add_headline -e haml)
+      assert_file 'app/overrides/posts/_post/add_headline.html.haml.deface', "/\n  insert_after 'h1'\n%h2 These robots are awesome.\n"
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -4,10 +4,22 @@ require 'rspec'
 require 'action_view'
 require 'action_controller'
 require 'deface'
-#have to manually require following three for testing purposes
+require 'rails/generators'
+#have to manually require following for testing purposes
 require 'deface/action_view_extensions'
+
+#adding fake class as it's needed by haml 4.0, don't
+#want to have to require the entire rails stack in specs.
+module Rails
+  class Railtie
+    def self.initializer(*args)
+    end
+  end
+end
+
 require 'haml'
 require 'deface/haml_converter'
+require 'generators/deface/override_generator'
 require 'time'
 
 if defined?(Haml::Options)
@@ -44,10 +56,13 @@ shared_context "mock Rails" do
       Rails.application.config.stub :watchable_dirs => {}
     end
 
+    Rails.stub :root => Pathname.new('spec/dummy')
+
     Rails.stub :logger => mock('logger')
     Rails.logger.stub(:error)
     Rails.logger.stub(:warning)
     Rails.logger.stub(:info)
+    Rails.logger.stub(:debug)
 
     Time.stub :zone => mock('zone')
     Time.zone.stub(:now).and_return Time.parse('1979-05-25')

data/tasks/precompile.rake

@@ -1,35 +1,10 @@
 require 'deface'
 
 namespace :deface do
-  include Deface::TemplateHelper
 
   desc "Precompiles overrides into template files"
   task :precompile => [:environment, :clean] do |t, args|
-    base_path = Rails.root.join("app/compiled_views")
-
-    # temporarily configures deface env and loads
-    # all overrides so we can precompile
-    unless Rails.application.config.deface.enabled
-      Rails.application.config.deface = Deface::Environment.new
-      Rails.application.config.deface.overrides.early_check
-      Rails.application.config.deface.overrides.load_all Rails.application
-    end
-
-    Rails.application.config.deface.overrides.all.each do |virtual_path,overrides|
-      template_path = base_path.join( "#{virtual_path}.html.erb")
-
-      FileUtils.mkdir_p template_path.dirname
-      begin
-        source = load_template_source(virtual_path.to_s, false, true)
-        if source.blank?
-          raise "Compiled source was blank for '#{virtual_path}'"
-        end
-        File.open(template_path, 'w') {|f| f.write source } 
-      rescue Exception => e
-        puts "Unable to precompile '#{virtual_path}' due to: "
-        puts e.message
-      end
-    end
+    Deface::Precompiler.precompile()
   end
 
   desc "Removes all precompiled override templates"

metadata

@@ -1,229 +1,258 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: deface
-version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+version: !ruby/object:Gem::Version 
   prerelease: 6
+  version: 1.0.0.rc2
 platform: ruby
-authors:
-- Brian D Quinn
+authors: 
+  - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &70318167536000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70318167536000
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &70318167534880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  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: &70318167533180 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.11.0
-  type: :development
-  prerelease: false
-  version_requirements: *70318167533180
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70318167532080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.4
-  type: :development
-  prerelease: false
-  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.
+
+date: 2013-03-23 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: nokogiri
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.5.9
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rails
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "3.1"
+    type: :runtime
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: colorize
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.5.8
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 2.11.0
+    type: :development
+    version_requirements: *id004
+  - !ruby/object:Gem::Dependency 
+    name: haml
+    prerelease: false
+    requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.1.4
+    type: :development
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: simplecov
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.6.4
+    type: :development
+    version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: generator_spec
+    prerelease: false
+    requirement: &id007 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.8.5
+    type: :development
+    version_requirements: *id007
+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
 executables: []
+
 extensions: []
-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
-- spec/assets/shared/_hello.html.haml
-- spec/assets/shared/_post.html.erb
-- 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
-- spec/deface/environment_spec.rb
-- spec/deface/haml_converter_spec.rb
-- spec/deface/override_spec.rb
-- 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
+
+extra_rdoc_files: 
+  - README.markdown
+files: 
+  - .gitignore
+  - .rspec
+  - .travis.yml
+  - Gemfile
+  - MIT-LICENSE
+  - README.markdown
+  - Rakefile
+  - deface.gemspec
+  - gemfiles/haml4_0.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/generators
+  - 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/precompiler.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
+  - lib/generators/deface/USAGE
+  - lib/generators/deface/override_generator.rb
+  - lib/generators/deface/templates/override.html.erb.deface
+  - lib/generators/deface/templates/override.html.haml.deface
+  - spec/assets/admin/posts/index.html.erb
+  - spec/assets/dummy_app/overrides/posts/index/app_override.html.erb.deface
+  - spec/assets/dummy_app/overrides/posts/precompileme/precompileme.html.erb.deface
+  - spec/assets/dummy_engine/overrides/users/index/engine_override.html.erb.deface
+  - spec/assets/posts/precompileme.html.erb
+  - spec/assets/shared/_hello.html.haml
+  - spec/assets/shared/_post.html.erb
+  - 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
+  - spec/deface/environment_spec.rb
+  - spec/deface/haml_converter_spec.rb
+  - spec/deface/override_spec.rb
+  - spec/deface/parser_spec.rb
+  - spec/deface/precompiler_spec.rb
+  - spec/deface/search_spec.rb
+  - spec/deface/template_helper_spec.rb
+  - spec/deface/utils/failure_finder_spec.rb
+  - spec/generators/deface/override_generator_spec.rb
+  - spec/spec_helper.rb
+  - tasks/precompile.rake
+  - tasks/utils.rake
 homepage: http://github.com/railsdog/deface
 licenses: []
+
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+rdoc_options: 
+  - --charset=UTF-8
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Deface is a library that allows you to customize ERB & HAML views in Rails
-test_files:
-- 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
-- spec/assets/shared/_hello.html.haml
-- spec/assets/shared/_post.html.erb
-- 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
-- spec/deface/environment_spec.rb
-- spec/deface/haml_converter_spec.rb
-- spec/deface/override_spec.rb
-- 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
+test_files: 
+  - spec/assets/admin/posts/index.html.erb
+  - spec/assets/dummy_app/overrides/posts/index/app_override.html.erb.deface
+  - spec/assets/dummy_app/overrides/posts/precompileme/precompileme.html.erb.deface
+  - spec/assets/dummy_engine/overrides/users/index/engine_override.html.erb.deface
+  - spec/assets/posts/precompileme.html.erb
+  - spec/assets/shared/_hello.html.haml
+  - spec/assets/shared/_post.html.erb
+  - 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
+  - spec/deface/environment_spec.rb
+  - spec/deface/haml_converter_spec.rb
+  - spec/deface/override_spec.rb
+  - spec/deface/parser_spec.rb
+  - spec/deface/precompiler_spec.rb
+  - spec/deface/search_spec.rb
+  - spec/deface/template_helper_spec.rb
+  - spec/deface/utils/failure_finder_spec.rb
+  - spec/generators/deface/override_generator_spec.rb
+  - spec/spec_helper.rb