install_theme 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.6.1 / 2009-10-06
+
+Major:
+
+* much better algorithm for cleaning up stylesheets
+* The content_id argument is now content_path - it is either a CSSpath or XPath expression. 
+  The --inside_yields flag is renamed to --partial (-p) 
+  Testing for using xpath and csspath in the content_path and --partials arguments.
+
 === 0.6.0 / 2009-10-02
 
 Major:

data/README.rdoc

@@ -17,9 +17,9 @@ in action.
 
 Simple case:
 
-    install_theme path/to/template path/to/rails_app content_id
+    install_theme path/to/template path/to/rails_app content_path
 
-Replace some DOM content with <%= yield :some_label %> with --inside_yields:
+Replace some DOM content with <%= yield :some_label %> with --partials:
 
     install_theme path/to/app path/to/rails_app content_box \
       --inside_yield "header:#header h2" \

data/lib/install_theme.rb

@@ -10,11 +10,11 @@ require 'sass/css'
 require 'haml/exec'
 
 class InstallTheme
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
   
   attr_reader :template_root, :rails_root, :index_path, :template_type
   attr_reader :stylesheet_dir, :javascript_dir, :image_dir
-  attr_reader :content_id, :inside_yields
+  attr_reader :content_path, :partials
   attr_reader :stdout
   attr_reader :original_named_yields, :original_body_content
   
@@ -23,8 +23,8 @@ class InstallTheme
     @rails_root     = File.expand_path(options[:rails_root] || File.dirname('.'))
     @template_type  = (options[:template_type] || detect_template).to_s
     @index_path     = options[:index_path] || "index.html"
-    @content_id     = options[:content_id] || "content"
-    @inside_yields  = options[:inside_yields] || {}
+    @content_path   = options[:content_path] || "content"
+    @partials       = options[:partials] || {}
     @stylesheet_dir = options[:stylesheet_dir] || detect_stylesheet_dir
     @javascript_dir = options[:javascript_dir] || detect_javascript_dir
     @image_dir      = options[:image_dir] || detect_image_dir
@@ -95,11 +95,11 @@ class InstallTheme
       contents.sub!(%r{\s*</head>}, "\n  <%= yield(:head) %>\n</head>")
 
       doc = Hpricot(contents)
-      doc.search("##{content_id},.#{content_id}").each do |elm|
+      doc.search(content_path).each do |elm|
         @original_body_content = elm.inner_html.strip
         elm.inner_html = "<%= yield %>"
       end
-      inside_yields.to_a.each do |name, css_path|
+      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}') %>"
@@ -181,9 +181,7 @@ class InstallTheme
     template_stylesheets.each do |file|
       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
+        f << clean_stylesheet(File.read(file))
       end
       convert_to_sass(target_path) if haml?
     end
@@ -303,6 +301,10 @@ class InstallTheme
     Dir[File.join(template_root, image_dir, '**/*.{jpg,png,gif}')]
   end
   
