install_theme 0.8.1 → 0.8.2

data/install_theme.yml

@@ -0,0 +1,9 @@
+--- 
+image_dir: img
+index_path: index.html
+content_path: 
+no_sass: false
+stylesheet_dir: css
+javascript_dir: spec/expected/rails/base_app/public/javascripts
+partials: {}
+

data/lib/install_theme.rb

@@ -4,9 +4,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'rubigen'
 require 'rubigen/scripts/generate'
 require 'hpricot'
+require 'ostruct'
 
 class InstallTheme
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
   
   attr_reader :template_root, :rails_root, :index_path, :template_type
   attr_reader :layout_name, :action
@@ -15,22 +16,26 @@ class InstallTheme
   attr_reader :content_path, :partials
   attr_reader :stdout
   attr_reader :original_named_yields, :original_body_content
+  attr_reader :no_sass
   
   def initialize(options = {})
     @template_root  = File.expand_path(options[:template_root] || File.dirname('.'))
     @rails_root     = File.expand_path(options[:rails_root] || File.dirname('.'))
     @template_type  = (options[:template_type] || detect_template).to_s
-    @defaults_file  = options[:defaults_file] || "install_theme.yml"
-    @stylesheet_dir = options[:stylesheet_dir] || detect_stylesheet_dir
-    @javascript_dir = options[:javascript_dir] || detect_javascript_dir
-    @image_dir      = options[:image_dir] || detect_image_dir
-    @layout_name    = options[:layout] || "application"
+    @defaults_file  = options[:defaults_file]  || "install_theme.yml"
+    @layout_name    = options[:layout]         || "application"
     @layout_name.gsub!(/\..*/, '') # allow application.html.erb to be passed in, but clean it up to 'application'
     @action         = options[:action]
 
     @stdout         = options[:stdout] || $stdout
 
     load_template_defaults unless options[:ignore_defaults]
+
+    @stylesheet_dir = options[:stylesheet_dir] || @stylesheet_dir || detect_stylesheet_dir
+    @javascript_dir = options[:javascript_dir] || @javascript_dir || detect_javascript_dir
+    @image_dir      = options[:image_dir]      || @image_dir || detect_image_dir
+    @no_sass        = options[:no_sass]        || @no_sass || false
+
     @index_path     = options[:index_path] || @index_path || "index.html"
     @content_path   = options[:content_path] || @content_path
     @partials       ||= {}
@@ -91,9 +96,13 @@ class InstallTheme
     return unless File.exist?(File.join(template_root, defaults_file))
     require "yaml"
     defaults = YAML.load_file(File.join(template_root, defaults_file))
-    @content_path = defaults["content_path"]
-    @partials     = defaults["partials"]
-    @index_path   = defaults["index_path"]
+    @content_path   = defaults["content_path"]
+    @partials       = defaults["partials"]
+    @index_path     = defaults["index_path"]
+    @stylesheet_dir = defaults["stylesheet_dir"]
+    @image_dir      = defaults["image_dir"]
+    @javascript_dir = defaults["javascript_dir"]
+    @no_sass        = defaults["no_sass"]
   end
   
   def convert_file_to_layout(html_path, layout_path)
@@ -230,17 +239,31 @@ class InstallTheme
 
   def prepare_assets
     template_stylesheets.each do |file|
-      target_path = File.join(template_temp_path, 'public/stylesheets', File.basename(file))
+      if !stylesheet_dir.blank? && file =~ /#{stylesheet_dir}\/(.*)$/
+        rel_path = $1
+      else
+        rel_path = File.basename(file)
+      end
+      target_path = File.join(template_temp_path, 'public/stylesheets', rel_path)
+      FileUtils.mkdir_p(File.dirname(target_path))
       File.open(target_path, "w") do |f|
         f << clean_stylesheet(File.read(file))
       end
-      convert_to_sass(target_path) if haml?
+      convert_to_sass(target_path) if haml? && !no_sass
     end
     template_javascripts.each do |file|
-      FileUtils.cp_r(file, File.join(template_temp_path, 'public/javascripts'))
+      file =~ /#{javascript_dir}\/(.*)$/
+      rel_path = $1
+      target_file = File.join(template_temp_path, 'public/javascripts', rel_path)
+      FileUtils.mkdir_p(File.dirname(target_file))
+      FileUtils.cp_r(file, target_file)
     end
     template_images.each do |file|
-      FileUtils.cp_r(file, File.join(template_temp_path, 'public/images'))
+      file =~ /#{image_dir}\/(.*)$/
+      rel_path = $1
+      target_file = File.join(template_temp_path, 'public/images', rel_path)
+      FileUtils.mkdir_p(File.dirname(target_file))
+      FileUtils.cp_r(file, target_file)
     end
   end
   
