Use fewer conditionals & simplify the required files

This commit is contained in:
Jon Atack 2015-04-08 22:55:44 +05:30
parent e01b7ffc26
commit 63d4973885
1 changed files with 12 additions and 7 deletions

View File

@ -10,7 +10,6 @@ end
module Ransack module Ransack
extend Configuration extend Configuration
class UntraversableAssociationError < StandardError; end; class UntraversableAssociationError < StandardError; end;
end end
@ -18,20 +17,26 @@ Ransack.configure do |config|
Ransack::Constants::AREL_PREDICATES.each do |name| Ransack::Constants::AREL_PREDICATES.each do |name|
config.add_predicate name, :arel_predicate => name config.add_predicate name, :arel_predicate => name
end end
Ransack::Constants::DERIVED_PREDICATES.each do |args| Ransack::Constants::DERIVED_PREDICATES.each do |args|
config.add_predicate *args config.add_predicate *args
end end
end end
require 'ransack/translate'
require 'ransack/adapters/active_record/ransack/translate' if defined?(::ActiveRecord::Base)
require 'ransack/adapters/mongoid/ransack/translate' if defined?(::Mongoid)
require 'ransack/search' require 'ransack/search'
require 'ransack/ransacker' require 'ransack/ransacker'
require 'ransack/adapters/active_record' if defined?(::ActiveRecord::Base)
require 'ransack/adapters/mongoid' if defined?(::Mongoid)
require 'ransack/helpers' require 'ransack/helpers'
require 'action_controller' require 'action_controller'
require 'ransack/translate'
if defined?(::ActiveRecord::Base)
require 'ransack/adapters/active_record/ransack/translate'
require 'ransack/adapters/active_record'
end
if defined?(::Mongoid)
require 'ransack/adapters/mongoid/ransack/translate'
require 'ransack/adapters/mongoid'
end
ActionController::Base.helper Ransack::Helpers::FormHelper ActionController::Base.helper Ransack::Helpers::FormHelper