lib/galakei/railtie.rb in galakei-0.12.1 vs lib/galakei/railtie.rb in galakei-0.13.0

@@ -1,13 +1,17 @@
 module Galakei
   class Railtie < ::Rails::Railtie
     config.galakei = ActiveSupport::OrderedOptions.new
     initializer "galakei.extend.action_controller" do |app|
-      filters = %w[Views ContentType Recode NonStandardChar]
-      filters << :Haml if defined?(Haml)
       ActiveSupport.on_load :action_controller do
         include Galakei::HelperMethods
-        filters.each {|f| Galakei::Filter.const_get(f).inject(self) }
+        before_filter Galakei::Filter::Views, :if => :galakei?
+        after_filter Galakei::Filter::ContentType, :if => lambda {|c| Galakei::Filter::ContentType.condition?(c) }
+        before_filter Galakei::Filter::Recode::Params, :if => lambda {|c| Galakei::Filter::Recode.condition?(c) }
+        after_filter Galakei::Filter::Recode::Response, :if => lambda {|c| Galakei::Filter::Recode.condition?(c) }
+        after_filter Galakei::Filter::NonStandardChar, :if => lambda {|c| Galakei::Filter::NonStandardChar.condition?(c) }
+        after_filter Galakei::Filter::Hankaku, :if => lambda {|c| Galakei::Filter::Hankaku.condition?(c) }
+        around_filter Galakei::Filter::Haml, :if => :galakei? if defined?(Haml)
       end
       ActiveSupport.on_load :action_view do
         include Galakei::InputMode
       end
     end