elabs 3.0.0 → 4.0.0

data/app/models/elabs/license.rb

@@ -1,10 +1,15 @@
 module Elabs
   class License < ApplicationRecord
     self.table_name = 'licenses'
+    include Elabs::Concerns::Sluggable
+
+    SLUGGABLE_FIELD = :name
+    SLUG_FIELD      = :slug
 
     validates :name, presence: true
     validates :url,  presence: true
     validates :icon, presence: true
+    validates :slug, presence: true, uniqueness: true
 
     has_many :albums
     has_many :articles

data/app/models/elabs/note.rb

@@ -2,11 +2,13 @@ module Elabs
   class Note < ApplicationContentRecord
     self.table_name = 'notes'
 
+    SLUGGABLE_FIELD = :created_at
     ADDITIONAL_HABTM_COUNTER_CACHES = [
       %w[projects notes]
     ].freeze
 
     validates :content, presence: true
+    validates :slug,    presence: true, uniqueness: true
     validates_with AssociatedAuthorValidator, relations: %w[project]
 
     belongs_to :user

data/app/models/elabs/project.rb

@@ -2,9 +2,12 @@ module Elabs
   class Project < ApplicationContentRecord
     self.table_name = 'projects'
 
+    SLUGGABLE_FIELD = :name
+
     validates :name,              presence: true
     validates :short_description, presence: true
     validates :description,       presence: true
+    validates :slug,              presence: true, uniqueness: true
     validates_with AssociatedAuthorValidator, relations: %w[album article note upload]
 
     belongs_to :user

data/app/models/elabs/tag.rb

@@ -1,8 +1,13 @@
 module Elabs
   class Tag < ApplicationRecord
     self.table_name = 'tags'
+    include Elabs::Concerns::Sluggable
+
+    SLUGGABLE_FIELD = :name
+    SLUG_FIELD      = :slug
 
     validates :name, presence: true
+    validates :slug, presence: true, uniqueness: true
 
     has_many :albums_tags
     has_many :articles_tags

data/app/models/elabs/upload.rb

@@ -2,6 +2,7 @@ module Elabs
   class Upload < ApplicationContentRecord
     self.table_name = 'uploads'
 
