elabs 2.0.0 → 3.0.0

data/app/controllers/elabs/reports_controller.rb

@@ -1,5 +1,5 @@
 module Elabs
-  class ReportsController < ElabsApplicationController
+  class ReportsController < ElabsPublicController
     # POST /reports
     # POST /reports.json
     # rubocop:disable Metrics/AbcSize
@@ -9,7 +9,7 @@ module Elabs
       respond_to do |format|
         if report.save
           format.html { redirect_to request.referer, notice: _('Report was successfully created.') }
-          format.json { render json: { message: 'ok' }, status: :created, location: report }
+          format.json { render json: { message: 'ok' }, status: :created }
         else
           format.html { redirect_to request.referer, notice: { error: report.errors } }
           format.json { render json: report.errors, status: :unprocessable_entity }

data/app/controllers/elabs/tags_controller.rb

@@ -1,5 +1,5 @@
 module Elabs
-  class TagsController < ElabsApplicationController
+  class TagsController < ElabsPublicController
     ALLOWED_ORDER_FROM = %w[name].freeze
     DEFAULT_ORDER      = { name: :desc }.freeze
 
@@ -8,7 +8,7 @@ module Elabs
     # GET /tags
     # GET /tags.json
     def index
-      @tags = Tag.all
+      @tags = scope_request Tag.all
     end
 
     # GET /tags/1

data/app/controllers/elabs/users_controller.rb

@@ -1,14 +1,14 @@
 module Elabs
-  class UsersController < ElabsApplicationController
+  class UsersController < ElabsPublicController
     ALLOWED_ORDER_FROM = %w[username created_at].freeze
-    DEFAULT_ORDER      = { username: :desc }.freeze
+    DEFAULT_ORDER      = { username: :asc }.freeze
 
     before_action :set_user, only: %i[show edit update destroy]
 
     # GET /users
     # GET /users.json
     def index
-      @users = User.page(params[:page]).per(self.class::MAX_ITEMS_PER_PAGE)
+      @users = scope_request User.page(params[:page]).per(self.class::MAX_ITEMS_PER_PAGE)
     end
 
     # GET /users/1

data/app/helpers/elabs/admin_content_helper.rb

@@ -2,27 +2,20 @@ module Elabs
   module AdminContentHelper
     def admin_action_links(singular_model, entity)
       out = []
-      out.push(admin_show_online_link(entity))
+      out.push(show_online_link(entity))
       out.push(admin_lock_link(singular_model, entity))
       out.push(admin_destroy_link(singular_model, entity))
 
       raw out.join('')
     end
 
-    def admin_show_link(singular_model, entity)
-      link_to send("admin_#{singular_model}_path".to_sym, entity),
-              title:  _('Show'),
-              class:  'btn btn--small btn--show' do
-        icon('eye', ['fw'])
-      end
+    # @deprecated This will be deprecated in 4.0
+    def admin_show_online_link(singular_model, entity)
+      admin_show_link(singular_model, entity)
     end
 
-    def admin_show_online_link(entity)
-      link_to entity,
-              title: _('View online'),
-              class: 'btn btn--small btn--show' do
-        icon('globe', ['fw'])
-      end
+    def admin_show_link(singular_model, entity)
+      namespace_show_link('admin', singular_model, entity)
     end
 
     def admin_lock_link(singular_model, entity)
@@ -35,20 +28,11 @@ module Elabs
     end
 
     def admin_destroy_link(singular_model, entity)
-      link_to send("admin_#{singular_model}_path".to_sym, entity),
-              title:  _('Destroy'),
-              class:  'btn btn--small btn--destroy',
-              method: :delete, data: { confirm: _('Are you sure?') } do
-        icon('trash', ['fw'])
-      end
+      namespace_destroy_link('admin', singular_model, entity)
     end
 
     def admin_edit_link(singular_model, entity)
-      link_to send("edit_admin_#{singular_model}_path".to_sym, entity),
-              title: _('Edit'),
-              class: 'btn btn--small btn--edit' do
-        icon('pencil-alt', ['fw'])
-      end
+      namespace_edit_link('admin', singular_model, entity)
     end
   end
 end

data/app/helpers/elabs/application_helper.rb

@@ -29,7 +29,7 @@ module Elabs
     def icon(name, classes = [], base = 'fas')
       icon_class = ["#{base} fa-#{name}"]
       icon_class += classes.map do |c|
-        if %w[2x 3x 4x].include? c
+        if %w[2x 3x 4x fw].include? c
           "fa-#{c}"
         else
           c

data/app/helpers/elabs/content_helper.rb

@@ -0,0 +1,39 @@
+module Elabs
+  module ContentHelper
+    def show_online_link(entity)
+      link_to entity,
+              title: _('View online'),
+              class: 'btn btn--small btn--show' do
+        icon('eye', ['fw'])
+      end
+    end
+
+    def namespace_show_link(namespace, singular_model, entity)
+      link_to send("#{namespace}_#{singular_model}_path", entity),
+              title: _('View online'),
+              class: 'btn btn--small btn--show' do
+        icon('eye', ['fw'])
+      end
+    end
+
+    def namespace_edit_link(namespace, singular_model, entity)
+      link_to send("edit_#{namespace}_#{singular_model}_path", entity),
+              title: _('Edit'),
+              class: 'btn btn--small btn--edit' do
+        icon('pencil-alt', ['fw'])
+      end
+    end
+
+    def namespace_destroy_link(namespace, singular_model, entity, confirm = true)
+      link_params = {
+        title:  _('Destroy'),
+        method: :delete,
+        class:  'btn btn--small btn--destroy'
+      }
+      link_params[:data] = { confirm: _('Are you sure?') } if confirm
+      link_to send("#{namespace}_#{singular_model}_path".to_sym, entity), link_params do
+        icon('trash', ['fw'])
+      end
+    end
+  end
+end

data/app/helpers/elabs/form_helper.rb

@@ -1,23 +1,35 @@
 module Elabs
   module FormHelper
-    def album_selector(form)
-      form.select :album_ids, Elabs::Album.by_member(current_user).for_list, {}, multiple: true
+    def album_selector(form, field = :album_ids, multiple: true)
+      form.select field, Elabs::Album.by_member(current_user).for_list, {},
+                  multiple: multiple, id: selector_id(form, field)
     end
 
-    def language_selector(form)
-      form.select :language_id, Elabs::Language.for_list
+    def language_selector(form, field = :language_id, multiple: false)
+      form.select field, Elabs::Language.for_list, {},
+                  multiple: multiple, id: selector_id(form, field)
     end
 
-    def license_selector(form)
-      form.select :license_id, Elabs::License.for_list
+    def license_selector(form, field = :license_id, multiple: false)
+      form.select field, Elabs::License.for_list, {},
+                  multiple: multiple, id: selector_id(form, field)
     end
 
-    def project_selector(form)
-      form.select :project_ids, Elabs::Project.by_member(current_user).for_list, {}, multiple: true
+    def project_selector(form, field = :project_ids, multiple: true)
+      form.select field, Elabs::Project.by_member(current_user).for_list, {},
+                  multiple: multiple, id: selector_id(form, field)
     end
 
-    def uploads_selector(form)
-      form.select :upload_ids, Elabs::Upload.by_member(current_user).for_list, {}, multiple: true
+    def uploads_selector(form, field = :upload_ids, multiple: true)
+      form.select field, Elabs::Upload.by_member(current_user).for_list, {},
+                  multiple: multiple, id: selector_id(form, field)
+    end
+
+    private
+
+    def selector_id(form, field)
+      field_name = field.to_s.sub(/(.*)_id(s?)/, '\1\2')
+      "#{form.object_name}_#{field_name}"
     end
   end
 end

