no_peeping_toms 2.1.2 → 2.1.3

data/History.rdoc

@@ -1,3 +1,6 @@
+=== Version 2.1.3 / 2012-07-26
+* Fix deprecation warning
+
 === Version 2.0.1 / 2011-02-16
 * Supports current Rails 3.x release.  No longer supports Rails 2.
 

data/lib/no_peeping_toms.rb

@@ -45,32 +45,36 @@ module NoPeepingToms
     end
   end
 
-  module InstanceMethods
-    # Overrides ActiveRecord#define_callbacks so that observers are only called
-    # when enabled.
-    #
-    # This is a bit yuck being a protected method, but appears to be the cleanest
-    # way so far
-    def define_callbacks_with_enabled_check(klass)
-      observer = self
-      observer_name = observer.class.name.underscore.gsub('/', '__')
+  # Overrides ActiveRecord#define_callbacks so that observers are only called
+  # when enabled.
+  #
+  # This is a bit yuck being a protected method, but appears to be the cleanest
+  # way so far
+  def define_callbacks_with_enabled_check(klass)
+    observer = self
+    observer_name = observer.class.name.underscore.gsub('/', '__')
 
-      ActiveRecord::Callbacks::CALLBACKS.each do |callback|
-        next unless respond_to?(callback)
-        callback_meth = :"_notify_#{observer_name}_for_#{callback}"
-        unless klass.respond_to?(callback_meth)
-          klass.send(:define_method, callback_meth) do
-            observer.send(callback, self) if observer.observer_enabled?
-          end
-          klass.send(callback, callback_meth)
+    ActiveRecord::Callbacks::CALLBACKS.each do |callback|
+      next unless respond_to?(callback)
+      callback_meth = :"_notify_#{observer_name}_for_#{callback}"
+      unless klass.respond_to?(callback_meth)
+        klass.send(:define_method, callback_meth) do
+          observer.send(callback, self) if observer.observer_enabled?
         end
+        klass.send(callback, callback_meth)
       end
     end
+  end
 
-    # Determines whether this observer should be run
-    def observer_enabled?
-      self.class.observer_enabled?(self)
-    end
+  # Enables interception of custom observer notifications, i.e.
+  #   notify_observers(:custom_notification)
+  def update(*args, &block)
+    super if observer_enabled?
+  end
+
+  # Determines whether this observer should be run
+  def observer_enabled?
+    self.class.observer_enabled?(self)
   end
 end
 

data/lib/no_peeping_toms/version.rb

@@ -1,3 +1,3 @@
 module NoPeepingToms
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/spec/no_peeping_toms_spec.rb

@@ -3,7 +3,22 @@ require File.dirname(__FILE__) + '/spec_helper'
 module NoPeepingTomsSpec
   class Person < ActiveRecord::Base; end
   class SpecialPerson < Person; end
-  
+  class HungryPerson < Person
+    def eat_dinner!
+      notify_observers(:ate_dinner)
+    end
+  end
+
+  class DinnerObserver < ActiveRecord::Observer
+    observe Person
+    cattr_accessor :called
+
+    def ate_dinner(person)
+      self.class.called ||= 0
+      self.class.called += 1
+    end
+  end
+
   class PersonObserver < ActiveRecord::Observer
     cattr_accessor :called
 
@@ -12,7 +27,7 @@ module NoPeepingTomsSpec
       self.class.called += 1
     end
   end
-  
+
   class AnotherObserver < ActiveRecord::Observer
     observe Person
     cattr_accessor :called
@@ -26,6 +41,7 @@ module NoPeepingTomsSpec
   # Register the observers with the host app
   PersonObserver.instance
   AnotherObserver.instance
+  DinnerObserver.instance
 
   describe NoPeepingToms, "configuration" do
     it "enables observers by default" do
@@ -82,6 +98,22 @@ module NoPeepingTomsSpec
       AnotherObserver.called.should be_true
     end
 
+    it "should not call observers with custom notifications if they are disabled" do
+      DinnerObserver.called = 0
+      lambda {
+        HungryPerson.new.eat_dinner!
+      }.should_not change(DinnerObserver, :called)
+    end
+
+    it "should call observers with custom notifications if they are enabled" do
+      DinnerObserver.called = 0
+      ActiveRecord::Observer.with_observers(NoPeepingTomsSpec::DinnerObserver) do
+        lambda {
+          HungryPerson.new.eat_dinner!
+        }.should change(DinnerObserver, :called).by(1)
+      end
+    end
+
     it "should ensure peeping toms are reset after raised exception" do
       lambda {
         ActiveRecord::Observer.with_observers(NoPeepingTomsSpec::PersonObserver) do

metadata

@@ -1,71 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: no_peeping_toms
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.1.3
   prerelease: 
-  version: 2.1.2
 platform: ruby
-authors: 
+authors:
 - Pat Maddox
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70118143254060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70118143254060
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70118143253560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70118143253560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70118143253100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.5"
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70118143253100
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70118143252720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Disables observers during testing, allowing you to write model tests that are completely decoupled from the observer.
-email: 
+  prerelease: false
+  version_requirements: *70118143252720
+description: Disables observers during testing, allowing you to write model tests
+  that are completely decoupled from the observer.
+email:
 - pat.maddox@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - History.rdoc
 - README.rdoc
 - lib/no_peeping_toms/version.rb
@@ -77,30 +74,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/patmaddox/no-peeping-toms
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: no_peeping_toms
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Disables observers during testing, allowing you to write model tests that are completely decoupled from the observer.
+summary: Disables observers during testing, allowing you to write model tests that
+  are completely decoupled from the observer.
 test_files: []
-