install_theme 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.4.1 / 2009-09-27
+
+Major:
+* Allow a class name instead of a DOM element id for the content path
+* Templates can have assets in the root of the template folder
+
+Minor:
+* cleaning actual/expected files so EOL characters aren't the cause of diff mismatches
+
 === 0.4.0 / 2009-09-27
 
 * rename gem to install_theme from convert_theme

data/lib/install_theme.rb

@@ -6,7 +6,7 @@ require 'rubigen'
 require 'rubigen/scripts/generate'
 
 class InstallTheme
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
   
   attr_reader :template_root, :rails_root, :index_path, :template_type
   attr_reader :stylesheet_dir, :javascript_dir, :image_dir
@@ -66,10 +66,10 @@ class InstallTheme
   protected
   
   def convert_file_to_layout(html_path, layout_path)
-    File.open(File.join(template_temp_path, layout_path), "w") do |file|
+    File.open(File.join(template_temp_path, layout_path), "w") do |f|
       index_file = File.read(File.join(template_root, html_path)).gsub(/\r/, '')
       doc = Hpricot(index_file)
-      doc.search("##{content_id}").each { |elm| elm.inner_html = "<%= yield %>" }
+      doc.search("##{content_id},.#{content_id}").each { |elm| elm.inner_html = "<%= yield %>" }
       inside_yields.to_a.each do |name, css_path|
         doc.search(css_path).each do |elm|
           inside_yields_originals[name] = elm.inner_html.strip
@@ -77,11 +77,25 @@ class InstallTheme
         end
       end
       contents = doc.to_html
-      contents.gsub!(%r{(["'])/?#{image_dir}}, '\1/images')
-      contents.gsub!(%r{(["'])/?#{stylesheet_dir}}, '\1/stylesheets')
-      contents.gsub!(%r{(["'])/?#{javascript_dir}}, '\1/javascripts')
+      template_images.each do |file|
+        image = File.basename(file)
+        contents.gsub!(%r{(["'])/?[\w_\-\/]*#{image}}, '\1/images/' + image)
+      end
+      template_stylesheets.each do |file|
+        stylesheet = File.basename(file)
+        contents.gsub!(%r{(["'])/?[\w_\-\/]*#{stylesheet}}, '\1/stylesheets/' + stylesheet)
+      end
+      template_javascripts.each do |file|
+        javascript = File.basename(file)
+        contents.gsub!(%r{(["'])/?[\w_\-\/]*#{javascript}}, '\1/javascripts/' + javascript)
+      end
+
+      contents.gsub!(%r{(["'])/?#{image_dir}}, '\1/images') unless image_dir.blank?
+      contents.gsub!(%r{(["'])/?#{stylesheet_dir}}, '\1/stylesheets') unless stylesheet_dir.blank?
+      contents.gsub!(%r{(["'])/?#{javascript_dir}}, '\1/javascripts') unless javascript_dir.blank?
+
       contents.sub!(%r{\s*</head>}, "\n  <%= yield(:head) %>\n</head>")
-      file << contents
+      f << contents
     end
   end
 
@@ -139,7 +153,7 @@ class InstallTheme
     if path = Dir[File.join(template_root, '**/*.css')].first
       File.dirname(path).gsub(template_root, '').gsub(%r{^/}, '')
     else
-      'stylescheets'
+      'stylesheets'
     end
   end
   
@@ -160,15 +174,15 @@ class InstallTheme
   end
   
   def template_stylesheets
-    Dir[File.join(template_root, stylesheet_dir, '*')]
+    Dir[File.join(template_root, stylesheet_dir, '*.css')]
   end
   
   def template_javascripts
-    Dir[File.join(template_root, javascript_dir, '*')]
+    Dir[File.join(template_root, javascript_dir, '*.js')]
   end
 
   def template_images
-    Dir[File.join(template_root, image_dir, '*')]
+    Dir[File.join(template_root, image_dir, '*.{jpg,png,gif}')]
   end
   
   def show_readme

data/spec/install_theme_spec.rb

@@ -25,7 +25,7 @@ describe InstallTheme do
       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_file(File.join(@expected_application, "app/views/layouts/application.html.erb"))
+        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?
@@ -63,7 +63,7 @@ describe InstallTheme do
     end
     describe "becomes a Rails app" do
       it "should create app/views/layouts/application.html.erb as a layout file" do
-        expected = clean_file(File.join(@expected_application, "app/views/layouts/application.html.erb"))
+        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?
@@ -83,5 +83,83 @@ describe InstallTheme do
         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 == ""
+      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
+    end
+  end
+
+  context "the-hobbit-website-template theme to ERb" do
+    before 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
+      @expected_application = File.dirname(__FILE__) + "/expected/rails/the-hobbit-website-template"
+    end
+    it { @theme.stylesheet_dir.should == "" }
+    it { @theme.image_dir.should == "img" }
+    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 == ""
+      end
+      
+      %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)
+            diff = `diff #{expected} #{actual}  2> /dev/null`
+            rputs diff unless diff.strip.empty?
+            diff.strip.should == ""
+          end
+        end
+    end
+  end
 end
 

data/spec/spec_helper.rb

@@ -18,15 +18,24 @@ module Kernel
   end
 end
 
-def clean_file(orig_file)
+def clean_html(orig_file)
   tmp_dir = ENV['TMPDIR'] || '/tmp'
-  file = File.join(tmp_dir, 'clean_file.html')
+  file = File.join(tmp_dir, 'clean_html.html')
   File.open(file, "w") do |f|
     f << Hpricot(open(orig_file)).to_html
   end
   file
 end
 
+def clean_file(orig_file)
+  tmp_dir = ENV['TMPDIR'] || '/tmp'
+  file = File.join(tmp_dir, 'clean_html.html')
+  File.open(file, "w") do |f|
+    f << File.open(orig_file).readlines.join("\n")
+  end
+  file
+end
+
 def setup_base_rails(options = {})
   tmp_path = File.dirname(__FILE__) + "/tmp"
   FileUtils.rm_rf(tmp_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: install_theme
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Dr Nic Williams