diff options
Diffstat (limited to 'activeresource')
-rw-r--r-- | activeresource/Rakefile | 16 | ||||
-rw-r--r-- | activeresource/activeresource.gemspec | 12 | ||||
-rw-r--r-- | activeresource/lib/active_resource/railtie.rb | 4 | ||||
-rw-r--r-- | activeresource/lib/active_resource/railties/log_subscriber.rb (renamed from activeresource/lib/active_resource/railties/subscriber.rb) | 2 | ||||
-rw-r--r-- | activeresource/lib/active_resource/version.rb | 5 | ||||
-rw-r--r-- | activeresource/test/abstract_unit.rb | 4 | ||||
-rw-r--r-- | activeresource/test/cases/log_subscriber_test.rb (renamed from activeresource/test/cases/subscriber_test.rb) | 18 |
7 files changed, 26 insertions, 35 deletions
diff --git a/activeresource/Rakefile b/activeresource/Rakefile index 829752516f..175b379699 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -5,22 +5,6 @@ require 'rake/rdoctask' require 'rake/packagetask' require 'rake/gempackagetask' -require File.join(File.dirname(__FILE__), 'lib', 'active_resource', 'version') - -PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' -PKG_NAME = 'activeresource' -PKG_VERSION = ActiveResource::VERSION::STRING + PKG_BUILD -PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" - -RELEASE_NAME = "REL #{PKG_VERSION}" - -RUBY_FORGE_PROJECT = "activerecord" -RUBY_FORGE_USER = "webster132" - -PKG_FILES = FileList[ - "lib/**/*", "test/**/*", "[A-Z]*", "Rakefile" -].exclude(/\bCVS\b|~$/) - desc "Default Task" task :default => [ :test ] diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 1722ebeb8e..3718bb4f2e 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -1,9 +1,11 @@ +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 = '3.0.0.beta1' - s.summary = 'REST-model framework (part of Rails).' - s.description = 'REST-model framework (part of Rails).' + 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' s.author = 'David Heinemeier Hansson' @@ -18,6 +20,6 @@ Gem::Specification.new do |s| s.extra_rdoc_files = %w( README ) s.rdoc_options.concat ['--main', 'README'] - s.add_dependency('activesupport', '= 3.0.0.beta1') - s.add_dependency('activemodel', '= 3.0.0.beta1') + s.add_dependency('activesupport', version) + s.add_dependency('activemodel', version) end diff --git a/activeresource/lib/active_resource/railtie.rb b/activeresource/lib/active_resource/railtie.rb index 7e35fdc0eb..27c88415f6 100644 --- a/activeresource/lib/active_resource/railtie.rb +++ b/activeresource/lib/active_resource/railtie.rb @@ -5,8 +5,8 @@ module ActiveResource class Railtie < Rails::Railtie railtie_name :active_resource - require "active_resource/railties/subscriber" - subscriber ActiveResource::Railties::Subscriber.new + require "active_resource/railties/log_subscriber" + log_subscriber ActiveResource::Railties::LogSubscriber.new initializer "active_resource.set_configs" do |app| app.config.active_resource.each do |k,v| diff --git a/activeresource/lib/active_resource/railties/subscriber.rb b/activeresource/lib/active_resource/railties/log_subscriber.rb index fb98061b71..86806a93d0 100644 --- a/activeresource/lib/active_resource/railties/subscriber.rb +++ b/activeresource/lib/active_resource/railties/log_subscriber.rb @@ -1,6 +1,6 @@ module ActiveResource module Railties - class Subscriber < Rails::Subscriber + class LogSubscriber < Rails::LogSubscriber def request(event) result = event.payload[:result] info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}" diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 461fef5283..bb60954e05 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -2,8 +2,9 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 3 MINOR = 0 - TINY = "0.beta1" + TINY = 0 + BUILD = "beta1" - STRING = [MAJOR, MINOR, TINY].join('.') + STRING = [MAJOR, MINOR, TINY, BUILD].join('.') end end diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 1af535e811..fcb770d612 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -1,12 +1,14 @@ require File.expand_path('../../../load_paths', __FILE__) +lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) + require 'rubygems' require 'test/unit' require 'active_resource' require 'active_support' require 'active_support/test_case' -$:.unshift "#{File.dirname(__FILE__)}/../test" require 'setter_trap' require 'logger' diff --git a/activeresource/test/cases/subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb index fb890e86cb..f0330e8f51 100644 --- a/activeresource/test/cases/subscriber_test.rb +++ b/activeresource/test/cases/log_subscriber_test.rb @@ -1,20 +1,22 @@ require "abstract_unit" require "fixtures/person" -require "rails/subscriber/test_helper" -require "active_resource/railties/subscriber" +require "rails/log_subscriber/test_helper" +require "active_resource/railties/log_subscriber" require "active_support/core_ext/hash/conversions" -class SubscriberTest < ActiveSupport::TestCase - include Rails::Subscriber::TestHelper - Rails::Subscriber.add(:active_resource, ActiveResource::Railties::Subscriber.new) +# TODO: This test should be part of Railties +class LogSubscriberTest < ActiveSupport::TestCase + include Rails::LogSubscriber::TestHelper 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) @@ -26,6 +28,6 @@ class SubscriberTest < ActiveSupport::TestCase wait assert_equal 2, @logger.logged(:info).size assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0] - assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1] + assert_match(/\-\-\> 200 200 106/, @logger.logged(:info)[1]) end -end
\ No newline at end of file +end |