elabs 2.0.0 → 3.0.0

data/app/views/elabs/users/index.json.jbuilder

@@ -1 +1 @@
-json.array! @users, partial: 'users/user', as: :user
+json.array! @users, partial: 'user', as: :user

data/app/views/elabs/users/show.html.haml

@@ -1,20 +1,25 @@
-- @page_title = @user.real_name || @user.username
+- @page_title = @user.display_name
 .user.user--full
   %aside
     %ul
+      - if Elabs.use_avatars && @user.avatar.attached?
+        %li.image
+          = image_tag main_app.url_for(avatar_image(@user.avatar, :medium).processed)
       %li
         = icon('user', ['fw'])
-        %strong= _('Username')
+        %strong= _('Username:')
         = @user.username
-      %li
-        = icon('user', ['fw'])
-        %strong= _('Real name')
-        = @user.real_name
+      - if @user.real_name.present?
+        %li
+          = icon('user', ['fw'])
+          %strong= _('Real name:')
+          = @user.real_name
       %li
         = icon('calendar-check', ['fw'])
-        %strong= _('Subscription date')
-        = @user.created_at
-      %li
+        %strong= _('Since:')
+        = short_date @user.created_at
+
+      %li.separator
         = icon('amount', ['fw'])
         %strong= _('Albums:')
         = @user.albums_count
@@ -35,7 +40,7 @@
         %strong= _('Uploads:')
         = @user.uploads_count
   .content
-    - unless @user.biography.nil?
+    - if @user.biography.present?
       %article
         = markdown @user.biography
 

data/app/views/elabs/users/show.json.jbuilder

@@ -1 +1 @@
-json.partial! 'users/user', user: @user
+json.partial! 'user', user: @user

data/config/routes.rb

@@ -15,32 +15,35 @@ Elabs::Engine.routes.draw do
   resources :articles,  only: %i[index show] do
     post 'comment', to: 'articles#create_comment', as: 'create_comment'
   end
-  resources :languages, only: %i[index show] do
-    resources :albums,   only: %i[index]
+  resources :notes, only: %i[index show] do
+    post 'comment', to: 'notes#create_comment', as: 'create_comment'
+  end
+  resources :projects, only: %i[index show] do
     resources :articles, only: %i[index]
+    resources :albums,   only: %i[index]
     resources :notes,    only: %i[index]
-    resources :projects, only: %i[index]
     resources :uploads,  only: %i[index]
+    post 'comment', to: 'projects#create_comment', as: 'create_comment'
   end
-  resources :licenses, only: %i[index show] do
+  resources :uploads, only: %i[index show] do
+    post 'comment', to: 'uploads#create_comment', as: 'create_comment'
+  end
+
+  # Classifiers
+  resources :languages, only: %i[index show] do
     resources :albums,   only: %i[index]
     resources :articles, only: %i[index]
     resources :notes,    only: %i[index]
     resources :projects, only: %i[index]
     resources :uploads,  only: %i[index]
   end
-  resources :notes, only: %i[index show] do
-    post 'comment', to: 'notes#create_comment', as: 'create_comment'
-  end
-  resources :projects, only: %i[index show] do
-    resources :articles, only: %i[index]
+  resources :licenses, only: %i[index show] do
     resources :albums,   only: %i[index]
+    resources :articles, only: %i[index]
     resources :notes,    only: %i[index]
+    resources :projects, only: %i[index]
     resources :uploads,  only: %i[index]
-    post 'comment', to: 'projects#create_comment', as: 'create_comment'
   end
-
-  # Classifiers
   resources :tags, only: %i[index show] do
     resources :albums,   only: %i[index]
     resources :articles, only: %i[index]
@@ -48,9 +51,6 @@ Elabs::Engine.routes.draw do
     resources :projects, only: %i[index]
     resources :uploads,  only: %i[index]
   end
-  resources :uploads, only: %i[index show] do
-    post 'comment', to: 'uploads#create_comment', as: 'create_comment'
-  end
   resources :users, only: %i[index show] do
     resources :albums,   only: %i[index]
     resources :articles, only: %i[index]
@@ -83,9 +83,13 @@ Elabs::Engine.routes.draw do
       put 'toggle_publication', to: 'uploads#toggle_publication', as: :toggle_publication
     end
 
