notifications 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4db6d361624d9bc1d23d47a7ccc2972a72c2b7db
-  data.tar.gz: 9997b74887d08320e258d170c726e20a5f7b5196
+  metadata.gz: 19fdfc6600364423b916ac5ceb8f6f392a3f069d
+  data.tar.gz: b771f33617dab12b562c6b737495f7cfee80fc1a
 SHA512:
-  metadata.gz: 3c0c36018c209e2b50b02b856880f4170b2ce33df7322a3a766c27c1b0461cc98c6b4670b25ad9d143d4d29df1441e48499d898b4bed929270ab1a88fb0fec9c
-  data.tar.gz: ec47e9eb45a4bfa1e158f478191dc3b5fb78bc327f25c7205c32aca71df454418ae4fd3a17c01f279c372ead7ed3ff55ab8040a649c52f8e134440bfe4baa32e
+  metadata.gz: cddce6321db0f1a954ff3e2816b8c3cf858f4893d995788abfd8b3e9a150acc4667440c6c11450b780ff6b302e9357f715b8620cbe869b9b7d0a267149337205
+  data.tar.gz: f072bd94cd7509e33193bd8dd40953dd9bd4e0fdea9b0b34c933f2bc33be44b66276350275e947ccd03c880323e4302a74277b6d0e118374df2470ba120ebbb1

data/README.md

@@ -6,7 +6,7 @@ Rails mountable Notification for any applications.
 
 ## Example:
 
-<img width="650" alt="2016-03-29 10 48 16" src="https://cloud.githubusercontent.com/assets/5518/14096499/d7555aaa-f59b-11e5-87f0-e4728db903c8.png">
+<img width="800" alt="2016-03-29 10 48 16" src="https://cloud.githubusercontent.com/assets/5518/16578955/eb59e472-42cf-11e6-825e-8fc9ecf58a8b.png">
 
 ## Installation
 
@@ -97,7 +97,7 @@ You app must be have:
 
 ### About Notification template N+1 performance
 
-We suggest use [second_level_cached](https://github.com/hooopo/second_level_cache) for solve N+1 performance issue.
+Suggest you to use [second_level_cache](https://github.com/hooopo/second_level_cache) for solve N+1 performance issue.
 
 ## Contributing
 

data/app/controllers/notifications/application_controller.rb

@@ -3,7 +3,9 @@ module Notifications
     helper_method :current_user
 
     alias_method :origin_current_user, Notifications.config.current_user_method.to_sym
-    alias_method :origin_authenticate_user!, Notifications.config.authenticate_user_method.to_sym
+    if Notifications.config.authenticate_user_method
+      alias_method :origin_authenticate_user!, Notifications.config.authenticate_user_method.to_sym
+    end
 
     before_action :authenticate_user!
 
@@ -12,7 +14,7 @@ module Notifications
     end
 
     def authenticate_user!
-      origin_authenticate_user!
+      origin_authenticate_user! if Notifications.config.authenticate_user_method
     end
   end
 end

data/app/controllers/notifications/notifications_controller.rb

@@ -1,7 +1,7 @@
 module Notifications
   class NotificationsController < Notifications::ApplicationController
     def index
-      @notifications = current_user.notifications.includes(:actor).order('id desc').page(params[:page])
+      @notifications = notifications.includes(:actor).order('id desc').page(params[:page])
 
       unread_ids = []
       @notifications.each do |n|
@@ -13,8 +13,14 @@ module Notifications
     end
 
     def clean
-      Notification.where(user_id: current_user.id).delete_all
+      notifications.delete_all
       redirect_to notifications_path
     end
+
+    private
+
+    def notifications
+      Notification.where(user_id: current_user.id)
+    end
   end
 end

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

@@ -3,7 +3,9 @@
      data-id="<%= notification.id %>"
      class="media notification notification-<%= notification.notify_type %><%= ' unread' if !notification.read? %>">
   <div class="media-left">
-    <%= link_to image_tag(notification.actor_avatar_url), notification.actor_profile_url, title: notification.actor_name, class: 'user-avatar' %>
+    <% 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' %>
+    <% end %>
   </div>
   <div class="media-body">
     <%= render partial: "/notifications/#{notification.notify_type}", locals: { notification: notification } %>

data/config/initializers/notifications.rb

@@ -9,10 +9,10 @@ Notifications.configure do
   # Method of user avatar in User model, default: nil
   # self.user_avatar_url_method = nil
 
-  # Method name of user profile page path, in User model, default: 'profile_url'
+  # Method name of user profile page path, in User model, default: nil
   # self.user_profile_url_method = 'profile_url'
 
-  # authenticate_user method in your Controller, default: 'authenticate_user!'
+  # authenticate_user method in your Controller, default: nil
   # If you use Devise, authenticate_user! is correct
   # self.authenticate_user_method = 'authenticate_user!'
 

data/lib/generators/notifications/install_generator.rb

@@ -10,7 +10,7 @@ module Notifications
         if File.exist?(path)
           puts 'Skipping config/initializers/notifications.rb creation, as file already exists!'
         else
-          puts 'Adding Homeland initializer (config/initializers/notifications.rb)...'
+          puts 'Adding Notifications initializer (config/initializers/notifications.rb)...'
           template 'config/initializers/notifications.rb', path
         end
       end

data/lib/notifications.rb

@@ -14,8 +14,8 @@ module Notifications
       @config.user_class               = 'User'
       @config.user_name_method         = 'name'
       @config.user_avatar_url_method   = nil
-      @config.user_profile_url_method  = 'profile_url'
-      @config.authenticate_user_method = 'authenticate_user!'
+      @config.user_profile_url_method  = nil
+      @config.authenticate_user_method = nil
       @config.current_user_method      = 'current_user'
       @config
     end

data/lib/notifications/configuration.rb

@@ -22,7 +22,7 @@ module Notifications
     #
     attr_accessor :user_avatar_url_method
 
-    # method name of user profile page path, in User model, default: 'profile_url'
+    # method name of user profile page path, in User model, default: nil
     # Example:
     #
     # class User
@@ -37,7 +37,7 @@ module Notifications
     # current_user method name in your Controller, default: 'current_user'
     attr_accessor :current_user_method
 
-    # authenticate_user method in your Controller, default: 'authenticate_user!'
+    # authenticate_user method in your Controller, default: nil
     attr_accessor :authenticate_user_method
 
     # pagination size, default: 32

data/lib/notifications/model.rb

@@ -31,7 +31,8 @@ module Notifications
     end
 
     def actor_profile_url
-      return '#' if self.actor.blank?
+      return nil if Notifications.config.user_profile_url_method.blank?
+      return nil if self.actor.blank?
       self.actor.send(Notifications.config.user_profile_url_method)
     end
 

data/lib/notifications/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifications
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-26 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,16 +34,16 @@ dependencies:
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
 description: Rails mountable Notification for any applications.
 email:
 - huacnlee@gmail.com
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails mountable Notification for any applications.