install_theme 0.4.1 → 0.5.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.5.0 / 2009-09-27
+
+* haml support
+
 === 0.4.1 / 2009-09-27
 
 Major:

data/Manifest.txt

@@ -58,6 +58,7 @@ spec/expected/rails/bloganje/Rakefile
 spec/expected/rails/bloganje/app/controllers/application_controller.rb
 spec/expected/rails/bloganje/app/helpers/application_helper.rb
 spec/expected/rails/bloganje/app/views/layouts/application.html.erb
+spec/expected/rails/bloganje/app/views/layouts/application.html.haml
 spec/expected/rails/bloganje/config/boot.rb
 spec/expected/rails/bloganje/config/database.yml
 spec/expected/rails/bloganje/config/environment.rb
@@ -145,6 +146,7 @@ spec/expected/rails/bloganje/public/robots.txt
 spec/expected/rails/bloganje/public/stylesheets/Copy of theme.css
 spec/expected/rails/bloganje/public/stylesheets/ie-sucks.css
 spec/expected/rails/bloganje/public/stylesheets/iepngfix.htc
+spec/expected/rails/bloganje/public/stylesheets/sass/style.sass
 spec/expected/rails/bloganje/public/stylesheets/style.css
 spec/expected/rails/bloganje/public/stylesheets/switch.css
 spec/expected/rails/bloganje/public/stylesheets/theme.css
@@ -154,6 +156,119 @@ 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
+spec/expected/rails/the-hobbit-website-template/app/helpers/application_helper.rb
+spec/expected/rails/the-hobbit-website-template/app/views/layouts/application.html.erb
+spec/expected/rails/the-hobbit-website-template/config/boot.rb
+spec/expected/rails/the-hobbit-website-template/config/database.yml
+spec/expected/rails/the-hobbit-website-template/config/environment.rb
+spec/expected/rails/the-hobbit-website-template/config/environments/development.rb
+spec/expected/rails/the-hobbit-website-template/config/environments/production.rb
+spec/expected/rails/the-hobbit-website-template/config/environments/test.rb
+spec/expected/rails/the-hobbit-website-template/config/initializers/backtrace_silencers.rb
+spec/expected/rails/the-hobbit-website-template/config/initializers/inflections.rb
+spec/expected/rails/the-hobbit-website-template/config/initializers/mime_types.rb
+spec/expected/rails/the-hobbit-website-template/config/initializers/new_rails_defaults.rb
+spec/expected/rails/the-hobbit-website-template/config/initializers/session_store.rb
+spec/expected/rails/the-hobbit-website-template/config/locales/en.yml
+spec/expected/rails/the-hobbit-website-template/config/routes.rb
+spec/expected/rails/the-hobbit-website-template/db/seeds.rb
+spec/expected/rails/the-hobbit-website-template/doc/README_FOR_APP
+spec/expected/rails/the-hobbit-website-template/public/404.html
+spec/expected/rails/the-hobbit-website-template/public/422.html
+spec/expected/rails/the-hobbit-website-template/public/500.html
+spec/expected/rails/the-hobbit-website-template/public/favicon.ico
+spec/expected/rails/the-hobbit-website-template/public/images/bg.jpg
+spec/expected/rails/the-hobbit-website-template/public/images/bgcontainer.jpg
+spec/expected/rails/the-hobbit-website-template/public/images/bgcontent.gif
+spec/expected/rails/the-hobbit-website-template/public/images/bgfooter.gif
+spec/expected/rails/the-hobbit-website-template/public/images/divider.gif
+spec/expected/rails/the-hobbit-website-template/public/images/gfx.jpg
+spec/expected/rails/the-hobbit-website-template/public/images/header.jpg
+spec/expected/rails/the-hobbit-website-template/public/images/map.jpg
+spec/expected/rails/the-hobbit-website-template/public/images/pattern.gif
+spec/expected/rails/the-hobbit-website-template/public/images/quote.gif
+spec/expected/rails/the-hobbit-website-template/public/images/rails.png
+spec/expected/rails/the-hobbit-website-template/public/images/stripes.gif
+spec/expected/rails/the-hobbit-website-template/public/index.html
+spec/expected/rails/the-hobbit-website-template/public/javascripts/application.js
+spec/expected/rails/the-hobbit-website-template/public/javascripts/controls.js
+spec/expected/rails/the-hobbit-website-template/public/javascripts/dragdrop.js
+spec/expected/rails/the-hobbit-website-template/public/javascripts/effects.js
+spec/expected/rails/the-hobbit-website-template/public/javascripts/prototype.js
+spec/expected/rails/the-hobbit-website-template/public/robots.txt
+spec/expected/rails/the-hobbit-website-template/public/stylesheets/default.css
+spec/expected/rails/the-hobbit-website-template/script/about
+spec/expected/rails/the-hobbit-website-template/script/console
+spec/expected/rails/the-hobbit-website-template/script/dbconsole
+spec/expected/rails/the-hobbit-website-template/script/destroy
+spec/expected/rails/the-hobbit-website-template/script/generate
+spec/expected/rails/the-hobbit-website-template/script/performance/benchmarker
+spec/expected/rails/the-hobbit-website-template/script/performance/profiler
+spec/expected/rails/the-hobbit-website-template/script/plugin
+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
@@ -286,6 +401,35 @@ 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
+spec/fixtures/the-hobbit-website-template/img/bgcontent.gif
+spec/fixtures/the-hobbit-website-template/img/bgfooter.gif
+spec/fixtures/the-hobbit-website-template/img/divider.gif
+spec/fixtures/the-hobbit-website-template/img/gfx.jpg
+spec/fixtures/the-hobbit-website-template/img/header.jpg
+spec/fixtures/the-hobbit-website-template/img/map.jpg
+spec/fixtures/the-hobbit-website-template/img/pattern.gif
+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
@@ -315,6 +459,7 @@ 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

