notifly 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a10193432e95569d125bb24dd62b696de6565c76
-  data.tar.gz: d609cb8074f894e9664483b3ce56e2e9cfb17b45
+  metadata.gz: 7dcf76340dfa95ff24b649a6bdf908dbbbfaafa2
+  data.tar.gz: ee70a15bd945e508b4bbe4c81701bb2f3df0a1e1
 SHA512:
-  metadata.gz: 97ef498cfd0600d05e039ef28f05f32e2b8ef49d8f55a56f6fa556b44b38a171dee6147e687983fe73f4080cf2b8b325970d65dc1f5022db3226cd09d7426098
-  data.tar.gz: 80c043382c0d7c6d048f339cb0c36fb0bb6ac12f5f7eb3b1e97627127163370b3fcaaf12d56524fc053413683df2c87f4a02ace23d3a1f93815732f93c84bf37
+  metadata.gz: 62ad12ece6bc6fcdd874c83e26e7092ca7c4b65693f45c5bcaf8f8aa5d0762b0541b60acc23b6cbd27509bd881b0318256017171fb07a1711720b0b20810a7e1
+  data.tar.gz: c6943c8fdc1c939ff618c8d37307ebe0436d705a74ba0c4d82517a7e263fad52d72c36f8d1645eaa06596c26789cec2ec12c27382a4f39a95b34a70c370acdc5

data/README.md

