lazy_observers 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lazy_observers (0.0.2)
+    lazy_observers (0.0.3)
       activerecord
 
 GEM

data/Readme.md

@@ -2,8 +2,6 @@ Make Activerecord Observers not load observed models -> faster/safer environment
  - faster tests + console
  - able to boot environment without/with empty/with old database
 
-Works on rails 2.3 + 3.0 (not yet 3.2)
-
 Install
 =======
 
@@ -39,10 +37,10 @@ Loads all classes registered via observers, to make sure you did not misspell</b
 
     LazyObservers.check_classes
 
-
-# TODO
- - Rails 3.0: does not work for models that are loaded before the observers
- - Rails 3.2: blows up
+TIPS
+====
+ - do not use observe and lazy_observe in the same observer (and if you have to, use observe after lay_observe)
+ - do not use Model classes with class-methods of the observer e.g. class FooObserver; Foo.something{}; def after_update; end; end
 
 Author
 ======

data/gemfiles/rails-2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/lazy_observers
   specs:
-    lazy_observers (0.0.0)
+    lazy_observers (0.0.2)
       activerecord
 
 GEM

data/gemfiles/rails-3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/lazy_observers
   specs:
-    lazy_observers (0.0.0)
+    lazy_observers (0.0.2)
       activerecord
 
 GEM

data/gemfiles/rails-3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mgrosser/code/tools/lazy_observers
   specs:
-    lazy_observers (0.0.0)
+    lazy_observers (0.0.2)
       activerecord
 
 GEM

data/lib/lazy_observers.rb

@@ -7,21 +7,24 @@ module LazyObservers
     class_name = klass.name
     loaded << [klass, class_name]
     observers.each do |observer, observed|
-      connect!(observer, klass) if observed.include?(class_name)
+      connect!(observer.instance, klass) if observed.include?(class_name)
     end
-    (on_loads[class_name]||[]).each{|block| block.call(klass) }
+    (on_load_callbacks[class_name]||[]).each{|block| block.call(klass) }
   end
 
-  def self.register_observer(observer, classes)
-    observers[observer] = classes
+  def self.register_observer_instance(observer, classes)
     loaded.each do |klass, name|
       connect!(observer, klass) if classes.include?(name)
     end
   end
 
+  def self.register_observer_class(observer, classes)
+    observers[observer] = classes
+  end
+
   def self.on_load(class_name, &block)
-    on_loads[class_name] ||= []
-    on_loads[class_name] << block
+    on_load_callbacks[class_name] ||= []
+    on_load_callbacks[class_name] << block
   end
 
   # to check you did not specify a class that does not exist
@@ -35,7 +38,7 @@ module LazyObservers
 
   private
 
-  def self.on_loads
+  def self.on_load_callbacks
     @on_loads ||= {}
   end
 
@@ -48,21 +51,12 @@ module LazyObservers
   end
 
   def self.connect!(observer, klass)
-    observer.instance.observed_class_inherited(klass)
-  end
-end
-
-ActiveRecord::Base.send(:subclasses).each{|klass| LazyObservers.register_observed(klass) }
-
-ActiveRecord::Observer.class_eval do
-  def self.lazy_observe(*classes)
-    raise "pass class names, not classes or symbols!" unless classes.all?{|klass| klass.is_a?(String) }
-    define_method(:observed_classes) { Set.new }
-    LazyObservers.register_observer self, classes
+    @connected ||= {}
+    return if @connected[[observer, klass]]
+    @connected[[observer, klass]] = true
+    observer.observed_class_inherited(klass)
   end
-end
 
-module LazyObservers
   module InheritedNotifier
     def inherited(subclass)
       LazyObservers.register_observed subclass
@@ -72,9 +66,9 @@ module LazyObservers
 
   module InheritedDebugger
     def inherited(subclass)
-      @inherited_counter ||= 0
-      @inherited_counter += 1
-      puts "##{@inherited_counter} #{subclass}"
+      $lazy_observers_inherited_counter ||= 0
+      $lazy_observers_inherited_counter += 1
+      puts "##{$lazy_observers_inherited_counter} #{subclass}"
       puts caller
       puts "-" * 72
       super
@@ -82,4 +76,25 @@ module LazyObservers
   end
 end
 
+descendants = (ActiveRecord::VERSION::MAJOR > 2 ? :descendants : :subclasses)
+ActiveRecord::Base.send(descendants).each{|klass| LazyObservers.register_observed(klass) }
+
+ActiveRecord::Observer.class_eval do
+  def self.lazy_observe(*classes)
+    raise "pass class names, not classes or symbols!" unless classes.all?{|klass| klass.is_a?(String) }
+    define_method(:observed_classes) { Set.new } # prevent default of PostObserver -> Post
+    LazyObservers.register_observer_class self, classes
+    define_method(:lazy_observed_classes) { Set.new(classes) }
+  end
+
+  # since AR uses respond_to? on the observer we need our observer to be fully defined before registering
+  alias_method :initialize_without_lazy, :initialize
+  def initialize
+    initialize_without_lazy
+    if defined?(lazy_observed_classes)
+      LazyObservers.register_observer_instance(self, lazy_observed_classes)
+    end
+  end
+end
+
 ActiveRecord::Base.send(:extend, LazyObservers::InheritedNotifier)

data/lib/lazy_observers/version.rb

@@ -1,3 +1,3 @@
 module LazyObservers
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/app/non_lazy_movie_observer.rb

@@ -0,0 +1,19 @@
+class NonLazyMovieObserver < ActiveRecord::Observer
+  observe Movie
+
+  def called
+    @called ||= []
+  end
+
+  def after_update(*args)
+    @called << [:after_update, args]
+  end
+
+  def after_save(*args)
+    @called << [:after_update, args]
+  end
+
+  def after_create(*args)
+    @called << [:after_create, args]
+  end
+end

data/spec/lazy_observers_spec.rb

@@ -2,6 +2,7 @@ require "spec_helper"
 require File.expand_path("../app/user_observer", __FILE__)
 require File.expand_path("../app/post_observer", __FILE__)
 require File.expand_path("../app/product_observer", __FILE__)
+require File.expand_path("../app/non_lazy_movie_observer", __FILE__)
 
 describe LazyObservers do
   it "has a VERSION" do
@@ -61,6 +62,12 @@ describe LazyObservers do
     }.to raise_error(/not classes or symbols/i)
   end
 
+  it "does not break normal observers" do
+    NonLazyMovieObserver.instance.called.clear # in case other specs ran first
+    movie = Movie.create!
+    NonLazyMovieObserver.instance.called.should == [[:after_create, [movie]], [:after_update, [movie]]]
+  end
+
   it "calls callback when matching class is loaded" do
     loaded = []
     LazyObservers.on_load("Group") do |klass|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_observers
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +52,7 @@ files:
 - spec/app/inherited_movie.rb
 - spec/app/movie.rb
 - spec/app/movie_observer.rb
+- spec/app/non_lazy_movie_observer.rb
 - spec/app/post.rb
 - spec/app/post_observer.rb
 - spec/app/product_observer.rb
@@ -76,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4605400004788605618
+      hash: 3011854085487653016
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -85,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4605400004788605618
+      hash: 3011854085487653016
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24