install_theme 0.5.1 → 0.5.2

data/History.txt

@@ -1,3 +1,22 @@
+=== 0.5.2 / 2009-09-29
+
+NOTE: Haml output can be improved by installing haml from http://github.com/drnic/haml
+to get latest patches. Future History.txt will update when it has been applied to haml gem.
+
+Major:
+* Speed improvements by using html2haml/css2sass internally instead of Ruby shell
+
+Minor/Internal:
+* reverted the content_for erb to have -%> suffixes [Jack Chen and Dr Nic Williams]
+* Fixed the test for generation of the sample haml file of content_for samples [Jack Chen and Dr Nic Williams]
+* removing the matchers we weren't using [Jack Chen and Dr Nic Williams]
+* If html2haml or css2sass throw an error then copy over the original erb/css file instead. [Jack Chen and Dr Nic Williams]
+* rendering html2haml with rhtml enabled [Jack Chen and Dr Nic Williams]
+* using before(:all) around the theme installation calls so they are only run once
+* removed test theme webresourcedepot
+* sample extracted HTML placed into a app/views/original_template/index.html.erb file instead of readme printout
+* removed the djclub test theme as its interesting qualities for testing (assets in root folder) are duplicated by the hobbit theme
+
 === 0.5.1 / 2009-09-28
 
 Major:

data/Manifest.txt

@@ -156,63 +156,6 @@ spec/expected/rails/bloganje/public/stylesheets/theme3.css
 spec/expected/rails/bloganje/public/stylesheets/theme4.css
 spec/expected/rails/bloganje/test/performance/browsing_test.rb
 spec/expected/rails/bloganje/test/test_helper.rb
-spec/expected/rails/djclub/README
-spec/expected/rails/djclub/Rakefile
-spec/expected/rails/djclub/app/controllers/application_controller.rb
-spec/expected/rails/djclub/app/helpers/application_helper.rb
-spec/expected/rails/djclub/app/views/layouts/application.html.erb
-spec/expected/rails/djclub/config/boot.rb
-spec/expected/rails/djclub/config/database.yml
-spec/expected/rails/djclub/config/environment.rb
-spec/expected/rails/djclub/config/environments/development.rb
-spec/expected/rails/djclub/config/environments/production.rb
-spec/expected/rails/djclub/config/environments/test.rb
-spec/expected/rails/djclub/config/initializers/backtrace_silencers.rb
-spec/expected/rails/djclub/config/initializers/inflections.rb
-spec/expected/rails/djclub/config/initializers/mime_types.rb
-spec/expected/rails/djclub/config/initializers/new_rails_defaults.rb
-spec/expected/rails/djclub/config/initializers/session_store.rb
-spec/expected/rails/djclub/config/locales/en.yml
-spec/expected/rails/djclub/config/routes.rb
-spec/expected/rails/djclub/db/seeds.rb
-spec/expected/rails/djclub/doc/README_FOR_APP
-spec/expected/rails/djclub/public/404.html
-spec/expected/rails/djclub/public/422.html
-spec/expected/rails/djclub/public/500.html
-spec/expected/rails/djclub/public/favicon.ico
-spec/expected/rails/djclub/public/images/bodybg.gif
-spec/expected/rails/djclub/public/images/contentbg.gif
-spec/expected/rails/djclub/public/images/djset.gif
-spec/expected/rails/djclub/public/images/footerbg.gif
-spec/expected/rails/djclub/public/images/header.jpg
-spec/expected/rails/djclub/public/images/leftbg.gif
-spec/expected/rails/djclub/public/images/middlebg.gif
-spec/expected/rails/djclub/public/images/navbottom.gif
-spec/expected/rails/djclub/public/images/navtop.gif
-spec/expected/rails/djclub/public/images/photos.jpg
-spec/expected/rails/djclub/public/images/rails.png
-spec/expected/rails/djclub/public/images/rightbg.gif
-spec/expected/rails/djclub/public/images/timetoparty.jpg
-spec/expected/rails/djclub/public/index.html
-spec/expected/rails/djclub/public/javascripts/application.js
-spec/expected/rails/djclub/public/javascripts/controls.js
-spec/expected/rails/djclub/public/javascripts/dragdrop.js
-spec/expected/rails/djclub/public/javascripts/effects.js
-spec/expected/rails/djclub/public/javascripts/prototype.js
-spec/expected/rails/djclub/public/robots.txt
-spec/expected/rails/djclub/public/stylesheets/style.css
-spec/expected/rails/djclub/script/about
-spec/expected/rails/djclub/script/console
-spec/expected/rails/djclub/script/dbconsole
-spec/expected/rails/djclub/script/destroy
-spec/expected/rails/djclub/script/generate
-spec/expected/rails/djclub/script/performance/benchmarker
-spec/expected/rails/djclub/script/performance/profiler
-spec/expected/rails/djclub/script/plugin
-spec/expected/rails/djclub/script/runner
-spec/expected/rails/djclub/script/server
-spec/expected/rails/djclub/test/performance/browsing_test.rb
-spec/expected/rails/djclub/test/test_helper.rb
 spec/expected/rails/the-hobbit-website-template/README
 spec/expected/rails/the-hobbit-website-template/Rakefile
 spec/expected/rails/the-hobbit-website-template/app/controllers/application_controller.rb
@@ -269,66 +212,6 @@ spec/expected/rails/the-hobbit-website-template/script/runner
 spec/expected/rails/the-hobbit-website-template/script/server
 spec/expected/rails/the-hobbit-website-template/test/performance/browsing_test.rb
 spec/expected/rails/the-hobbit-website-template/test/test_helper.rb
-spec/expected/rails/webresourcedepot/README
-spec/expected/rails/webresourcedepot/Rakefile
-spec/expected/rails/webresourcedepot/app/controllers/application_controller.rb
-spec/expected/rails/webresourcedepot/app/helpers/application_helper.rb
-spec/expected/rails/webresourcedepot/app/views/layouts/application.html.erb
-spec/expected/rails/webresourcedepot/config/boot.rb
-spec/expected/rails/webresourcedepot/config/database.yml
-spec/expected/rails/webresourcedepot/config/environment.rb
-spec/expected/rails/webresourcedepot/config/environments/development.rb
-spec/expected/rails/webresourcedepot/config/environments/production.rb
-spec/expected/rails/webresourcedepot/config/environments/test.rb
-spec/expected/rails/webresourcedepot/config/initializers/backtrace_silencers.rb
-spec/expected/rails/webresourcedepot/config/initializers/inflections.rb
-spec/expected/rails/webresourcedepot/config/initializers/mime_types.rb
-spec/expected/rails/webresourcedepot/config/initializers/new_rails_defaults.rb
-spec/expected/rails/webresourcedepot/config/initializers/session_store.rb
-spec/expected/rails/webresourcedepot/config/locales/en.yml
-spec/expected/rails/webresourcedepot/config/routes.rb
-spec/expected/rails/webresourcedepot/db/seeds.rb
-spec/expected/rails/webresourcedepot/doc/README_FOR_APP
-spec/expected/rails/webresourcedepot/public/404.html
-spec/expected/rails/webresourcedepot/public/422.html
-spec/expected/rails/webresourcedepot/public/500.html
-spec/expected/rails/webresourcedepot/public/favicon.ico
-spec/expected/rails/webresourcedepot/public/images/Thumbs.db
-spec/expected/rails/webresourcedepot/public/images/add-icon.gif
-spec/expected/rails/webresourcedepot/public/images/arrow.gif
-spec/expected/rails/webresourcedepot/public/images/bg-center-column.jpg
-spec/expected/rails/webresourcedepot/public/images/bg-dotted.gif
-spec/expected/rails/webresourcedepot/public/images/bg-footer.gif
-spec/expected/rails/webresourcedepot/public/images/bg-header.gif
-spec/expected/rails/webresourcedepot/public/images/bg-left-header.gif
-spec/expected/rails/webresourcedepot/public/images/bg-left-link.gif
-spec/expected/rails/webresourcedepot/public/images/bg-middle.gif
-spec/expected/rails/webresourcedepot/public/images/bg-orange-button.gif
-spec/expected/rails/webresourcedepot/public/images/bg-select.gif
-spec/expected/rails/webresourcedepot/public/images/bg-th-left.gif
-spec/expected/rails/webresourcedepot/public/images/bg-th-right.gif
-spec/expected/rails/webresourcedepot/public/images/edit-icon.gif
-spec/expected/rails/webresourcedepot/public/images/hr.gif
-spec/expected/rails/webresourcedepot/public/images/login-icon.gif
-spec/expected/rails/webresourcedepot/public/images/logo.gif
-spec/expected/rails/webresourcedepot/public/images/rails.png
-spec/expected/rails/webresourcedepot/public/images/save-icon.gif
-spec/expected/rails/webresourcedepot/public/images/tab-active-left.gif
-spec/expected/rails/webresourcedepot/public/images/tab-active-right.gif
-spec/expected/rails/webresourcedepot/public/images/tab-active.gif
-spec/expected/rails/webresourcedepot/public/images/tab-left.gif
-spec/expected/rails/webresourcedepot/public/images/tab-right.gif
-spec/expected/rails/webresourcedepot/public/images/tab.gif
-spec/expected/rails/webresourcedepot/public/index.html
-spec/expected/rails/webresourcedepot/public/javascripts/application.js
-spec/expected/rails/webresourcedepot/public/javascripts/controls.js
-spec/expected/rails/webresourcedepot/public/javascripts/dragdrop.js
-spec/expected/rails/webresourcedepot/public/javascripts/effects.js
-spec/expected/rails/webresourcedepot/public/javascripts/prototype.js
-spec/expected/rails/webresourcedepot/public/robots.txt
-spec/expected/rails/webresourcedepot/public/stylesheets/all.css
-spec/expected/rails/webresourcedepot/test/performance/browsing_test.rb
-spec/expected/rails/webresourcedepot/test/test_helper.rb
 spec/fixtures/bloganje/README.md
 spec/fixtures/bloganje/blank.html
 spec/fixtures/bloganje/css/Copy of theme.css