@@ -1,4 +1,5 @@
-# Notifly [![Build Status](https://travis-ci.org/algorich/notifly.svg?branch=master)](https://travis-ci.org/algorich/notifly) [![Dependency Status](https://gemnasium.com/algorich/notifly.svg)](https://gemnasium.com/algorich/notifly)
+# Notifly
+[![Build Status](https://travis-ci.org/algorich/notifly.svg?branch=master)](https://travis-ci.org/algorich/notifly) [![Gem Version](https://badge.fury.io/rb/notifly.svg)](http://badge.fury.io/rb/notifly) [![Dependency Status](https://gemnasium.com/algorich/notifly.svg)](https://gemnasium.com/algorich/notifly)
 
 This project is still under development and it intend to offer a full notification
 system, back and front-end. Questions and suggestions are welcome and you can
@@ -48,7 +49,7 @@ Notifly **need** to storage the notifications and to do it you need to run the m
 
 We have two ways to create notifications:
 
-#### 1. Using `#notifly` method in your classes (as callback)
+### Using `#notifly` method in your classes (as callback)
 
 If you want to create notifications after (or before) **any** method call.
 
@@ -90,7 +91,7 @@ notiflies and set the values to all notiflies. If you need to overwrite some
 default value, just declare it again like the `:accept_gift` notifly above.
 
 
-#### Using `#notifly!` method on your receiver object
+### Using `#notifly!` method on your receiver object
 
 If you need to create notifications without callbacks, even in the
 controller scope.
@@ -123,12 +124,61 @@ end
 
 The receiver will be always the object which you call `#notifly!`
 
+### Mail
+
+Notifly can send mails too. To do it, just add the option `mail` to your notifly
+statement
+
+```ruby
+class TicketOrder < ActiveRecord::Base
+  belongs_to :ticket
+  belongs_to :buyer
+  belongs_to :owner
+
+  notifly default_values: { receiver: :owner }
+
+  notifly before: :destroy, template: :destroy_order_notification, sender: :buyer,
+    data: :attributes, email: { template: :destroy_order_mail }
+  notifly after: :send_gift!, template: :ticket_gift, sender: :buyer,
+    target: :ticket, email: true, if: -> { completed? }
+  notifly after: :accept_gift, sender: :owner, receiver: :buyer, target: :ticket,
+    template: :accept_gift, email: { only: true }
+
+  def send_gift!
+    # code here
+  end
+
+  def accept_gift
+    # code here
+  end
+end
+```
+
+| Email                        | Description |
+| ---------------------------- | ----------- |
+| `true`                       | send email and notification using notifly template |
+| `only: true`                 | send only an email using notifly template |
+| `template: :foo`             | send email using `foo` mail template and a notification using notifly template |
+
+Notiflies with `mail: { only: true }` will persist notifications, but them won't
+be in receivers notifications views. If you use [delayed_job](https://github.com/collectiveidea/delayed_job)
+or [sidekiq](https://github.com/mperham/sidekiq) mails will be sent async.
+
+### Notifications access
+
 You can access the notifications using the following methods:
 
-  - `receiver_object.notiflies`
+  - `receiver_object.notifly_notifications`
   - Querying `Notifly::Notifications`
   - Using our front-end helpers
 
+#### Useful scopes
+
+  - all_from: used on `Notifly::Notifications` to show notifications from a specific receiver
+  - unseen: used on `Notifly::Notifications` and `#notifly_notifications` to show **only** unseen notifications
+  - not_only-mail: used on `Notifly::Notifications` and `#notifly_notifications` to remove notification that are **mail only**
+
+
 ## Front-end
 
 First, you need to have a `current_user` in `ApplicationController`, if you use
@@ -156,17 +206,29 @@ This will inject our views and it will be like that
 
 ![image](http://upl.io/i/4i26o3.png)
 
-As you can see, notifications are rendered with their templates. It uses a simple
-default template but if you want to change it or create new ones run the code below
-or create them in `app/views/notifly/templates/_your_template.html.erb`
+Notifications and Mails are rendered with their templates. They use a simple default
+template but if you want to change or create new ones run the generate below
+with the option that you want or create them in `app/views/notifly/templates/`.
+Remember that notifications templates should be in `notifications` folder and
+mails templates in `mails` folder.
 
 ```shell
   $ rails generate notifly:views
 ```
 
-Now if you want to customize the layout, just generate it adding the option `--layout`
-to the code above and change it as you want. But if you already have a layout and just
-want add our features to it, take a look at [Adapting your layout](#adapting).
+| Option           | Description |
+| ---------------- | ----------- |
+| `--notification` | generates notifications templates files |
+| `--layout`       | generates layout files |
+| `--mail`         | generates mail templates files |
+
+If you already have a layout and just want add our features to it, take a look
+at [Adapting your layout](#adapting).
+
+### I18n
+
+Notifly uses I18n to render the mail's subject and if you run the install generator
+you can change it in `config/locales/notifly.en.yaml` or create your own.
 
 ### <a name='adapting'></a> Adapting your layout
 
@@ -188,13 +250,14 @@ Above are the elements that will loading the Notifly in your layout
     this element will contain all notifications (`_notification.html.erb`) rendered
     by `_index.html.erb`
   - **Next page link**: this link will append the next notifications page to the
-    `#notifly-notifications-container`, this is rendered by `_footer.html.erb` and
-    will be injected in `#notifly-notifications-footer`
+    `#notifly-notifications-container`, it should be in the page and should have
+    the id `#notifly-more-notifications-link`. This link should not have a href.
+  - **Mark as read**: this link will mark all notifications in the page as read,
+    it should be in the page and should have the id `#notifly-mark-as-read-link`.
+    This link should not have a href.
   - **Loading**: html element that will be showing while the notifications request
     isn't completed. It should be in `#notifly-notifications-container` and should
     have the class `loading`
-  - **Mark as read**: this link will mark all notifications in the page as read,
-    it will be rendered in `#notifly-header-actions`
   - **Toggle read**: this link will be rendered by `_actions.html.erb' in
     `_notification.html.erb`
 

data/app/assets/javascripts/notifly.js

@@ -1,5 +1,13 @@
 //= require 'jquery'
 //= require 'jquery_ujs'
-//= require 'notifly/counter'
 //= require 'notifly/get_notifications'
+//= require 'notifly/seen_notifications'
+//= require 'notifly/read_notifications'
+//= require 'notifly/more_notifications'
 //= require 'twitter/bootstrap'
+
+$(document).ready(function() {
+  $(document).on('click', '#notifly-notifications-panel.dropdown-menu', function (e) {
+    $('#notifly').hasClass('keep_open') && e.stopPropagation();
+  });
+});

data/app/assets/javascripts/notifly/get_notifications.js.erb

@@ -1,26 +1,27 @@
 <% notifly = Notifly::Engine.routes.url_helpers %>
-var notiflyNotificationsRequested;
+var notiflyLastNotification, notiflyFirstNotification;
 
 var _notiflyGetNotifications = function () {
-  var $notifly = $('#notifly-icon');
+  var $notifly = $('#notifly');
 
-  $notifly.click(function () {
-    if (!notiflyNotificationsRequested) {
-      notiflyNotificationsRequested = true;
-
-      $.ajax({
-        url: '<%= notifly.notifications_path %>',
-        type: 'GET',
-        error: _notiflyHandleNotificationsError
-      });
-    }
-  });
+  if($notifly !== undefined) {
+    $.ajax({
+      url: '<%= notifly.notifications_path %>',
+      data: {
+        scope: 'newer',
+        reference_notification_id: notiflyFirstNotification || null,
+        mark_as_seen: $notifly.hasClass('open')
+      },
+      type: 'GET',
+      complete: _notiflyRepeatRequest
+    });
+  }
 };
 
-var _notiflyHandleNotificationsError = function () {
-  notiflyNotificationsRequested = false;
+var _notiflyRepeatRequest = function () {
+  setTimeout(_notiflyGetNotifications, <%= Notifly.timeout %>);
 };
 
 $(document).ready(function() {
   _notiflyGetNotifications();
-});
+});

data/app/assets/javascripts/notifly/more_notifications.js.erb

@@ -0,0 +1,23 @@
+<% notifly = Notifly::Engine.routes.url_helpers %>
+
+var _notiflyMoreNotifications = function () {
+  var $notifly = $('#notifly');
+
+  if($notifly != undefined) {
+    $notifly.find('#notifly-more-notifications-link').click(function () {
+      $.ajax({
+        url: '<%= notifly.notifications_path %>',
+        data: {
+          scope: 'older',
+          reference_notification_id: notiflyLastNotification,
+          mark_as_seen: $notifly.hasClass('open')
+        },
+        type: 'GET'
+      });
+    });
+  }
+};
+
+$(document).ready(function() {
+  _notiflyMoreNotifications();
+});

data/app/assets/javascripts/notifly/read_notifications.js.erb

@@ -0,0 +1,22 @@
+<% notifly = Notifly::Engine.routes.url_helpers %>
+
+var _notiflyReadNotifications = function () {
+  var $notifly = $('#notifly-mark-as-read-link');
+
+  if($notifly != undefined) {
+    $notifly.click(function () {
+      $.ajax({
+        url: '<%= notifly.read_notifications_path %>',
+        data: {
+          first_notification_id: notiflyFirstNotification,
+          last_notification_id: notiflyLastNotification
+        },
+        type: 'PUT'
+      });
+    });
+  }
+};
+
+$(document).ready(function() {
+  _notiflyReadNotifications();
+});

data/app/assets/javascripts/notifly/seen_notifications.js.erb

@@ -0,0 +1,22 @@
+<% notifly = Notifly::Engine.routes.url_helpers %>
+
+var _notiflySeenNotifications = function () {
+  var $trigger = $('#notifly-trigger');
+
+  if($trigger !== undefined) {
+    $trigger.click(function () {
+      $.ajax({
+        url: '<%= notifly.seen_notifications_path %>',
+        data: {
+          first_notification_id: notiflyFirstNotification,
+          last_notification_id: notiflyLastNotification
+        },
+        type: 'PUT'
+      });
+    });
+  }
+};
+
+$(document).ready(function() {
+  _notiflySeenNotifications();
+});

data/app/controllers/notifly/notifications_controller.rb

@@ -2,21 +2,19 @@ require_dependency "notifly/application_controller"
 
 module Notifly
   class NotificationsController < ApplicationController
-    def counter
-      @counter = count_unseen
-    end
-
     def index
-      @notifications = current_user_notifications.page(params[:page]).per(Notifly.per_page)
-      Notifly::Notification.where(id: @notifications.map(&:id)).update_all(seen: true)
+      @notifications = scoped_notifications
+      @notifications.update_all(seen: true) if params[:mark_as_seen] == 'true'
+
       @counter = count_unseen
+      @scope_param = scope_param
     end
 
-
-    def read_specific
-      size = params[:pages].to_i * Notifly.per_page
-      @notifications = current_user_notifications.limit(size)
-      @notifications.update_all read: true
+    def read
+      if params[:first_notification_id].present? and params[:last_notification_id].present?
+        @notifications = notifications_between
+        @notifications.update_all(read: true)
+      end
     end
 
     def toggle_read
@@ -24,13 +22,34 @@ module Notifly
       @notification.update(read: !@notification.read)
     end
 
+    def seen
+      if params[:first_notification_id].present? and params[:last_notification_id].present?
+        @notifications = notifications_between
+        @notifications.update_all(seen: true)
+      end
+      @counter = count_unseen
+    end
+
     private
+      def scoped_notifications
+        current_user_notifications.send(scope_param, than: params[:reference_notification_id])
+      end
+
+      def scope_param
+        return params[:scope] if ['older', 'newer'].include?(params[:scope])
+      end
+
       def current_user_notifications
-        Notifly::Notification.all_from(current_user).order('created_at DESC')
+        current_user.notifly_notifications.not_only_mail
       end
 
       def count_unseen
-        Notifly::Notification.unseen_from(current_user).count
+        current_user_notifications.unseen.count
+      end
+
+      def notifications_between
+        current_user_notifications.between(params[:first_notification_id],
+          params[:last_notification_id])
       end
   end
 end

data/app/mailers/notifly/notification_mailer.rb

@@ -0,0 +1,21 @@
+module Notifly
+  class NotificationMailer < ActionMailer::Base
+    default from: Notifly.mailer_sender
+
+    def notifly(to: nil, notification_id: nil, template: nil)
+      if defined? Delayed::Job or defined? Sidekiq::Worker
+        delay.send_notification(to, notification_id, template)
+      else
+        send_notification(to, notification_id, template).deliver
+      end
+    end
+
+    private
+      def send_notification(to, notification_id, template)
+        @notification = Notifly::Notification.find(notification_id)
+        @template = template
+
+        mail to: to, subject: t("notifly.mail_subject.#{@template}")
+      end
+  end
+end

data/app/models/notifly/notification.rb

@@ -6,10 +6,31 @@ module Notifly
 
     before_validation :convert_data, :set_template
 
-    scope :all_from,    ->(receiver) { where(receiver: receiver) }
-    scope :unseen_from, ->(receiver) { where(receiver: receiver, seen: false) }
+    scope :all_from,      -> (receiver) { where(receiver: receiver) }
+    scope :unseen,        -> { where(seen: false) }
+    scope :not_only_mail, -> { where.not(mail: 'only') }
+    scope :limited,       -> { limit(Notifly.per_page) }
+    scope :ordered,       -> { order('created_at DESC') }
+    scope :newer,         ->(than: nil) do
+      return ordered.limited if than.blank?
 
-    validates :receiver, :template, presence: true
+      reference = find(than)
+      ordered.where('created_at > ?', reference.created_at).where.not(id: reference)
+    end
+    scope :older,         ->(than: nil) do
+      reference = find(than)
+
+      ordered.
+      where('created_at < ?', reference.created_at).
+      where.not(id: reference).
+      limited
+    end
+    scope :between,       ->(first, last) do
+      notifications = where(id: [first, last])
+      where(created_at: (notifications.first.created_at..notifications.last.created_at))
+    end
+
+    validates :receiver, :template, :mail, presence: true
 
     def data
       YAML.load(read_attribute(:data))

data/app/views/notifly/layouts/_notification.html.erb

@@ -3,7 +3,7 @@
 <% read = notification.read ? '' : 'notifly-notification-not-read' %>
 
 <div id='<%= "notifly-notification-#{notification.id}" %>' class="notifly-notification <%= read %>">
-  <%= render partial: "notifly/templates/#{notification.template}",
+  <%= render partial: "notifly/templates/notifications/#{notification.template}",
     locals: { notification: notification } %>
 
   <span class="notifly-notification-actions">

data/app/views/notifly/layouts/_notifly.html.erb

@@ -1,8 +1,8 @@
 <!-- This partial requires the locals: receiver -->
 
-<div id="notifly" class="dropdown">
+<div id="notifly" class="dropdown keep_open">
 
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+  <a id="notifly-trigger" href="#" class="dropdown-toggle" data-toggle="dropdown">
     <span id="notifly-counter"></span>
     <span id="notifly-icon"><%= notifly_icon %></span>
   </a>
@@ -13,6 +13,7 @@
       Notifications
 
       <span id="notifly-header-actions" class="pull-right">
+        <%= link_to 'Mark as read', '#', id: 'notifly-mark-as-read-link' %>
       </span>
     </div>
 
@@ -20,6 +21,8 @@
        <div class="loading">Loading notifications...</div>
     </div>
 
-    <div id="notifly-notifications-footer"></div>
+    <div id="notifly-notifications-footer">
+      <%= link_to 'More', '#', id: 'notifly-more-notifications-link' %>
+    </div>
   </div>
 </div>

data/app/views/notifly/notification_mailer/notifly.html.erb

@@ -0,0 +1,2 @@
+<%= render partial: "notifly/templates/mails/#{@template}",
+  locals: { notification: @notification } %>

data/app/views/notifly/notifications/index.js.erb

@@ -1,20 +1,33 @@
-<%
-  rendered_notifications = render partial: 'notifly/layouts/index',
-    locals: { notifications: @notifications }
+<% rendered_notifications = render partial: 'notifly/layouts/index',
+  locals: { notifications: @notifications } %>
+<% last_notification = @notifications.last.try(:id) %>
+<% first_notification = @notifications.first.try(:id) %>
 
-  notifications_pages = { pages: @notifications.current_page }
-  rendered_header_actions = link_to 'Mark as read', read_specific_notifications_path(notifications_pages),
-    remote: true, method: :put
+<% if @notifications.any? %>
+  $('#notifly-notifications-content .loading').remove();
 
-  rendered_footer = render partial: 'notifly/layouts/footer',
-    locals: { notifications: @notifications }
-%>
+  <% if @scope_param == 'older' %>
+    $('#notifly-notifications-content').append("<%= j rendered_notifications %>");
+    notiflyLastNotification = <%= last_notification %>;
 
-$('#notifly-header-actions').html("<%= escape_javascript rendered_header_actions %>");
+  <% else %>
+    $('#notifly-notifications-content').prepend("<%= j rendered_notifications %>");
+    notiflyFirstNotification = <%= first_notification %>;
 
-$('#notifly-notifications-content .loading').remove();
-$('#notifly-notifications-content').append("<%= escape_javascript rendered_notifications %>");
-$('#notifly-notifications-footer').html("<%= escape_javascript rendered_footer %>");
+    if (notiflyLastNotification == undefined)
+      notiflyLastNotification = <%= last_notification %>;
 
-$('#notifly-counter').html("<%= escape_javascript(render 'notifly/layouts/counter', counter: @counter)%>");
-$('#notifly-icon').html("<%= escape_javascript notifly_icon(@counter > 0) %>")
+  <% end %>
+
+<% else %>
+    if (notiflyLastNotification == undefined)
+      $('#notifly-more-notifications-link').remove();
+
+<% end %>
+
+<% if @scope_param == 'older' and Notifly::Notification.older(than: last_notification).blank? %>
+  $('#notifly-more-notifications-link').remove();
+<% end %>
+
+$('#notifly-counter').html("<%= j(render 'notifly/layouts/counter', counter: @counter)%>");
+$('#notifly-icon').html("<%= j notifly_icon(@counter > 0) %>")

data/app/views/notifly/notifications/{read_specific.js.erb → read.js.erb}

@@ -1,4 +1,4 @@
 <% rendered_index = render partial: 'notifly/layouts/index',
   locals: { notifications: @notifications } %>
 
-$('#notifly-notifications-content').html("<%= escape_javascript rendered_index %>");
+$('#notifly-notifications-content').html("<%= j rendered_index %>");

data/app/views/notifly/notifications/seen.js.erb

@@ -0,0 +1,2 @@
+$('#notifly-counter').html("<%= j(render 'notifly/layouts/counter', counter: @counter)%>");
+$('#notifly-icon').html("<%= j notifly_icon(@counter > 0) %>")

data/app/views/notifly/notifications/toggle_read.js.erb

@@ -2,4 +2,4 @@
   locals: { notification: @notification } %>
 
 $('<%= "#notifly-notification-#{@notification.id}" %>')
-  .replaceWith('<%= escape_javascript rendered_notification %>')
+  .replaceWith('<%= j rendered_notification %>')

data/app/views/notifly/templates/mails/_default.html.erb

@@ -0,0 +1 @@
+Default notification mail

data/config/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  notifly:
+    mail_subject:
+      default: 'You have a new notification'

data/config/routes.rb

@@ -3,9 +3,8 @@ Notifly::Engine.routes.draw do
     put :toggle_read
 
     collection do
-      get :counter
-      put :update_counter
-      put :read_specific
+      put :read
+      put :seen
     end
   end
 end

data/db/migrate/20141125165636_add_mail_to_notifly_notifications.rb

@@ -0,0 +1,5 @@
+class AddMailToNotiflyNotifications < ActiveRecord::Migration
+  def change
+    add_column :notifly_notifications, :mail, :string
+  end
+end

data/lib/generators/notifly/install/install_generator.rb

@@ -15,7 +15,8 @@ module Notifly
       end
 
       def copy_config
-        template "config/initializers/notifly.rb"
+        template 'config/initializers/notifly.rb'
+        copy_file '../../../../../config/locales/en.yml', 'config/locales/notifly.en.yml'
       end
 
       def remember_to_install_migrations

data/lib/generators/notifly/install/templates/config/initializers/notifly.rb

@@ -1,4 +1,16 @@
 Notifly.setup do |config|
   # Define how many notifications per page.
   config.per_page = 10
+
+  # Define the time interval in miliseconfs between requests to check notifications.
+  config.timeout = 10000
+
+  # Define the notifly icon from font-awesome-rails
+  config.icon = 'bell'
+
+  # Define the notifly icon size
+  config.icon_size = '2x'
+
+  # Define your mailer sender
+  config.mailer_sender = 'change-me-at-config-initializers-notifly@exemple.com'
 end

data/lib/generators/notifly/views/views_generator.rb

@@ -2,10 +2,17 @@ module Notifly
   module Generators
     class ViewsGenerator < Rails::Generators::Base
       source_root File.expand_path('../../../../../app/views/notifly', __FILE__)
-      class_option :layout, type: :boolean, default: false, desc: 'Include layout files.'
+
+      class_option :layout, type: :boolean, default: false,
+        desc: 'Include/Remove layout files.'
+      class_option :mail, type: :boolean, default: false,
+        desc: 'Include/Remove mails templates files.'
+      class_option :notification, type: :boolean, default: false,
+        desc: 'Include/Remove notifications templates files.'
 
       def copy_views
-        copy_file 'templates/_default.html.erb', "#{main_app_path}/templates/_default.html.erb"
+        notifications_templates if options.notification?
+        notifications_mails_templates if options.mail?
         layout_files if options.layout?
       end
 
@@ -14,6 +21,14 @@ module Notifly
           'app/views/notifly'
         end
 
+        def notifications_templates
+          directory 'templates/notifications', "#{main_app_path}/templates/notifications"
+        end
+
+        def notifications_mails_templates
+          directory 'templates/mails', "#{main_app_path}/templates/mails"
+        end
+
         def layout_files
           directory 'layouts', "#{main_app_path}/layouts"
         end

data/lib/notifly.rb

@@ -16,6 +16,12 @@ module Notifly
   mattr_accessor :icon_empty
   @@icon_empty = 'bell-o'
 
+  mattr_accessor :mailer_sender
+  @@mailer_sender = 'change-me-at-config-initializers-notifly@exemple.com'
+
+  mattr_accessor :timeout
+  @@timeout = 10000
+
   # Default way to setup Notifly. Run rails generate notifly:install to create
   # a fresh initializer with all configuration values.
   def self.setup

data/lib/notifly/engine.rb

@@ -1,5 +1,4 @@
 require 'jquery-rails'
-require 'kaminari'
 
 module Notifly
   class Engine < ::Rails::Engine

data/lib/notifly/models/flyable.rb

@@ -91,11 +91,20 @@ module Notifly
 
       def _create_notification_for(fly)
         new_fly = _default_fly.merge(fly)
-        Notifly::Notification.create! _get_attributes_from(new_fly)
+        notification = Notifly::Notification.create _get_attributes_from(new_fly)
+
+        if new_fly.mail.present?
+          template = new_fly.mail.try(:fetch, :template) || notification.template
+
+          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}"
       end
 
-      def notifly_notifications(options={})
-        Notifly::Notification.where(receiver: self)
+      def notifly_notifications
+        Notifly::Notification.all_from(self)
       end
 
       private
@@ -114,7 +123,7 @@ module Notifly
         end
 
         def _eval_for(key, value)
-          if key.to_sym == :template
+          if [:template, :mail].include? key.to_sym
             value
           elsif value == :self
             self

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
+          :if, :unless, :data, :mail
 
         def initialize(options={})
           options = options.fetch(:default_values, options)
@@ -23,13 +23,25 @@ module Notifly
         end
 
         def attributes
-          instance_values.reject { |key| [hook, :if, :unless].include? key.to_sym  }
+          no_attrs = [hook, :if, :unless, :mail]
+          attrs = instance_values.reject { |key| no_attrs.include? key.to_sym  }
+          attrs.merge({mail: get_mail_type})
         end
 
         def merge(fly)
           raise TypeError, "#{fly} is not a Fly" unless fly.is_a? self.class
 
-          Notifly::Models::Options::Fly.new attributes.merge(fly.attributes)
+          Notifly::Models::Options::Fly.new instance_values.merge(fly.instance_values)
+        end
+
+        def get_mail_type
+          if mail == true
+            :always
+          elsif mail.present? and mail[:only]
+            :only
+          else
+            :never
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifly
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Pedro Passalini
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,20 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -255,34 +241,39 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/notifly.js
-- app/assets/javascripts/notifly/counter.js.erb
 - app/assets/javascripts/notifly/get_notifications.js.erb
+- app/assets/javascripts/notifly/more_notifications.js.erb
+- app/assets/javascripts/notifly/read_notifications.js.erb
+- app/assets/javascripts/notifly/seen_notifications.js.erb
 - app/assets/stylesheets/notifly.css
 - app/assets/stylesheets/notifly/layout.css
 - app/controllers/notifly/application_controller.rb
 - app/controllers/notifly/notifications_controller.rb
 - app/helpers/notifly/view_helper.rb
+- app/mailers/notifly/notification_mailer.rb
 - app/models/notifly/notification.rb
 - app/views/notifly/layouts/_actions.html.erb
 - app/views/notifly/layouts/_counter.html.erb
-- app/views/notifly/layouts/_footer.html.erb
 - app/views/notifly/layouts/_index.html.erb
 - app/views/notifly/layouts/_notification.html.erb
 - app/views/notifly/layouts/_notifly.html.erb
-- app/views/notifly/notifications/counter.js.erb
+- app/views/notifly/notification_mailer/notifly.html.erb
 - app/views/notifly/notifications/index.js.erb
-- app/views/notifly/notifications/read_specific.js.erb
+- app/views/notifly/notifications/read.js.erb
+- app/views/notifly/notifications/seen.js.erb
 - app/views/notifly/notifications/toggle_read.js.erb
-- app/views/notifly/templates/_default.html.erb
+- app/views/notifly/templates/mails/_default.html.erb
+- app/views/notifly/templates/notifications/_default.html.erb
 - bin/rails
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20141103170528_create_notifly_notifications.rb
 - 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
 - lib/generators/notifly/install/install_generator.rb
 - lib/generators/notifly/install/templates/config/initializers/notifly.rb
 - lib/generators/notifly/install/utils.rb
-- lib/generators/notifly/views/USAGE
 - lib/generators/notifly/views/views_generator.rb
 - lib/notifly.rb
 - lib/notifly/engine.rb

data/app/assets/javascripts/notifly/counter.js.erb

@@ -1,23 +0,0 @@
-<% notifly = Notifly::Engine.routes.url_helpers %>
-var notiflyCounterRequested;
-
-var _notiflyGetCounter = function (notiflyPath) {
-  var $counter = $('#notifly-counter');
-
-  if (!notiflyCounterRequested) {
-    $.ajax({
-      url: '<%= notifly.counter_notifications_path %>',
-      type: 'GET',
-      error: _notiflyHandleCounterError
-    });
-  }
-};
-
-
-var _notiflyHandleCounterError = function () {
-  notiflyCounterRequested = false;
-};
-
-$(document).ready(function() {
-  _notiflyGetCounter();
-});

data/app/views/notifly/layouts/_footer.html.erb

@@ -1,3 +0,0 @@
-<!-- This partial requires the locals: notifications -->
-
-<%= link_to_next_page notifications, 'More', remote: true, id: 'notifly-next-page' %>

data/app/views/notifly/notifications/counter.js.erb

@@ -1,2 +0,0 @@
-$('#notifly-counter').html("<%= escape_javascript(render 'notifly/layouts/counter', counter: @counter)%>");
-$('#notifly-icon').html("<%= escape_javascript notifly_icon(@counter > 0) %>")

data/lib/generators/notifly/views/USAGE

@@ -1,8 +0,0 @@
-Description:
-    This generator will create Notifly views in your application
-
-Example:
-    rails generate notifly:views:templates
-
-    This will create:
-        app/views/notifly/templates/default.html.erb