diff options
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/activeresource.gemspec | 9 | ||||
| -rw-r--r-- | activeresource/test/cases/log_subscriber_test.rb | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 209364a5dc..3718bb4f2e 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -1,10 +1,9 @@ -$:.unshift "lib" -require "active_resource/version" +version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'activeresource' - s.version = ActiveResource::VERSION::STRING + s.version = version s.summary = 'REST modeling framework (part of Rails).' s.description = 'REST on Rails. Wrap your RESTful web app with Ruby classes and work with them like Active Record models.' s.required_ruby_version = '>= 1.8.7' @@ -21,6 +20,6 @@ Gem::Specification.new do |s| s.extra_rdoc_files = %w( README ) s.rdoc_options.concat ['--main', 'README'] - s.add_dependency('activesupport', "= #{ActiveResource::VERSION::STRING}") - s.add_dependency('activemodel', "= #{ActiveResource::VERSION::STRING}") + s.add_dependency('activesupport', version) + s.add_dependency('activemodel', version) end diff --git a/activeresource/test/cases/log_subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb index 5df2cad599..f0330e8f51 100644 --- a/activeresource/test/cases/log_subscriber_test.rb +++ b/activeresource/test/cases/log_subscriber_test.rb @@ -7,15 +7,16 @@ require "active_support/core_ext/hash/conversions" # TODO: This test should be part of Railties class LogSubscriberTest < ActiveSupport::TestCase include Rails::LogSubscriber::TestHelper - Rails::LogSubscriber.add(:active_resource, ActiveResource::Railties::LogSubscriber.new) def setup + super + @matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person') ActiveResource::HttpMock.respond_to do |mock| mock.get "/people/1.xml", {}, @matz end - super + Rails::LogSubscriber.add(:active_resource, ActiveResource::Railties::LogSubscriber.new) end def set_logger(logger) |