elabs 2.0.0.pre → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 838695848a9e3f533e2419d77e5097a05e267442099baacc40753526d54c1731
-  data.tar.gz: c006a4f8a7e418d3f3969e74b787d6726fecdac085cea7edac0e35c8df375de5
+  metadata.gz: b290d73dc3d912c67d96bb1be6f003e3937379450feeb5d5fb10de85e8c2d152
+  data.tar.gz: 895e5179cadaf4ca0dc9cd616cfcae0df47955d0330cb803cd4d65d6cc3423c9
 SHA512:
-  metadata.gz: 7021d019b2d4460ce463f72c026e82bf467a1e6c56e43be61f7fa9e212ce68bbfd12a24439200eb5fd8714f5f975375dad3c288f80cbd00878dcbb205dab94dc
-  data.tar.gz: 2756d6742ed8d5da4d2506e552a48e51f6398b5db548933278a1dd6f163b238f82395de846cec3ff972aca9898bd504e1bb42971912b19cf57a0fc739741293a
+  metadata.gz: dfadce23c0741913e150116ae8388e78e2f39287604036231116163b29174e1510ebf40a62ae067a02012b3041528dfa5531aaf66cf06aa05ba2373d402165af
+  data.tar.gz: 971646fbaee841718146fd8161fc8429ef6fa40fac4b1659034232eee7a997ea0442e579db580e66ea39da38e3108dad35c2686af68a8a1012f1a8229b5edd26

data/CHANGELOG.md

@@ -1,6 +1,37 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [2.0.0] - 2018-09-08 - Rails engine
+Everything seems to run fine, it's enough for a major version.
+
+### Added
+
+  - Added missing ability to set content as "hidden in history":
+    following updates and activity on an "hidden" element will not be
+    logged in activity table.
+
+## [2.0.0.pre] - 2018-09-07 - Rails engine
+### Added
+
+  - Generators to make views/assets override easy
+  - Generator to copy needed files and initializer
+  - Two controller concerns to easily extend your custom controllers:
+    - "ElabsController", used to load Elabs layout and some helpers
+    - "Reportable", to prepare an empty report when using elabs layout
+
+### Changed
+
+  - The app is now an engine.
+
+### Improved
+
+  - New documentation
+  - Various improvements:
+    - Acts strings for notices are now in the "acts" helper
+
+### Fixed
+  - Translations of acts notices are now fixed
+
 ## [1.0.0] - 2018-08-09 - First v1 \o/
 ### Added
 

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    elabs (2.0.0.pre)
+    elabs (2.0.0)
       rails (~> 5.2.1)
 
 GEM

data/ROADMAP.md