@@ -304,7 +327,14 @@ class InstallTheme
   end
   
   def create_install_theme_yml
-    config = { "content_path" => content_path, "partials" => partials }
+    config = { 
+      "content_path" => content_path, "partials" => partials,
+      "index_path" => index_path,
+      "stylesheet_dir" => stylesheet_dir,
+      "image_dir" => image_dir,
+      "javascript_dir" => javascript_dir,
+      "no_sass" => no_sass
+    }
     install_theme_yml = File.join(template_root, 'install_theme.yml')
     File.open(install_theme_yml, 'w') {|f| f << config.to_yaml}
   end
@@ -361,9 +391,13 @@ class InstallTheme
   end
   
   def clean_stylesheet(contents)
-    contents.gsub(%r{url\((["']?)[\./]*(#{image_dir}|#{stylesheet_dir}|)\/?}) do |match|
-      target_path = (!stylesheet_dir.blank? && $2 == stylesheet_dir) ? "stylesheets" : "images"
-      "url(#{$1}/#{target_path}/"
+    relative_image_dir = image_dir.gsub(/#{stylesheet_dir}\//, '')
+    dirs = "#{image_dir}|#{stylesheet_dir}|#{relative_image_dir}|".gsub("/", '\/')
+    contents.gsub(%r{url\((["']?)[\./]*(#{dirs}|)\/?(.*?)(["']?)\)}) do |match|
+      quote, path, file_name = $1, $2, $3
+      target_path = "stylesheets" if file_name =~ /css$/
+      target_path ||= (!stylesheet_dir.blank? && path == stylesheet_dir) ? "stylesheets" : "images"
+      "url(#{quote}/#{target_path}/#{file_name}#{quote})"
     end
   end
   
@@ -390,9 +424,13 @@ class InstallTheme
   def require_haml
     require 'haml'
     require 'haml/html'
-    require 'sass'
-    require 'sass/css'
+    unless no_sass
+      require 'sass'
+      require 'sass/css'
+    end
     require 'haml/exec'
     require 'open3'
   end
-end
+end
+
+require "install_theme/parsers"

data/lib/install_theme/cli.rb

@@ -43,6 +43,8 @@ class InstallTheme
                 "Generate ERb templates. Default: Yes, unless it's not.") { |arg| options[:template_type] = 'erb' }
         opts.on("--haml",
                 "Generate HAML templates. Default: Auto-detect") { |arg| options[:template_type] = 'haml' }
+        opts.on("--no-sass",
+                "Don't generate sass files, just normal css. Default: false") { |arg| options[:no_sass] = true }
         opts.on("--index_path index.html", String,
                 "HTML page to use for application layout.",
                 "Default: index.html") { |arg| options[:index_path] = arg }

data/lib/install_theme/parsers.rb

@@ -0,0 +1,4 @@
+module InstallTheme::Parsers
+end
+
+require "install_theme/parsers/rails_form"

data/lib/install_theme/parsers/rails_form.rb

@@ -0,0 +1,74 @@
+class InstallTheme::Parsers::RailsForm
+  attr_reader :inputs
+  attr_reader :model
+  
+  # Parses an HTML page and returns an Array of RailsForm objects
+  # Each maps to a <form> tag, and #valid? returns true if a form
+  # maps to a Ruby on Rails form.
+  def self.parse(html)
+    doc = Hpricot(html)
+    doc.search('form').map { |form| self.new(form) }
+  end
+  
+  def initialize(form_node)
+    @form_node = form_node
+    parse_form_info
+    @inputs = @form_node.search('input[@type="text"],textarea').map { |input| parse_input(input) }
+  end
+  
+  def valid?
+    model
+  end
+  
+  def render
+    if valid?
+      "TODO"
+    else
+      @form_node.to_html
+    end
+  end
+  
+  protected
+  def parse_form_info
+    if @form_node.attributes['id'] =~ /new_(.*)$/
+      @model = $1
+      @request_action = 'new'
+    elsif @form_node.attributes['id'] =~ /edit_(.*?)_(\d+?)$/
+      @model = $1
+      @request_action = 'edit'
+      @model_id = $2
+    end
+  end
+  
+  def parse_input(input_node)
+    input = OpenStruct.new(:field => nil, :helper => 'text_field', :value => nil, :render => "", :node => input_node)
+    if input_node.attributes['name'] && input_node.attributes['name'] =~ /\[(.*?)\]$/
+      input.field = $1
+    end
+    input.helper = 'text_area' if input_node.name == 'textarea'
+    input.value = input_node.attributes['value']
+    input.render = render_input(input)
+    input
+  end
+  
+  def render_input(input)
+    if input.field
+      options_list = []
+      attributes = input.node.attributes.clone
+      attributes.delete('id')
+      attributes.delete('name')
+      attributes.delete('type')
+      for attribute in attributes.keys.sort
+        options_list << ":#{attribute} => '#{input.node.attributes[attribute]}'"
+      end
+      options = options_list.empty? ? "" : ", " + options_list.join(', ')
+      "<%= f.#{input.helper} :#{input.field}#{options} %>"
+    else
+      input.node.to_html # render normal HTML if form isn't rails form
+    end
+  end
+  
+  def render_header
+    "<% form_for @#{model} do |f| %>"
+  end
+end

data/spec/convert_css_spec.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe InstallTheme do
+  def clean_stylesheet(contents, options = {})
+    theme = InstallTheme.new({:image_dir => "img", :stylesheet_dir => "css"}.merge(options))
+    theme.send(:clean_stylesheet, contents)
+  end
+
+  describe "fixing image urls" do
+    it "should convert url('image.png') to url('/images/image.png')" do
+      original = "background-image: url('image.png');"
+      expected = "background-image: url('/images/image.png');"
+      clean_stylesheet(original).should == expected
+    end
+    
+    it "should convert url('image.png') to url('/images/image.png') if image and css dirs are both root" do
+      original = "background-image: url('image.png');"
+      expected = "background-image: url('/images/image.png');"
+      clean_stylesheet(original, :image_dir => "", :stylesheet_dir => "").should == expected
+    end
+    
+    it "should convert url(image.png) to url(/images/image.png)" do
+      original = "background-image: url(image.png);"
+      expected = "background-image: url(/images/image.png);"
+      clean_stylesheet(original).should == expected
+    end
+    
+    it 'should convert url("img/image.png") to url("/images/image.png")' do
+      original = 'background-image: url("img/image.png");'
+      expected = 'background-image: url("/images/image.png");'
+      clean_stylesheet(original).should == expected
+    end
+
+    it "should convert url(/img/image.png) to url(/images/image.png)" do
+      original = "background-image: url(/img/image.png);"
+      expected = "background-image: url(/images/image.png);"
+      clean_stylesheet(original).should == expected
+    end
+
+    it "should convert url(../img/image.png) to url(/images/image.png)" do
+      original = "background-image: url(../img/image.png);"
+      expected = "background-image: url(/images/image.png);"
+      clean_stylesheet(original).should == expected
+    end
+
+    it "should convert url(css/iepngfix.htc) to url(/stylesheets/iepngfix.htc)" do
+      original = "behavior: url(css/iepngfix.htc)"
+      expected = "behavior: url(/stylesheets/iepngfix.htc)"
+      clean_stylesheet(original).should == expected
+    end
+
+    it "should convert url(reset.css) to url(/stylesheets/reset.css)" do
+      original = "behavior: url(reset.css)"
+      expected = "behavior: url(/stylesheets/reset.css)"
+      clean_stylesheet(original).should == expected
+    end
+  end
+end

data/spec/expected/rails/bloganje/app/views/layouts/special.html.erb

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

data/spec/expected/rails/bloganje/app/views/posts/show.html.erb

@@ -0,0 +1,184 @@
+
+       			<div id="rightnow">
+                    <h3 class="reallynow">
+                        <span>Right Now</span>
+                        <a href="#" class="add">Add New Product</a>
+                        <a href="#" class="app_add">Some Action</a>
+                        <br />
+                    </h3>
+				    <p class="youhave">You have <a href="#">19 new orders</a>, <a href="#">12 new users</a> and <a href="#">5 new reviews</a>, today you made <a href="#">$1523.63 in sales</a> and a total of <strong>$328.24 profit </strong>
+                    </p>
+			  </div>
+              <div id="infowrap">
+              <div id="infobox">
+                    <h3>Sales for July</h3>
+                    <p><img src="/images/graph.jpg" height="266" width="360" /></p>            
+                  </div>
+                  <div class="margin-left" id="infobox">
+                    <h3>Traffic for July</h3> 
+                    <p><img src="/images/graph2.jpg" height="266" alt="a" width="359" /></p>
+                  </div>
+                  <div id="infobox">
+                    <h3>Last 5 Orders</h3>
+                    <table>
+						<thead>
+							<tr>
+                            	<th>Customer</th>
+                                <th>Items</th>
+                                <th>Grand Total</th>
+                            </tr>
+						</thead>
+						<tbody>
+							<tr>
+                            	<td><a href="#">Jennifer Kyrnin</a></td>
+                                <td>1</td>
+                                <td>14.95 €</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Mark Kyrnin</a></td>
+                            	<td>2</td>
+                                <td>34.27 €</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Virgílio Cezar</a></td>
+                                <td>2</td>
+                                <td>61.39 €</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Todd Simonides</a></td>
+                                <td>5</td>
+                                <td>1472.56 €</td>
+                            </tr>
+                            <tr>
+                            	<td><a href="#">Carol Elihu</a></td>
+                                <td>1</td>
+                                <td>9.95 €</td>
+                            </tr>
+						</tbody>
+					</table>            
+                  </div>
+                  <div class="margin-left" id="infobox">
+                    <h3>Bestsellers</h3> 
+                    <table>
+						<thead>
+							<tr>
+                            	<th>Product Name</th>
+                                <th>Price</th>
+                                <th>Orders</th>
+                            </tr>
+						</thead>
+						<tbody>
+							<tr>
+                            	<td><a href="#">Apple iPhone 3G 8GB</a></td>
+                                <td>199.00 €</td>
+                                <td>24</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Fuji FinePix S5800</a></td>
+                            	<td>365.24 €</td>
+                                <td>19</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Canon PIXMA MP140</a></td>
+                                <td>59.50 €</td>
+                                <td>12</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Apple iPhone 3G 16GB</a></td>
+                                <td>199.00 €</td>
+                                <td>10</td>
+                            </tr>
+                            <tr>
+                            	<td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
+                                <td>499.00 €</td>
+                                <td>6</td>
+                            </tr>
+						</tbody>
+					</table>
+                  </div>
+                  <div id="infobox">
+                    <h3>New Customers</h3>
+                    <table>
+						<thead>
+							<tr>
+                            	<th>Customer</th>
+                                <th>Orders</th>
+                                <th>Average</th>
+                                <th>Total</th>
+                            </tr>
+						</thead>
+						<tbody>
+							<tr>
+                            	<td><a href="#">Jennifer Kyrnin</a></td>
+                                <td>1</td>
+                                <td>5.6€</td>
+                                <td>14.95 €</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Mark Kyrnin</a></td>
+                            	<td>2</td>
+                                <td>14.97€</td>
+                                <td>34.27 €</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Virgílio Cezar</a></td>
+                                <td>2</td>
+                                <td>15.31€</td>
+                                <td>61.39 €</td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Todd Simonides</a></td>
+                                <td>5</td>
+                                <td>502.61€</td>
+                                <td>1472.56 €</td>
+                            </tr>
+                            <tr>
+                            	<td><a href="#">Carol Elihu</a></td>
+                                <td>1</td>
+                                <td>5.1€</td>
+                                <td>9.95 €</td>
+                            </tr>
+						</tbody>
+					</table>                 
+                  </div>
+                  <div class="margin-left" id="infobox">
+                    <h3>Last 5 Reviews</h3> 
+                    <table>
+						<thead>
+							<tr>
+                            	<th>Reviewer</th>
+                                <th>Product</th>
+                                <th>Action</th>
+                            </tr>
+						</thead>
+						<tbody>
+							<tr>
+                            	<td><a href="#">Jennifer Kyrnin</a></td>
+                                <td><a href="#">Apple iPhone 3G 8GB</a></td>
+                                <td><a href="#"><img src="/images/page_white_link.png" /></a><a href="#"><img src="/images/page_white_edit.png" /></a><a href="#"><img src="/images/page_white_delete.png" /></a></td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Mark Kyrnin</a></td>
+                            	<td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
+                                <td><a href="#"><img src="/images/page_white_link.png" /></a><a href="#"><img src="/images/page_white_edit.png" /></a><a href="#"><img src="/images/page_white_delete.png" /></a></td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Virgílio Cezar</a></td>
+                                <td><a href="#">Fuji FinePix S5800</a></td>
+                                <td><a href="#"><img src="/images/page_white_link.png" /></a><a href="#"><img src="/images/page_white_edit.png" /></a><a href="#"><img src="/images/page_white_delete.png" /></a></td>
+                            </tr>
+							<tr>
+                            	<td><a href="#">Todd Simonides</a></td>
+                                <td><a href="#">Canon PIXMA MP140</a></td>
+                                <td><a href="#"><img src="/images/page_white_link.png" /></a><a href="#"><img src="/images/page_white_edit.png" /></a><a href="#"><img src="/images/page_white_delete.png" /></a></td>
+                            </tr>
+                            <tr>
+                            	<td><a href="#">Carol Elihu</a></td>
+                                <td><a href="#">Prenosnik HP 530 1,6GHz</a></td>
+                                <td><a href="#"><img src="/images/page_white_link.png" /></a><a href="#"><img src="/images/page_white_edit.png" /></a><a href="#"><img src="/images/page_white_delete.png" /></a></td>
+                            </tr>
+						</tbody>
+					</table>
+                  </div>
+              </div>
+