aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/lib/active_resource
diff options
context:
space:
mode:
Diffstat (limited to 'activeresource/lib/active_resource')
-rw-r--r--activeresource/lib/active_resource/base.rb21
1 files changed, 9 insertions, 12 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb
index fd583d40e9..9a810e4adf 100644
--- a/activeresource/lib/active_resource/base.rb
+++ b/activeresource/lib/active_resource/base.rb
@@ -6,13 +6,14 @@ module ActiveResource
# calls.
cattr_accessor :logger
- def self.inherited(base)
- base.site = site.to_s if site
- super
- end
-
class << self
- attr_reader :site
+ def site
+ if defined?(@site)
+ @site
+ elsif superclass != Object and superclass.site
+ superclass.site.dup.freeze
+ end
+ end
def site=(site)
@site = create_site_uri_from(site)
@@ -83,13 +84,9 @@ module ActiveResource
def find_single(scope, options)
new(connection.get(element_path(scope, options)), options)
end
-
+
def create_site_uri_from(site)
- returning site.is_a?(URI) ? site : URI.parse(site) do |uri|
- def uri.<<(extra)
- path << extra
- end unless uri.respond_to?(:<<)
- end
+ site.is_a?(URI) ? site.dup : URI.parse(site)
end
end