@@ -401,21 +284,6 @@ spec/fixtures/bloganje/img/icons/world.png
 spec/fixtures/bloganje/index.html
 spec/fixtures/bloganje/psd/template.psd
 spec/fixtures/bloganje/users.html
-spec/fixtures/djclub/djclub.psd
-spec/fixtures/djclub/images/bodybg.gif
-spec/fixtures/djclub/images/contentbg.gif
-spec/fixtures/djclub/images/djset.gif
-spec/fixtures/djclub/images/footerbg.gif
-spec/fixtures/djclub/images/header.jpg
-spec/fixtures/djclub/images/leftbg.gif
-spec/fixtures/djclub/images/middlebg.gif
-spec/fixtures/djclub/images/navbottom.gif
-spec/fixtures/djclub/images/navtop.gif
-spec/fixtures/djclub/images/photos.jpg
-spec/fixtures/djclub/images/rightbg.gif
-spec/fixtures/djclub/images/timetoparty.jpg
-spec/fixtures/djclub/index.html
-spec/fixtures/djclub/style.css
 spec/fixtures/the-hobbit-website-template/default.css
 spec/fixtures/the-hobbit-website-template/img/bg.jpg
 spec/fixtures/the-hobbit-website-template/img/bgcontainer.jpg
@@ -430,38 +298,9 @@ spec/fixtures/the-hobbit-website-template/img/quote.gif
 spec/fixtures/the-hobbit-website-template/img/stripes.gif
 spec/fixtures/the-hobbit-website-template/index.html
 spec/fixtures/the-hobbit-website-template/license-readme.txt
