Merge pull request #2 from Adman65/master

Remove Rails Dependency
This commit is contained in:
José Valim
2011-12-06 00:49:09 -08:00
7 changed files with 21 additions and 14 deletions

View File

@@ -16,7 +16,7 @@ module ActionController
#
# class ApplicationController < ActionController::Base
# private
#
#
# def serialization_scope
# current_user
# end
@@ -48,4 +48,4 @@ module ActionController
end
end
end
end
end

View File

@@ -23,12 +23,13 @@ ActiveModel::Serialization.class_eval do
end
end
require "action_controller"
begin
require 'action_controller'
require 'action_controller/serialization'
module ActionController
autoload :Serialization, "action_controller/serialization"
ActiveSupport.on_load(:action_controller) do
include ::ActionController::Serialization
end
rescue LoadError => ex
# rails on installed, continuing
end
ActiveSupport.on_load(:action_controller) do
include ::ActionController::Serialization
end