disclosure 0.0.5 → 0.0.6

data/app/mailers/disclosure/email_reactor.rb

@@ -2,16 +2,20 @@ module Disclosure
   class EmailReactor < ActionMailer::Base
     default Disclosure.configuration.email_reactor_defaults
 
-    def react!(model, action, rule)
-      self.notification(model, action, rule).deliver
+    def react!(model, action, user)
+      self.notification(model, action, user).deliver
     end
 
-    def notification(model, action, rule)
+    def notification(model, action, user)
+      @model = model
+      @action = action
+      @user = user
+      @subject = t("disclosure.email_reactor.#{model.class.name.underscore}.#{action}.subject")
       mail(
-        :to => rule.owner.email,
-        :subject => t("disclosure.email_reactor.#{rule.notifier_class}.#{action}.subject"),
-        :template_path => "disclosure/email/#{rule.notifier_class}",
-        :template_name => "action"
+        :to => @user.email,
+        :subject => @subject,
+        :template_path => "disclosure/email/#{model.class.name.underscore}",
+        :template_name => @action
       )
     end
   end

data/lib/disclosure/notifications.rb

@@ -9,12 +9,19 @@ module Disclosure
     def self.instrument!
       Disclosure.configuration.notifier_classes.each do |klass|
         klass.class_eval do
-          after_commit :notify_disclosure
+          around_save :notify_disclosure_with_save
 
           private
 
-          def notify_disclosure
-            ActiveSupport::Notifications.instrument("disclosure.model_updated", :model => self)
+          def notify_disclosure_with_save
+            # Keep track of the original model to pick up changes properly
+            @model_before_save = self
+
+            # Call save, etc.
+            yield
+
+            # Send the notification with the original model
+            ActiveSupport::Notifications.instrument("disclosure.model_saved", :model => @model_before_save)
           end
         end
       end

data/lib/disclosure/version.rb

@@ -1,3 +1,3 @@
 module Disclosure
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disclosure
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3608972705387088730
+      hash: 4604734519384497078
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3608972705387088730
+      hash: 4604734519384497078
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23