From eec2d301d4ce9df9c71c1a5aa63053eb970b6818 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Mon, 15 Feb 2010 10:20:11 -0600 Subject: Fix test load paths for those not using bundler --- activeresource/test/abstract_unit.rb | 6 ++++-- activeresource/test/cases/subscriber_test.rb | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'activeresource') diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 1af535e811..1c6f92cba4 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -1,4 +1,7 @@ -require File.expand_path('../../../load_paths', __FILE__) +require File.expand_path('../../../bundler', __FILE__) + +lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") +$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) require 'rubygems' require 'test/unit' @@ -6,7 +9,6 @@ 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/subscriber_test.rb index fb890e86cb..c673a0551a 100644 --- a/activeresource/test/cases/subscriber_test.rb +++ b/activeresource/test/cases/subscriber_test.rb @@ -1,9 +1,13 @@ +railties_path = File.expand_path('../../../../railties/lib', __FILE__) +$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path) + require "abstract_unit" require "fixtures/person" require "rails/subscriber/test_helper" require "active_resource/railties/subscriber" require "active_support/core_ext/hash/conversions" +# TODO: This test should be part of Railties class SubscriberTest < ActiveSupport::TestCase include Rails::Subscriber::TestHelper Rails::Subscriber.add(:active_resource, ActiveResource::Railties::Subscriber.new) @@ -28,4 +32,4 @@ class SubscriberTest < ActiveSupport::TestCase assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0] assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1] end -end \ No newline at end of file +end -- cgit v1.2.3 From f0523f72b46db14e2f50c8347a8708734c650f84 Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Mon, 15 Feb 2010 21:44:30 +0700 Subject: Rename Rails::Subscriber to Rails::LogSubscriber --- activeresource/lib/active_resource/railtie.rb | 4 +-- .../lib/active_resource/railties/log_subscriber.rb | 15 +++++++++++ .../lib/active_resource/railties/subscriber.rb | 15 ----------- activeresource/test/cases/log_subscriber_test.rb | 31 ++++++++++++++++++++++ activeresource/test/cases/subscriber_test.rb | 31 ---------------------- 5 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 activeresource/lib/active_resource/railties/log_subscriber.rb delete mode 100644 activeresource/lib/active_resource/railties/subscriber.rb create mode 100644 activeresource/test/cases/log_subscriber_test.rb delete mode 100644 activeresource/test/cases/subscriber_test.rb (limited to 'activeresource') 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/log_subscriber.rb b/activeresource/lib/active_resource/railties/log_subscriber.rb new file mode 100644 index 0000000000..86806a93d0 --- /dev/null +++ b/activeresource/lib/active_resource/railties/log_subscriber.rb @@ -0,0 +1,15 @@ +module ActiveResource + module Railties + class LogSubscriber < Rails::LogSubscriber + def request(event) + result = event.payload[:result] + info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}" + info "--> %d %s %d (%.1fms)" % [result.code, result.message, result.body.to_s.length, event.duration] + end + + def logger + ActiveResource::Base.logger + end + end + end +end \ No newline at end of file diff --git a/activeresource/lib/active_resource/railties/subscriber.rb b/activeresource/lib/active_resource/railties/subscriber.rb deleted file mode 100644 index fb98061b71..0000000000 --- a/activeresource/lib/active_resource/railties/subscriber.rb +++ /dev/null @@ -1,15 +0,0 @@ -module ActiveResource - module Railties - class Subscriber < Rails::Subscriber - def request(event) - result = event.payload[:result] - info "#{event.payload[:method].to_s.upcase} #{event.payload[:request_uri]}" - info "--> %d %s %d (%.1fms)" % [result.code, result.message, result.body.to_s.length, event.duration] - end - - def logger - ActiveResource::Base.logger - end - end - end -end \ No newline at end of file diff --git a/activeresource/test/cases/log_subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb new file mode 100644 index 0000000000..56709b6fd3 --- /dev/null +++ b/activeresource/test/cases/log_subscriber_test.rb @@ -0,0 +1,31 @@ +require "abstract_unit" +require "fixtures/person" +require "rails/log_subscriber/test_helper" +require "active_resource/railties/log_subscriber" +require "active_support/core_ext/hash/conversions" + +class LogSubscriberTest < ActiveSupport::TestCase + include Rails::LogSubscriber::TestHelper + Rails::LogSubscriber.add(:active_resource, ActiveResource::Railties::LogSubscriber.new) + + def setup + @matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person') + ActiveResource::HttpMock.respond_to do |mock| + mock.get "/people/1.xml", {}, @matz + end + + super + end + + def set_logger(logger) + ActiveResource::Base.logger = logger + end + + def test_request_notification + matz = Person.find(1) + 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] + end +end \ No newline at end of file diff --git a/activeresource/test/cases/subscriber_test.rb b/activeresource/test/cases/subscriber_test.rb deleted file mode 100644 index fb890e86cb..0000000000 --- a/activeresource/test/cases/subscriber_test.rb +++ /dev/null @@ -1,31 +0,0 @@ -require "abstract_unit" -require "fixtures/person" -require "rails/subscriber/test_helper" -require "active_resource/railties/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) - - def setup - @matz = { :id => 1, :name => 'Matz' }.to_xml(:root => 'person') - ActiveResource::HttpMock.respond_to do |mock| - mock.get "/people/1.xml", {}, @matz - end - - super - end - - def set_logger(logger) - ActiveResource::Base.logger = logger - end - - def test_request_notification - matz = Person.find(1) - 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] - end -end \ No newline at end of file -- cgit v1.2.3 From 24ab5665b2f12a589e96a4b742cc49c08bf0e9df Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Tue, 23 Feb 2010 17:31:17 -0800 Subject: Revert "Fix test load paths for those not using bundler" This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818. This commit broke tests. You cannot have a file called "bundler" on the load path. --- activeresource/test/abstract_unit.rb | 6 ++---- activeresource/test/cases/log_subscriber_test.rb | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'activeresource') diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 1c6f92cba4..1af535e811 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -1,7 +1,4 @@ -require File.expand_path('../../../bundler', __FILE__) - -lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") -$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) +require File.expand_path('../../../load_paths', __FILE__) require 'rubygems' require 'test/unit' @@ -9,6 +6,7 @@ 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/log_subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb index 45eb4da8a4..c25dd4ebc5 100644 --- a/activeresource/test/cases/log_subscriber_test.rb +++ b/activeresource/test/cases/log_subscriber_test.rb @@ -1,6 +1,3 @@ -railties_path = File.expand_path('../../../../railties/lib', __FILE__) -$:.unshift(railties_path) if File.directory?(railties_path) && !$:.include?(railties_path) - require "abstract_unit" require "fixtures/person" require "rails/log_subscriber/test_helper" @@ -32,4 +29,4 @@ class LogSubscriberTest < ActiveSupport::TestCase assert_equal "GET http://37s.sunrise.i:3000/people/1.xml", @logger.logged(:info)[0] assert_match /\-\-\> 200 200 106/, @logger.logged(:info)[1] end -end +end \ No newline at end of file -- cgit v1.2.3 From f10a019452d6864420dd15830073d93dd90de0f1 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Fri, 26 Feb 2010 20:45:01 -0200 Subject: no more warning ambiguous first argument; put parentheses or even spaces on log_subscriber_test --- activeresource/test/cases/log_subscriber_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activeresource') diff --git a/activeresource/test/cases/log_subscriber_test.rb b/activeresource/test/cases/log_subscriber_test.rb index c25dd4ebc5..5df2cad599 100644 --- a/activeresource/test/cases/log_subscriber_test.rb +++ b/activeresource/test/cases/log_subscriber_test.rb @@ -27,6 +27,6 @@ class LogSubscriberTest < 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 -- cgit v1.2.3 From 30446f7b29b1803ea24f9c6d9ed93b16dcbf7431 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 28 Feb 2010 18:29:34 -0600 Subject: correct activeresource load path --- activeresource/test/abstract_unit.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'activeresource') 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' -- cgit v1.2.3 From 11db694e0b825e3077e7545b08c1bf975997021f Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Mon, 1 Mar 2010 21:55:43 -0500 Subject: Remove cruft in the gem packaging and release code --- activeresource/Rakefile | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'activeresource') diff --git a/activeresource/Rakefile b/activeresource/Rakefile index 829752516f..a0a8ab19d1 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -7,20 +7,6 @@ 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 ] -- cgit v1.2.3 From a4111bbca0884e4a748ab32ba7d7b550ec8d9186 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Mon, 1 Mar 2010 23:03:07 -0500 Subject: Update versions of all components to normalize them to new format --- activeresource/lib/active_resource/version.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activeresource') 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 -- cgit v1.2.3 From f221a6f19f4cee31e2d103ea9a1930f59223fc25 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Mon, 1 Mar 2010 23:36:54 -0500 Subject: Leverage VERSION constants from gemspecs to avoid tedious updates when releasing --- activeresource/Rakefile | 2 -- activeresource/activeresource.gemspec | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'activeresource') diff --git a/activeresource/Rakefile b/activeresource/Rakefile index a0a8ab19d1..175b379699 100644 --- a/activeresource/Rakefile +++ b/activeresource/Rakefile @@ -5,8 +5,6 @@ require 'rake/rdoctask' require 'rake/packagetask' require 'rake/gempackagetask' -require File.join(File.dirname(__FILE__), 'lib', 'active_resource', 'version') - desc "Default Task" task :default => [ :test ] diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 1722ebeb8e..4cee5dbddd 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -1,7 +1,10 @@ +$:.unshift "lib" +require "active_resource/version" + Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'activeresource' - s.version = '3.0.0.beta1' + s.version = ActiveResource::VERSION::STRING s.summary = 'REST-model framework (part of Rails).' s.description = 'REST-model framework (part of Rails).' s.required_ruby_version = '>= 1.8.7' @@ -18,6 +21,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', "= #{ActiveResource::VERSION::STRING}") + s.add_dependency('activemodel', "= #{ActiveResource::VERSION::STRING}") end -- cgit v1.2.3 From 56ea20605a54386158e90e290caa6d15e7623ade Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 2 Mar 2010 10:32:09 -0800 Subject: Wordsmith gem descriptions --- activeresource/activeresource.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activeresource') diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 4cee5dbddd..209364a5dc 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -5,8 +5,8 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'activeresource' s.version = ActiveResource::VERSION::STRING - s.summary = 'REST-model framework (part of Rails).' - s.description = 'REST-model framework (part of Rails).' + 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' -- cgit v1.2.3 From 312570c488d71264eff83bb72b163005539a59fd Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Tue, 2 Mar 2010 22:56:34 -0800 Subject: Fix active_resource tests --- activeresource/test/cases/log_subscriber_test.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'activeresource') 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) -- cgit v1.2.3 From deb00bcb8cf88eb6420282c9af0af64fb69aeed4 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Thu, 4 Mar 2010 22:41:39 -0500 Subject: Read Rails version from a file instead of modifying the load path and doing requires Signed-off-by: Jeremy Kemper --- activeresource/activeresource.gemspec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'activeresource') diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 209364a5dc..001c8dc62a 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -1,10 +1,9 @@ -$:.unshift "lib" -require "active_resource/version" +version = File.read("../RAILS_VERSION").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 -- cgit v1.2.3 From 4bc2cbc3cfa231b3dea0dce38a6fa2723c7ed94d Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Sat, 6 Mar 2010 13:30:25 -0600 Subject: Load RAILS_VERSION relative to the gemspec file. --- activeresource/activeresource.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'activeresource') diff --git a/activeresource/activeresource.gemspec b/activeresource/activeresource.gemspec index 001c8dc62a..3718bb4f2e 100644 --- a/activeresource/activeresource.gemspec +++ b/activeresource/activeresource.gemspec @@ -1,4 +1,4 @@ -version = File.read("../RAILS_VERSION").strip +version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY -- cgit v1.2.3