data/app/helpers/elabs/member_content_helper.rb

@@ -2,7 +2,7 @@ module Elabs
   module MemberContentHelper
     def member_action_links(singular_model, entity)
       out = []
-      out.push member_show_link(entity)
+      out.push show_online_link(entity)
       out.push member_edit_link(singular_model, entity)
       out.push member_publish_link(singular_model, entity)
       out.push member_destroy_link(singular_model, entity)
@@ -10,20 +10,12 @@ module Elabs
       raw out.join('')
     end
 
-    def member_show_link(entity)
-      link_to entity,
-              title: _('View online'),
-              class: 'btn btn--small btn--show' do
-        icon('eye', ['fw'])
-      end
+    def member_edit_link(singular_model, entity)
+      namespace_edit_link('member', singular_model, entity)
     end
 
-    def member_edit_link(singular_model, entity)
-      link_to send("edit_member_#{singular_model}_path", entity),
-              title: _('Edit'),
-              class: 'btn btn--small btn--edit' do
-        icon('pencil-alt', ['fw'])
-      end
+    def member_destroy_link(singular_model, entity, confirm = true)
+      namespace_destroy_link('member', singular_model, entity, confirm)
     end
 
     def member_publish_link(singular_model, entity)
@@ -34,14 +26,5 @@ module Elabs
         icon(entity.published? ? 'calendar-times' : 'calendar-check', ['fw'])
       end
     end
-
-    def member_destroy_link(singular_model, entity)
-      link_to send("member_#{singular_model}_path".to_sym, entity),
-              title:  _('Destroy'),
-              method: :delete, data: { confirm: _('Are you sure?') },
-              class:  'btn btn--small btn--destroy' do
-        icon('trash', ['fw'])
-      end
-    end
   end
 end

data/app/helpers/elabs/notification_helper.rb

@@ -0,0 +1,69 @@
+module Elabs
+  module NotificationHelper
+    def notification_message(notification)
+      user   = notification_user notification.source_user
+      action = notification_action notification.event
+      link   = notification_link notification
+      string = notification_string notification
+      format(string, user: user, action: action, link: link).html_safe
+    end
+
+    def notification_icon(event)
+      actions = {
+        comment: 'comment',
+        report:  'flag',
+        lock:    'lock',
+        unlock:  'unlock',
+        delete:  'trash'
+      }.freeze
+      icon (actions[event.to_sym] || 'question'), ['fw']
+    end
+
+    def notification_count
+      Elabs::Notification.for_user(current_user).count
+    end
+
+    private
+
+    def notification_action(event)
+      actions = {
+        comment: _('has commented'),
+        report:  _('has reported'),
+        lock:    _('has locked'),
+        unlock:  _('has unlocked'),
+        delete:  _('has deleted')
+      }.freeze
+      actions[event.to_sym] || "[missing: #{event}]"
+    end
+
+    def notification_user(user)
+      return link_to user.display_name, user if user
+
+      _('Someone')
+    end
+
+    def notification_link(notification)
+      return "##{notification.content_id}" if notification.event == 'delete'
+
+      link = case notification.content_type
+             when 'Elabs::Report'
+               admin_reports_path
+             else
+               notification.content
+             end
+      link_to("##{notification.content_id}", link).html_safe
+    end
+
+    def notification_string(notification)
+      strings = {
+        'Elabs::Album' => _('%<user>s %<action>s your album %<link>s'),
+        'Elabs::Article' => _('%<user>s %<action>s your article %<link>s'),
+        'Elabs::Note'    => _('%<user>s %<action>s your note %<link>s'),
+        'Elabs::Project' => _('%<user>s %<action>s your project %<link>s'),
+        'Elabs::Upload'  => _('%<user>s %<action>s your file %<link>s'),
+        'Elabs::Report'  => _('%<user>s %<action>s %<link>s')
+      }.freeze
+      strings[notification.content_type] || '%<user> %<action>s something (<%link>)'
+    end
+  end
+end

data/app/helpers/elabs/thumbnails_helper.rb

@@ -24,5 +24,20 @@ module Elabs
 
       { resize: dimensions }
     end
+
+    def avatar_image(avatar, size = :medium)
+      x           = avatar.blob.metadata[:width].to_f
+      y           = avatar.blob.metadata[:height].to_f
+      bigger_size = x < y ? x : y
+      dimensions  = case size
+                    when :large
+                      '512'
+                    when :medium
+                      '256'
+                    when :small
+                      '64'
+                    end
+      avatar.variant(combine_options: { gravity: 'center', crop: "#{bigger_size}x#{bigger_size}+0+0", resize: dimensions.to_s }).processed
+    end
   end
 end

data/app/helpers/elabs/time_helper.rb

@@ -2,6 +2,7 @@ module Elabs
   module TimeHelper
     def same_day?(previous_date_time, current_date_time)
       return false if previous_date_time.nil?
+
       date1 = Date.parse(previous_date_time.to_s)
       date2 = Date.parse(current_date_time.to_s)
 
@@ -15,5 +16,11 @@ module Elabs
     def date_time_to_time(time)
       time.strftime(_('%I:%M %p'))
     end
+
+    def short_date(date)
+      return nil if date.nil?
+
+      I18n.l date, format: :short
+    end
   end
 end

data/app/models/elabs/application_content_record.rb

@@ -3,6 +3,7 @@ module Elabs
     include Elabs::Concerns::ContentEntity
     include Elabs::Concerns::ActableEntity
     include Elabs::Concerns::CountableEntity
+    include Elabs::Concerns::NotifiableEntity
     include Elabs::Concerns::Taggable
 
     self.abstract_class = true

data/app/models/elabs/application_record.rb

@@ -1,5 +1,7 @@
 module Elabs
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
+
+    attr_accessor :changed_by
   end
 end

data/app/models/elabs/comment.rb

@@ -8,5 +8,19 @@ module Elabs
 
     belongs_to :content, polymorphic: true
     belongs_to :user,    optional: true
+
+    after_save :notify_author, if: :notify_author?
+
+    def notify_author?
+      user_id ? content.user_id != user_id : true
+    end
+
+    def notify_author
+      notification = { content: content,
+                       event:   :comment,
+                       user_id: content.user_id }
+      notification[:source_user] = user if user_id
+      Elabs::Notification.create! notification
+    end
   end
 end

data/app/models/elabs/concerns/actable_entity.rb

@@ -26,18 +26,6 @@ module Elabs
                   end
       end
 
-      def current_publish_action
-        published? && unlocked? ? :publish : :unpublish
-      end
-
-      def current_lock_action
-        published? && locked? ? :lock : :unlock
-      end
-
-      def current_update_action
-        published? && unlocked? ? :update : :nothing
-      end
-
       def update_acts
         acts.destroy_all if %i[lock unpublish].include? @action
         Act.create content: self, event: @action unless @action == :nothing || hidden_in_history

data/app/models/elabs/concerns/content_entity.rb

@@ -56,6 +56,29 @@ module Elabs
         self.published_at = nil if changed.include?('published') && !published?
       end
 
+      # method used by ActableEntity/NotifiableEntity to determine the events.
+      def current_publish_action
+        return :nothing unless unlocked?
+
+        published? ? :publish : :unpublish
+      end
+
+      # method used by ActableEntity/NotifiableEntity to determine the events.
+      def current_lock_action
+        return :nothing unless published?
+
+        locked? ? :lock : :unlock
+      end
+
+      # method used by ActableEntity/NotifiableEntity to determine the events.
+      def current_update_action
+        published? && unlocked? ? :update : :nothing
+      end
+
+      def changed_by_someone_else
+        changed_by.present? && changed_by.id != user.id
+      end
+
       class_methods do
         def find_publicly_visible(id)
           entity = where(id: id).published.first