Setup ActiveResource autoloads
This commit is contained in:
parent
28f36279cd
commit
0b694a4ff4
|
@ -1,6 +1,5 @@
|
|||
$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
|
||||
require 'active_resource'
|
||||
require 'active_resource/http_mock'
|
||||
require 'active_support/core_ext/hash/conversions'
|
||||
|
||||
ActiveSupport::XmlMini.backend = ENV['XMLMINI'] || 'REXML'
|
||||
|
|
|
@ -25,18 +25,15 @@ activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
|
|||
$:.unshift(activesupport_path) if File.directory?(activesupport_path)
|
||||
require 'active_support'
|
||||
|
||||
begin
|
||||
require 'active_model'
|
||||
rescue LoadError
|
||||
$:.unshift "#{File.dirname(__FILE__)}/../../activemodel/lib"
|
||||
require 'active_model'
|
||||
end
|
||||
|
||||
require 'active_resource/formats'
|
||||
require 'active_resource/base'
|
||||
require 'active_resource/validations'
|
||||
require 'active_resource/custom_methods'
|
||||
activemodel_path = "#{File.dirname(__FILE__)}/../../activemodel/lib"
|
||||
$:.unshift(activemodel_path) if File.directory?(activemodel_path)
|
||||
require 'active_model'
|
||||
|
||||
module ActiveResource
|
||||
autoload :Base, 'active_resource/base'
|
||||
autoload :Connection, 'active_resource/connection'
|
||||
autoload :CustomMethods, 'active_resource/custom_methods'
|
||||
autoload :Formats, 'active_resource/formats'
|
||||
autoload :Validations, 'active_resource/validations'
|
||||
autoload :HttpMock, 'active_resource/http_mock'
|
||||
end
|
||||
|
|
|
@ -10,10 +10,9 @@ require 'active_support/core_ext/object/misc'
|
|||
require 'set'
|
||||
require 'uri'
|
||||
|
||||
module ActiveResource
|
||||
autoload :Formats, 'active_resource/formats'
|
||||
autoload :Connection, 'active_resource/connection'
|
||||
require 'active_resource/exceptions'
|
||||
|
||||
module ActiveResource
|
||||
# ActiveResource::Base is the main class for mapping RESTful resources as models in a Rails application.
|
||||
#
|
||||
# For an outline of what Active Resource is capable of, see link:files/vendor/rails/activeresource/README.html.
|
||||
|
@ -1085,7 +1084,8 @@ module ActiveResource
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
require 'active_resource/validations'
|
||||
require 'active_resource/custom_methods'
|
||||
class Base
|
||||
include CustomMethods, Validations
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
require 'active_resource/exceptions'
|
||||
require 'active_resource/formats'
|
||||
require 'active_support/core_ext/benchmark'
|
||||
require 'net/https'
|
||||
require 'date'
|
||||
|
|
|
@ -117,8 +117,4 @@ module ActiveResource
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
class Base
|
||||
include CustomMethods
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
require 'active_resource/connection'
|
||||
require 'active_support/core_ext/kernel/reporting'
|
||||
|
||||
module ActiveResource
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
require 'active_resource/exceptions'
|
||||
require 'active_support/core_ext/array/wrap'
|
||||
|
||||
module ActiveResource
|
||||
|
@ -80,8 +79,4 @@ module ActiveResource
|
|||
@errors ||= Errors.new(self)
|
||||
end
|
||||
end
|
||||
|
||||
class Base
|
||||
include Validations
|
||||
end
|
||||
end
|
||||
|
|
|
@ -6,7 +6,6 @@ require 'mocha'
|
|||
|
||||
$:.unshift "#{File.dirname(__FILE__)}/../lib"
|
||||
require 'active_resource'
|
||||
require 'active_resource/http_mock'
|
||||
|
||||
$:.unshift "#{File.dirname(__FILE__)}/../test"
|
||||
require 'setter_trap'
|
||||
|
|
Loading…
Reference in New Issue