-spec/fixtures/webresourcedepot/README.md
-spec/fixtures/webresourcedepot/css/all.css
-spec/fixtures/webresourcedepot/img/Thumbs.db
-spec/fixtures/webresourcedepot/img/add-icon.gif
-spec/fixtures/webresourcedepot/img/arrow.gif
-spec/fixtures/webresourcedepot/img/bg-center-column.jpg
-spec/fixtures/webresourcedepot/img/bg-dotted.gif
-spec/fixtures/webresourcedepot/img/bg-footer.gif
-spec/fixtures/webresourcedepot/img/bg-header.gif
-spec/fixtures/webresourcedepot/img/bg-left-header.gif
-spec/fixtures/webresourcedepot/img/bg-left-link.gif
-spec/fixtures/webresourcedepot/img/bg-middle.gif
-spec/fixtures/webresourcedepot/img/bg-orange-button.gif
-spec/fixtures/webresourcedepot/img/bg-select.gif
-spec/fixtures/webresourcedepot/img/bg-th-left.gif
-spec/fixtures/webresourcedepot/img/bg-th-right.gif
-spec/fixtures/webresourcedepot/img/edit-icon.gif
-spec/fixtures/webresourcedepot/img/hr.gif
-spec/fixtures/webresourcedepot/img/login-icon.gif
-spec/fixtures/webresourcedepot/img/logo.gif
-spec/fixtures/webresourcedepot/img/save-icon.gif
-spec/fixtures/webresourcedepot/img/tab-active-left.gif
-spec/fixtures/webresourcedepot/img/tab-active-right.gif
-spec/fixtures/webresourcedepot/img/tab-active.gif
-spec/fixtures/webresourcedepot/img/tab-left.gif
-spec/fixtures/webresourcedepot/img/tab-right.gif
-spec/fixtures/webresourcedepot/img/tab.gif
-spec/fixtures/webresourcedepot/index.html
 spec/install_theme_cli_spec.rb
 spec/install_theme_haml_spec.rb
 spec/install_theme_spec.rb
-spec/matchers/have_same_contents_as.rb
 spec/spec.opts
 spec/spec_helper.rb
 tasks/rspec.rake

data/Rakefile

@@ -13,8 +13,8 @@ $hoe = Hoe.spec 'install_theme' do
   self.rubyforge_name = "drnicutilities"
   extra_deps << ['hpricot','>= 0.8.1']
   extra_deps << ['rubigen','>= 1.5.2']
+  extra_deps << ['haml', '>= 2.2.6']
   extra_dev_deps << ['rails', '2.3.4']
-  extra_dev_deps << ['haml']
 end
 
 require 'newgem/tasks'

data/lib/install_theme.rb

@@ -1,12 +1,16 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'hpricot'
 require 'rubigen'
 require 'rubigen/scripts/generate'
+require 'haml'
+require 'haml/html'
+require 'sass'
+require 'sass/css'
+require 'haml/exec'
 
 class InstallTheme
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
   
   attr_reader :template_root, :rails_root, :index_path, :template_type
   attr_reader :stylesheet_dir, :javascript_dir, :image_dir
@@ -34,6 +38,7 @@ class InstallTheme
     @inside_yields_originals = {}
     convert_file_to_layout(index_path, 'app/views/layouts/application.html.erb')
     convert_to_haml('app/views/layouts/application.html.erb') if haml?
+    prepare_sample_controller_and_view
     prepare_assets
     run_generator(options)
     show_readme
@@ -102,15 +107,51 @@ class InstallTheme
   def convert_to_haml(path)
     from_path = File.join(template_temp_path, path)
     haml_path = from_path.gsub(/erb$/, "haml")
-    `html2haml "#{from_path}" "#{haml_path}"`
-    FileUtils.rm_rf(from_path)
+    html2haml(from_path, haml_path)
+    # only remove .erb if haml conversion successful
+    if File.size?(haml_path)
+      FileUtils.rm_rf(from_path)
+    else
+      FileUtils.rm_rf(haml_path)
+    end
   end
 
   def convert_to_sass(from_path)
     sass_path = from_path.gsub(/css$/, "sass").gsub(%r{public/stylesheets/}, 'public/stylesheets/sass/')
     FileUtils.mkdir_p(File.dirname(sass_path))