+  def clean_stylesheet(contents)
+    contents.gsub(%r{url\((["']?)[\./]*(?:#{image_dir}|#{stylesheet_dir}|)\/?}, 'url(\1/images/')
+  end
+  
   def show_readme
     stdout.puts <<-README
     

data/lib/install_theme/cli.rb

@@ -8,7 +8,7 @@ class InstallTheme
         opts.banner = <<-BANNER.gsub(/^          /,'')
           Use any HTML template as a theme generator for your Rails app.
           
-          Usage: #{File.basename($0)} path/to/template path/to/rails_app content_id [options]
+          Usage: #{File.basename($0)} path/to/template path/to/rails_app content_path [options]
           
           Options are:
         BANNER
@@ -22,13 +22,13 @@ class InstallTheme
         opts.on("--index_path index.html", String,
                 "HTML page to use for application layout.",
                 "Default: index.html") { |arg| options[:index_path] = arg }
-        opts.on("--inside_yield KEY_AND_CSS_PATH", String,
+        opts.on("-p", "--partial KEY_AND_PATH", String,
                 "Replace the inner HTML of an element with <%= yield :key %>",
-                "Example: --inside_yield header:#header",
-                "Default: nil") do |arg|
-                  options[:inside_yields] ||= {}
+                "Example using CSS path: --partial header:#header",
+                "Example using XPath: --partial \"header://div[@id='header']\"") do |arg|
+                  options[:partials] ||= {}
                   key, css_path = arg.split(/\s*:\s*/)[0..1]
-                  options[:inside_yields][key.strip.to_sym] = css_path.strip
+                  options[:partials][key.strip.to_sym] = css_path.strip
                 end
         opts.on("-h", "--help",
                 "Show this help message.") { |arg| stdout.puts opts; exit }
@@ -39,7 +39,7 @@ class InstallTheme
       end
       options[:template_root] = arguments.shift
       options[:rails_root]    = arguments.shift
-      options[:content_id]    = arguments.shift
+      options[:content_path]  = arguments.shift
       unless options[:template_root] && options[:rails_root]
         stdout.puts "trying"
         stdout.puts parser; exit
@@ -47,4 +47,4 @@ class InstallTheme
       InstallTheme.new(options).apply_to_target
     end
   end
-end
+end

data/spec/install_theme_cli_spec.rb

@@ -6,23 +6,23 @@ describe InstallTheme::CLI, "execute" do
     theme = stub
     InstallTheme.should_receive(:new).
       with(:template_root => "path/to/app", 
-        :rails_root => "path/to/rails_app",
-        :content_id => "content_box",
-        :index_path => "root.html",
-        :template_type => "haml",
-        :inside_yields => { :header => '#header h2', :sidebar => '#sidebar' }
+        :rails_root       => "path/to/rails_app",
+        :content_path     => "#content_box",
+        :index_path       => "root.html",
+        :template_type    => "haml",
+        :partials         => { :header => '#header h2', :sidebar => '#sidebar' }
       ).
       and_return(theme)
     theme.should_receive(:apply_to_target)
     @stdout = stdout do |stdout_io|
-      InstallTheme::CLI.execute(stdout_io, %w[path/to/app path/to/rails_app content_box
+      InstallTheme::CLI.execute(stdout_io, %w[path/to/app path/to/rails_app #content_box
         --index_path=root.html
         --haml
-        --inside_yield header:#header\ h2
-        --inside_yield sidebar:#sidebar
+        --partial header:#header\ h2
+        -p sidebar:#sidebar
       ])
     end
   end
   
   it("parses arguments and run generator") { }
-end
+end

data/spec/install_theme_haml_spec.rb

@@ -7,8 +7,8 @@ describe InstallTheme do
       @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' },
+          :content_path    => "content",
+          :partials => { :header => '#header h2', :sidebar => '#sidebar' },
           :stdout        => stdout)
         @theme.apply_to_target(:stdout => stdout, :generator => {:collision => :force, :quiet => true})
       end

data/spec/install_theme_spec.rb

@@ -1,15 +1,15 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe InstallTheme do
-  context "bloganje theme to ERb" do
+  context "bloganje theme to ERb using CSS path" do
     before(:all) do
       setup_base_rails
       @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)
+          :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"
@@ -42,15 +42,16 @@ describe InstallTheme do
     end
   end
 
-  context "the-hobbit-website-template theme to ERb" do
+  context "the-hobbit-website-template theme to ERb using xpath" 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)
+          :partials      => { :menu => "//div[@class='navigation']", :subtitle => "//div[@class='header']/p" },
+          :content_path  => "//div[@class='content']", 
+          :stdout        => stdout)
         @theme.apply_to_target(:generator => {:collision => :force, :quiet => true})
       end
       @expected_application = File.dirname(__FILE__) + "/expected/rails/the-hobbit-website-template"

metadata

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