+    resources :notifications, only: %i[index destroy]
+
     get '/preferences', to: 'preferences#edit', as: :edit_preferences
     patch '/preferences', to: 'preferences#update', as: :update_preferences
-    patch '/account', to: 'users#update', as: :update_user
+
+    get '/infos', to: 'users#edit', as: :edit_infos
+    patch '/infos', to: 'users#update', as: :update_infos
   end
 
   # Admin
@@ -106,6 +110,7 @@ Elabs::Engine.routes.draw do
     resources :uploads, only: %i[index destroy] do
       put 'toggle_lock', to: 'uploads#toggle_lock', as: :toggle_lock
     end
+
     # Basic resources
     resources :languages, except: %i[show]
     resources :licenses,  except: %i[show]

data/db/migrate/20180910000015_remove_license_timestamps.rb

@@ -0,0 +1,6 @@
+class RemoveLicenseTimestamps < ActiveRecord::Migration[5.2]
+  def change
+    remove_column :licenses, :created_at
+    remove_column :licenses, :updated_at
+  end
+end

data/db/migrate/20180910175012_create_notifications.rb

@@ -0,0 +1,13 @@
+class CreateNotifications < ActiveRecord::Migration[5.2]
+  def change
+    create_table :notifications do |t|
+      t.references :content, polymorphic: true
+      t.string :event
+      t.belongs_to :user
+      t.references :source_user, table: :users, index: { name: :source_user_index }
+      t.string :message, default: nil, null: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20180913093027_add_fields_in_preferences.rb

@@ -0,0 +1,6 @@
+class AddFieldsInPreferences < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :preferences, :writing_language, table: :languages, index: { name: :writing_language_preferences_index }
+    add_reference :preferences, :writing_license, table: :licenses, index: { name: :writing_license_preferences_index }
+  end
+end

data/docs/migrating.md

@@ -1,4 +1,18 @@
 # Migration guide
 
+## From 2.x to 3.0.0
+
+First of all, read the changelog for the 3.0.0 release
+
+- Update the translations: `rails g elabs:install` and accept to override
+  the initializer, and everything in `locale` folder
+- Apply the last migrations: `rake elabs:install:migrations` then
+  `rails db:migrate`
+
+If you have overridden things, you will need to check them manually. You
+can use the various generators to re-copy the elabs views/assets,... and
+and compare them with your version (hint: you should use a version
+control system to avoid messing up things).
+
 ## From 1.0.1 to 2.0.0
 No one ever used 1.0.0 in production, so there is no guide for it :)

data/docs/setup.md

@@ -31,6 +31,7 @@ gem 'devise'
 gem 'kaminari'
 # Translations
 gem 'gettext_i18n_rails'
+gem 'rails-i18n'
 # Engine
 gem 'elabs'
 

data/lib/elabs.rb

@@ -34,6 +34,9 @@ module Elabs
   mattr_accessor :av_formats_video
   @@av_formats_video = ['video/mp4', 'video/webm', 'video/ogg']
 
+  mattr_accessor :use_avatars
+  @@use_avatars = false
+
   def self.setup
     yield self
   end

data/lib/elabs/version.rb

@@ -1,3 +1,3 @@
 module Elabs
-  VERSION = '2.0.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/lib/generators/elabs/required_assets_generator.rb

@@ -17,7 +17,7 @@ module Elabs
       desc 'Copies required files if you plan to use elabs views'
 
       def copy_files
-        directory 'app/assets/images/elabs'
+        directory 'spec/dummy/app/assets/images/elabs', 'app/assets/images/elabs'
         template 'spec/dummy/package.json', 'package.json'
         directory 'spec/dummy/public/fonts', 'public/fonts'
       end

data/lib/generators/templates/elabs.rb

@@ -22,4 +22,10 @@ Elabs.setup do |config|
 
   # List of video formats that can be used with html5 players
   config.av_formats_video = ['video/mp4', 'video/webm', 'video/ogg']
+
+  # ActiveStorage validations are not supported. This leads to saving
+  # the uploaded file even if validation fails. To prevent this, the
+  # attached file is deleted on failure, resulting on avatar suppression.
+  # Set this value to false to avoid using avatars
+  config.use_avatars = false
 end

