notifications 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9cf008411221f8643f6272a4f492d6567f7e4c2e0391ee64aab731a3895c7e74
-  data.tar.gz: 75455d8f4aafd04a1d2ec0b57fd4e50e61518b54a8e27667d8e694be5210747d
+  metadata.gz: 60fefd52121d61d6beb17f2ddc27a829b78147ded2c816e643d691c89ceb583d
+  data.tar.gz: 67eb1c905055995f9f7c15563e0e45c83a90654765ba1201296f1f3426590182
 SHA512:
-  metadata.gz: 1dbee55f530440d4c1ed3000857ffdc4abcbb25825c06164b658fa67b7f19e29a872fc851cfa64b7477db7da491a4f25ab6e5cda6bf461942251220f7c1c687b
-  data.tar.gz: 1feea3486d23c7e3e6598cdf012cd7f947cc017189b2258503c07236b8d1f71854cff20645d0e9df94bd6c548df8b6d4955d7e012407baba3eeafb6c6a842f7e
+  metadata.gz: db8c63d042a9f10e5e30931dd710ff98d1fe46cd2885b918a2cedc5c868a0accf021ae4fea485d98436b9f384aa1d43965b97e88285ffd3f1fddfd59c3e0e711
+  data.tar.gz: d198158df36b375edd8e474d132be772666d24e3a3afaaeeb074cfcae31eff3a810c86ab91fd96ef86e8b46efb4e8440bcb5de28f262aeecbbe81af30d956d8c

data/README.md

@@ -10,15 +10,10 @@ Mountable notifications for any Rails applications.
 
 ## Installation
 
-```ruby
-# Gemfile Rails ~> 5
-gem 'notifications', '~> 0.6.0'
-# Gemfile for Rails ~> 4.2
-gem 'notifications', '~> 0.5.0'
+```bash
+$ bundle add notifications
 ```
 
-And then run `bundle install`.
-
 You now have a notifications generator in your Rails application:
 
 ```bash
@@ -73,7 +68,7 @@ read_count = Notification.read_count(current_user)
 # for non-user class
 Notifications.config.user_class = 'Member'
 
-#or change 
+#or change
 
 Notifications.configure do
   # Class name of you User model, default: 'User'

data/Rakefile

@@ -1,24 +1,24 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 
-load 'rails/tasks/engine.rake'
-load 'rails/tasks/statistics.rake'
+load "rails/tasks/engine.rake"
+load "rails/tasks/statistics.rake"
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "lib"
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 
-task 'assets:precompile' => 'app:assets:precompile'
+task "assets:precompile" => "app:assets:precompile"
 task default: :test

data/app/controllers/notifications/notifications_controller.rb

@@ -1,24 +1,28 @@
 module Notifications
   class NotificationsController < Notifications::ApplicationController
     def index
-      @notifications = notifications.includes(:actor).order('id desc').page(params[:page])
+      @notifications = notifications.includes(:actor).order("id desc").page(params[:page])
 
       unread_ids = @notifications.reject(&:read?).select(&:id)
-      Notification.read!(unread_ids)
+      Notification.read!(current_user, unread_ids)
 
       @notification_groups = @notifications.group_by { |note| note.created_at.to_date }
     end
 
+    def read
+      Notification.read!(current_user, params[:ids])
+      render json: { ok: 1 }
+    end
+
     def clean
       notifications.delete_all
       redirect_to notifications_path
     end
 
     private
-
-    def notifications
-      raise 'You need reqiure user login for /notifications page.' unless current_user
-      Notification.where(user_id: current_user.id)
-    end
+      def notifications
+        raise "You need reqiure user login for /notifications page." unless current_user
+        Notification.where(user_id: current_user.id)
+      end
   end
 end

data/config/routes.rb

@@ -1,7 +1,8 @@
 Notifications::Engine.routes.draw do
-  resources :notifications, path: '' do
+  resources :notifications, path: "" do
     collection do
       delete :clean
