notifly 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 939b12ea220c250f5b9e543f70c97f344fc0e973
-  data.tar.gz: 6c827c9a14c21d476ddb6bad7b17a22f29e21fd5
+  metadata.gz: 6111c9569a44311f1348d13fe80f7a8463feae4a
+  data.tar.gz: 65b36c5d13eb9d42d2cb8a628f39d25361d7c306
 SHA512:
-  metadata.gz: 275d3eb8008e16314a5bb02fea4094dea61c905b750d42a2200a1a3d16aa84319943abb33ad76bb266da07f85bd7eb069588cf11d26cae85f6f12b9c1554df5e
-  data.tar.gz: 262dd1bc12350d735cb64f35322fbcb44fb9aa96666ac5063d492caf16d9b3f69f7f95c5636b6227de190e64b29a2be34d2fbc95dcb48bf092d0a62356ddfe80
+  metadata.gz: 09d4e63529826842d329b5663951e99b21748a8ab15785e0544610baea5d435889e9752db0d5bfedb03f4894e9b85ea5d5979a401bc410de3924ceb4d7e40b24
+  data.tar.gz: 78e93dcbb853a7afbaf79b6d6973f157b875e77945f9b7d4e40f13b1522e52e78a15d083dbbc51134bf50b805c82287d912aff2827937666353fb0c7f9de8ccb

data/README.md

@@ -16,7 +16,7 @@ In actual version, notifications are composed by:
   - Read: flag that records if the receiver read the notification
   - Seen: flag that records if the receiver seen the notification
   - If and Unless: used to create notifications conditionally
-  - type: helper
+  - Kind: an attribute to scope notifications
 
 
 # Install
@@ -65,7 +65,8 @@ class TicketOrder < ActiveRecord::Base
   notifly before: :destroy, template: :destroy, sender: :buyer, data: :attributes
   notifly after: :send_gift!, template: :ticket_gift, sender: :buyer,
     target: :ticket, if: -> { completed? }
-  notifly after: :accept_gift, sender: :owner, receiver: :buyer, target: :ticket
+  notifly after: :accept_gift, sender: -> { self.owner }, receiver: :buyer, target: :ticket,
+    then: ->(notification) { self.send_mail_with(notification) }
 
   def send_gift!
     # code here
@@ -74,6 +75,10 @@ class TicketOrder < ActiveRecord::Base
   def accept_gift
     # code here
   end
+
+  def send_mail_with(notification)
+    # code here
+  end
 end
 ```
 Value explanation about each parameter:
@@ -86,6 +91,8 @@ Value explanation about each parameter:
 | `template`          | The symbol or string that indicates which partial will be rendered at views. The partial must be inside `app/views/notifly/templates/`. Default is `:default`. |
 | `target`            | The method which returns the notification target object. It's a third actor of the notification. Example: In "Max sent you a ticket" notification, Max is the sender, you are the receiver and the **ticket is the target**. |
 | `data`              | A method which returns a hash with usefull values to be persisted, like ticket price or whatever you want to persist. |
+| `kind`              | String used to scope notifications, default is `:notification` and all notifications with default type will be shown in `current_user`'s notifications
+| `then`              | Callback that will be executed **after** the notification creation. It can receive a notification as parameter. Right now it only works in the code above.
 
 Note that you can use the `default_values` parameter, it is specific to DRY your
 notiflies and set the values to all notiflies. If you need to overwrite some

data/lib/notifly/models/flyable.rb

@@ -91,17 +91,14 @@ module Notifly
 
       def _create_notification_for(fly)
         new_fly = _default_fly.merge(fly)
-        notification = Notifly::Notification.create _get_attributes_from(new_fly)
 
-        if new_fly.mail.present?
-          template = new_fly.mail.try(:fetch, :template) || notification.template
+        notification = Notifly::Notification.create _get_attributes_from(new_fly)
+        _after_create_notification(notification, new_fly)
 
-          Notifly::NotificationMailer.notifly to: self.email, template: template,
-            notification_id: notification.id
-        end
       rescue => e
         logger.error "Something goes wrong with Notifly, will ignore: #{e}"
         raise e if not Rails.env.production?
+
       end
 
       def notifly_notifications(kind=nil)
@@ -137,6 +134,20 @@ module Notifly
             end
           end
         end
+
+        def _after_create_notification(notification, fly)
+          if fly.then.present?
+            block = fly.then;
+            block.parameters.present? ? instance_exec(notification, &block) : instance_exec(&block)
+          end
+
+          if fly.mail.present?
+            template = fly.mail.try(:fetch, :template) || notification.template
+
+            Notifly::NotificationMailer.notifly to: self.email, template: template,
+              notification_id: notification.id
+          end
+        end
     end
   end
 end

data/lib/notifly/models/options/fly.rb

@@ -3,7 +3,7 @@ module Notifly
     module Options
       class Fly
         attr_accessor :before, :after, :template, :sender, :receiver, :target,
-          :if, :unless, :data, :mail, :kind
+          :if, :unless, :data, :mail, :kind, :then
 
         def initialize(options={})
           options = options.fetch(:default_values, options)
@@ -23,7 +23,7 @@ module Notifly
         end
 
         def attributes
-          no_attrs = [hook, :if, :unless, :mail]
+          no_attrs = [hook, :if, :unless, :mail, :then]
           attrs = instance_values.reject { |key| no_attrs.include? key.to_sym  }
           attrs.merge({mail: get_mail_type})
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifly
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Pedro Passalini
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails