lib/uploader/engine.rb in glebtv-rails-uploader-0.4.1 vs lib/uploader/engine.rb in glebtv-rails-uploader-0.5.0

- old
+ new

@@ -2,24 +2,28 @@ require 'uploader' module Uploader class Engine < ::Rails::Engine isolate_namespace Uploader - + initializer "uploader.assets_precompile" do |app| app.config.assets.precompile += Uploader.assets end - - initializer "uploader.helpers" do + + initializer "uploader.helpers" do ActiveSupport.on_load :action_view do ActionView::Base.send(:include, Uploader::Helpers::FormTagHelper) ActionView::Helpers::FormBuilder.send(:include, Uploader::Helpers::FormBuilder) end end - + initializer "uploader.hooks" do require "uploader/hooks/active_record" if Object.const_defined?("ActiveRecord") - require "uploader/hooks/formtastic" if Object.const_defined?("Formtastic") - require "uploader/hooks/simple_form" if Object.const_defined?("SimpleForm") + + if Object.const_defined?("SimpleForm") + require "uploader/hooks/simple_form" + elsif Object.const_defined?("Formtastic") + require "uploader/hooks/formtastic" + end end end end