install_theme 0.7.2 → 0.8.0

data/History.txt

@@ -1,3 +1,16 @@
+=== 0.8.0 / 2009-10-12
+
+Major:
+* Paths (xpath/css path) can specify to replace the internals of a DOM (as it did before) or the entire DOM node itself. Previously --partial "header:#header h2" would have replace the inner HTML of the DOM, but now it replaces the DOM node itself. To replace the inner HTML, use --partial "header:#header h2:text" (css path) or --partial "header://div[@id='header']/h2/text()"
+* CLI option --action/-a added - the extracted content_path contents can be stored in a Rails action template file
+
+Minor:
+* convert layouts to haml regardless of their name
+* Updated CLI Usage help
+
+Internal:
+* Minimized spec suite by extracting a common file diff test into macro method
+
 === 0.7.2 / 2009-10-10
 
 * CLI shows a useful error message when --partial argument is incorrectly formatted

data/README.rdoc

@@ -24,12 +24,29 @@ Simple case:
 Replace some DOM content with <%= yield :some_label %> with --partial:
 
     install_theme path/to/rails_app path/to/template #content_box \
-      --partial "header:#header h2" \
+      --partial "header:#header h2 text()" \
       --partial sidebar:#sidebar"
 
 NOTE: The order of the first two arguments has been reversed since the original
 public release. This is in preparation for path/to/template to be optional.
 
+NOTE: The default behaviour of the css/xpath selectors has/is changing. Originally it
+replaced the internal content of the selected DOM node. Now, the default is to 
+replace the entire DOM node. To replace the internal content of the DOM node use
+`/text()` (for xpath) or `:text` (for CSS paths) at the end of the selector. 
+
+For example, for CSS paths:
+
+    --partial ".header h2:text" # replaces contents of the h2 element
+    --partial ".header h2"        # replaces the h2 element itself
+
+For Xpaths:
+
+    --partial "//div[@id='header']/h2/text()" # replaces contents of the h2 element
+    --partial "//div[@id='header']/h2"        # replaces the h2 element itself
+
+The same goes for the content_path argument of the executable.
+
 Similarly, in 0.7.0 the content_path argument is optional after the first time
 you install a specific theme (see 'Theme Reuse' section).
 

data/lib/install_theme.rb

@@ -3,17 +3,13 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'rubigen'
 require 'rubigen/scripts/generate'
-require 'haml'
-require 'haml/html'
-require 'sass'
-require 'sass/css'
-require 'haml/exec'
+require 'nokogiri'
 
 class InstallTheme
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
   
   attr_reader :template_root, :rails_root, :index_path, :template_type
-  attr_reader :layout_name
+  attr_reader :layout_name, :action
   attr_reader :stylesheet_dir, :javascript_dir, :image_dir
   attr_reader :defaults_file
   attr_reader :content_path, :partials
@@ -30,6 +26,7 @@ class InstallTheme
     @image_dir      = options[:image_dir] || detect_image_dir
     @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
 
@@ -44,10 +41,12 @@ class InstallTheme
   end
   
   def apply_to_target(options = {})
+    require_haml if haml?
     @stdout = options[:stdout] || @stdout || $stdout
     @original_named_yields = {}
     convert_file_to_layout(index_path, "app/views/layouts/#{layout_name}.html.erb")
-    convert_to_haml('app/views/layouts/application.html.erb') if haml?
+    convert_to_haml("app/views/layouts/#{layout_name}.html.erb") if haml?
+    prepare_action
     prepare_sample_controller_and_view
     prepare_layout_partials
     prepare_assets
@@ -125,22 +124,33 @@ class InstallTheme
       EOS
 
       doc = Hpricot(contents)
-      doc.search(content_path).each do |elm|
-        @original_body_content = elm.inner_html.strip
-        elm.inner_html = "<%= yield %>"
-      end
+      @original_body_content = replace_by_path(doc, content_path, "<%= yield %>")
       partials.to_a.each do |name, css_path|