data/lib/install_theme.rb

@@ -6,7 +6,7 @@ require 'rubigen'
 require 'rubigen/scripts/generate'
 
 class InstallTheme
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
   
   attr_reader :template_root, :rails_root, :index_path, :template_type
   attr_reader :stylesheet_dir, :javascript_dir, :image_dir
@@ -33,6 +33,7 @@ class InstallTheme
     @stdout = options[:stdout] || @stdout || $stdout
     @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_assets
     run_generator(options)
     show_readme
@@ -42,7 +43,6 @@ class InstallTheme
   # and is accessed via source_root within the generator.
   def template_temp_path
     @template_temp_path ||= begin
-      tmp_dir = ENV['TMPDIR'] || '/tmp'
       template_path = File.join(tmp_dir, "install_theme", "templates")
     end
   end
@@ -98,14 +98,30 @@ class InstallTheme
       f << contents
     end
   end
+  
+  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)
+  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)
+  end
 
   def prepare_assets
     template_stylesheets.each do |file|
-      File.open(File.join(template_temp_path, 'public/stylesheets', File.basename(file)), "w") do |f|
+      target_path = File.join(template_temp_path, 'public/stylesheets', File.basename(file))
+      File.open(target_path, "w") do |f|
         contents = File.read(file)
         contents.gsub!(%r{url\((["']?)[./]*#{image_dir}}, 'url(\1/images')
         f << contents
       end
+      convert_to_sass(target_path) if haml?
     end
     template_javascripts.each do |file|
       FileUtils.cp_r(file, File.join(template_temp_path, 'public/javascripts'))
@@ -174,15 +190,15 @@ class InstallTheme
   end
   
   def template_stylesheets
-    Dir[File.join(template_root, stylesheet_dir, '*.css')]
+    Dir[File.join(template_root, stylesheet_dir, '**/*.css')]
   end
   
   def template_javascripts
-    Dir[File.join(template_root, javascript_dir, '*.js')]
+    Dir[File.join(template_root, javascript_dir, '**/*.js')]
   end
 
   def template_images
-    Dir[File.join(template_root, image_dir, '*.{jpg,png,gif}')]
+    Dir[File.join(template_root, image_dir, '**/*.{jpg,png,gif}')]
   end
   
   def show_readme
@@ -192,17 +208,31 @@ class InstallTheme
     
     README
     stdout.puts "You are using named yields. Here are examples how to use them: "
-    stdout.puts <<-EOS.gsub(/^    /, '')
-    <% content_for :head do -%>
-      <script>...</script>
-    <% end -%>
-    EOS
+    stdout.puts show_content_for(:head, '<script></script>')
     inside_yields_originals.to_a.each do |key, original_contents|
-      stdout.puts <<-EOS.gsub(/^      /, '')
+      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 -%>
-        #{original_contents}
+        #{contents}
       <% end -%>
       EOS
     end
   end
+  
+  def tmp_dir
+    ENV['TMPDIR'] || '/tmp'
+  end
 end

data/spec/expected/rails/bloganje/app/views/layouts/application.html.haml

@@ -0,0 +1,90 @@
+!!!
+%html{ :xmlns => "http://www.w3.org/1999/xhtml" }
+  %head
+    %meta{ :content => "text/html; charset=utf-8" }
+    %title
+      Dashboard - Admin Template
+    %link{ :href => "/stylesheets/theme.css", :rel => "stylesheet", :type => "text/css" }
+    %link{ :href => "/stylesheets/style.css", :rel => "stylesheet", :type => "text/css" }
+    %script
+      var StyleFile = "theme" + document.cookie.charAt(6) + ".css";
+      document.writeln('<link rel="stylesheet" type="text/css" href="/stylesheets/' + StyleFile + '">');
+    /
+      [if IE]>
+      <link rel="stylesheet" type="text/css" href="/stylesheets/ie-sucks.css" />
+      <![endif]
+    = yield(:head)
+  %body
+    #container
+      #header
+        %h2
+          = yield(:header)
+        #topmenu
+          %ul
+            %li.current
+              %a{ :href => "index.html" }
+                Dashboard
+            %li
+              %a{ :href => "#" }
+                Orders
+            %li
+              %a{ :href => "users.html" }
+                Users
+            %li
+              %a{ :href => "#" }
+                Manage
+            %li
+              %a{ :href => "#" }
+                CMS
+            %li
+              %a{ :href => "#" }
+                Statistics
+            %li
+              %a{ :href => "#" }
+                Settings
+      #top-panel
+        #panel
+          %ul
+            %li
+              %a.report{ :href => "#" }
+                Sales Report
+            %li
+              %a.report_seo{ :href => "#" }
+                SEO Report
+            %li
+              %a.search{ :href => "#" }
+                Search
+            %li
+              %a.feed{ :href => "#" }
+                RSS Feed
+      #wrapper
+        #content
+          = yield
+        #sidebar
+          = yield(:sidebar)
+      #footer
+        #credits
+          Template by
+          %a{ :href => "http://www.bloganje.com" }
+            Bloganje
+        #styleswitcher
+          %ul
+            %li
+              %a#defswitch{ :href => "javascript: document.cookie='theme='; window.location.reload();", :title => "Default" }
+                d
+            %li
+              %a#blueswitch{ :href => "javascript: document.cookie='theme=1'; window.location.reload();", :title => "Blue" }
+                b
+            %li
+              %a#greenswitch{ :href => "javascript: document.cookie='theme=2'; window.location.reload();", :title => "Green" }
+                g
+            %li
+              %a#brownswitch{ :href => "javascript: document.cookie='theme=3'; window.location.reload();", :title => "Brown" }
+                b
+            %li
+              %a#mixswitch{ :href => "javascript: document.cookie='theme=4'; window.location.reload();", :title => "Mix" }
+                m
+            %li
+              %a#defswitch{ :href => "javascript: document.cookie='theme=5'; window.location.reload();", :title => "Mix" }
+                m
+        %br

data/spec/expected/rails/bloganje/public/stylesheets/ie-sucks.css

@@ -1,21 +1,140 @@
-#content{
-	width:740px;
-}
-#topmenu{
-	margin-top:26px;
-}
-#sidebar{
-	width:160px;
-}
-#sidebar ul{
-	width:150px;
-}
-#sidebar ul li ul{
-	width:140px;
-}
-#sidebar h3{
-	margin-bottom:5px;
-}
-#rightnow .reallynow a {
-	padding:0 0 0 10px;
-}
+body
+  background: #f7f6f0 url(/images/bg.jpg) repeat-x top
+  color: #202020
+
+
+a
+  color: #993300
+
+  &:visited
+    color: #993300
+
+
+input, select
+  border: 1px solid #e8e7e1
+
+
+#header h2
+  color: #FFF
+
+
+#content
+  background: #FFF
+
+
+#sidebar
+  background: #FFF
+
+  h3
+    background: #f7f6f0
+    border-bottom: 1px solid #e8e7e1
+
+
+#topmenu
+  a
+    color: #f7f6f0
+    background: #cc3300
+
+    &:visited
+      color: #f7f6f0
+      background: #cc3300
+
+    &:hover
+      color: #FFF
+
+  .current a
+    color: #993400
+    background: #FFF url(/images/bg_menu_red.jpg) repeat-x top
+    border-left: #FFF 1px solid
+    border-right: #FFF 1px solid
+
+    &:hover, &:visited
+      color: #993400
+      background: #FFF url(/images/bg_menu_red.jpg) repeat-x top
+      border-left: #FFF 1px solid
+      border-right: #FFF 1px solid
+
+
+#top-panel
+  background: #FFF
+
+
+table
+  background: none
+
+
+td, th
+  border: 1px solid #e8e7e1
+
+
+thead
+  background: #f7f6f0
+
+
+#styleswitcher
+  background: #FFFFFF
+
+
+#footer
+  background: #FFF
+
+
+#box
+  border: 1px solid #e8e7e1
+
+  h3
+    background: #f7f6f0
+    border-bottom: 1px solid #e8e7e1
+    color: #993300
+
+
+form#form
+  fieldset
+    border: 1px solid #e8e7e1
+
+  legend
+    border: 1px solid #e8e7e1
+    background: #fff url(/images/form_red.gif) repeat-x center left
+    color: #993300
+
+  input
+    border: 1px solid #e8e7e1
+    background: #fff url(/images/form_red.gif) repeat-x top left
+
+  textarea
+    border: 1px solid #e8e7e1
+    background: #fff url(/images/form_red.gif) repeat-x bottom left
+
+  option
+    background: #FFF
+
+  optgroup
+    background: #e8e7e1
+
+    option
+  #button1, #button2
+    color: #c00
+
+  #button1:hover, #button2:hover
+    color: #000
+
+
+#infobox
+  border: 1px solid #e8e7e1
+
+  h3
+    background: #f7f6f0
+    border-bottom: 1px solid #e8e7e1
+    color: #993300
+
+
+#rightnow
+  border: 1px solid #e8e7e1
+
+  .reallynow
+    background: #f7f6f0
+    color: #993300
+
+  h3
+    background: #f7f6f0
+    border-bottom: 1px solid #e8e7e1