data/locale/app.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-09-06 06:46+0200\n"
-"PO-Revision-Date: 2018-09-06 06:46+0200\n"
+"POT-Creation-Date: 2018-09-14 00:25+0200\n"
+"PO-Revision-Date: 2018-09-14 00:25+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -79,6 +79,24 @@ msgstr ""
 msgid "%<text>s %<icon>s"
 msgstr ""
 
+msgid "%<user>s %<action>s %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your album %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your article %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your file %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your note %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your project %<link>s"
+msgstr ""
+
 msgid "%I:%M %p"
 msgstr ""
 
@@ -94,7 +112,7 @@ msgstr ""
 msgid "A note"
 msgstr ""
 
-msgid "About"
+msgid "About you"
 msgstr ""
 
 msgid "Account"
@@ -103,6 +121,9 @@ msgstr ""
 msgid "Act"
 msgstr ""
 
+msgid "Active"
+msgstr ""
+
 msgid "Act|Content type"
 msgstr ""
 
@@ -187,6 +208,11 @@ msgid_plural "%<nb>i errors prevented your comment from being saved:"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "An error prevented your infos from being updated:"
+msgid_plural "%<nb>i errors prevented your infos from being updated:"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "An error prevented your password from being changed:"
 msgid_plural "%<nb>i errors prevented your password from being changed:"
 msgstr[0] ""
@@ -340,6 +366,9 @@ msgstr ""
 msgid "Created at"
 msgstr ""
 
+msgid "Creator:"
+msgstr ""
+
 msgid "Currently waiting confirmation for: %<email>s"
 msgstr ""
 
@@ -412,7 +441,7 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-msgid "Icon:"
+msgid "Infos"
 msgstr ""
 
 msgid "Insc. date"
@@ -562,6 +591,9 @@ msgstr ""
 msgid "Member"
 msgstr ""
 
+msgid "Mime type:"
+msgstr ""
+
 msgid "Name"
 msgstr ""
 
@@ -631,6 +663,12 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
+msgid "Notification was successfully destroyed."
+msgstr ""
+
+msgid "Notifications"
+msgstr ""
+
 msgid "Oh noes ! There is nothing here!"
 msgstr ""
 
@@ -640,6 +678,12 @@ msgstr ""
 msgid "Only SFW"
 msgstr ""
 
+msgid "Original name:"
+msgstr ""
+
+msgid "Pass reset"
+msgstr ""
+
 msgid "Permalink"
 msgstr ""
 
@@ -688,9 +732,6 @@ msgstr ""
 msgid "Published at:"
 msgstr ""
 
-msgid "Real name"
-msgstr ""
-
 msgid "Real name:"
 msgstr ""
 
@@ -754,12 +795,6 @@ msgstr ""
 msgid "Send me reset password instructions"
 msgstr ""
 
-msgid "Sensitive changes"
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
 msgid "Show NSFW"
 msgstr ""
 
@@ -784,7 +819,7 @@ msgstr ""
 msgid "Skip hist."
 msgstr ""
 
-msgid "Subscription date"
+msgid "Someone"
 msgstr ""
 
 msgid "Subscription date:"
@@ -847,6 +882,9 @@ msgstr ""
 msgid "This content needs review and have been retired for now."
 msgstr ""
 
+msgid "This feature is experimental. If you provide an invalid file, your current avatar will be deleted."
+msgstr ""
+
 msgid "This space is empty"
 msgstr ""
 
@@ -973,6 +1011,9 @@ msgstr ""
 msgid "Your infos were successfully saved"
 msgstr ""
 
+msgid "Your picture should be in \"png\" or \"jpg\", preferably a square of 512px."
+msgstr ""
+
 msgid "created"
 msgstr ""
 
@@ -1108,9 +1149,27 @@ msgstr ""
 msgid "errors.messages.not_saved.other"
 msgstr ""
 
+msgid "has commented"
+msgstr ""
+
+msgid "has deleted"
+msgstr ""
+
+msgid "has locked"
+msgstr ""
+
+msgid "has reported"
+msgstr ""
+
+msgid "has unlocked"
+msgstr ""
+
 msgid "locked"
 msgstr ""
 
+msgid "needs to be a \"png\" or \"jpg\" image"
+msgstr ""
+
 msgid "published"
 msgstr ""
 

data/locale/en/app.edit.po

