notifly 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 079f1db58c119ea5ec0aa5b487c0aa45f6b24d61
-  data.tar.gz: b1a215bc6e1d3caccafedd29e86c2ee5e90467df
+  metadata.gz: 939b12ea220c250f5b9e543f70c97f344fc0e973
+  data.tar.gz: 6c827c9a14c21d476ddb6bad7b17a22f29e21fd5
 SHA512:
-  metadata.gz: 3aa005a8e84945e9228599e91a3b791a8ff8a9923af1cc5cff9e043e5bcd0e8a47ad9c17586ba5002183e2a28032be4b32d83f4ed93cc7ad48044f96ab3a2991
-  data.tar.gz: a31efb84696178c8126b037f221a4e0cab4e5f4e3f4779eea11071fbcc5422c04be383b9b8820769726dc9ff8e71a83a3d695828e315ede74707f816d1fda7bb
+  metadata.gz: 275d3eb8008e16314a5bb02fea4094dea61c905b750d42a2200a1a3d16aa84319943abb33ad76bb266da07f85bd7eb069588cf11d26cae85f6f12b9c1554df5e
+  data.tar.gz: 262dd1bc12350d735cb64f35322fbcb44fb9aa96666ac5063d492caf16d9b3f69f7f95c5636b6227de190e64b29a2be34d2fbc95dcb48bf092d0a62356ddfe80

data/README.md

@@ -16,6 +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
 
 
 # Install

data/app/controllers/notifly/notifications_controller.rb

@@ -41,7 +41,7 @@ module Notifly
 
       def current_user_notifications
         @user = current_user
-        @user.notifly_notifications.not_only_mail
+        @user.notifly_notifications(:notification).not_only_mail
       end
 
       def count_unseen

data/app/models/notifly/notification.rb

@@ -4,7 +4,7 @@ module Notifly
     belongs_to :sender, polymorphic: true
     belongs_to :receiver, polymorphic: true
 
-    before_validation :convert_data, :set_template, :set_mail
+    before_validation :convert_data, :set_defaults
 
     scope :all_from,      -> (receiver) { where(receiver: receiver) }
     scope :unseen,        -> { where(seen: false) }
@@ -30,7 +30,7 @@ module Notifly
       where(created_at: (notifications.first.created_at..notifications.last.created_at))
     end
 
-    validates :receiver, :template, :mail, presence: true
+    validates :receiver, :template, :mail, :kind, presence: true
 
     def data
       YAML.load(read_attribute(:data))
@@ -41,12 +41,10 @@ module Notifly
         self.data = read_attribute(:data).to_json
       end
 
-      def set_template
+      def set_defaults
+        self.mail     ||= :never
+        self.kind     ||= :notification
         self.template ||= :default
       end
-
-      def set_mail
-        self.mail ||= :never
-      end
   end
 end

data/db/migrate/20141212122918_add_kind_to_notifly_notification.rb

@@ -0,0 +1,5 @@
+class AddKindToNotiflyNotification < ActiveRecord::Migration
+  def change
+    add_column :notifly_notifications, :kind, :string, default: :notification
+  end
+end

data/lib/notifly/models/flyable.rb

@@ -101,10 +101,12 @@ module Notifly
         end
       rescue => e
         logger.error "Something goes wrong with Notifly, will ignore: #{e}"
+        raise e if not Rails.env.production?
       end
 
-      def notifly_notifications
-        Notifly::Notification.all_from(self)
+      def notifly_notifications(kind=nil)
+        notifications = Notifly::Notification.all_from(self)
+        kind.present? ? notifications.where(kind: kind) : notifications
       end
 
       private
@@ -123,12 +125,16 @@ module Notifly
         end
 
         def _eval_for(key, value)
-          if [:template, :mail].include? key.to_sym
+          if [:template, :mail, :kind].include? key.to_sym
             value
           elsif value == :self
             self
           else
-            send(value)
+            if value.is_a? Proc
+              instance_exec &value
+            else
+              send(value)
+            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
+          :if, :unless, :data, :mail, :kind
 
         def initialize(options={})
           options = options.fetch(:default_values, options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifly
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Pedro Passalini
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -203,6 +203,7 @@ files:
 - db/migrate/20141104150224_add_data_to_notification.rb
 - db/migrate/20141117193436_add_seen_to_notifly_notification.rb
 - db/migrate/20141125165636_add_mail_to_notifly_notifications.rb
+- db/migrate/20141212122918_add_kind_to_notifly_notification.rb
 - lib/generators/notifly/install/install_generator.rb
 - lib/generators/notifly/install/templates/config/initializers/notifly.rb
 - lib/generators/notifly/install/utils.rb