spina-admin-journal 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c43ca7425af717514efb0bc6a142651eae11fd79446019ab19b87bb8c952f497
-  data.tar.gz: 3af013de932268d05fb32013c7d1f09a89166eedd43276ce73c1756819cdea75
+  metadata.gz: 6c0a0d703a86719e315f9ea84b71b62a8ca32dff43d33ba9b012dc924f550b4e
+  data.tar.gz: c3c548eb605e39ecd8b2bfe56c6343e9187c8bb7c8747fc8c7169240d2e160ed
 SHA512:
-  metadata.gz: d792437f01a6474b290daa7deaea9232eb78892a77e08c877abbab9ce97221785c653eca15062b2656a70e155b74ad3ed77aae3e2a3260306c153bfb9c4401fc
-  data.tar.gz: 1ef7f100bd6d37727916951f588d4fcad17d4c896e3fab8c136f2ac663b0290afb3293adc3c6c1cb2d1e99f463363a4c352879a09d53df624e31403d1120a111
+  metadata.gz: ff8186db67c005d436664f43492133268aa44b7af675076b2e16a40764920f5c9403f236964d57040aa9388b4b1540bca5e448fb63874c06cab8f644af687db4
+  data.tar.gz: f66bce803e4e7269991dc0199b32eb05e33b7c11ae555a7971105dfc1f1bcb24fdec3c6eb7b1571abb27d95317d5f3165656fedf4ae7e17a00b33786de472e2c

data/app/controllers/spina/admin/journal/articles_controller.rb