+      post :read
     end
   end
 end

data/lib/generators/notifications/controllers_generator.rb

@@ -1,8 +1,8 @@
-require 'rails/generators'
+require "rails/generators"
 module Notifications
   module Generators
     class ControllersGenerator < Rails::Generators::Base #:nodoc:
-      source_root File.expand_path('../../../app/controllers', __dir__)
+      source_root File.expand_path("../../../app/controllers", __dir__)
       desc "Used to copy Notifications's controllers to your application's controllers."
 
       def copy_controllers

data/lib/generators/notifications/i18n_generator.rb

@@ -1,9 +1,9 @@
-require 'rails/generators'
+require "rails/generators"
 module Notifications
   module Generators
     class I18nGenerator < Rails::Generators::Base
       desc "Create Notifications's default I18n files"
-      source_root File.expand_path('../../..', __dir__)
+      source_root File.expand_path("../../..", __dir__)
 
       def add_locales
         %w[en.yml zh-CN.yml].each do |fname|

data/lib/generators/notifications/install_generator.rb

@@ -1,27 +1,27 @@
-require 'rails/generators'
+require "rails/generators"
 module Notifications
   module Generators
     class InstallGenerator < Rails::Generators::Base
       desc "Create Notifications's base files"
-      source_root File.expand_path('../../..', __dir__)
+      source_root File.expand_path("../../..", __dir__)
 
       def add_initializer
         path = "#{Rails.root}/config/initializers/notifications.rb"
         if File.exist?(path)
-          puts 'Skipping config/initializers/notifications.rb creation, as file already exists!'
+          puts "Skipping config/initializers/notifications.rb creation, as file already exists!"
         else
-          puts 'Adding Notifications initializer (config/initializers/notifications.rb)...'
-          template 'config/initializers/notifications.rb', path
+          puts "Adding Notifications initializer (config/initializers/notifications.rb)..."
+          template "config/initializers/notifications.rb", path
         end
       end
 
       def add_models
         path = "#{Rails.root}/app/models/notification.rb"
         if File.exist?(path)
-          puts 'Skipping notification.rb creation, as file already exists!'
+          puts "Skipping notification.rb creation, as file already exists!"
         else
-          puts 'Adding model (notification.rb)...'
-          template 'app/models/notification.rb', path
+          puts "Adding model (notification.rb)..."
+          template "app/models/notification.rb", path
         end
       end
 
@@ -30,7 +30,7 @@ module Notifications
       end
 
       def add_migrations
-        exec('rake notifications:install:migrations')
+        exec("rake notifications:install:migrations")
       end
     end
   end

data/lib/generators/notifications/views_generator.rb

@@ -1,13 +1,13 @@
-require 'rails/generators'
+require "rails/generators"
 module Notifications
   module Generators
     class ViewsGenerator < Rails::Generators::Base #:nodoc:
-      source_root File.expand_path('../../..', __dir__)
+      source_root File.expand_path("../../..", __dir__)
       desc "Used to copy Notifications's views to your application's views."
 
       def copy_views
-        directory 'app/views/notifications', 'app/views/notifications'
-        template 'app/assets/stylesheets/notifications.scss', 'app/assets/stylesheets/notifications.scss'
+        directory "app/views/notifications", "app/views/notifications"
+        template "app/assets/stylesheets/notifications.scss", "app/assets/stylesheets/notifications.scss"
       end
     end
   end

data/lib/notifications.rb

@@ -1,20 +1,20 @@
-require 'notifications/model'
-require 'notifications/engine'
-require 'notifications/configuration'
-require 'notifications/version'
-require 'kaminari'
+require "notifications/model"
+require "notifications/engine"
+require "notifications/configuration"
+require "notifications/version"
+require "kaminari"
 
 module Notifications
   class << self
     def config
       return @config if defined?(@config)
       @config = Configuration.new