-        doc.search(css_path).each do |elm|
-          original_named_yields[name] = elm.inner_html.strip
-          elm.inner_html = "<%= yield(:#{name}) || render_or_default('#{name}') %>"
-        end
+        original_named_yields[name] = 
+          replace_by_path(doc, css_path, "<%= yield(:#{name}) || render_or_default('#{name}') %>")
       end
       contents = doc.to_html
-
       f << contents
     end
   end
   
+  # see replace_by_path_spec.rb for examples
+  def replace_by_path(doc, path, replacement)
+    result = ""
+    return "" unless path && path.strip.match(/^(.*?)(|\s*:text|\s*\/?text\(\))$/)
+    outer_path, is_text = $1, !$2.blank?
+    if node = doc.search(outer_path).first
+      if is_text
+        result = node.inner_html
+        node.inner_html = replacement
+      else
+        result = node.to_html
+        node.parent.replace_child(node, Hpricot::Text.new(replacement))
+      end
+    end
+    result
+  end
+  
   def convert_to_haml(path)
     from_path = File.join(template_temp_path, path)
     haml_path = from_path.gsub(/erb$/, "haml")
@@ -197,6 +207,17 @@ class InstallTheme
     convert_to_haml('app/views/original_template/index.html.erb') if haml?
   end
   
+  def prepare_action
+    return unless action
+    action_path = "app/views/#{action}.html.erb"
+    target_path = File.join(template_temp_path, action_path)
+    FileUtils.mkdir_p(File.dirname(target_path))
+    File.open(target_path, "w") do |f|
+      f << original_body_content
+    end
+    convert_to_haml(action_path) if haml?
+  end
+  
   def prepare_layout_partials
     original_named_yields.to_a.each do |key, original_contents|
       partial_file = "app/views/layouts/_#{key}.html.erb"
@@ -243,20 +264,22 @@ class InstallTheme
   end
   
   # converts +from+ HTML into +to+ HAML
-  # +from+ can either be file name, HTML content (String) or an Hpricot::Node
+  # +from+ can either be file name, HTML content (String) or an Nokogiri::XML::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)
+    Open3.popen3("html2haml #{from} #{to}") { |stdin, stdout, stderr| stdout.read }
+    # TODO - the following is failing for some reason
+    # 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)
@@ -363,4 +386,13 @@ class InstallTheme
   def tmp_dir
     ENV['TMPDIR'] || '/tmp'
   end
+  
+  def require_haml
+    require 'haml'
+    require 'haml/html'
+    require 'sass'
+    require 'sass/css'
+    require 'haml/exec'
+    require 'open3'
+  end
 end

data/lib/install_theme/cli.rb

@@ -10,13 +10,18 @@ class InstallTheme
           
           Usage: #{File.basename($0)} path/to/rails_app path/to/template content_path [options]
           
+            Examples of paths (CSS or XPath):
+              * #header h2      - replaces the entire h2 element
+              * #header h2:text - replaces the inner HTML of the h2 element
+              * //div[@class='header']/h2        - replaces the entire h2 element
+              * //div[@class='header']/h2/text() - replaces the inner HTML of the h2 element
+          
           Options are:
         BANNER
         opts.separator ""
         opts.on("-p", "--partial KEY_AND_PATH", String,
                 "Replace the inner HTML of an element with <%= yield :key %>",
-                "Example using CSS path: --partial header:#header",
-                "Example using XPath: --partial \"header://div[@id='header']\"") do |arg|
+                "See path examples above.") do |arg|
                   options[:partials] ||= {}
                   key, path = arg.split(/\s*:\s*/)[0..1]
                   if key && path
@@ -30,12 +35,14 @@ class InstallTheme
                 "Set the layout file name.",
                 "Layout files are stored in app/views/layouts and will be suffixed by .html.erb or .html.haml",
                 "Default: application") { |arg| options[:layout] = arg }
+        opts.on("-a", "--action posts/show", String,
+                "Store content extracted from content_path into Rails action.",
+                "Example, '-a posts/show' will create app/views/posts/show.html.erb file.",
+                "Default: none") { |arg| options[:action] = arg }
         opts.on("--erb",
-                "Generate ERb templates.",
-                "Default: auto-detect") { |arg| options[:template_type] = 'erb' }
+                "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' }
+                "Generate HAML templates. Default: Auto-detect") { |arg| options[:template_type] = 'haml' }
         opts.on("--index_path index.html", String,
                 "HTML page to use for application layout.",
                 "Default: index.html") { |arg| options[:index_path] = arg }

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

@@ -1,4 +1,5 @@
-<ul>
+<div id="sidebar">
+  				<ul>
                 	<li><h3><a href="#" class="house">Dashboard</a></h3>
                         <ul>
                         	<li><a href="#" class="report">Sales Report</a></li>
@@ -29,4 +30,5 @@
                             <li><a href="#" class="online">Users online</a></li>
                         </ul>
                     </li>
-				</ul>
+				</ul>       
+          </div>

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

@@ -1,63 +1,64 @@
-%ul
-  %li
-    %h3
-      %a.house{ :href => "#" }
-        Dashboard
-    %ul
-      %li
-        %a.report{ :href => "#" }
-          Sales Report
-      %li
-        %a.report_seo{ :href => "#" }
-          SEO Report
-      %li
-        %a.search{ :href => "#" }
-          Search
-  %li
-    %h3
-      %a.folder_table{ :href => "#" }
-        Orders
-    %ul
-      %li
-        %a.addorder{ :href => "#" }
-          New order
-      %li
-        %a.shipping{ :href => "#" }
-          Shipments
-      %li
-        %a.invoices{ :href => "#" }
-          Invoices
-  %li
-    %h3
-      %a.manage{ :href => "#" }
-        Manage
-    %ul
-      %li
-        %a.manage_page{ :href => "#" }
-          Pages
-      %li
-        %a.cart{ :href => "#" }
-          Products
-      %li
-        %a.folder{ :href => "#" }
-          Product categories
-      %li
-        %a.promotions{ :href => "#" }
-          Promotions
-  %li
-    %h3
-      %a.user{ :href => "#" }
-        Users
-    %ul
-      %li
-        %a.useradd{ :href => "#" }
-          Add user
-      %li
-        %a.group{ :href => "#" }
-          User groups
-      %li
-        %a.search{ :href => "#" }
-          Find user
-      %li
-        %a.online{ :href => "#" }
-          Users online
+#sidebar
+  %ul
+    %li
+      %h3
+        %a.house{ :href => "#" }
+          Dashboard
+      %ul
+        %li
+          %a.report{ :href => "#" }
+            Sales Report
+        %li
+          %a.report_seo{ :href => "#" }
+            SEO Report
+        %li
+          %a.search{ :href => "#" }
+            Search
+    %li
+      %h3
+        %a.folder_table{ :href => "#" }
+          Orders
+      %ul
+        %li
+          %a.addorder{ :href => "#" }
+            New order
+        %li
+          %a.shipping{ :href => "#" }
+            Shipments
+        %li
+          %a.invoices{ :href => "#" }
+            Invoices
+    %li
+      %h3
+        %a.manage{ :href => "#" }
+          Manage
+      %ul
+        %li
+          %a.manage_page{ :href => "#" }
+            Pages
+        %li
+          %a.cart{ :href => "#" }
+            Products
+        %li
+          %a.folder{ :href => "#" }
+            Product categories
+        %li
+          %a.promotions{ :href => "#" }
+            Promotions
+    %li
+      %h3
+        %a.user{ :href => "#" }
+          Users
+      %ul
+        %li
+          %a.useradd{ :href => "#" }
+            Add user
+        %li
+          %a.group{ :href => "#" }
+            User groups
+        %li
+          %a.search{ :href => "#" }
+            Find user
+        %li
+          %a.online{ :href => "#" }
+            Users online

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