-    `css2sass "#{from_path}" "#{sass_path}"`
-    FileUtils.rm_rf(from_path)
+    css2sass(from_path, sass_path)
+    # only remove .erb if haml conversion successful
+    if File.size?(sass_path)
+      FileUtils.rm_rf(from_path)
+    else
+      FileUtils.rm_rf(sass_path)
+    end
+  end
+  
+  # The extracted chunks of HTML are retained in
+  # app/views/original_template/index.html.erb (or haml)
+  # wrapped in content_for blocks.
+  #
+  # Users can review this file for ideas of what HTML
+  # works best in each section.
+  def prepare_sample_controller_and_view
+    FileUtils.chdir(template_temp_path) do
+      FileUtils.mkdir_p("app/controllers")
+      File.open("app/controllers/original_template_controller.rb", "w") { |f| f << <<-EOS.gsub(/^      /, '') }
+      class OriginalTemplateController < ApplicationController
+      end
+      EOS
+
+      FileUtils.mkdir_p("app/views/original_template")
+      File.open("app/views/original_template/index.html.erb", "w") do |f|
+        f << "<p>You are using named yields. Here are examples how to use them:</p>\n"
+        f << show_content_for(:head, '<script></script>')
+        inside_yields_originals.to_a.each do |key, original_contents|
+          f << show_content_for(key, original_contents)
+        end
+      end
+    end
+    convert_to_haml('app/views/original_template/index.html.erb') if haml?
   end
 
   def prepare_assets
@@ -141,6 +182,36 @@ class InstallTheme
       :source => template_temp_path, :destination => rails_root)
     RubiGen::Scripts::Generate.new.run(["install_theme"], generator_options)
   end
+  
+  # converts +from+ HTML into +to+ HAML
+  # +from+ can either be file name, HTML content (String) or an Hpricot::Node
+  # +to+ can either be a file name or an IO object with a #write method
+  def html2haml(from, to)
+    converter = Haml::Exec::HTML2Haml.new([])
+    from = File.read(from) if File.exist?(from)
+    to   = File.open(to, "w") unless to.respond_to?(:write)
+    converter.instance_variable_set("@options", { :input => from, :output => to })
+    converter.instance_variable_set("@module_opts", { :rhtml => true })
+    begin
+      converter.send(:process_result)
+    rescue Exception => e
+      stdout.puts "Failed to convert #{File.basename(from)} to haml"
+    end
+    to.close if to.respond_to?(:close)
+  end
+
+  def css2sass(from, to)
+    converter = Haml::Exec::CSS2Sass.new([])
+    from = File.read(from) if File.exist?(from)
+    to   = File.open(to, "w") unless to.respond_to?(:write)
+    converter.instance_variable_set("@options", { :input => from, :output => to })
+    converter.instance_variable_set("@module_opts", { :rhtml => true })
+    begin
+      converter.send(:process_result)
+    rescue Exception => e
+    end
+    to.close if to.respond_to?(:close)
+  end
 
   def in_template_root(&block)
     FileUtils.chdir(template_root, &block)
@@ -207,29 +278,14 @@ class InstallTheme
     Your theme has been installed into your app.
     
     README
-    stdout.puts "You are using named yields. Here are examples how to use them: "
-    stdout.puts show_content_for(:head, '<script></script>')
-    inside_yields_originals.to_a.each do |key, original_contents|
-      stdout.puts show_content_for(key, original_contents)
-    end
   end
   
   def show_content_for(key, contents)
-    if haml?
-      contents_file = File.join(tmp_dir, "partial.html")
-      File.open(contents_file, "w") { |f| f << contents }
-      haml_contents = `html2haml #{contents_file}`
-      <<-EOS.gsub(/^      /, '')
-      - content_for :#{key} do
-        #{haml_contents}
-      EOS
-    else
-      <<-EOS.gsub(/^      /, '')
-      <% content_for :#{key} do -%>
-        #{contents}
-      <% end -%>
-      EOS
-    end
+    <<-EOS.gsub(/^    /, '')
+    <% content_for :#{key} do -%>
+      #{contents}
+    <% end -%>
+    EOS
   end
   
   def tmp_dir

data/spec/install_theme_haml_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe InstallTheme do
   context "bloganje theme to haml" do
