notifications 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19fdfc6600364423b916ac5ceb8f6f392a3f069d
-  data.tar.gz: b771f33617dab12b562c6b737495f7cfee80fc1a
+  metadata.gz: 289be7485587ec007b2383811b0a99daf76d7099
+  data.tar.gz: d0197d7f693e1462f7ff802101aa3e94d05ec653
 SHA512:
-  metadata.gz: cddce6321db0f1a954ff3e2816b8c3cf858f4893d995788abfd8b3e9a150acc4667440c6c11450b780ff6b302e9357f715b8620cbe869b9b7d0a267149337205
-  data.tar.gz: f072bd94cd7509e33193bd8dd40953dd9bd4e0fdea9b0b34c933f2bc33be44b66276350275e947ccd03c880323e4302a74277b6d0e118374df2470ba120ebbb1
+  metadata.gz: 7ca9ee7e713d576e07603fe543d34c4eeebb22c726f5eaf185c066c1bb7c7bac8a73fdb61547895588f07c6daa387513cd560ce1efdd1a0243fdb21e1525f455
+  data.tar.gz: 42d62d628b94b53c6d1504bc8f24c747cd955883b2facedde2aab40ebcc4614c78a0258cd1e09243fe687d751baec0b207b7b73dfb53c5e514c68392c7f57305

data/app/controllers/notifications/notifications_controller.rb

@@ -3,10 +3,7 @@ module Notifications
     def index
       @notifications = notifications.includes(:actor).order('id desc').page(params[:page])
 
-      unread_ids = []
-      @notifications.each do |n|
-        unread_ids << n.id unless n.read?
-      end
+      unread_ids = @notifications.reject(&:read?).select(&:id)
       Notification.read!(unread_ids)
 
       @notification_groups = @notifications.group_by { |note| note.created_at.to_date }
@@ -20,6 +17,7 @@ module Notifications
     private
 
     def notifications
+      raise "You need reqiure user login for /notifications page." unless current_user
       Notification.where(user_id: current_user.id)
     end
   end

data/app/models/notification.rb

@@ -2,7 +2,5 @@
 class Notification < ActiveRecord::Base
   include Notifications::Model
 
-  self.per_page = 20
-
   # Write your custom methods...
 end

data/app/views/notifications/notifications/_notification.html.erb

@@ -1,7 +1,7 @@
 <%= cache(['notifications', Notifications::VERSION, notification]) do %>
 <div id="notification-<%= notification.id %>"
      data-id="<%= notification.id %>"
-     class="media notification notification-<%= notification.notify_type %><%= ' unread' if !notification.read? %>">
+     class="media notification notification-<%= notification.notify_type %><%= ' unread' unless notification.read? %>">
   <div class="media-left">
     <% if notification.actor_profile_url && notification.actor_avatar_url %>
       <%= link_to image_tag(notification.actor_avatar_url), notification.actor_profile_url, title: notification.actor_name, class: 'user-avatar' %>

data/app/views/notifications/notifications/index.html.erb

@@ -18,5 +18,5 @@
       <% end %>
     <% end %>
   </div>
-  <%= will_paginate @notifications %>
+  <%= paginate @notifications %>
 </div>

data/lib/notifications.rb

@@ -2,15 +2,13 @@ require 'notifications/model'
 require 'notifications/engine'
 require 'notifications/configuration'
 require 'notifications/version'
-require 'will_paginate'
-require 'will_paginate/active_record'
+require 'kaminari'
 
 module Notifications
   class << self
     def config
       return @config if defined?(@config)
       @config = Configuration.new
-      @config.per_page                 = 32
       @config.user_class               = 'User'
       @config.user_name_method         = 'name'
       @config.user_avatar_url_method   = nil

data/lib/notifications/configuration.rb

@@ -39,8 +39,5 @@ module Notifications
 
     # authenticate_user method in your Controller, default: nil
     attr_accessor :authenticate_user_method
-
-    # pagination size, default: 32
-    attr_accessor :per_page
   end
 end

data/lib/notifications/version.rb

@@ -1,3 +1,3 @@
 module Notifications
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifications
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jason Lee
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.15'
 description: Rails mountable Notification for any applications.
 email:
 - huacnlee@gmail.com