theme_generator 1.2.2 → 1.3.0

data/MIT-LICENSE

@@ -1,6 +1,4 @@
-Copyright (c) 2005 Tobias Luetke
-
-Theme Generator additions Copyright (c) 2005 Matthew McCray
+Copyright (c) 2005 Matt McCray, based on code from Typo by Tobias Luetke
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "1.2.2"
+PKG_VERSION = "1.3.0"
 PKG_NAME = "theme_generator"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_SUMMARY = "[Rails] Theme generator adds support for themes into Rails applications"
@@ -18,13 +18,6 @@ PKG_FILES = FileList[
 desc "Default Task"
 task :default => [ :lines ]
 
-desc "Delete tar.gz / zip / rdoc"
-task :cleanup => [ :rm_packages, :clobber_rdoc ]
-
-task :install => [:package] do
-  `gem install pkg/#{PKG_FILE_NAME}.gem`
-end
-
 task :syntax do 
   filelist = Dir.glob('**/*.rb')
   filelist.each do |file|
@@ -38,13 +31,12 @@ task :syntax do
   puts 'Syntax OK'  
 end
 
-# Genereate the RDoc documentation
-# NEEDS TO BE MOD'ED
+# Generate the RDoc documentation
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Theme Generator"
   rdoc.options << '--line-numbers --inline-source'
-  rdoc.rdoc_files.include('templates/*.rb')
+  rdoc.rdoc_files.include('templates/*.rb', 'templates/README')
 }
 
 task :lines do
@@ -66,21 +58,21 @@ task :lines do
 end
 
 spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = PKG_SUMMARY
-  s.has_rdoc = true
-  s.files = PKG_FILES #Dir['lib/**/*']  
-
   s.author = 'M@ McCray'
   s.email = 'darthapo@gmail.com'
   s.homepage = 'http://www.mattmccray.com'
+
+  s.name = PKG_NAME
+  s.version = PKG_VERSION
+  s.summary = PKG_SUMMARY
+  
+  s.has_rdoc = false
+  s.files = PKG_FILES
 end
 
 Rake::GemPackageTask.new(spec) do |p|
   #puts "  File List:" 
   #puts "   - #{PKG_FILES.join("\n   - ")}"
-     
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true

data/USAGE

@@ -3,7 +3,7 @@ NAME
              folder structure.
 
 SYNOPSIS
-     theme [theme name]  (use _system_ to update theme system files only)
+     theme [theme_name]  (use _system_ to update theme system files only)
 
 DESCRIPTION
      This generator creates general purpose theme support. It's designed to leverage
@@ -24,6 +24,6 @@ EXAMPLE
      This will generate the file structure for a theme named 'default' and prepare 
      the rails application for theme support. 
 
-	  Starting with version 1.2, you can update just the theme system files by running:
+	  You can update the theme support files by running:
 
  	  ./script/generate theme _system_

data/templates/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2005 Matt McCray, based on code from Typo by Tobias Luetke
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR

data/templates/README

@@ -1,33 +1,87 @@
+= Theme Support for Rails Applications
+
+This plugin provides support for themes to the rails application environment. 
+It supports theme specific images, stylesheets, javascripts, and views. The 
+views can be in ERb (rhtml) or liquid formats. Optionally, you can configure 
+the theme system to ignore any templates except liquid ones.
+
+
 == Usage
 
-You can specify the current theme the same way you would a layout:
+This plugin automatically makes any patches needed for theme support. You can
+use the theme_generator to create the file structure needed, or create it 
+yourself.
+
+It expects the following theme folder structure.
+
+  themes/
+    [theme_name]
+      layouts/         <- layout .rhtml or .liquid templates
+      images/
+      stylesheets/
+      javascripts/
+      views/           <- you can override application views
+      about.markdown
+      preview.png
+
+When run in production mode, it will automatically cache the theme files so that
+the web-server will deliver them in subsequent requests. You can pre-cache all of 
+the theme files by using the included rake tasks:
+
+  $ rake theme_create_cache
+
+The theme file cache uses the following file structure:
+
+  public/
+    themes/
+      [theme_name]/
+        images/
+        stylesheets/
+        javascripts/
+
+All of the included rake tasks:
+
+* theme_create_cache
+* theme_remove_cache
+* theme_update_cache
+
+You specify which theme to use in your controller by using the 'theme' helper.
+It's used just like the 'layout' helper. In fact, you can use them both 
+simultaneously. The following will render actions using the 'default' layout 
+in the 'blue_bird' theme (theme/blue_bird/layouts/default.rhtml):
 
   class ApplicationController < ActionController::Base