@@ -44,7 +44,7 @@
       </div>
         <div id="wrapper">
             <div id="content"><%= yield %></div>
-            <div id="sidebar"><%= yield(:sidebar) || render_or_default('sidebar') %></div>
+            <%= yield(:sidebar) || render_or_default('sidebar') %>
       </div>
         <div id="footer">
         <div id="credits">

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

@@ -61,8 +61,7 @@
       #wrapper
         #content
           = yield
-        #sidebar
-          = yield(:sidebar) || render_or_default('sidebar')
+        = yield(:sidebar) || render_or_default('sidebar')
       #footer
         #credits
           Template by

data/spec/expected/rails/the-hobbit-website-template/app/views/layouts/application.html.erb

@@ -26,7 +26,7 @@
 
 		<div class="header">
 			<h1>The Hobbit</h1>
-			<p><%= yield(:subtitle) || render_or_default('subtitle') %></p>
+			<%= yield(:subtitle) || render_or_default('subtitle') %>
 		</div>
 
 		<div class="pattern"><span></span></div>

data/spec/install_theme_cli_spec.rb

@@ -12,6 +12,7 @@ describe InstallTheme::CLI, "execute" do
         :template_type    => "haml",
         :partials         => { "header" => '#header h2', "sidebar" => '#sidebar' },
         :defaults_file    => "install_theme.yml",
+        :action           => "posts/show",
         :layout           => "iphone"
       ).
       and_return(theme)
@@ -25,6 +26,7 @@ describe InstallTheme::CLI, "execute" do
         -p sidebar:#sidebar
         --defaults_file install_theme.yml
         --layout iphone
+        --action posts/show
       ])
     end
   end

data/spec/install_theme_haml_spec.rb

@@ -1,38 +1,19 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe InstallTheme do
+  include SetupThemeHelpers
+  extend FileDiffMatcher
+
   context "bloganje theme to haml" do
