test/plugins/pagination.rb in composite_primary_keys-1.0.10 vs test/plugins/pagination.rb in composite_primary_keys-1.1.0

@@ -95,11 +95,11 @@
       unknown_option_keys = options.keys - valid_options
       raise ActionController::ActionControllerError,
             "Unknown options: #{unknown_option_keys.join(', ')}" unless
               unknown_option_keys.empty?
 
-      options[:singular_name] ||= Inflector.singularize(collection_id.to_s)
-      options[:class_name]  ||= Inflector.camelize(options[:singular_name])
+      options[:singular_name] ||= ActiveSupport::Inflector.singularize(collection_id.to_s)
+      options[:class_name]  ||= ActiveSupport::Inflector.camelize(options[:singular_name])
     end
 
     # Returns a paginator and a collection of Active Record model instances
     # for the paginator's current page. This is designed to be used in a
     # single action; to automatically paginate multiple actions, consider