-    
     layout 'default'
-    theme 'blue'
-    
+
+    theme 'blue_bird'
+
+    ...
   end
 
-If your application supports per-user themes, and the user's selected theme is 
-stored in the user object, you could implement that like this:
+You can also defer the theme lookup to a controller method:
 
   class ApplicationController < ActionController::Base
-  
     layout 'default'
-    theme :get_user_theme
 
-    # If a user is logged in, use their theme choice, otherwise
-    # use the theme named 'default'
-    def get_user_theme
-       return @session[:user].theme unless @session[:user].nil?
-       'default'
+	 theme :get_theme
+
+    def get_theme
+
+		# If you let the user choose their own theme, you might
+		# add a User#theme field...
+
+		current_user.theme
     end
-  
+
+    ...
   end
 
+
+Note: By setting it in the ApplicationController you can set the theme for the 
+whole application.
+
 In your application views, there are theme specific helper tags 
-available to you.
+available to you. For ERb templates they are:
 
  - theme_image_tag
  - theme_image_path
@@ -36,51 +90,28 @@ available to you.
  - theme_stylesheet_link_tag
  - theme_stylesheet_path
 
-Views can be overridden by themes placing templates in the themes/[theme_name]/views
-folder. You can use the default ERb templates, or Liquid templates.
+For liquid templates there is a single helper, themeitem,  that will determine 
+the path base on the theme file extension. Here's how you'd use it:
 
-You can tell the theme system to only allow Liquid templates in a theme by
-setting 'force_liquid' in your controller:
+  <link rel="StyleSheet" href="{% themeitem %} default.css {% endthemeitem %}" />
+  ...
+  <img src="{% themeitem %} logo.png {% endthemeitem %}" />
 
- class ApplicationController < ActionController::Base
- 
-   layout 'default'
-   theme 'blue'
+The output from those two calls are:
 
-   force_liquid true
+  <link rel="StyleSheet" href="/themes/[current_theme]/images/default.css" />
+  ...
+  <img src="/themes/[current_theme]/images/logo.png" />
  
- end
-
-If force_liquid is set to true, the theme system will only render .liquid 
-template files. If .rhtml templates are found, an exception is raised.
-
-    Note: force_liquid is only for theme templates. Your 
-          application templates can still be ERb (.rhtml) 
-          files.
-
-Before hosting, I would recommend running the rake task to pre-cache all of 
-the theme files:
-
-  rake theme_create_cache
-  
-There is also a handy rake task for removing all the cached theme files:
-
-  rake theme_remove_cache
-
-You can also update the cache:
-
-  rake theme_update_cache
-
-== Upgrading
-
-Starting with version 1.2, you can update just the theme system files by
-running:
-
-  ./script/generate theme _system_
-
 
 == Changelog
 
+1.3.0 - The theme_system component is no longer needed. All of the
+        theme support is driven by a single plugin named, oddly enough, 
+        'theme_support'. Also improved theme route support. Instead of
+        overriding RouteSet#reload, RouteSet#draw is overridden, making
+        the theme support entirely transparent -- hopefully ;-) 
+
 1.2.2 - More Bug-fixes.
 
 1.2.1 - Bug-fixes and documentation clean up.
@@ -100,7 +131,8 @@ running:
 
 1.1.0 - [Breaking] Abstraction of the Typo theme system. The themes are
         now the same as is used in Typo. The theme engine itself is a
-        combination of plugins and a component.
+        combination of plugins and a component. No more symlinks, thank
+        goodness.
 
 1.0.2 - The current_theme is now retrieved from the controller. Where
         symlinks are created on *nix systems, shortcuts are created 
@@ -110,3 +142,8 @@ running:
         to the appropriate directories on supported platforms.
 
 1.0.0 - Initial release
+
+
+---
+Copyright (c) 2005 Matt McCray, based on code from Typo by Tobias Luetke 
+released under the MIT license

data/templates/about.markdown

@@ -1,3 +1,3 @@
 ### <%= class_name %>
 
-This description can be found in  themes/<%= file_name %>/about.markdown
+This description can be found in themes/<%= file_name %>/about.markdown

data/templates/actioncontroller_ex.rb

@@ -1,20 +1,37 @@
 # Extend the Base ActionController to support themes
-#
 ActionController::Base.class_eval do 
 
    attr_accessor :current_theme
    attr_accessor :force_liquid_template
    
+   # Use this in your controller just like the <tt>layout</tt> macro.
+   # Example:
+   #
+   #  theme 'theme_name'
+   #
+   # -or-
+   #
+   #  theme :get_theme
+   #
+   #  def get_theme
+   #    'theme_name'
+   #  end
    def self.theme(theme_name, conditions = {})
      # TODO: Allow conditions... (?)
      write_inheritable_attribute "theme", theme_name
    end
 
+   # Set <tt>force_liquid</tt> to true in your controlelr to only allow 
+   # Liquid template in themes.
+   # Example:
+   #
+   #  force_liquid true
    def self.force_liquid(force_liquid_value, conditions = {})
      # TODO: Allow conditions... (?)
      write_inheritable_attribute "force_liquid", force_liquid_value
    end
 
+   # Retrieves the current set theme
    def current_theme(passed_theme=nil)
      theme = passed_theme || self.class.read_inheritable_attribute("theme")
      
@@ -25,6 +42,7 @@ ActionController::Base.class_eval do
      end
    end
    
+   # Retrieves the force liquid flag
    def force_liquid_template(passed_value=nil)
       force_liquid = passed_value || self.class.read_inheritable_attribute("force_liquid")
 

data/templates/actionview_ex.rb

@@ -1,12 +1,16 @@
-# Extend the Base ActionView to support rendering themes
+# Extending <tt>ActionView::Base</tt> to support rendering themes
 #
 module ActionView
+   # <tt>ThemeError</tt> is thrown when <tt>force_liquid</tt> is true, and 
+   # a <tt>.liquid</tt> template isn't found.
    class ThemeError < StandardError
    end
    
+   # Extending <tt>ActionView::Base</tt> to support rendering themes
    class Base
       alias_method :__render_file, :render_file
 
