theme_support 3.0.4 → 3.0.5

data/README

@@ -149,6 +149,8 @@ The theme_support plugin includes patches from the following:
 Thanks guys!
 
 == Changelog
+  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 
 
   3.0.3 - Hack which uses layout theme but crashes if it doesn't exist ! Now it loads the default layout

data/VERSION

@@ -1 +1 @@
-3.0.4
+3.0.5

data/lib/theme_support/helpers/erb_theme_tags.rb

@@ -5,19 +5,19 @@ 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')
+      compute_public_path(source || "theme", "themes/#{theme}/stylesheets", 'css').html_safe
    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')
+      compute_public_path(source, "themes/#{theme}/images", 'png').html_safe
    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}/javascripts", 'js')
+      compute_public_path(source, "themes/#{theme}/javascripts", 'js').html_safe
    end
    
    # This tag it will automatially include theme specific css files
@@ -27,7 +27,7 @@ module ActionView::Helpers::AssetTagHelper
       sources.collect { |source|
          source = theme_stylesheet_path(source)
          tag("link", { "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source }.merge(options))
-      }.join("\n")
+      }.join("\n").html_safe
    end
    
    # This tag will return a theme-specific IMG
@@ -42,7 +42,7 @@ module ActionView::Helpers::AssetTagHelper
        options.delete :size
      end
 
-     tag("img", options)
+     tag("img", options).html_safe
    end
    
    # This tag can be used to return theme-specific javscripts
@@ -58,6 +58,6 @@ module ActionView::Helpers::AssetTagHelper
      sources.collect { |source|
        source = theme_javascript_path(source)        
        content_tag("script", "", { "type" => "text/javascript", "src" => source }.merge(options))
-     }.join("\n")
+     }.join("\n").html_safe
    end
 end

data/lib/theme_support/patches/routeset_ex.rb

@@ -1,11 +1,11 @@
 module ThemeSupport
   module RoutingExtensions
     def themeing
-      @set.with_options :controller => 'theme' do |theme|       
-        match '/themes/:theme/images/*filename', :to => 'theme#images', :as => 'theme_images'
-        match '/themes/:theme/stylesheets/*filename', :to => 'theme#stylesheets', :as => 'theme_stylesheets'
-        match '/themes/:theme/javascripts/*filename', :to => 'theme#javascript', :as => 'theme_javascript'
-        match '/themes/*whatever', :to => 'theme#error'
+      @set.with_options :controller => 'themesupport' do |theme|
+        match '/themes/:theme/images/*filename', :to => 'themesupport#images', :as => 'theme_images'
+        match '/themes/:theme/stylesheets/*filename', :to => 'themesupport#stylesheets', :as => 'theme_stylesheets'
+        match '/themes/:theme/javascripts/*filename', :to => 'themesupport#javascript', :as => 'theme_javascript'
+        match '/themes/*whatever', :to => 'themesupport#error'
       end
     end
   end

data/lib/theme_support/{theme.rb → themesupport.rb}

@@ -1,4 +1,4 @@
-class Theme
+class Themesupport
   cattr_accessor :cache_theme_lookup
   @@cache_theme_lookup = false
 
@@ -12,13 +12,13 @@ class Theme
  
   def description
     if @description_html.nil?
-      @description_html = RedCloth.new(File.read( File.join(Theme.path_to_theme(name), "about.markdown") )).to_html(:markdown, :textile) rescue "#{title}"
+      @description_html = RedCloth.new(File.read( File.join(Themesupport.path_to_theme(name), "about.markdown") )).to_html(:markdown, :textile) rescue "#{title}"
     end
     @description_html
   end
   
   def has_preview?
-    File.exists?( File.join( Theme.path_to_theme(name), 'images', 'preview.png' ) ) rescue false
+    File.exists?( File.join( Themesupport.path_to_theme(name), 'images', 'preview.png' ) ) rescue false
   end
   
   def preview_image

data/lib/theme_support/{theme_controller.rb → themesupport_controller.rb}

@@ -1,6 +1,6 @@
 # The controller for serving/cacheing theme content...
 #
-class ThemeController < ActionController::Base
+class ThemesupportController < ActionController::Base
 
   after_filter :cache_theme_files
   
@@ -24,13 +24,13 @@ class ThemeController < 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 "#{Theme.path_to_theme(theme)}/#{type}/#{file}", :type => mime, :content_type => mime, :disposition => 'inline'
+    send_file "#{Themesupport.path_to_theme(theme)}/#{type}/#{file}", :type => mime, :content_type => mime, :disposition => 'inline'
   end
 
   def cache_theme_files
     path = request.fullpath
     begin
-      ThemeController.cache_page( response.body, path )
+      ThemesupportController.cache_page( response.body, path )
     rescue
       STERR.puts "Cache Exception: #{$!}"
     end

data/lib/theme_support/{theme_error.rb → themesupport_error.rb}

@@ -1,4 +1,4 @@
 # <tt>ThemeError</tt> is thrown when <tt>force_liquid</tt> is true, and 
 # a <tt>.liquid</tt> template isn't found.
-class ThemeError < StandardError
+class ThemesupportError < StandardError
 end

data/lib/theme_support/{theme_helper.rb → themesupport_helper.rb}

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

data/lib/theme_support.rb

@@ -2,8 +2,8 @@
 require 'theme_support/railtie'
 
 # Load the Theme model and ThemeController
-require 'theme_support/theme'
-require 'theme_support/theme_controller'
+require 'theme_support/themesupport'
+require 'theme_support/themesupport_controller'
 
 # Initializes theme support by extending some of the core Rails classes
 require 'theme_support/patches/abstractcontroller_ex'

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.4" =~ /[\.\d]+/) && $&
+  s.version     = ("$Release: 3.0.5" =~ /[\.\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: 15
+  hash: 13
   prerelease: false
   segments: 
   - 3
   - 0
-  - 4
-  version: 3.0.4
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Pierre Yager and Sylvain Claudel
@@ -41,12 +41,12 @@ files:
 - lib/theme_support/patches/abstractcontroller_ex.rb
 - lib/theme_support/patches/routeset_ex.rb
 - lib/theme_support/patches/actionmailer_ex.rb
-- lib/theme_support/theme_controller.rb
-- lib/theme_support/theme_helper.rb
+- lib/theme_support/themesupport.rb
+- lib/theme_support/themesupport_error.rb
+- lib/theme_support/themesupport_helper.rb
 - lib/theme_support/tasks.rb
-- lib/theme_support/theme.rb
 - lib/theme_support/railtie.rb
-- lib/theme_support/theme_error.rb
+- lib/theme_support/themesupport_controller.rb
 - lib/theme_support/helpers/erb_theme_tags.rb
 - lib/theme_support/helpers/liquid_theme_tags.rb
 - Gemfile