- Use Kaminari instead of will_paginate.

- Remove `config.per_page` config.

Author: huacnlee

CHANGELOG.md

@@ -1,3 +1,11 @@
+0.4.0
+-----
+
+Break Changes:
+
+- Use Kaminari instead of will_paginate.
+- Remove `config.per_page` config.
+
 0.3.0
 -----
 

Gemfile

@@ -10,7 +10,7 @@ gem 'devise', '4.2.0'
 gem 'jquery-rails'
 gem 'mysql2'
 gem 'puma'
-gem 'bootstrap', '~> 4.0.0.alpha3.1'
+gem 'bootstrap', '~> 4.0.0.alpha6'
 
 group :development, :test do
   gem 'minitest'

Gemfile.lock

@@ -2,8 +2,8 @@ PATH
   remote: .
   specs:
     notifications (0.3.0)
+      kaminari (>= 0.15)
       rails (>= 4.2.0, < 5.1)
-      will_paginate (~> 3)
 
 GEM
   remote: https://rubygems.org/
@@ -84,6 +84,18 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.0.3)
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
+    kaminari-core (1.0.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -161,13 +173,12 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootstrap (~> 4.0.0.alpha3.1)
+  bootstrap (~> 4.0.0.alpha6)
   codecov
   coffee-rails
   devise (= 4.2.0)

app/controllers/notifications/notifications_controller.rb

@@ -3,10 +3,7 @@ class NotificationsController < Notifications::ApplicationController
     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 @@ def clean
     private
 
     def notifications
+      raise "You need reqiure user login for /notifications page." unless current_user
       Notification.where(user_id: current_user.id)
     end
   end

app/models/notification.rb

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

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' %>

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

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

lib/notifications.rb

@@ -2,15 +2,13 @@
 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

lib/notifications/configuration.rb

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

notifications.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
 
   s.add_dependency 'rails', '>= 4.2.0', '< 5.1'
-  s.add_dependency 'will_paginate', '~> 3'
+  s.add_dependency 'kaminari', '>= 0.15'
 end