@@ -78,6 +78,24 @@ msgstr ""
 msgid "%<text>s %<icon>s"
 msgstr ""
 
+msgid "%<user>s %<action>s %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your album %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your article %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your file %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your note %<link>s"
+msgstr ""
+
+msgid "%<user>s %<action>s your project %<link>s"
+msgstr ""
+
 msgid "%I:%M %p"
 msgstr ""
 
@@ -93,7 +111,7 @@ msgstr ""
 msgid "A note"
 msgstr ""
 
-msgid "About"
+msgid "About you"
 msgstr ""
 
 msgid "Account"
@@ -102,6 +120,9 @@ msgstr ""
 msgid "Act"
 msgstr ""
 
+msgid "Active"
+msgstr ""
+
 msgid "Act|Content type"
 msgstr ""
 
@@ -186,6 +207,11 @@ msgid_plural "%<nb>i errors prevented your comment from being saved:"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "An error prevented your infos from being updated:"
+msgid_plural "%<nb>i errors prevented your infos from being updated:"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "An error prevented your password from being changed:"
 msgid_plural "%<nb>i errors prevented your password from being changed:"
 msgstr[0] ""
@@ -339,6 +365,9 @@ msgstr ""
 msgid "Created at"
 msgstr ""
 
+msgid "Creator:"
+msgstr ""
+
 msgid "Currently waiting confirmation for: %<email>s"
 msgstr ""
 
@@ -411,7 +440,7 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-msgid "Icon:"
+msgid "Infos"
 msgstr ""
 
 msgid "Insc. date"
@@ -561,6 +590,9 @@ msgstr ""
 msgid "Member"
 msgstr ""
 
+msgid "Mime type:"
+msgstr ""
+
 msgid "Name"
 msgstr ""
 
@@ -630,6 +662,12 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
+msgid "Notification was successfully destroyed."
+msgstr ""
+
+msgid "Notifications"
+msgstr ""
+
 msgid "Oh noes ! There is nothing here!"
 msgstr ""
 
@@ -639,6 +677,12 @@ msgstr ""
 msgid "Only SFW"
 msgstr ""
 
+msgid "Original name:"
+msgstr ""
+
+msgid "Pass reset"
+msgstr ""
+
 msgid "Permalink"
 msgstr ""
 
@@ -687,9 +731,6 @@ msgstr ""
 msgid "Published at:"
 msgstr ""
 
-msgid "Real name"
-msgstr ""
-
 msgid "Real name:"
 msgstr ""
 
@@ -753,12 +794,6 @@ msgstr ""
 msgid "Send me reset password instructions"
 msgstr ""
 
-msgid "Sensitive changes"
-msgstr ""
-
-msgid "Show"
-msgstr ""
-
 msgid "Show NSFW"
 msgstr ""
 
@@ -783,7 +818,7 @@ msgstr ""
 msgid "Skip hist."
 msgstr ""
 
-msgid "Subscription date"
+msgid "Someone"
 msgstr ""
 
 msgid "Subscription date:"
@@ -846,6 +881,9 @@ msgstr ""
 msgid "This content needs review and have been retired for now."
 msgstr ""
 
+msgid "This feature is experimental. If you provide an invalid file, your current avatar will be deleted."
+msgstr ""
+
 msgid "This space is empty"
 msgstr ""
 
@@ -972,6 +1010,9 @@ msgstr ""
 msgid "Your infos were successfully saved"
 msgstr ""
 
+msgid "Your picture should be in \"png\" or \"jpg\", preferably a square of 512px."
+msgstr ""
+
 msgid "created"
 msgstr ""
 
@@ -1107,9 +1148,27 @@ msgstr "1 error prohibited this %{resource} from being saved:"
 msgid "errors.messages.not_saved.other"
 msgstr "%{count} errors prohibited this %{resource} from being saved:"
 
+msgid "has commented"
+msgstr ""
+
+msgid "has deleted"
+msgstr ""
+
+msgid "has locked"
+msgstr ""
+
+msgid "has reported"
+msgstr ""
+
+msgid "has unlocked"
+msgstr ""
+
 msgid "locked"
 msgstr ""
 
+msgid "needs to be a \"png\" or \"jpg\" image"
+msgstr ""
+
 msgid "published"
 msgstr ""