@@ -7,6 +7,7 @@ module Spina
       class ArticlesController < ApplicationController
         PARTS_PARAMS = [
           :name, :title, :type, :content, :filename, :signed_blob_id, :alt, :attachment_id, :image_id,
+          :first_page, :last_page,
           { images_attributes: %i[filename signed_blob_id image_id alt],
             content_attributes: [
               :name, :title,
@@ -20,7 +21,7 @@ module Spina
           params.merge("#{locale}_content_attributes": [*PARTS_PARAMS])
         end
         PARAMS = [:issue_id, :licence_id, :title, :url, :doi, :status, { affiliation_ids: [], **CONTENT_PARAMS }].freeze
-        PARTS = %w[abstract attachment].freeze
+        PARTS = %w[abstract attachment page_range].freeze
 
         before_action :set_breadcrumb
         before_action :set_tabs, except: %i[index destroy sort]

data/app/controllers/spina/admin/journal/authors_controller.rb

@@ -16,6 +16,7 @@ module Spina
         def new
           @author = Author.new
           @author.affiliations << Affiliation.new(status: :primary)
+          add_breadcrumb t('.new')
         end
 
         def edit; end

data/app/controllers/spina/admin/journal/issues_controller.rb

@@ -4,7 +4,8 @@ module Spina
   module Admin
     module Journal
       # Controller for {Issue} records.
-      class IssuesController < ApplicationController
+      # TODO: extract methods to helpers to reduce class length
+      class IssuesController < ApplicationController # rubocop:disable Metrics/ClassLength
         PARTS_PARAMS = [
           :name, :title, :type, :content, :filename, :signed_blob_id, :alt, :attachment_id, :image_id,
           { images_attributes: %i[filename signed_blob_id image_id alt],
@@ -25,6 +26,7 @@ module Spina
         before_action :set_breadcrumb
         before_action :set_tabs, except: %i[index destroy sort]
         before_action :set_issue, only: %i[edit update destroy]
+        before_action :set_articles, only: %i[edit update]
         before_action :set_parts_attributes, only: %i[new edit]
         before_action :build_parts, only: %i[edit]
 
@@ -92,6 +94,10 @@ module Spina
           @issue = Issue.find(params[:id])
         end
 
+        def set_articles
+          @articles = @issue.articles.sorted_asc
+        end
+
         def issue_params
           params.require(:admin_journal_issue).permit(PARAMS)
         end

data/app/controllers/spina/admin/journal/journals_controller.rb

@@ -21,7 +21,7 @@ module Spina
           params.merge("#{locale}_content_attributes": [*PARTS_PARAMS])
         end
         PARAMS = [:name, { **CONTENT_PARAMS }].freeze
-        PARTS = %w[journal_abbreviation logo description documents].freeze
+        PARTS = %w[journal_abbreviation logo description documents issn].freeze
 
         before_action :set_journal
         before_action :set_parts_attributes

data/app/models/spina/parts/admin/journal/page_range.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Spina
+  module Parts
+    module Admin
+      module Journal
+        # Part representing a range of pages
+        class PageRange < Spina::Parts::Base
+          attr_json :first_page, :integer
+          attr_json :last_page, :integer
+
+          validate :valid_range
+
+          def content
+            self
+          end
+
+          def valid_range
+            return if first_page.nil? && last_page.nil?
+
+            if last_page.nil?
+              errors.add :last_page, 'must be present'
+            elsif last_page < first_page
+              errors.add :last_page, 'must be larger than the first page'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/spina/admin/journal/issues/_form_articles.html.haml

@@ -11,4 +11,4 @@
           %th= ::Spina::Admin::Journal::Article.human_attribute_name :title
           %th
       %tbody.html5sortable{ data: { id: @issue.id, sorted_collection: 'admin_journal_articles', sort_url: !@issue.id.nil? && sort_admin_journal_articles_url(@issue) } }
-        = render @issue.articles.any? ? @issue.articles : 'empty_list', message: t('.no_articles')
+        = render @articles && @articles.any? ? @articles : 'empty_list', message: t('.no_articles')

data/app/views/spina/admin/parts/admin/journal/page_ranges/_form.html.haml

@@ -0,0 +1,6 @@
+.page-form-label= f.object.title
+.page-form-control
+  = f.number_field :first_page, style: 'width: 10%;'
+  –
+  = f.number_field :last_page, style: 'width: 10%;'
+

data/db/migrate/20210626153728_create_spina_parts_admin_journal_page_ranges.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class CreateSpinaPartsAdminJournalPageRanges < ActiveRecord::Migration[6.1] # :nodoc:
+  def change
+    create_table :spina_parts_admin_journal_page_ranges, &:timestamps
+  end
+end

data/lib/spina/admin/journal/engine.rb

@@ -11,6 +11,10 @@ module Spina
             plugin.namespace = 'journal'
           end
         end
+
+        config.after_initialize do
+          Spina::Part.register Spina::Parts::Admin::Journal::PageRange
+        end
       end
     end
   end

data/lib/spina/admin/journal/version.rb

@@ -3,7 +3,7 @@
 module Spina
   module Admin
     module Journal
-      VERSION = '0.5.0'
+      VERSION = '0.6.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-journal
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Louis Van Steene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-23 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +293,7 @@ files:
 - app/models/spina/admin/journal/journal.rb
 - app/models/spina/admin/journal/licence.rb
 - app/models/spina/admin/journal/volume.rb
+- app/models/spina/parts/admin/journal/page_range.rb
 - app/validators/spina/admin/journal/uri_validator.rb
 - app/views/layouts/spina/admin/journal/articles.html.haml
 - app/views/layouts/spina/admin/journal/authors.html.haml
@@ -352,6 +353,7 @@ files:
 - app/views/spina/admin/journal/volumes/edit.html.haml
 - app/views/spina/admin/journal/volumes/index.html.haml
 - app/views/spina/admin/journal/volumes/new.html.haml
+- app/views/spina/admin/parts/admin/journal/page_ranges/_form.html.haml
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20201216152147_create_spina_admin_journal_journals.rb
@@ -370,6 +372,7 @@ files:
 - db/migrate/20210521121318_add_status_to_spina_admin_journal_articles.rb
 - db/migrate/20210618090155_create_spina_admin_journal_licences.rb
 - db/migrate/20210618094533_add_licence_to_spina_admin_journal_articles.rb
+- db/migrate/20210626153728_create_spina_parts_admin_journal_page_ranges.rb
 - lib/spina/admin/journal.rb
 - lib/spina/admin/journal/engine.rb
 - lib/spina/admin/journal/version.rb