@@ -6,24 +6,14 @@ See the [issues](https://gitlab.com/experimentslabs/website/website/issues) for
 
 ## [Next] - Already done
 ### Added
-  - Generators to make views/assets override easy
-  - Generator to copy needed files and initializer
-  - Two controller concerns to easily extend your custom controllers:
-    - "ElabsController", used to load Elabs layout and some helpers
-    - "Reportable", to prepare an empty report when using elabs layout
 
 ### Changed
-  - The app is now an engine.
 
 ### Improved
-  - New documentation
-  - Various improvements:
-    - Acts strings for notices are now in the "acts" helper
 
 ### Removed
 
 ### Fixed
-  - Translations of acts notices are now fixed
 
 ## Planned
 

data/app/helpers/elabs/form_helper.rb

@@ -0,0 +1,23 @@
+module Elabs
+  module FormHelper
+    def album_selector(form)
+      form.select :album_ids, Elabs::Album.by_member(current_user).for_list, {}, multiple: true
+    end
+
+    def language_selector(form)
+      form.select :language_id, Elabs::Language.for_list
+    end
+
+    def license_selector(form)
+      form.select :license_id, Elabs::License.for_list
+    end
+
+    def project_selector(form)
+      form.select :project_ids, Elabs::Project.by_member(current_user).for_list, {}, multiple: true
+    end
+
+    def uploads_selector(form)
+      form.select :upload_ids, Elabs::Upload.by_member(current_user).for_list, {}, multiple: true
+    end
+  end
+end

data/app/models/elabs/album.rb

@@ -20,5 +20,7 @@ module Elabs
     has_many :projects, through: :projects_albums, dependent: :destroy
     has_many :uploads,  through: :albums_uploads,  dependent: :destroy
     has_many :comments, as: 'content'
+
+    scope :for_list, -> { order(:name).pluck(:name, :id) }
   end
 end

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

@@ -40,7 +40,7 @@ module Elabs
 
       def update_acts
         acts.destroy_all if %i[lock unpublish].include? @action
-        Act.create content: self, event: @action unless @action == :nothing
+        Act.create content: self, event: @action unless @action == :nothing || hidden_in_history
       end
 
       # TODO: check if used ? (dependent: destroy may do the trick.)

data/app/models/elabs/language.rb

@@ -13,5 +13,6 @@ module Elabs
 
     scope :with_content_only, -> { where.not(albums_count: 0).or(where.not(articles_count: 0)).or(where.not(notes_count: 0)).or(where.not(projects_count: 0)).or(where.not(uploads_count: 0)) }
     scope :available_site_translations, -> { select(:id, :name, :iso639_1).where(iso639_1: I18n.available_locales) }
+    scope :for_list, -> { order(:name).pluck(:name, :id) }
   end
 end

data/app/models/elabs/license.rb

@@ -11,5 +11,7 @@ module Elabs
     has_many :notes
     has_many :projects
     has_many :uploads
+
+    scope :for_list, -> { order(:name).pluck(:name, :id) }
   end
 end

data/app/models/elabs/project.rb

@@ -21,5 +21,7 @@ module Elabs
     has_many :notes,    through: :projects_notes,    dependent: :destroy
     has_many :uploads,  through: :projects_uploads,  dependent: :destroy
     has_many :comments, as: 'content'
+
+    scope :for_list, -> { order(:name).pluck(:name, :id) }
   end
 end

data/app/models/elabs/upload.rb

@@ -24,5 +24,7 @@ module Elabs
     has_many :comments, as: 'content'
 
     has_one_attached :file
+
+    scope :for_list, -> { order(:title).pluck(:title, :id) }
   end
 end

data/app/views/elabs/member/albums/_form.html.haml

@@ -35,18 +35,16 @@
       = f.label :hidden_in_history
   .field
     = f.label :license
-    .field-input= f.collection_select :license_id, Elabs::License.all, :id, :name
+    .field-input= license_selector f
   .field
     = f.label :language
-    .field-input= f.collection_select :language_id, Elabs::Language.all, :id, :name
+    .field-input= language_selector f
   .field
     = f.label :uploads
-    .field-input= f.collection_select :upload_ids,
-                  Elabs::Upload.by_member(current_user), :id, :title, {}, multiple: true
+    .field-input= uploads_selector f
   .field
     = f.label :projects
-    .field-input= f.collection_select :project_ids,
-                  Elabs::Project.by_member(current_user), :id, :name, {}, multiple: true
+    .field-input= project_selector f
   .field
     = f.label :tags, for: :tags_list
     .field-input

data/app/views/elabs/member/articles/_form.html.haml

@@ -42,14 +42,13 @@
       = f.label :hidden_in_history
   .field
     = f.label :license
-    .field-input= f.collection_select :license_id, Elabs::License.all, :id, :name
+    .field-input= license_selector f
   .field
     = f.label :language
-    .field-input= f.collection_select :language_id, Elabs::Language.all, :id, :name
+    .field-input= language_selector f
   .field
     = f.label :projects
-    .field-input= f.collection_select :project_ids,
-                  Elabs::Project.by_member(current_user), :id, :name, {}, multiple: true
+    .field-input= project_selector f
   .field
     = f.label :tags, for: :tags_list
     .field-input

data/app/views/elabs/member/notes/_form.html.haml

@@ -30,14 +30,13 @@
       = f.label :hidden_in_history
   .field
     = f.label :license
-    .field-input= f.collection_select :license_id, Elabs::License.all, :id, :name
+    .field-input= license_selector f
   .field
     = f.label :language
-    .field-input= f.collection_select :language_id, Elabs::Language.all, :id, :name
+    .field-input= language_selector f
   .field
     = f.label :projects
-    .field-input= f.collection_select :project_ids,
-                  Elabs::Project.by_member(current_user), :id, :name, {}, multiple: true
+    .field-input= project_selector f
   .field
     = f.label :tags, for: :tags_list
     .field-input

data/app/views/elabs/member/projects/_form.html.haml

@@ -46,10 +46,10 @@
       = f.label :hidden_in_history
   .field
     = f.label :license
-    .field-input= f.collection_select :license_id, Elabs::License.all, :id, :name
+    .field-input= license_selector f
   .field
     = f.label :language
-    .field-input= f.collection_select :language_id, Elabs::Language.all, :id, :name
+    .field-input= language_selector f
   .field
     = f.label :tags, for: :tags_list
     .field-input

data/app/views/elabs/member/uploads/_form.html.haml

@@ -34,10 +34,10 @@
       = f.label :hidden_in_history
   .field
     = f.label :license
-    .field-input= f.collection_select :license_id, Elabs::License.all, :id, :name
+    .field-input= license_selector f
   .field
     = f.label :language
-    .field-input= f.collection_select :language_id, Elabs::Language.all, :id, :name
+    .field-input= language_selector f
   .field
     = f.label :file
     .field-input
@@ -46,11 +46,10 @@
                           formats: available_formats.join(', '))
   .field
     = f.label :albums
-    .field-input= f.collection_select :album_ids, Elabs::Album.by_member(current_user), :id, :name, {}, multiple: true
+    .field-input= album_selector f
   .field
     = f.label :projects
-    .field-input= f.collection_select :project_ids,
-                  Elabs::Project.by_member(current_user), :id, :name, {}, multiple: true
+    .field-input= project_selector f
   .field
     = f.label :tags, for: :tags_list
     .field-input

data/lib/elabs/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elabs
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0
 platform: ruby
 authors:
 - Manuel Tancoigne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,6 +152,7 @@ files:
 - app/helpers/elabs/application_helper.rb
 - app/helpers/elabs/content_filters_helper.rb
 - app/helpers/elabs/content_renderer_helper.rb
+- app/helpers/elabs/form_helper.rb
 - app/helpers/elabs/member_content_helper.rb
 - app/helpers/elabs/thumbnails_helper.rb
 - app/helpers/elabs/time_helper.rb
@@ -451,9 +452,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6