+    SLUGGABLE_FIELD = :title
     ADDITIONAL_HABTM_COUNTER_CACHES = [
       %w[albums uploads],
       %w[projects uploads]
@@ -10,6 +11,7 @@ module Elabs
     validates :title,           presence: true
     validates :description,     presence: true
     validates :file_attachment, presence: true
+    validates :slug,            presence: true, uniqueness: true
     validates_with AssociatedAuthorValidator, relations: %w[album project]
 
     belongs_to :user

data/app/models/elabs/user.rb

@@ -1,6 +1,10 @@
 module Elabs
   class User < ApplicationRecord
     self.table_name = 'users'
+    include Elabs::Concerns::Sluggable
+
+    SLUGGABLE_FIELD = nil
+    SLUG_FIELD      = :username
 
     validates :username, presence: true, uniqueness: true
     validates :role, presence: false
@@ -25,6 +29,10 @@ module Elabs
 
     scope :admins, -> { where(role: 'admin') }
 
+    after_create do
+      Preference.create! user: self, show_nsfw: false
+    end
+
     def admin?
       role == 'admin'
     end
@@ -33,8 +41,8 @@ module Elabs
       real_name.present? ? real_name : "@#{username}"
     end
 
-    after_create do
-      Preference.create! user: self, show_nsfw: false
+    def to_param
+      username
     end
 
     private

data/app/views/elabs/acts/_act.rss.builder

@@ -0,0 +1,22 @@
+if act.event == 'publish'
+  case act.content_type
+  when 'Elabs::Album'
+    render 'elabs/albums/album', album: act.content, builder: builder
+  when 'Elabs::Article'
+    render 'elabs/articles/article', article: act.content, builder: builder
+  when 'Elabs::Note'
+    render 'elabs/notes/note', note: act.content, builder: builder
+  when 'Elabs::Project'
+    render 'elabs/projects/project', project: act.content, builder: builder
+  when 'Elabs::Upload'
+    render 'elabs/uploads/upload', upload: act.content, builder: builder
+  end
+else
+  builder.item do
+    builder.title act_notice_string(act, false)
+    builder.description act_notice_string(act)
+    builder.pubDate act.created_at.to_s(:rfc822)
+    builder.link url_for act.content
+    builder.guid url_for act.content
+  end
+end

data/app/views/elabs/acts/index.html.haml

@@ -20,7 +20,11 @@
           - when 'Elabs::Upload'
             = render 'elabs/uploads/upload', upload: act.content
         - else
-          %div{ class: "act-action act-action--#{act.event}" }= act_notice_string act
+          %div{ class: "act-action act-action--#{act.event}" }
+            = act_notice_string act
+            - if act.reason.present?
+              —
+              %q= act.reason
 
         - previous_date = act.created_at
 

data/app/views/elabs/acts/index.rss.builder

@@ -0,0 +1,15 @@
+xml.instruct! :xml, version: '1.0'
+xml.rss version: '2.0' do
+  xml.channel do
+    xml.title "#{Elabs.site_name} - activity"
+    xml.description "Last #{params['show_nsfw'] == 'false' ? 'SFW' : ''} activity from #{Elabs.site_name}"
+    xml.link activities_url
+
+    @acts.each do |act|
+      next if params['show_nsfw'] == 'false' && !act.content.sfw
+      next if params['only_creations'] == 'true' && !act.event != 'publish'
+
+      render 'act', act: act, builder: xml
+    end
+  end
+end

data/app/views/elabs/admin/albums/index.html.haml

@@ -21,11 +21,11 @@
     - @albums.each do |album|
       %tr.album
         %td= album.name
-        %td.is-icon= boolean_icon_tag album.sfw
-        %td.is-icon= boolean_icon_tag album.published
-        %td.is-icon= boolean_icon_tag album.locked, 'lock', 'unlock'
+        %td.is-icon= colored_good_or_bad_icon_tag album.sfw
+        %td.is-icon= colored_good_or_bad_icon_tag album.published
+        %td.is-icon= colored_good_or_bad_icon_tag album.locked, 'lock', 'unlock', true
         %td.is-icon= boolean_icon_tag album.hidden_in_history
-        %td= short_date album.published_at
+        %td= medium_datetime album.published_at
         %td= album.user.username
         %td= album.license.name
         %td= album.language.name

data/app/views/elabs/admin/articles/index.html.haml

@@ -20,11 +20,11 @@
     - @articles.each do |article|
       %tr.article
         %td= article.title
-        %td.is-icon= boolean_icon_tag article.sfw
-        %td.is-icon= boolean_icon_tag article.published
-        %td.is-icon= boolean_icon_tag article.locked, 'lock', 'unlock'
+        %td.is-icon= colored_good_or_bad_icon_tag article.sfw
+        %td.is-icon= colored_good_or_bad_icon_tag article.published
+        %td.is-icon= colored_good_or_bad_icon_tag article.locked, 'lock', 'unlock', true
         %td.is-icon= boolean_icon_tag article.hidden_in_history
-        %td= short_date article.published_at
+        %td= medium_datetime article.published_at
         %td= article.user.username
         %td= article.license.name
         %td= article.language.name

data/app/views/elabs/admin/languages/_form.html.haml

@@ -15,4 +15,5 @@
     .field-input= f.text_field :name
 
   .actions
-    = f.submit _('Save'), class: 'btn btn--save'
+    .actions-buttons
+      = f.submit _('Save'), class: 'btn btn--save'

data/app/views/elabs/admin/licenses/_form.html.haml

@@ -22,4 +22,5 @@
     .field-input= f.text_field :icon
 
   .actions
-    = f.submit _('Save'), class: 'btn btn--save'
+    .actions-buttons
+      = f.submit _('Save'), class: 'btn btn--save'

data/app/views/elabs/admin/notes/index.html.haml

@@ -20,11 +20,11 @@
     - @notes.each do |note|
       %tr.note
         %td= note.content[0...100]
-        %td.is-icon= boolean_icon_tag note.sfw
-        %td.is-icon= boolean_icon_tag note.published
-        %td.is-icon= boolean_icon_tag note.locked
-        %td.is-icon= boolean_icon_tag note.hidden_in_history
-        %td= short_date note.published_at
+        %td.is-icon= colored_good_or_bad_icon_tag note.sfw
+        %td.is-icon= colored_good_or_bad_icon_tag note.published
+        %td.is-icon= colored_good_or_bad_icon_tag note.locked, 'lock', 'unlock', true
+        %td.is-icon= boolean_icon_tag value: note.hidden_in_history
+        %td= medium_datetime note.published_at
         %td= note.user.username
         %td= note.license.name
         %td= note.language.name

data/app/views/elabs/admin/projects/index.html.haml

@@ -23,11 +23,11 @@
     - @projects.each do |project|
       %tr.project
         %td= project.name
-        %td.is-icon= boolean_icon_tag project.sfw
-        %td.is-icon= boolean_icon_tag project.published
-        %td.is-icon= boolean_icon_tag project.locked, 'lock', 'unlock'
+        %td.is-icon= colored_good_or_bad_icon_tag project.sfw
+        %td.is-icon= colored_good_or_bad_icon_tag project.published
+        %td.is-icon= colored_good_or_bad_icon_tag project.locked, 'lock', 'unlock', true
         %td.is-icon= boolean_icon_tag project.hidden_in_history
-        %td= short_date project.published_at
+        %td= medium_datetime project.published_at
         %td= project.user.username
         %td= project.license.name
         %td= project.language.name

data/app/views/elabs/admin/reports/index.html.haml

@@ -18,8 +18,8 @@
         %td= report.name
         %td= report.email
         %td= report.user&.username
-        %td.is-icon= boolean_icon_tag report.allow_contact
-        %td= short_date report.created_at
+        %td.is-icon= colored_good_or_bad_icon_tag report.allow_contact
+        %td= medium_datetime report.created_at
         %td= link_to report.url, report.url, target: '_blank'
         %td= report.reason
         %td.actions

data/app/views/elabs/admin/tags/_form.html.haml

@@ -14,4 +14,5 @@
     .field-input= f.text_field :name
 
   .actions
-    = f.submit _('Save'), class: 'btn btn--save'
+    .actions-buttons
+      = f.submit _('Save'), class: 'btn btn--save'

data/app/views/elabs/admin/uploads/index.html.haml

@@ -21,11 +21,11 @@
     - @uploads.each do |upload|
       %tr.upload
         %td= upload.title
-        %td.is-icon= boolean_icon_tag upload.sfw
-        %td.is-icon= boolean_icon_tag upload.published
-        %td.is-icon= boolean_icon_tag upload.locked, 'lock', 'unlock'
+        %td.is-icon= colored_good_or_bad_icon_tag upload.sfw
+        %td.is-icon= colored_good_or_bad_icon_tag upload.published
+        %td.is-icon= colored_good_or_bad_icon_tag upload.locked, 'lock', 'unlock', true
         %td.is-icon= boolean_icon_tag upload.hidden_in_history
-        %td= short_date upload.published_at
+        %td= medium_datetime upload.published_at
         %td= upload.user.username
         %td= upload.license.name
         %td= upload.language.name

data/app/views/elabs/admin/users/index.html.haml

@@ -20,9 +20,9 @@
       %tr.user
         %td= user.username
         %td= user.role
-        %td= short_date user.created_at
-        %td.is-icon= boolean_icon_tag user.confirmed_at.present?
-        %td.is-icon= boolean_icon_tag user.reset_password_sent_at.present?
+        %td= medium_datetime user.created_at
+        %td.is-icon= colored_good_or_bad_icon_tag user.confirmed_at.present?
+        %td.is-icon= colored_good_or_bad_icon_tag user.reset_password_sent_at.present?
         %td.is-counter= user.albums_count
         %td.is-counter= user.articles_count
         %td.is-counter= user.notes_count

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

@@ -20,7 +20,7 @@
     = @user.real_name
   %li
     %strong= _('Subscription date:')
-    = short_date @user.created_at
+    = medium_datetime @user.created_at
 
 %dt= _('Bio')
-= markdown(@user.biography || '')
+= render_entity_content @user, :biography

data/app/views/elabs/albums/_album.html.haml

@@ -27,7 +27,7 @@
           %li= render 'elabs/layouts/lists/projects', projects: album.projects
           %li= render 'elabs/layouts/lists/tags', tags: album.tags
     %article{ lang: album.language.iso639_1 }
-      = markdown album.description
+      = render_entity_content album, :description, false
       .content__relations
         = render 'elabs/layouts/empty' if album.uploads.length.zero?
         .uploads-list

data/app/views/elabs/albums/_album.rss.builder

@@ -0,0 +1,7 @@
+builder.item do
+  builder.title rss_title(album, 'name')
+  builder.description album.description
+  builder.pubDate album.published_at.to_s(:rfc822)
+  builder.link album_url(album)
+  builder.guid album_url(album)
+end

data/app/views/elabs/albums/_album_inline.html.haml

@@ -0,0 +1,8 @@
+- if !show_item? album
+  = render 'elabs/layouts/hidden_entry_inline', entity: album
+- else
+  %span.album.album--inline
+    = icon 'book', ['fw']
+    = link_to album.name, album, lang: album.language.iso639_1
+    - if album.language.iso639_1 != locale
+      (#{album.language.iso639_1})

data/app/views/elabs/albums/index.rss.builder

@@ -0,0 +1,14 @@
+xml.instruct! :xml, version: '1.0'
+xml.rss version: '2.0' do
+  xml.channel do
+    xml.title "#{Elabs.site_name} - albums"
+    xml.description "Last #{params['show_nsfw'] == 'false' ? 'SFW' : ''} albums from #{Elabs.site_name}"
+    xml.link albums_url
+
+    @albums.each do |album|
+      next if params['show_nsfw'] == 'false' && !album.sfw
+
+      render 'album', builder: xml, album: album
+    end
+  end
+end

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

@@ -14,12 +14,12 @@
         %li
           = icon('calendar-check', ['fw'])
           %strong= _('Published at:')
-          = short_date @album.published_at
+          = medium_datetime @album.published_at
 
         %li
           = icon('calendar', ['fw'])
           %strong= _('Updated at:')
-          = short_date @album.updated_at
+          = medium_datetime @album.updated_at
 
         %li.separator
           = icon('info', ['fw'])
@@ -46,7 +46,7 @@
 
     .content
       %article{ lang: @album.language.iso639_1 }
-        = markdown @album.description
+        = render_entity_content @album, :description
 
       .content__relations
         = render 'elabs/layouts/empty' if @album.uploads.length.zero?

data/app/views/elabs/articles/_article.html.haml

@@ -27,4 +27,4 @@
           %li= render 'elabs/layouts/lists/projects', projects: article.projects
           %li= render 'elabs/layouts/lists/tags', tags: article.tags
 
-    %article{ lang: article.language.iso639_1 }= markdown article.excerpt
+    %article{ lang: article.language.iso639_1 }= render_entity_content article, :excerpt, false

data/app/views/elabs/articles/_article.rss.builder

@@ -0,0 +1,7 @@
+builder.item do
+  builder.title rss_title(article, 'title')
+  builder.description "#{article.excerpt}\n#{article.content}"
+  builder.pubDate article.published_at.to_s(:rfc822)
+  builder.link article_url(article)
+  builder.guid article_url(article)
+end

data/app/views/elabs/articles/_article_inline.html.haml

@@ -0,0 +1,8 @@
+- if !show_item? article
+  = render 'elabs/layouts/hidden_entry_inline', entity: article
+- else
+  %span.article.article--inline
+    = icon 'font', ['fw']
+    = link_to article.title, article, lang: article.language.iso639_1
+    - if article.language.iso639_1 != locale
+      (#{article.language.iso639_1})

data/app/views/elabs/articles/index.rss.builder

@@ -0,0 +1,14 @@
+xml.instruct! :xml, version: '1.0'
+xml.rss version: '2.0' do
+  xml.channel do
+    xml.title "#{Elabs.site_name} - articles"
+    xml.description "Last #{params['show_nsfw'] == 'false' ? 'SFW' : ''} articles from #{Elabs.site_name}"
+    xml.link articles_url
+
+    @articles.each do |article|
+      next if params['show_nsfw'] == 'false' && !article.sfw
+
+      render 'article', builder: xml, article: article
+    end
+  end
+end

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

@@ -13,11 +13,11 @@
         %li
           = icon('calendar-check', ['fw'])
           %strong= _('Published at:')
-          = short_date @article.published_at
+          = medium_datetime @article.published_at
         %li
           = icon('calendar', ['fw'])
           %strong= _('Updated at:')
-          = short_date @article.updated_at
+          = medium_datetime @article.updated_at
         %li.separator
           = icon('info', ['fw'])
           %strong= _('SFW:')
@@ -36,8 +36,8 @@
 
     .content
       %article{ lang: @article.language.iso639_1 }
-        = markdown @article.excerpt
-        = markdown @article.content
+        = render_entity_content @article, :excerpt
+        = render_entity_content @article, :content
 
   = render 'elabs/comments/comments',
             entity: @article,

data/app/views/elabs/comments/_comments.html.haml

@@ -1,3 +1,5 @@
+= render 'elabs/comments/form', url: url, new_comment: new_comment
+
 %section.comments-list
   - if user_is_author_of entity
     %h2= _('Comments')
@@ -15,7 +17,6 @@
               %li
                 = icon('calendar', ['fw'])
                 %strong= _('Posted on:')
-                = short_date comment.created_at
-        %article= markdown comment.comment
+                = medium_datetime comment.created_at
+        %article= render_entity_content comment, :comment, false
 
-  = render 'elabs/comments/form', url: url, new_comment: new_comment