-    before do
+    before(:all) do
       setup_base_rails :haml => true
       @stdout = stdout do |stdout|
         @theme = InstallTheme.new(:template_root => File.dirname(__FILE__) + "/fixtures/bloganje", 
@@ -14,30 +14,34 @@ describe InstallTheme do
       end
       @expected_application = File.dirname(__FILE__) + "/expected/rails/bloganje"
     end
-    describe "becomes a Rails app with html templates" do
-      it { @theme.should be_haml }
-      it { File.should be_exist(File.join(@expected_application, "app/views/layouts/application.html.haml")) }
-      it { File.should be_exist(File.join(@target_application, "app/views/layouts/application.html.haml")) }
-      it { File.should_not be_exist(File.join(@target_application, "app/views/layouts/application.html.erb")) }
-      it "should create app/views/layouts/application.html.erb as a layout file" do
-        expected = clean_html(File.join(@expected_application, "app/views/layouts/application.html.haml"))
-        actual   = clean_html(File.join(@target_application, "app/views/layouts/application.html.haml"))
-        diff = `diff #{expected} #{actual}  2> /dev/null`
-        rputs diff unless diff.strip.empty?
-        diff.strip.should == ""
-      end
-      
-      it { File.should be_exist(File.join(@target_application, "public/stylesheets/sass/style.sass")) }
-      it { File.should be_exist(File.join(@expected_application, "public/stylesheets/sass/style.sass")) }
-      it do
-        expected = File.join(@expected_application, "public/stylesheets/sass/style.sass")
-        actual   = File.join(@target_application, "public/stylesheets/sass/style.sass")
-        diff = `diff #{expected} #{actual}  2> /dev/null`
-        rputs diff unless diff.strip.empty?
-        diff.strip.should == ""
+    it { @theme.should be_haml }
+    it { File.should be_exist(File.join(@expected_application, "app/views/layouts/application.html.haml")) }
+    it { File.should be_exist(File.join(@target_application, "app/views/layouts/application.html.haml")) }
+    it { File.should_not be_exist(File.join(@target_application, "app/views/layouts/application.html.erb")) }
+    it "should create app/views/layouts/application.html.erb as a layout file" do
+      expected = clean_html(File.join(@expected_application, "app/views/layouts/application.html.haml"))
+      actual   = clean_html(File.join(@target_application, "app/views/layouts/application.html.haml"))
+      diff = `diff #{expected} #{actual}  2> /dev/null`
+      rputs diff unless diff.strip.empty?
+      diff.strip.should == ""
+    end
+    
+    it { File.should be_exist(File.join(@target_application, "public/stylesheets/sass/style.sass")) }
+    it { File.should be_exist(File.join(@expected_application, "public/stylesheets/sass/style.sass")) }
+    it do
+      expected = File.join(@expected_application, "public/stylesheets/sass/style.sass")
+      actual   = File.join(@target_application, "public/stylesheets/sass/style.sass")
+      diff = `diff #{expected} #{actual}  2> /dev/null`
+      rputs diff unless diff.strip.empty?
+      diff.strip.should == ""
+    end
+    it { File.should be_exist(File.join(@target_application, "app/views/original_template/index.html.haml")) }
+    context "sample template /original_template/index.html.haml" do
+      subject do
+        File.read(File.join(@target_application, 'app/views/original_template/index.html.haml'))
       end
-      it { @stdout.should include("- content_for :head do\n  %script") }
-      it { @stdout.should include("- content_for :header do\n  My eCommerce Admin area") }
+      it { should include("- content_for :head do\n  %script") }
+      it { should include("- content_for :header do\n  My eCommerce Admin area") }
     end
   end
 end

data/spec/install_theme_spec.rb

@@ -2,138 +2,62 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe InstallTheme do
   context "bloganje theme to ERb" do
-    before do
+    before(:all) do
       setup_base_rails
-      stdout do |stdout|
+      @stdout = stdout do |stdout|
         @theme = InstallTheme.new(:template_root => File.dirname(__FILE__) + "/fixtures/bloganje", 
           :rails_root    => @target_application,
           :content_id    => "content",
           :inside_yields => { :header => '#header h2', :sidebar => '#sidebar' },
           :stdout        => stdout)
+        @theme.apply_to_target(:stdout => stdout, :generator => {:collision => :force, :quiet => true})
       end
       @expected_application = File.dirname(__FILE__) + "/expected/rails/bloganje"
     end
     it { @theme.stylesheet_dir.should == "css" }
     it { @theme.image_dir.should == "img" }
     it { @theme.should be_erb }
-    describe "becomes a Rails app with html templates" do
-      before do
-        @stdout = stdout do |stdout|
-          @theme.apply_to_target(:stdout => stdout, :generator => {:collision => :force, :quiet => true})
-        end
-      end
-      it { File.should be_exist(File.join(@target_application, "app/views/layouts/application.html.erb")) }
-      it { File.should be_exist(File.join(@expected_application, "app/views/layouts/application.html.erb")) }
-      it "should create app/views/layouts/application.html.erb as a layout file" do
-        expected = clean_html(File.join(@expected_application, "app/views/layouts/application.html.erb"))
-        actual   = File.join(@target_application, "app/views/layouts/application.html.erb")
-        diff = `diff #{expected} #{actual}  2> /dev/null`
-        rputs diff unless diff.strip.empty?
-        diff.strip.should == ""
-      end
-      
-      %w[public/stylesheets/style.css
-        public/stylesheets/theme.css].each do |matching_file|
-          it { File.should be_exist(File.join(@target_application, matching_file)) }
-          it { File.should be_exist(File.join(@expected_application, matching_file)) }
-          it do
-            expected = File.join(@expected_application, matching_file)
-            actual   = File.join(@target_application, matching_file)
-            diff = `diff #{expected} #{actual}  2> /dev/null`
-            rputs diff unless diff.strip.empty?
-            diff.strip.should == ""
-          end
-        end
-      it { @stdout.should include("<% content_for :head do -%>\n  <script></script>\n<% end -%>") }
-      it { @stdout.should include("<% content_for :header do -%>\n  My eCommerce Admin area\n<% end -%>") }
+    it { File.should be_exist(File.join(@target_application, "app/views/layouts/application.html.erb")) }
+    it { File.should be_exist(File.join(@expected_application, "app/views/layouts/application.html.erb")) }
+    it "should create app/views/layouts/application.html.erb as a layout file" do
+      expected = clean_html(File.join(@expected_application, "app/views/layouts/application.html.erb"))
+      actual   = File.join(@target_application, "app/views/layouts/application.html.erb")
+      diff = `diff #{expected} #{actual}  2> /dev/null`
+      rputs diff unless diff.strip.empty?
+      diff.strip.should == ""
     end
-  end
-
-  context "webresourcedepot theme to ERb" do
-    before do
-      setup_base_rails
-        @stdout = stdout do |stdout|
-          @theme = InstallTheme.new(
-            :template_root => File.dirname(__FILE__) + "/fixtures/webresourcedepot",
-            :rails_root    => @target_application,
-            :content_id    => "center-column", :stdout => stdout)
-          @theme.apply_to_target(:generator => {:collision => :force, :quiet => true})
+    
+    %w[public/stylesheets/style.css
+      public/stylesheets/theme.css].each do |matching_file|
+        it { File.should be_exist(File.join(@target_application, matching_file)) }
+        it do
+          expected = File.join(@expected_application, matching_file)
+          actual   = File.join(@target_application, matching_file)
+          diff = `diff #{expected} #{actual}  2> /dev/null`
+          rputs diff unless diff.strip.empty?
+          diff.strip.should == ""
         end
-      @expected_application = File.dirname(__FILE__) + "/expected/rails/webresourcedepot"
-    end
-    describe "becomes a Rails app" do
-      it "should create app/views/layouts/application.html.erb as a layout file" do
-        expected = clean_html(File.join(@expected_application, "app/views/layouts/application.html.erb"))
-        actual   = File.join(@target_application, "app/views/layouts/application.html.erb")
-        diff = `diff #{expected} #{actual}  2> /dev/null`
-        rputs diff unless diff.strip.empty?
-        diff.strip.should == ""
       end
-      
-      %w[public/stylesheets/all.css].each do |matching_file|
-          it { File.should be_exist(File.join(@target_application, matching_file)) }
-          it { File.should be_exist(File.join(@expected_application, matching_file)) }
-          it do
-            expected = File.join(@expected_application, matching_file)
-            actual   = File.join(@target_application, matching_file)
-            diff = `diff #{expected} #{actual}  2> /dev/null`
-            rputs diff unless diff.strip.empty?
-            diff.strip.should == ""
-          end
-        end
-    end
-  end
-
-  context "djclub theme to ERb" do
-    before do
-      setup_base_rails
-        @stdout = stdout do |stdout|
-          @theme = InstallTheme.new(
-            :template_root => File.dirname(__FILE__) + "/fixtures/djclub",
-            :rails_root    => @target_application,
-            :inside_yields => { :menu => '#header ul' },
-            :content_id    => "content", :stdout => stdout)
-          @theme.apply_to_target(:generator => {:collision => :force, :quiet => true})
-        end
-      @expected_application = File.dirname(__FILE__) + "/expected/rails/djclub"
-    end
-    it { @theme.stylesheet_dir.should == "" }
-    it { @theme.image_dir.should == "images" }
-    describe "becomes a Rails app" do
-      it { File.should be_exist(File.join(@target_application, "app/views/layouts/application.html.erb")) }
-      it "should create app/views/layouts/application.html.erb as a layout file" do
-        expected = clean_html(File.join(@expected_application, "app/views/layouts/application.html.erb"))
-        actual   = File.join(@target_application, "app/views/layouts/application.html.erb")
-        diff = `diff #{expected} #{actual}  2> /dev/null`
-        rputs diff unless diff.strip.empty?
-        diff.strip.should == ""
+    context "sample template /templates/index.html.erb" do
+      subject do
+        File.read(File.join(@target_application, 'app/views/original_template/index.html.erb'))
       end
-      
-      %w[public/stylesheets/style.css].each do |matching_file|
-          it { File.should be_exist(File.join(@target_application, matching_file)) }
-          it { File.should be_exist(File.join(@expected_application, matching_file)) }
-          it do
-            expected = clean_file File.join(@expected_application, matching_file)
-            actual   = clean_file File.join(@target_application, matching_file)
-            diff = `diff #{expected} #{actual}  2> /dev/null`
-            rputs diff unless diff.strip.empty?
-            diff.strip.should == ""
-          end
-        end
+      it { should include("<% content_for :head do -%>\n  <script></script>\n<% end -%>") }
+      it { should include("<% content_for :header do -%>\n  My eCommerce Admin area\n<% end -%>") }
     end
   end
 
   context "the-hobbit-website-template theme to ERb" do
-    before do
+    before(:all) do
       setup_base_rails
-        @stdout = stdout do |stdout|
-          @theme = InstallTheme.new(
-            :template_root => File.dirname(__FILE__) + "/fixtures/the-hobbit-website-template",
-            :rails_root    => @target_application,
-            :inside_yields => { :menu => '.navigation', :subtitle => '.header p' },
-            :content_id    => "content", :stdout => stdout)
-          @theme.apply_to_target(:generator => {:collision => :force, :quiet => true})
-        end
+      @stdout = stdout do |stdout|
+        @theme = InstallTheme.new(
+          :template_root => File.dirname(__FILE__) + "/fixtures/the-hobbit-website-template",
+          :rails_root    => @target_application,
+          :inside_yields => { :menu => '.navigation', :subtitle => '.header p' },
+          :content_id    => "content", :stdout => stdout)
+        @theme.apply_to_target(:generator => {:collision => :force, :quiet => true})
+      end
       @expected_application = File.dirname(__FILE__) + "/expected/rails/the-hobbit-website-template"
     end
     it { @theme.stylesheet_dir.should == "" }
@@ -150,7 +74,6 @@ describe InstallTheme do
       
       %w[public/stylesheets/default.css].each do |matching_file|
           it { File.should be_exist(File.join(@target_application, matching_file)) }
-          it { File.should be_exist(File.join(@expected_application, matching_file)) }
           it do
             expected = clean_file File.join(@expected_application, matching_file)
             actual   = clean_file File.join(@target_application, matching_file)