elabs 2.0.0 → 3.0.0

data/app/controllers/elabs/admin/languages_controller.rb

@@ -8,8 +8,8 @@ module Elabs
       # GET /admin/languages
       # GET /admin/languages.json
       def index
-        order     = params['order_by'] || self.class::DEFAULT_ORDER_FIELD
-        direction = params['direction'] || 'desc'
+        order      = params['order_by'] || self.class::DEFAULT_ORDER_FIELD
+        direction  = params['direction'] || 'desc'
         @languages = Language.order(order => direction).page(params[:page]).per(self.class::MAX_ITEMS_PER_PAGE)
       end
 
@@ -29,7 +29,7 @@ module Elabs
         respond_to do |format|
           if @language.save
             format.html { redirect_to admin_languages_url, notice: _('Language was successfully created.') }
-            format.json { render :show, status: :created, location: @language }
+            format.json { render '_language', status: :created, location: @language, locals: { language: @language } }
           else
             format.html { render :new }
             format.json { render json: @language.errors, status: :unprocessable_entity }
@@ -43,7 +43,7 @@ module Elabs
         respond_to do |format|
           if @language.update(language_params)
             format.html { redirect_to admin_languages_url, notice: _('Language was successfully updated.') }
-            format.json { render :show, status: :ok, location: admin_languages_url }
+            format.json { render '_language', status: :ok, location: @language, locals: { language: @language } }
           else
             format.html { render :edit }
             format.json { render json: @language.errors, status: :unprocessable_entity }

data/app/controllers/elabs/admin/licenses_controller.rb

@@ -29,7 +29,7 @@ module Elabs
         respond_to do |format|
           if @license.save
             format.html { redirect_to admin_licenses_url, notice: _('License was successfully created.') }
-            format.json { render :show, status: :created, location: @license }
+            format.json { render '_license', status: :created, location: @license, locals: { license: @license } }
           else
             format.html { render :new }
             format.json { render json: @license.errors, status: :unprocessable_entity }
@@ -43,7 +43,7 @@ module Elabs
         respond_to do |format|
           if @license.update(license_params)
             format.html { redirect_to admin_licenses_url, notice: _('License was successfully updated.') }
-            format.json { render :show, status: :ok, location: @license }
+            format.json { render '_license', status: :ok, location: @license, locals: { license: @license } }
           else
             format.html { render :edit }
             format.json { render json: @license.errors, status: :unprocessable_entity }

data/app/controllers/elabs/admin/tags_controller.rb

@@ -10,7 +10,7 @@ module Elabs
       def index
         order     = params['order_by'] || self.class::DEFAULT_ORDER_FIELD
         direction = params['direction'] || 'desc'
-        @tags = Tag.order(order => direction).all
+        @tags     = Tag.order(order => direction).all
       end
 
       # GET /tags/1/edit
@@ -22,9 +22,9 @@ module Elabs
         respond_to do |format|
           if @tag.update(tag_params)
             format.html { redirect_to admin_tags_url, notice: _('Tag was successfully updated.') }
-            format.json { render :show, status: :ok, location: admin_tags_url }
+            format.json { render :_tag, status: :ok, location: admin_tags_url, locals: { tag: @tag } }
           else
-            format.html { render :edit }
+            format.html { render :edit, tag: @tag }
             format.json { render json: @tag.errors, status: :unprocessable_entity }
           end
         end

data/app/controllers/elabs/concerns/elabs_controller.rb

@@ -10,6 +10,7 @@ module Elabs
       included do
         helper Elabs::ApplicationHelper
         helper Elabs::ContentFiltersHelper
+        helper Elabs::NotificationHelper
 
         layout 'elabs/layouts/application'
       end

data/app/controllers/elabs/content_application_controller.rb

@@ -1,5 +1,5 @@
 module Elabs
-  class ContentApplicationController < ElabsApplicationController
+  class ContentApplicationController < ElabsPublicController
     DEFAULT_ORDER      = { published_at: :desc }.freeze
     IS_NSFW_FILTERABLE = true
 

data/app/controllers/elabs/elabs_application_controller.rb

@@ -1,85 +1,12 @@
 module Elabs
   class ElabsApplicationController < ActionController::Base
-    include Elabs::Concerns::Reportable
     include Elabs::Concerns::Localizable
 
-    ALLOWED_NESTED_FROM = [].freeze
-    ALLOWED_ORDER_FROM  = [].freeze
-    DEFAULT_ORDER       = { id: :desc }.freeze
-    IS_NSFW_FILTERABLE  = false
-    MAX_ITEMS_PER_PAGE  = Elabs.max_items_per_page
-
     before_action :set_nsfw_option
     protect_from_forgery with: :exception
 
-    layout 'elabs/layouts/application'
-
     private
 
-    def scope_request(orm_request)
-      orm_request = build_request_nested orm_request
-      orm_request = build_request_where orm_request
-      orm_request = build_request_nsfw orm_request if self.class::IS_NSFW_FILTERABLE
-
-      build_request_order orm_request
-    end
-
-    def build_request_nested(orm_request)
-      where_clauses = {}
-
-      params.each do |p|
-        # No need to do this with "album_id" as there is no action requiring it (as for a /albums/xxx/uploads)
-        next unless %w[tag_id project_id].include? p[0]
-        foreign_table                = p[0].chomp('_id').pluralize.to_sym
-        orm_request                  = orm_request.joins(foreign_table)
-        where_clauses[foreign_table] = { id: p[1] }
-        next
-      end
-
-      orm_request.where(where_clauses)
-    end
-
-    def build_request_where(orm_request)
-      allowed_scopes_ids = self.class::ALLOWED_NESTED_FROM.map { |n| "#{n}_id" }
-      clean_list = allowed_scopes_ids.reject { |s| %w[tag_id project_id].include? s }
-
-      params.each do |p|
-        orm_request = orm_request.where(p[0] => p[1]) if clean_list.include? p[0]
-      end
-
-      orm_request
-    end
-
-    def build_request_order(orm_request)
-      allowed_order_fields = self.class::ALLOWED_ORDER_FROM.map { |n| "order_by_#{n}" }
-      orders               = 0
-
-      params.each do |p|
-        next unless allowed_order_fields.include? p[0]
-        field       = p[0].gsub(/^order_by_/, '')
-        orm_request = orm_request.order "#{field}_id" => p[1]
-        orders += 1
-      end
-
-      orm_request = orm_request.order(self.class::DEFAULT_ORDER) if orders.zero?
-
-      orm_request
-    end
-
-    def build_request_nsfw(orm_request)
-      if params['sfw_status']
-        return case params['sfw_status']
-               when 'sfw_only'
-                 orm_request.where(sfw: true)
-               when 'nsfw_only'
-                 orm_request.where(sfw: false)
-               else
-                 orm_request
-               end
-      end
-      orm_request
-    end
-
     def set_nsfw_option
       session[:show_nsfw] ||= false
       session[:show_nsfw] = params['show_nsfw'] == 'true' if params['show_nsfw']

data/app/controllers/elabs/elabs_public_controller.rb

@@ -0,0 +1,80 @@
+module Elabs
+  class ElabsPublicController < ElabsApplicationController
+    include Elabs::Concerns::Reportable
+
+    ALLOWED_NESTED_FROM = [].freeze
+    ALLOWED_ORDER_FROM  = [].freeze
+    DEFAULT_ORDER       = { id: :desc }.freeze
+    IS_NSFW_FILTERABLE  = false
+    MAX_ITEMS_PER_PAGE  = Elabs.max_items_per_page
+
+    layout 'elabs/layouts/application'
+
+    private
+
+    def scope_request(orm_request)
+      orm_request = build_request_nested orm_request
+      orm_request = build_request_where orm_request
+      orm_request = build_request_nsfw orm_request if self.class::IS_NSFW_FILTERABLE
+
+      build_request_order orm_request
+    end
+
+    def build_request_nested(orm_request)
+      where_clauses = {}
+
+      params.each do |p|
+        # No need to do this with "album_id" as there is no action requiring it (as for a /albums/xxx/uploads)
+        next unless %w[tag_id project_id].include? p[0]
+
+        foreign_table                = p[0].chomp('_id').pluralize.to_sym
+        orm_request                  = orm_request.joins(foreign_table)
+        where_clauses[foreign_table] = { id: p[1] }
+        next
+      end
+
+      orm_request.where(where_clauses)
+    end
+
+    def build_request_where(orm_request)
+      allowed_scopes_ids = self.class::ALLOWED_NESTED_FROM.map { |n| "#{n}_id" }
+      clean_list         = allowed_scopes_ids.reject { |s| %w[tag_id project_id].include? s }
+
+      params.each do |p|
+        orm_request = orm_request.where(p[0] => p[1]) if clean_list.include? p[0]
+      end
+
+      orm_request
+    end
+
+    def build_request_order(orm_request)
+      allowed_order_fields = self.class::ALLOWED_ORDER_FROM.map { |n| "order_by_#{n}" }
+      orders               = 0
+
+      params.each do |p|
+        next unless allowed_order_fields.include? p[0]
+
+        field       = p[0].gsub(/^order_by_/, '')
+        orm_request = orm_request.order field => p[1]
+        orders += 1
+      end
+
+      orm_request = orm_request.order(self.class::DEFAULT_ORDER) if orders.zero?
+      orm_request
+    end
+
+    def build_request_nsfw(orm_request)
+      if params['sfw_status']
+        return case params['sfw_status']
+               when 'sfw_only'
+                 orm_request.where(sfw: true)
+               when 'nsfw_only'
+                 orm_request.where(sfw: false)
+               else
+                 orm_request
+               end
+      end
+      orm_request
+    end
+  end
+end

data/app/controllers/elabs/languages_controller.rb

@@ -1,14 +1,14 @@
 module Elabs
-  class LanguagesController < ElabsApplicationController
+  class LanguagesController < ElabsPublicController
     ALLOWED_ORDER_FROM = %w[name].freeze
-    DEFAULT_ORDER      = { name: :desc }.freeze
+    DEFAULT_ORDER      = { name: :asc }.freeze
 
     before_action :set_language, only: %i[show edit]
 
     # GET /languages
     # GET /languages.json
     def index
-      languages = Language.page(params[:page]).per(self.class::MAX_ITEMS_PER_PAGE)
+      languages = scope_request Language.page(params[:page]).per(self.class::MAX_ITEMS_PER_PAGE)
       @languages = if params['with_content_only'] && params['with_content_only'] == 'false'
                      languages
                    else

data/app/controllers/elabs/licenses_controller.rb

@@ -1,14 +1,14 @@
 module Elabs
-  class LicensesController < ElabsApplicationController
+  class LicensesController < ElabsPublicController
     ALLOWED_ORDER_FROM = %w[name].freeze
-    DEFAULT_ORDER      = { name: :desc }.freeze
+    DEFAULT_ORDER      = { name: :asc }.freeze
 
     before_action :set_license, only: [:show]
 
     # GET /licenses
     # GET /licenses.json
     def index
-      @licenses = License.all
+      @licenses = scope_request License.all
     end
 
     # GET /licenses/1

data/app/controllers/elabs/member/member_content_application_controller.rb

@@ -1,12 +1,12 @@
 module Elabs
   module Member
     class MemberContentApplicationController < MemberApplicationController
-      ALLOWED_FIELDS    = [].freeze
-      ALLOWED_RELATIONS = {}.freeze
+      ALLOWED_FIELDS      = [].freeze
+      ALLOWED_RELATIONS   = {}.freeze
       DEFAULT_ORDER_FIELD = 'updated_at'.freeze
-      MODEL             = nil
-      PLURAL_NAME       = nil
-      SINGULAR_NAME     = nil
+      MODEL               = nil
+      PLURAL_NAME         = nil
+      SINGULAR_NAME       = nil
 
       before_action :set_entity, only: %i[edit update destroy toggle_publication]
 
@@ -18,11 +18,15 @@ module Elabs
         direction = params['direction'] || 'desc'
         create_instance_variable self.class::PLURAL_NAME, self.class::MODEL.by_member(current_user.id).order(order => direction).page(params[:page]).per(self.class::MAX_ITEMS_PER_PAGE)
       end
+
       # rubocop: enable Metrics/AbcSize
 
       # GET /articles/new
       def new
-        create_instance_variable self.class::SINGULAR_NAME, self.class::MODEL.new
+        entity = self.class::MODEL.new
+        entity.language_id = current_user.preference.writing_language_id if current_user.preference.writing_language_id
+        entity.license_id = current_user.preference.writing_license_id if current_user.preference.writing_license_id
+        create_instance_variable self.class::SINGULAR_NAME, entity
       end
 
       # GET /articles/1/edit
@@ -37,34 +41,38 @@ module Elabs
         respond_to do |format|
           if @entity.save entity_params
             format.html { redirect_to_index_with_notice :notice, format(_('%<model_name>s was successfully created.'), model_name: self.class::SINGULAR_NAME.capitalize) }
-            format.json { render "member/#{self.class::PLURAL_NAME}/#{self.class::SINGULAR_NAME}", status: :created }
+            format.json { render partial_name, status: :created, locals: { "#{self.class::SINGULAR_NAME}": @entity } }
           else
             format.html { render :new }
             format.json { render json: @entity.errors, status: :unprocessable_entity }
           end
         end
       end
+
       # rubocop: enable Metrics/AbcSize
 
       # PATCH/PUT /articles/1
       # PATCH/PUT /articles/1.json
       # rubocop: disable Metrics/AbcSize
       def update
+        @entity.changed_by = current_user
         respond_to do |format|
           if @entity.update entity_params
             format.html { redirect_to_index_with_notice :notice, format(_('%<model_name>s was successfully updated.'), model_name: self.class::SINGULAR_NAME.capitalize) }
-            format.json { render "member/#{self.class::PLURAL_NAME}/#{self.class::SINGULAR_NAME}", status: :ok }
+            format.json { render partial_name, status: :ok, locals: { "#{self.class::SINGULAR_NAME}": @entity } }
           else
             format.html { render :edit }
             format.json { render json: @entity.errors, status: :unprocessable_entity }
           end
         end
       end
+
       # rubocop: enable Metrics/AbcSize
 
       # DELETE /articles/1
       # DELETE /articles/1.json
       def destroy
+        @entity.changed_by = current_user
         @entity.destroy
         respond_to do |format|
           format.html { redirect_to index_url, notice: format(_('%<model_name>s was successfully destroyed.'), model_name: self.class::SINGULAR_NAME.capitalize) }
@@ -74,13 +82,11 @@ module Elabs
 
       # PUT /<entity>/1/toggle_publication
       def toggle_publication
-        if @entity.toggle(:published).save
-          respond_to do |format|
+        respond_to do |format|
+          if @entity.toggle(:published).save
             format.html { redirect_to_index_with_notice :notice, publication_message(@entity) }
-            format.json { render :show, status: :ok }
-          end
-        else
-          respond_to do |format|
+            format.json { render partial_name, status: :ok, locals: { "#{self.class::SINGULAR_NAME}": @entity } }
+          else
             format.html { redirect_to_index_with_notice :error, 'An error prevented to update this entity' }
             format.json { render json: @entity.errors, status: :unprocessable_entity }
           end
@@ -106,6 +112,10 @@ module Elabs
         "member_#{self.class::PLURAL_NAME}".to_sym
       end
 
+      def partial_name
+        "_#{self.class::SINGULAR_NAME}".to_sym
+      end
+
       def redirect_to_index_with_notice(type, notice)
         redirect_to "member_#{self.class::PLURAL_NAME}".to_sym, "#{type}": notice
       end

data/app/controllers/elabs/member/notifications_controller.rb

@@ -0,0 +1,30 @@
+module Elabs
+  module Member
+    class NotificationsController < MemberApplicationController
+      MAX_ITEMS_PER_PAGE = Elabs.max_members_items_per_page
+      DEFAULT_ORDER_FIELD = 'created_at'.freeze
+
+      before_action :set_notification, only: [:destroy]
+
+      # GET /notifications
+      def index
+        order     = params['order_by'] || self.class::DEFAULT_ORDER_FIELD
+        direction = params['direction'] || 'desc'
+        @notifications = Notification.for_user(current_user).order(order => direction).page(params[:page]).per(self.class::MAX_ITEMS_PER_PAGE)
+      end
+
+      # DELETE /notifications/1
+      def destroy
+        @notification.destroy
+        redirect_to member_notifications_url, notice: _('Notification was successfully destroyed.')
+      end
+
+      private
+
+      # Use callbacks to share common setup or constraints between actions.
+      def set_notification
+        @notification = Notification.find(params[:id])
+      end
+    end
+  end
+end

data/app/controllers/elabs/member/preferences_controller.rb

@@ -29,7 +29,7 @@ module Elabs
 
       # Never trust parameters from the scary internet, only allow the white list through.
       def preference_params
-        params.require(:preference).permit(:show_nsfw, :locale)
+        params.require(:preference).permit(:show_nsfw, :locale, :writing_language_id, :writing_license_id)
       end
     end
   end

data/app/controllers/elabs/member/users_controller.rb

@@ -1,14 +1,17 @@
 module Elabs
   module Member
-    class UsersController < ElabsApplicationController
-      before_action :set_user, only: [:update]
+    class UsersController < MemberApplicationController
+      before_action :set_user, only: %i[edit update]
 
-      # PATCH/PUT /member/users/1
+      # GET /member/infos
+      def edit; end
+
+      # PATCH/PUT /member/infos
       def update
         if @user.update(user_params)
           redirect_to @user, notice: _('Your infos were successfully saved')
         else
-          render edit_user_registration_path
+          render :edit
         end
       end
 
@@ -21,7 +24,7 @@ module Elabs
 
       # Only allow a trusted parameter "white list" through.
       def user_params
-        params.require(:user).permit(:real_name, :biography)
+        params.require(:user).permit(:real_name, :biography, :avatar)
       end
     end
   end