-    before(:all) do
-      setup_base_rails :haml => true
-      @template_root = File.dirname(__FILE__) + "/fixtures/bloganje"
-      FileUtils.rm_rf(File.join(@template_root, "install_theme.yml"))
-      @stdout = stdout do |stdout|
-        @theme = InstallTheme.new(:template_root => @template_root,
-          :rails_root   => @target_application,
-          :content_path => "#content",
-          :partials     => { "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
+    before(:all) { setup_bloganje :rails => {:haml => true} }
     it { @theme.should be_haml }
     it { @theme.should be_valid }
 
-    %w[app/views/layouts/application.html.haml
-      app/views/layouts/_header.html.haml
-      app/views/layouts/_sidebar.html.haml
-      app/helpers/template_helper.rb
-      public/stylesheets/sass/style.sass].each do |matching_file|
-        it do
-          expected = clean_file File.join(@expected_application, matching_file), 'expected'
-          actual   = clean_file File.join(@target_application, matching_file), 'actual'
-          diff = `diff #{expected} #{actual}  2> /dev/null`
-          rputs diff unless diff.strip.empty?
-          diff.strip.should == ""
-        end
-      end
-
+    it_should_have_matching_file "app/views/layouts/application.html.haml"
+    it_should_have_matching_file "app/views/layouts/_header.html.haml"
+    it_should_have_matching_file "app/views/layouts/_sidebar.html.haml"
+    it_should_have_matching_file "app/helpers/template_helper.rb"
+    it_should_have_matching_file "public/stylesheets/sass/style.sass"
 
     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

data/spec/install_theme_spec.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe InstallTheme do
   include SetupThemeHelpers
+  extend FileDiffMatcher
   
   context "bloganje theme to ERb using CSS path" do
     before(:all) { setup_bloganje }
@@ -10,20 +11,14 @@ describe InstallTheme do
     it { @theme.should be_erb }
     it { @theme.should be_valid }
 
-    %w[app/views/layouts/application.html.erb
-      app/views/layouts/_header.html.erb
-      app/views/layouts/_sidebar.html.erb
-      app/helpers/template_helper.rb
-      public/stylesheets/style.css
-      public/stylesheets/theme.css].each do |matching_file|
-        it "should having matching file #{matching_file}" do
-          expected = clean_file File.join(@expected_application, matching_file), 'expected'
-          actual   = clean_file File.join(@target_application, matching_file), 'actual'
-          diff = `diff #{expected} #{actual}  2> /dev/null`
-          rputs diff unless diff.strip.empty?
-          diff.strip.should == ""
-        end
-      end
+    it_should_have_matching_file "app/views/layouts/application.html.erb"
+    it_should_have_matching_file "app/views/layouts/_header.html.erb"
+    it_should_have_matching_file "app/views/layouts/_sidebar.html.erb"
+    it_should_have_matching_file "app/views/posts/show.html.erb"
+    it_should_have_matching_file "app/helpers/template_helper.rb"
+    it_should_have_matching_file "public/stylesheets/style.css"
+    it_should_have_matching_file "public/stylesheets/theme.css"
+
     context "sample template /templates/index.html.erb" do
       subject do
         File.read(File.join(@target_application, 'app/views/original_template/index.html.erb'))
@@ -47,19 +42,10 @@ describe InstallTheme do
     it { @theme.image_dir.should == "img" }
     it { @theme.should be_valid }
 
-    %w[app/views/layouts/application.html.erb
-      app/helpers/template_helper.rb
-      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), 'expected'
-          actual   = clean_file File.join(@target_application, matching_file), 'actual'
-          diff = `diff #{expected} #{actual}  2> /dev/null`
-          rputs diff unless diff.strip.empty?
-          diff.strip.should == ""
-        end
-      end
+    it_should_have_matching_file "app/views/layouts/application.html.erb"
+    it_should_have_matching_file "app/helpers/template_helper.rb"
+    it_should_have_matching_file "public/stylesheets/default.css"
+    
     it "should create install_theme.yml containing the partial information" do
       expected = clean_file File.join(@template_root, "expected_install_theme.yml"), 'expected'
       actual   = clean_file File.join(@template_root, "install_theme.yml"), 'actual'
@@ -74,52 +60,25 @@ describe InstallTheme do
       setup_app_with_theme('bloganje', :setup_defaults => true)
     end
     it { File.should be_exist(File.join(@template_root, "install_theme.yml")) }
-    it { @theme.content_path.should == "#content" }
+    it { @theme.content_path.should == "#content:text" }
     it { @theme.should be_valid }
-    %w[app/views/layouts/application.html.erb
-      app/views/layouts/_header.html.erb
-      app/views/layouts/_sidebar.html.erb
-      app/helpers/template_helper.rb
-      public/stylesheets/style.css
-      public/stylesheets/theme.css].each do |matching_file|
-        it "should having matching file #{matching_file}" do
-          expected = clean_file File.join(@expected_application, matching_file), 'expected'
-          actual   = clean_file File.join(@target_application, matching_file), 'actual'
-          diff = `diff #{expected} #{actual}  2> /dev/null`
-          rputs diff unless diff.strip.empty?
-          diff.strip.should == ""
-        end
-      end
+    it_should_have_matching_file "app/views/layouts/application.html.erb"
+    it_should_have_matching_file "app/views/layouts/_header.html.erb"
+    it_should_have_matching_file "app/views/layouts/_sidebar.html.erb"
+    it_should_have_matching_file "app/helpers/template_helper.rb"
+    it_should_have_matching_file "public/stylesheets/style.css"
+    it_should_have_matching_file "public/stylesheets/theme.css"
   end
 
-  context "alternate layout file name" do
-    before(:all) do
-      setup_base_rails
-      @template_root = File.dirname(__FILE__) + "/fixtures/bloganje"
-      FileUtils.rm_rf(File.join(@template_root, "install_theme.yml"))
-      @stdout = stdout do |stdout|
-        @theme = InstallTheme.new(:template_root => @template_root,
-          :rails_root   => @target_application,
-          :stdout       => stdout)
-        @theme.apply_to_target(:stdout => stdout, :generator => {:collision => :force, :quiet => true})
-      end
-      @expected_application = File.dirname(__FILE__) + "/expected/rails/bloganje"
-    end
+  context "invalid if no content_path explicitly or via defaults file" do
+    before(:all) { setup_bloganje(:content_path => nil) }
     it { @theme.content_path.should be_nil }
     it { @theme.should_not be_valid }
   end
 
-  context "invalid if no content_path explicitly or via defaults file" do
+  context "alternate layout file name" do
     before(:all) { setup_bloganje(:layout => "special") }
-    %w[app/views/layouts/special.html.erb].each do |matching_file|
-      it "should having matching file #{matching_file}" do
-        expected = clean_file File.join(@expected_application, matching_file), 'expected'
-        actual   = clean_file File.join(@target_application, matching_file), 'actual'
-        diff = `diff #{expected} #{actual}  2> /dev/null`
-        rputs diff unless diff.strip.empty?
-        diff.strip.should == ""
-      end
-    end
+    it_should_have_matching_file "app/views/layouts/special.html.erb"
   end
 
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'spec'
+require 'hpricot'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'install_theme'
@@ -44,9 +45,21 @@ def stdout(&block)
   stdout_io.read
 end
 
+module FileDiffMatcher
+  def it_should_have_matching_file(matching_file)
+    it "should having matching file #{matching_file}" do
+      expected = clean_file File.join(@expected_application, matching_file), 'expected'
+      actual   = clean_file File.join(@target_application, matching_file), 'actual'
+      diff = `diff #{expected} #{actual}  2> /dev/null`
+      rputs diff unless diff.strip.empty?
+      diff.strip.should == ""
+    end
+  end
+end
+
 module SetupThemeHelpers
   def setup_app_with_theme(theme, theme_options = {})
-    setup_base_rails
+    setup_base_rails(theme_options.delete(:rails) || {})
     @template_root = File.join(File.dirname(__FILE__), "fixtures", theme)
     FileUtils.chdir(@template_root) do
       if theme_options.delete(:setup_defaults)
@@ -65,19 +78,21 @@ module SetupThemeHelpers
   end
 
   def setup_bloganje(theme_options = {})
-    setup_app_with_theme('bloganje', 
-      {:content_path => "#content", :partials => { "header" => '#header h2', "sidebar" => '#sidebar' }}.
-        merge(theme_options))
+    setup_app_with_theme('bloganje', {
+      :content_path => "#content:text", 
+      :partials => { "header" => '#header h2 text()', "sidebar" => '#sidebar' },
+      :action => "posts/show"
+    }.merge(theme_options))
   end
   
   def setup_hobbit(theme_options = {})
-    setup_app_with_theme('the-hobbit-website-template', 
-      { :content_path  => "//div[@class='content']", 
-        :partials      => { "menu" => "//div[@class='navigation']", "subtitle" => "//div[@class='header']/p" }}.
-      merge(theme_options))
+    setup_app_with_theme('the-hobbit-website-template', {
+      :content_path  => "//div[@class='content']/text()",
+      :partials      => { "menu" => "//div[@class='navigation']/text()", "subtitle" => "//div[@class='header']/p" }
+    }.merge(theme_options))
   end
 
-  def setup_base_rails(options = {})
+  def setup_base_rails(options)
     tmp_path = File.dirname(__FILE__) + "/tmp"
     FileUtils.rm_rf(tmp_path)
     FileUtils.mkdir_p(tmp_path  )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: install_theme
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +10:00
+date: 2009-10-12 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency