theme_support 3.0.5 → 3.0.6

data/README

@@ -149,6 +149,8 @@ The theme_support plugin includes patches from the following:
 Thanks guys!
 
 == Changelog
+  3.0.6 - We didn't need to preload cache (rake themes:cache:update) in development
+
   3.0.5 - html_safe on helpers, Theme model and controller become Themesupport model and controller
 
   3.0.4 - [BUG] override view when we use explicitely render 

data/VERSION

@@ -1 +1 @@
-3.0.5
+3.0.6

data/lib/theme_support/helpers/erb_theme_tags.rb

@@ -15,10 +15,16 @@ module ActionView::Helpers::AssetTagHelper
    end
 
    # returns the path to a theme javascript
-   def theme_javascript_path( source, theme=nil )
+   # Add ts to the name function, because rails think it's a route (_path)
+   def theme_javascript_pathts( source, theme=nil )
       theme = theme || controller.current_theme
       compute_public_path(source, "themes/#{theme}/javascripts", 'js').html_safe
    end
+
+   # To keep compatibility with old themesupport plugin
+   def theme_javascript_path( source, theme=nil )
+      theme_javascript_pathts( source, theme)
+   end
    
    # This tag it will automatially include theme specific css files
    def theme_stylesheet_link_tag(*sources)
@@ -56,7 +62,7 @@ module ActionView::Helpers::AssetTagHelper
        sources << "application" if defined?(Rails.root) && File.exists?("#{Rails.root}/public/javascripts/application.js")
      end
      sources.collect { |source|
-       source = theme_javascript_path(source)        
+       source = theme_javascript_pathts(source)
        content_tag("script", "", { "type" => "text/javascript", "src" => source }.merge(options))
      }.join("\n").html_safe
    end

data/lib/theme_support/themesupport_controller.rb

@@ -1,19 +1,20 @@
+# coding: utf-8
 # The controller for serving/cacheing theme content...
 #
 class ThemesupportController < ActionController::Base
 
-  after_filter :cache_theme_files
+  #after_filter :cache_theme_files
   
   def stylesheets
-    render_theme_item(:stylesheets, params[:filename].join('/'), params[:theme])
+    render_theme_item(:stylesheets, [params[:filename]].flatten.join('/'), params[:theme])
   end
 
   def javascript
-    render_theme_item(:javascripts, params[:filename].join('/'), params[:theme], 'text/javascript')
+    render_theme_item(:javascripts, [params[:filename]].flatten.join('/'), params[:theme], 'text/javascript')
   end
 
   def images
-    render_theme_item(:images, params[:filename].to_s, params[:theme])
+    render_theme_item(:images, [params[:filename]].flatten.join('/'), params[:theme])
   end
 
   def error
@@ -24,7 +25,11 @@ class ThemesupportController < ActionController::Base
   
   def render_theme_item(type, file, theme, mime = mime_for(file))
     render :text => "Not Found", :status => 404 and return if file.split(%r{[\\/]}).include?("..")
-    send_file "#{Themesupport.path_to_theme(theme)}/#{type}/#{file}", :type => mime, :content_type => mime, :disposition => 'inline'
+
+    #Call manually, if it is in a after_filter send_file doesn't work
+    cache_theme_files
+
+    send_file "#{Themesupport.path_to_theme(theme)}/#{type}/#{file}", :type => mime, :disposition => 'inline'
   end
 
   def cache_theme_files

data/theme_support.gemspec

@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |s|
   s.name        = 'theme_support'
   s.author      = 'Pierre Yager and Sylvain Claudel'
   s.email       = "pierre@levosgien.net"
-  s.version     = ("$Release: 3.0.5" =~ /[\.\d]+/) && $&
+  s.version     = ("$Release: 3.0.6" =~ /[\.\d]+/) && $&
   s.platform    = Gem::Platform::RUBY
   s.homepage    = 'http://github.com/zedalaye/theme_support'
   s.rubyforge_project = 'theme-support'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: theme_support
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 3
   - 0
-  - 5
-  version: 3.0.5
+  - 6
+  version: 3.0.6
 platform: ruby
 authors: 
 - Pierre Yager and Sylvain Claudel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +02:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: []