+      # Overrides the default <tt>Base#render_file</tt> to allow theme-specific views
       def render_file(template_path, use_full_path = true, local_assigns = {})
          search_path = [
             "../themes/#{controller.current_theme}/views",      # for components

data/templates/init.rb

@@ -1,12 +1,12 @@
-require 'actionview_ex'
-require 'actioncontroller_ex'
-require 'routeset_ex'
-require 'theme_helpers'
+# Initializes theme support by extending some of the core Rails classes
+require 'patches/actionview_ex'
+require 'patches/actioncontroller_ex'
+require 'patches/routeset_ex'
 
+# Add the tag helpers for rhtml and, optionally, liquid templates
+require 'helpers/rhtml_theme_tags'
 begin
-   require 'liquid_helpers'   
+   require 'helpers/liquid_theme_tags'   
 rescue
    # I guess Liquid isn't being used...
 end
-
-ActionController::Routing::Routes.install_theme_routes

data/templates/{liquid_helpers.rb → liquid_theme_tags.rb}

@@ -12,7 +12,7 @@ class Themeitem < Liquid::Block
                                       
    def initialize(markup, tokens)
       super
-      #@media_type = markup.strip
+      #@theme_name = markup.strip
    end
 
    def block_delimiter
@@ -26,18 +26,19 @@ class Themeitem < Liquid::Block
    def render(context)
       # Which, if either, of these are correct?
       base_url = context['request'].relative_url_root || ActionController::Base.asset_host.to_s
+      theme_name = @theme_name || context['active_theme']
 
       filename = @nodelist.join('').strip
       ext = File.extname( filename )
 
       if @@image_exts.include?( ext )
-         "#{base_url}/themes/#{context['active_theme']}/images/#{filename}"
+         "#{base_url}/themes/#{theme_name}/images/#{filename}"
 
       elsif @@stylesheet_exts.include?( ext )
-         "#{base_url}/themes/#{context['active_theme']}/stylesheets/#{filename}"
+         "#{base_url}/themes/#{theme_name}/stylesheets/#{filename}"
          
       elsif @@javascript_exts.include?( ext )
-         "#{base_url}/themes/#{context['active_theme']}/javascripts/#{filename}"
+         "#{base_url}/themes/#{theme_name}/javascripts/#{filename}"
       end
    end   
 end

data/templates/rhtml_theme_tags.rb

@@ -0,0 +1,60 @@
+#
+# These are theme helper tags
+#
+module ActionView::Helpers::AssetTagHelper
+
+   # returns the public path to a theme stylesheet
+   def theme_stylesheet_path( source=nil, theme=nil )
+      theme = theme || controller.current_theme
+      compute_public_path(source || "theme", "themes/#{theme}/stylesheets", 'css')
+   end
+
+   # returns the path to a theme image
+   def theme_image_path( source, theme=nil )
+      theme = theme || controller.current_theme
+      compute_public_path(source, "themes/#{theme}/images", 'png')
+   end
+
+   # returns the path to a theme javascript
+   def theme_javascript_path( source, theme=nil )
+      theme = theme || controller.current_theme
+      compute_public_path(source, "themes/#{theme}/javascript", 'js')
+   end
+   
+
+   # This tag it will automatially include theme specific css files
+   def theme_stylesheet_link_tag(*sources)
+      sources.uniq!
+      options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
+      sources.collect { |source|
+         source = theme_stylesheet_path(source)
+         tag("link", { "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source }.merge(options))
+      }.join("\n")
+   end
+   
+   # This tag will return a theme-specific IMG
+   def theme_image_tag(source, options = {})
+     options.symbolize_keys
+
+     options[:src] = theme_image_path(source)
+     options[:alt] ||= File.basename(options[:src], '.*').split('.').first.capitalize
+
+     if options[:size]
+       options[:width], options[:height] = options[:size].split("x")
+       options.delete :size
+     end
+
+     tag("img", options)
+   end
+   
+   # This tag can be used to return theme-specific javscripts
+   def theme_javascript_include_tag(*sources)
+     options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
+     sources = ['prototype', 'effects', 'controls', 'dragdrop'] if sources.first == :defaults
+     sources.collect { |source|
+       source = theme_javascript_path(source)        
+       content_tag("script", "", { "type" => "text/javascript", "src" => source }.merge(options))
+     }.join("\n")
+   end
+
+end

data/templates/routeset_ex.rb

@@ -1,25 +1,33 @@
-
+# Extends <tt>ActionController::Routing::RouteSet</tt> to automatically add the theme routes
 class ActionController::Routing::RouteSet
 
-  alias_method :__reload, :reload
+  alias_method :__draw, :draw
 
-  def reload
-    __reload
-    install_theme_routes
+  # Overrides the default <tt>RouteSet#draw</tt> to automatically
+  # include the routes needed by the <tt>ThemeController</tt>
+  def draw
+    old_routes = @routes
+    @routes = []
+    
+    begin 
+      create_theme_routes
+      yield self
+    rescue
+      @routes = old_routes
+      raise
+    end
+    
+    write_generation
+    write_recognition
   end
 
-  def create_theme_routes    
-    named_route 'theme_images', "/themes/:theme/images/:filename", :controller=>'theme_system/theme', :action=>'images'
-    named_route 'theme_stylesheets', "/themes/:theme/stylesheets/:filename", :controller=>'theme_system/theme', :action=>'stylesheets'
-    named_route 'theme_javascript', "/themes/:theme/javascript/:filename", :controller=>'theme_system/theme', :action=>'javascript'
+  # Creates the required routes for the <tt>ThemeController</tt>...
+  def create_theme_routes
+    named_route 'theme_images', "/themes/:theme/images/:filename", :controller=>'theme', :action=>'images'
+    named_route 'theme_stylesheets', "/themes/:theme/stylesheets/:filename", :controller=>'theme', :action=>'stylesheets'
+    named_route 'theme_javascript', "/themes/:theme/javascript/:filename", :controller=>'theme', :action=>'javascript'
 
-    connect "/themes/*", :controller=>'theme_system/theme', :action=>'error'
+    connect "/themes/*whatever", :controller=>'theme', :action=>'error'
   end
 
-  def install_theme_routes
-    create_theme_routes
-    write_generation
-    write_recognition
-    ActionController::Routing::NamedRoutes.install
-  end
 end

data/templates/theme.css

@@ -2,4 +2,6 @@
    Main StyleSheet for the '<%= class_name %>' theme
 */
 
-/* Your CSS here... */
+BODY {
+  
+}

data/templates/theme_controller.rb

@@ -1,4 +1,6 @@
-class ThemeSystem::ThemeController < ActionController::Base
+# The controller for serving/cacheing theme content...
+#
+class ThemeController < ActionController::Base
 
   after_filter :cache_theme_files
   
@@ -28,9 +30,9 @@ class ThemeSystem::ThemeController < ActionController::Base
   def cache_theme_files
     path = request.request_uri
     begin
-      ThemeSystem::ThemeController.cache_page( response.body, path )
+      ThemeController.cache_page( response.body, path )
     rescue
-      #STERR.puts "Cache Exception: #{$!}"
+      STERR.puts "Cache Exception: #{$!}"
     end
   end
 
@@ -53,7 +55,7 @@ class ThemeSystem::ThemeController < ActionController::Base
       'application/binary'
     end
   end  
-  
 
 end
 
+

data/templates/theme_helper.rb

@@ -0,0 +1,3 @@
+# this is here so that Rails doesn't complain about a missing default helper...
+module ThemeHelper
+end

data/templates/themes.rake

@@ -16,8 +16,7 @@ end
 
 desc "Removes the cached (public) theme folders"
 task :theme_remove_cache do
-  puts "Creating #{RAILS_ROOT}/public/themes"
-  #FileUtils.rm_r Dir.glob("#{RAILS_ROOT}/public/themes/*")
+  puts "Removing #{RAILS_ROOT}/public/themes"
   FileUtils.rm_r "#{RAILS_ROOT}/public/themes", :force => true
 end
 

data/theme_generator.rb

@@ -4,7 +4,6 @@ class ThemeGenerator < Rails::Generator::NamedBase
       record do |m|
 
          if file_name != '_system_'
-
             # Theme folder(s)
             m.directory File.join( "themes", file_name )
             m.template 'about.markdown', File.join( 'themes', file_name, 'about.markdown' )
@@ -20,29 +19,39 @@ class ThemeGenerator < Rails::Generator::NamedBase
             m.directory File.join( "themes", file_name, "views" )
             m.directory File.join( "themes", file_name, "images" )
             m.directory File.join( "themes", file_name, "javascript" )
-         
          end
+         
+         theme_support_dir = File.join( "vendor", "plugins", "theme_support" )
 
-         # Readme file
-         m.template 'README', "README_THEMES"
-
-         # The ThemeEngine plugins
-         m.directory File.join( "vendor", "plugins", "theme_engine" )
-         m.template 'init.rb', File.join( 'vendor', 'plugins', 'theme_engine', 'init.rb' )
-         m.directory File.join( "vendor", "plugins", "theme_engine", "lib" )
-         m.template 'actioncontroller_ex.rb', File.join( 'vendor', 'plugins', 'theme_engine', 'lib', 'actioncontroller_ex.rb' )
-         m.template 'actionview_ex.rb', File.join( 'vendor', 'plugins', 'theme_engine', 'lib', 'actionview_ex.rb' )
-         m.template 'liquid_helpers.rb', File.join( 'vendor', 'plugins', 'theme_engine', 'lib', 'liquid_helpers.rb' )
-         m.template 'routeset_ex.rb', File.join( 'vendor', 'plugins', 'theme_engine', 'lib', 'routeset_ex.rb' )
-         m.template 'theme_helpers.rb', File.join( 'vendor', 'plugins', 'theme_engine', 'lib', 'theme_helpers.rb' )
-         m.directory File.join( "vendor", "plugins", "theme_engine", "tasks" )
-         m.template 'themes.rake', File.join( 'vendor', 'plugins', 'theme_engine', 'tasks', 'themes.rake' )
-
-         # The ThemeSystem Component
-         m.directory File.join( "components", "theme_system" )
-         m.template 'theme.rb', File.join( 'components', 'theme_system', 'theme.rb' )
-         m.template 'theme_controller.rb', File.join( 'components', 'theme_system', 'theme_controller.rb' )
-
+         if !File.directory?( theme_support_dir ) or file_name == '_system_'
+         
+           # Readme file
+           m.template 'README', "README_THEMES"
+
+           # The ThemeEngine plugins
+           m.directory File.join( "vendor", "plugins", "theme_support" )
+           m.template 'README', File.join( "vendor", "plugins", "theme_support", 'README' )
+           m.template 'LICENSE', File.join( "vendor", "plugins", "theme_support", 'LICENSE' )
+           m.template 'init.rb', File.join( 'vendor', 'plugins', 'theme_support', 'init.rb' )
+           
+           m.directory File.join( "vendor", "plugins", "theme_support", "lib" )
+           m.template 'theme.rb', File.join( 'vendor', 'plugins', 'theme_support', 'lib', 'theme.rb' )
+           m.template 'theme_controller.rb', File.join( 'vendor', 'plugins', 'theme_support', 'lib', 'theme_controller.rb' )
+           m.template 'theme_helper.rb', File.join( 'vendor', 'plugins', 'theme_support', 'lib', 'theme_helper.rb' )
+           
+           m.directory File.join( "vendor", "plugins", "theme_support", "lib", "patches" )
+           m.template 'actionview_ex.rb', File.join( 'vendor', 'plugins', 'theme_support', 'lib', "patches", 'actionview_ex.rb' )
+           m.template 'routeset_ex.rb', File.join( 'vendor', 'plugins', 'theme_support', 'lib', "patches", 'routeset_ex.rb' )
+           m.template 'actioncontroller_ex.rb', File.join( 'vendor', 'plugins', 'theme_support', 'lib', "patches", 'actioncontroller_ex.rb' )
+
+           m.directory File.join( "vendor", "plugins", "theme_support", "lib", "helpers" )
+           m.template 'liquid_theme_tags.rb', File.join( 'vendor', 'plugins', 'theme_support', 'lib', 'helpers', 'liquid_theme_tags.rb' )
+           m.template 'rhtml_theme_tags.rb', File.join( 'vendor', 'plugins', 'theme_support', 'lib', 'helpers', 'rhtml_theme_tags.rb' )
+
+           m.directory File.join( "vendor", "plugins", "theme_support", "tasks" )
+           m.template 'themes.rake', File.join( 'vendor', 'plugins', 'theme_support', 'tasks', 'themes.rake' )
+           
+         end
       end
    end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: theme_generator
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
-date: 2005-11-12 00:00:00 -06:00
+  version: 1.3.0
+date: 2005-11-13 00:00:00 -06:00
 summary: "[Rails] Theme generator adds support for themes into Rails applications"
 require_paths: 
   - lib
@@ -15,7 +15,7 @@ description:
 autorequire: 
 default_executable: 
 bindir: bin
-has_rdoc: true
+has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
     - 
@@ -35,14 +35,16 @@ files:
   - templates/init.rb
   - templates/layout.liquid
   - templates/layout.rhtml
-  - templates/liquid_helpers.rb
+  - templates/LICENSE
+  - templates/liquid_theme_tags.rb
   - templates/preview.png
   - templates/README
+  - templates/rhtml_theme_tags.rb
   - templates/routeset_ex.rb
   - templates/theme.css
   - templates/theme.rb
   - templates/theme_controller.rb
-  - templates/theme_helpers.rb
+  - templates/theme_helper.rb
   - templates/themes.rake
   - MIT-LICENSE
   - Rakefile

data/templates/theme_helpers.rb

@@ -1,66 +0,0 @@
-#
-# These are theme helper tags
-#
-module ActionView
-   module Helpers
-      module AssetTagHelper
-
-         # TODO: Convert these to user the named route helpers (?)
-
-         # returns the public path to a theme stylesheet
-         def theme_stylesheet_path( source=nil, theme=nil )
-            theme = theme || controller.current_theme
-            compute_public_path(source || "theme", "themes/#{theme}/stylesheets", 'css')
-         end
-
-         # returns the path to a theme image
-         def theme_image_path( source, theme=nil )
-            theme = theme || controller.current_theme
-            compute_public_path(source, "themes/#{theme}/images", 'png')
-         end
-
-         # returns the path to a theme javascript
-         def theme_javascript_path( source, theme=nil )
-            theme = theme || controller.current_theme
-            compute_public_path(source, "themes/#{theme}/javascript", 'js')
-         end
-         
-
-         # This tag it will automatially include theme specific css files
-         def theme_stylesheet_link_tag(*sources)
-            sources.uniq!
-            options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
-            sources.collect { |source|
-               source = theme_stylesheet_path(source)
-               tag("link", { "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source }.merge(options))
-            }.join("\n")
-         end
-         
-         # This tag will return a theme-specific IMG
-         def theme_image_tag(source, options = {})
-           options.symbolize_keys
-
-           options[:src] = theme_image_path(source)
-           options[:alt] ||= File.basename(options[:src], '.*').split('.').first.capitalize
-
-           if options[:size]
-             options[:width], options[:height] = options[:size].split("x")
-             options.delete :size
-           end
-
-           tag("img", options)
-         end
-         
-         # This tag can be used to return theme-specific javscripts
-         def theme_javascript_include_tag(*sources)
-           options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
-           sources = ['prototype', 'effects', 'controls', 'dragdrop'] if sources.first == :defaults
-           sources.collect { |source|
-             source = theme_javascript_path(source)        
-             content_tag("script", "", { "type" => "text/javascript", "src" => source }.merge(options))
-           }.join("\n")
-         end
-
-      end 
-   end
-end