activesupport_notifications_backport 0.0.3 → 0.0.4

data/activesupport_notifications_backport.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'activesupport_notifications_backport'
-  s.version           = '0.0.3'
+  s.version           = '0.0.4'
   s.date              = '2012-03-20'
   s.rubyforge_project = 'activesupport_notifications_backport'
 

data/lib/active_support/notifications.rb

@@ -109,30 +109,34 @@ module ActiveSupport
     autoload :Event, File.expand_path('../notifications/instrumenter', __FILE__)
     autoload :Fanout, File.expand_path('../notifications/fanout', __FILE__)
 
-    @instrumenters = Hash.new { |h,k| h[k] = notifier.listening?(k) }
+    class Service
+      attr_reader :notifier, :instrumenter
 
-    class << self
-      attr_accessor :notifier
+      def initialize(notifier)
+        @notifier = notifier
+        @instrumenter = Instrumenter.new(notifier)
+        @instrumenters = Hash.new { |h,k| h[k] = notifier.listening?(k) }
+      end
 
       def publish(name, *args)
-        notifier.publish(name, *args)
+        @notifier.publish(name, *args)
       end
 
       def instrument(name, payload = {})
         if @instrumenters[name]
-          instrumenter.instrument(name, payload) { yield payload if block_given? }
+         @instrumenter.instrument(name, payload) { yield payload if block_given? }
         else
           yield payload if block_given?
         end
       end
 
       def subscribe(*args, &block)
-        notifier.subscribe(*args, &block).tap do
+        @notifier.subscribe(*args, &block).tap do
           @instrumenters.clear
         end
       end
 
-      def subscribed(callback, *args, &block)
+      def subscribed(callback, *args)
         subscriber = subscribe(*args, &callback)
         yield
       ensure
@@ -140,12 +144,45 @@ module ActiveSupport
       end
 
       def unsubscribe(args)
-        notifier.unsubscribe(args)
+        @notifier.unsubscribe(args)
         @instrumenters.clear
       end
 
       def instrumenter
-        Thread.current[:"instrumentation_#{notifier.object_id}"] ||= Instrumenter.new(notifier)
+        Thread.current[:"instrumentation_#{@notifier.object_id}"] ||= Instrumenter.new(@notifier)
+      end
+    end
+
+    class << self
+      attr_reader :service, :notifier
+
+      def publish(name, *args)
+        service.publish(name, *args)
+      end
+
+      def instrument(name, payload = {}, &block)
+        service.instrument(name, payload, &block)
+      end
+
+      def subscribe(*args, &block)
+        service.subscribe(*args, &block)
+      end
+
+      def subscribed(callback, *args, &block)
+        service.subscribed(callback, *args, &block)
+      end
+
+      def unsubscribe(args)
+        service.unsubscribe(args)
+      end
+
+      def instrumenter
+        service.instrumenter
+      end
+
+      def notifier=(value)
+        @service = Service.new(value)
+        @notifier = value
       end
     end
 

data/lib/activesupport_notifications_backport.rb

@@ -4,7 +4,7 @@ if ActiveSupport::VERSION::MAJOR > 2
 end
 
 module ActiveSupportNotificationsBackport
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end
 
 require 'active_support/secure_random'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesupport_notifications_backport
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70237287173860 !ruby/object:Gem::Requirement
+  requirement: &70219793442680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *70237287173860
+  version_requirements: *70219793442680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70237287172200 !ruby/object:Gem::Requirement
+  requirement: &70219793442300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237287172200
+  version_requirements: *70219793442300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70237287171180 !ruby/object:Gem::Requirement
+  requirement: &70219793441840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237287171180
+  version_requirements: *70219793441840
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70237287170320 !ruby/object:Gem::Requirement
+  requirement: &70219793441420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237287170320
+  version_requirements: *70219793441420
 description: ActiveSupport::Notifications backported for Rails 2.3
 email: technoweenie@gmail.com
 executables: []