live_resource-activerecord 0.0.2 → 0.0.3

data/lib/live_resource/activerecord/dependency.rb

@@ -30,15 +30,34 @@ module LiveResource
       end
 
       def observe(event)
-        dependency = self
-        model_class.class_eval do
-          send(event, dependency)
+        # Declare variables in method scope so they're preserved in the block
+        dependency          = self
+        subscribed_events   = @events
+        target              = @model_class
+        class_name          = "#{@resource.name}_dependency_on_#{@model_class}_for_#{@events.join('_')}"
+
+        # Construct a new observer class
+        dependency_observer = Class.new(::ActiveRecord::Observer) do
+          observe target
+
+          # Give it a class name otherwise ActiveRecord will explode
+          @_class_name = class_name
+          class << self
+            def name
+              @_class_name
+            end
+          end
+
+          # Create callback methods on the observer class for each subscribed event
+          subscribed_events.each do |event_name|
+            define_method(event_name) do |*args|
+              dependency.invoke(args[0], event_name)
+            end
+          end
         end
-      end
 
-      ::ActiveRecord::Callbacks::CALLBACKS.each do |callback|
-        event = callback
-        define_method(callback) { |record| invoke(record, event) }
+        # Instantiating the observer class will make it hook itself up
+        dependency_observer.send :new
       end
     end
 

data/lib/live_resource/activerecord/version.rb

@@ -1,5 +1,5 @@
 module LiveResource
   module ActiveRecord
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/live_resource/activerecord/dependency_spec.rb

@@ -18,19 +18,6 @@ describe Dependency do
   let(:events) { nil }
   let(:proc) { double(Proc) }
 
-  ActiveRecord::Callbacks::CALLBACKS.each do |callback|
-    context "##{callback}" do
-      subject { dependency.send(callback.to_sym, record) }
-
-      let(:record) { model_class.new }
-
-      it "should call #invoke with the ActiveRecord instance and the callback name" do
-        dependency.should_receive(:invoke).with(record, callback)
-        subject
-      end
-    end
-  end
-
   it "should pass the target to the superclass" do
     expect(dependency.target).to be model_class
   end
@@ -84,19 +71,4 @@ describe Dependency do
       end
     end
   end
-
-  describe "#observe" do
-    subject { dependency.observe(event) }
-
-    let(:event) { :after_create }
-
-    before do
-      model_class.stub(event)
-    end
-
-    it "should register itself for callbacks" do
-      model_class.should_receive(event).with(dependency)
-      subject
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: live_resource-activerecord
 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: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3578353206421120448
+      hash: -16503447049522901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3578353206421120448
+      hash: -16503447049522901
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25