From f0523f72b46db14e2f50c8347a8708734c650f84 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <s@sikachu.com>
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