-      @config.user_class               = 'User'
-      @config.user_name_method         = 'name'
+      @config.user_class               = "User"
+      @config.user_name_method         = "name"
       @config.user_avatar_url_method   = nil
       @config.user_profile_url_method  = nil
       @config.authenticate_user_method = nil
-      @config.current_user_method      = 'current_user'
+      @config.current_user_method      = "current_user"
       @config
     end
 

data/lib/notifications/base.rb

@@ -0,0 +1,12 @@
+module Notifications
+  class Base
+    extend ActiveSupport::Concern
+
+    included do
+    end
+
+    class_methods do
+      def
+    end
+  end
+end

data/lib/notifications/model.rb

@@ -2,7 +2,7 @@ module Notifications
   module Model
     extend ActiveSupport::Concern
 
-    DEFAULT_AVATAR = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAADwCAMAAAAJixmgAAAAFVBMVEWkpKSnp6eqqqq3t7fS0tLV1dXZ2dmshcKEAAAAtklEQVR4Ae3XsRGAAAjAQFRk/5HtqaTz5H+DlInvAQAAAAAAAAAAAAAAAAAAAACymiveO6o7BQsWLFiwYMGCBS8PFixYsGDBggULFixYsGDBggULFixYsGDBggULFixYsGDBc4IFCxYsWLBgwYIFC14ZfOeAPRQ8IliwYMGCBQsWLFiwYMGCBQsWLFiwYMGCBQsWLFiwYMGCBQsWLFiwYMGCBQv+JQAAAAAAAAAAAAAAAAAAAOAB4KJfdHmj+kwAAAAASUVORK5CYII='
+    DEFAULT_AVATAR = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPAAAADwCAMAAAAJixmgAAAAFVBMVEWkpKSnp6eqqqq3t7fS0tLV1dXZ2dmshcKEAAAAtklEQVR4Ae3XsRGAAAjAQFRk/5HtqaTz5H+DlInvAQAAAAAAAAAAAAAAAAAAAACymiveO6o7BQsWLFiwYMGCBS8PFixYsGDBggULFixYsGDBggULFixYsGDBggULFixYsGDBc4IFCxYsWLBgwYIFC14ZfOeAPRQ8IliwYMGCBQsWLFiwYMGCBQsWLFiwYMGCBQsWLFiwYMGCBQsWLFiwYMGCBQv+JQAAAAAAAAAAAAAAAAAAAOAB4KJfdHmj+kwAAAAASUVORK5CYII="
 
     included do
       belongs_to :actor, class_name: Notifications.config.user_class, optional: true
@@ -14,7 +14,6 @@ module Notifications
 
       scope :unread, -> { where(read_at: nil) }
       scope :read, -> { where.not(read_at: nil) }
-
     end
 
     def read?
@@ -22,7 +21,7 @@ module Notifications
     end
 
     def actor_name
-      return '' if self.actor.blank?
+      return "" if self.actor.blank?
       self.actor.send(Notifications.config.user_name_method)
     end
 
@@ -39,9 +38,9 @@ module Notifications
     end
 
     module ClassMethods
-      def read!(ids = [])
+      def read!(user, ids = [])
         return if ids.blank?
-        Notification.where(id: ids).update_all(read_at: Time.now)
+        Notification.where(user: user, id: ids).update_all(read_at: Time.now)
       end
 
       def unread_count(user)

data/lib/notifications/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Notifications
-  VERSION = '1.0.0'
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifications
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jason Lee
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -64,6 +64,7 @@ files:
 - lib/generators/notifications/install_generator.rb
 - lib/generators/notifications/views_generator.rb
 - lib/notifications.rb
+- lib/notifications/base.rb
 - lib/notifications/configuration.rb
 - lib/notifications/engine.rb
 - lib/notifications/model.rb
@@ -73,7 +74,7 @@ homepage: https://github.com/rails-engine/notifications
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,8 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Rails mountable Notification for any applications.
 test_files: []