Permalink
Browse files

Merge pull request #766 from haines/remove_railtie

Remove railtie and just use engine
  • Loading branch information...
sobrinho committed Dec 24, 2011
2 parents c2a4ee8 + b79ded5 commit 660a078b1c0fec74b2675f38b99586de233b9dbe
Showing with 5 additions and 14 deletions.
  1. +0 −1 lib/formtastic.rb
  2. +5 −1 lib/formtastic/engine.rb
  3. +0 −12 lib/formtastic/railtie.rb
View
@@ -1,5 +1,4 @@
# encoding: utf-8
-require 'formtastic/railtie' if defined?(::Rails)
require 'formtastic/engine' if defined?(::Rails)
module Formtastic
View
@@ -1,7 +1,11 @@
-# Configure Rails 3.1 to have assert_select_jquery() in tests
module Formtastic
# Required for formtastic.css to be discoverable in the asset pipeline
# @private
class Engine < ::Rails::Engine
+ initializer 'formtastic.initialize' do
+ ActiveSupport.on_load(:action_view) do
+ include Formtastic::Helpers::FormHelper
+ end
+ end
end
end
View
@@ -1,12 +0,0 @@
-# encoding: utf-8
-
-module Formtastic
- # @private
- class Railtie < Rails::Railtie
- initializer 'formtastic.initialize' do
- ActiveSupport.on_load(:action_view) do
- include Formtastic::Helpers::FormHelper
- end
- end
- end
-end

0 comments on commit 660a078

Please sign in to comment.