swiss_knife 0.1.1 → 0.1.2

data/lib/swiss_knife/helpers.rb

@@ -132,16 +132,17 @@ module SwissKnife
         bundle = SwissKnife::Assets.config["javascripts"][name.to_s] rescue nil
 
         if SwissKnife::Assets.merge? && bundle
-          html << javascript_include_tag("#{name}_packaged", options)
+          html << javascript_include_tag("#{name}_packaged".html_safe, options)
         elsif bundle
           bundle.each do |file|
-            html << javascript_include_tag("#{file}", options)
+            html << javascript_include_tag(file.to_s.html_safe, options)
           end
         else
-          html << javascript_include_tag("#{name}", options)
+          html << javascript_include_tag(name.to_s.html_safe, options)
         end
       end
-      html
+
+      html.html_safe
     end
 
     def stylesheet_includes(*args)
@@ -162,7 +163,7 @@ module SwissKnife
         end
       end
 
-      html
+      html.html_safe
     end
 
     def fieldset(legend, options = {}, &block)

data/lib/swiss_knife/railtie.rb

@@ -10,10 +10,12 @@ module SwissKnife
       require "swiss_knife/rake_tasks"
     end
 
-    initializer "swiss_knife.initialize" do |app|
-      ApplicationController.send :include, SwissKnife::ActionController
-      ApplicationController.helper SwissKnife::Helpers
-      ApplicationController.helper_method :page_title
+    config.after_initialize do
+      ActiveSupport.on_load(:action_controller) do
+        include SwissKnife::ActionController
+        helper SwissKnife::Helpers
+        helper_method :page_title
+      end
     end
   end
 end

data/lib/swiss_knife/version.rb

@@ -2,7 +2,7 @@ module SwissKnife
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/swiss_knife.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{swiss_knife}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2010-10-11}
+  s.date = %q{2010-10-12}
   s.description = %q{Several helpers for Rails 3}
   s.email = %q{fnando.vieira@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -03:00
+date: 2010-10-12 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency