cmor_showcase 0.0.36.pre → 0.0.37.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5844e4b3ac6e9d5610f5b37b1351f200d224229989fd7f1275085d145beb94d4
-  data.tar.gz: 3fd56fc8c7ef6c6817725d2a93dd48bb247ddc087193e0576d54ba971943a09d
+  metadata.gz: 973f667581372f211b2336ddc93f0e68ae71f06fa0f392cbfb3d0d97c1fe8126
+  data.tar.gz: 588b26d8a98887506ea7d660a1f9e1761f4927f806a1664fd0fe68e8c7d8a2b2
 SHA512:
-  metadata.gz: 9115c59d2ae913904237b24f734b0d821aa1c339f176f745afd841a2217e14d74dd4c8bac31843b63e5ba1e3616e0816ee422af2ff41d26fe1d604d2009aaa7f
-  data.tar.gz: b9c6cac32e8173a0978bc90d3bf4328d992ff8b357128d6a67c606ef626f8eed8493605f423fecb748e0973cfc7eb15cb75738fb5d1e44276a84b3d6b40dcb29
+  metadata.gz: fe0c975b96df6c6848ece2484fdf6cce92e3a51c5d6e694bea6df4018c206f6bdfd1067ec0528326ff1fefeed49fb1b0e28dfd155ed82ee890614a1cabd7a1c8
+  data.tar.gz: be4744898f605192ce5f422cd6425a8e194eead1e50354b35cab7c9b63bb2a888695d9badf119afca9cb22060ad93ba34c5313cd2b9e64b0a6607bd3fdc48f7d

data/app/controllers/cmor/showcase/categories_controller.rb

@@ -2,6 +2,7 @@ module Cmor::Showcase
   class CategoriesController < Cmor::Core::Backend::ResourcesController::Base
     include Rao::ResourcesController::ActsAsListConcern
     include Rao::ResourcesController::ActsAsPublishedConcern
+    include Rao::ResourcesController::FriendlyIdConcern
     
     def self.resource_class
       Cmor::Showcase::Category

data/app/controllers/cmor/showcase/file_details_controller.rb

@@ -0,0 +1,29 @@
+module Cmor::Showcase
+  class FileDetailsController < Cmor::Core::Backend::ResourcesController::Base
+    include Rao::ResourcesController::ActsAsListConcern
+    include Rao::ResourcesController::SortingConcern
+    include Rao::ResourcesController::BatchActionsConcern
+
+    def self.resource_class
+      Cmor::Showcase::FileDetail
+    end
+
+    def self.available_rest_actions
+      super - %i(new)
+    end
+
+    private
+
+    def after_reposition_location
+      last_location
+    end
+    
+    def after_destroy_many_location
+      last_location
+    end
+
+    def permitted_params
+      params.require(:file_detail).permit(:title, :description)
+    end
+  end
+end

data/app/controllers/cmor/showcase/items_controller.rb

@@ -2,6 +2,7 @@ module Cmor::Showcase
   class ItemsController < Cmor::Core::Backend::ResourcesController::Base
     include Rao::ResourcesController::ActsAsListConcern
     include Rao::ResourcesController::ActsAsPublishedConcern
+    include Rao::ResourcesController::FriendlyIdConcern
 
     def self.resource_class
       Cmor::Showcase::Item
@@ -9,8 +10,16 @@ module Cmor::Showcase
 
     private
 
+    def after_reposition_location
+      last_location # collection_path
+    end
+
+    def load_collection_scope
+      super.includes(:category)
+    end
+
     def permitted_params
-      params.require(:item).permit(:category_id, :identifier, :name, :body, :published, assets: [])
+      params.require(:item).permit(:category_id, :identifier, :name, :body, :published, assets: [], append_assets: [], overwrite_assets: [])
     end
   end
 end

data/app/models/cmor/showcase/category.rb

@@ -8,6 +8,10 @@ module Cmor::Showcase
     acts_as_list
     acts_as_published
 
+    # slugs
+    extend FriendlyId
+    friendly_id :name, use: :slugged
+
     validates :locale, presence: true
     validates :identifier, presence: true, uniqueness: true
     validates :name, presence: true, uniqueness: true

data/app/models/cmor/showcase/file_detail.rb

@@ -0,0 +1,9 @@
+module Cmor::Showcase
+  class FileDetail < ApplicationRecord
+    belongs_to :item
+    belongs_to :asset, class_name: 'ActiveStorage::Attachment', dependent: :destroy
+
+    acts_as_list scope: :item
+    default_scope { order(position: :asc) }
+  end
+end

data/app/models/cmor/showcase/item.rb

@@ -9,6 +9,11 @@ module Cmor::Showcase
     
     acts_as_list scope: :category
     acts_as_published
+
+    # slugs
+    extend FriendlyId
+    friendly_id :name, use: :slugged
+
     acts_as_markup :body, Cmor::Core::Configuration.default_markup_options
 
     validates :name, presence: true, uniqueness: { scope: [ :category_id ] }
@@ -16,19 +21,71 @@ module Cmor::Showcase
     module PreviewPictureConcern
       extend ActiveSupport::Concern
 
-      def images
-        assets.joins(:blob).where("active_storage_blobs.content_type LIKE '%image/%'")
+      def preview_picture
+        file_details.images.first
       end
+    end
+
+    include PreviewPictureConcern
 
-      def non_images
-        assets.joins(:blob).where("active_storage_blobs.content_type NOT LIKE '%image/%'")
+    module FileDetailsConcern
+      extend ActiveSupport::Concern
+
+      included do
+        has_many :file_details, inverse_of: :item, dependent: :destroy, autosave: true do
+          def images
+            joins(asset: :blob).where("active_storage_blobs.content_type LIKE '%image/%'")
+          end
+
+          def non_images
+            joins(asset: :blob).where("active_storage_blobs.content_type NOT LIKE '%image/%'")
+          end
+        end
+        before_validation :cleanup_orphaned_file_details
+        before_validation :ensure_file_details
       end
 
-      def preview_picture
-        images.first
+      def append_assets
+        assets
+      end
+
+       def append_assets=(assets)
+          if Rails.version < '6.0.0'
+            self.assets = assets
+          else
+            self.assets.attach(assets)
+          end
+        end
+
+      def overwrite_assets
+        assets
+      end
+
+      def overwrite_assets=(assets)
+        return if assets.nil? || assets.empty?
+        self.file_details.map { |fd| fd.mark_for_destruction }
+        self.assets = assets
+      end
+
+      private
+
+      def cleanup_orphaned_file_details
+        file_details.each do |file_detail|
+          file_detail.destroy if file_detail.asset.nil?
+        end
+      end
+
+      def ensure_file_details
+        (assets - file_details.all.map(&:asset)).map do |asset|
+          build_file_detail_for_asset(asset)
+        end
+      end
+
+      def build_file_detail_for_asset(asset)
+        file_details.build(asset: asset)
       end
     end
 
-    include PreviewPictureConcern
+    include FileDetailsConcern
   end
 end

data/app/views/cmor/showcase/file_details/_index_table.html.haml

@@ -0,0 +1,13 @@
+= table.batch_actions( actions: { destroy: destroy_many_file_details_path })
+= table.id
+= table.column :filename do |resource|
+  - resource.asset.blob.filename
+= table.column :blob_content_type do |resource|
+  - resource.asset.blob.content_type
+= table.column :blob_byte_size do |resource|
+  - resource.asset.blob.byte_size
+= table.column :blob_checksum do |resource|
+  - resource.asset.blob.checksum
+= table.column :blob_created_at do |resource|
+  - I18n.l(resource.asset.blob.created_at, format: :short)
+= table.timestamp :created_at

data/app/views/cmor/showcase/file_details/_query_form.html.haml

@@ -0,0 +1,2 @@
+= form.input :title_cont
+= form.input :name_cont, association: :item

data/app/views/cmor/showcase/items/_after_show_table.html.haml

@@ -0,0 +1,22 @@
+%h2= Cmor::Showcase::FileDetail.model_name.human(count: :other)
+
+= collection_table(collection: @resource.file_details, resource_class: Cmor::Showcase::FileDetail) do |table|
+  = table.acts_as_list_actions
+  = table.id
+  = table.thumbnail :asset
+  = table.column :title
+  = table.column :blob_filename do |resource|
+    - resource.asset.blob.filename
+  = table.column :blob_byte_size do |resource|
+    - number_to_human_size(resource.asset.blob.byte_size)
+  = table.column :blob_checksum do |resource|
+    - resource.asset.blob.checksum
+  = table.timestamps format: :short
+  = table.column :actions do |resource|
+    - capture_haml do
+      = link_to(main_app.url_for(resource.asset), class: 'btn btn-xs btn-responsive btn-primary') do
+        %i.fas.fa-download
+        %span.btn-text= t('.download')
+      = link_to([resource], id: "#{dom_id(resource)}-destroy", class: 'btn btn-xs btn-responsive btn-danger', method: :delete, data: { confirm: I18n.t('.confirmations.delete') }) do
+        %i.fas.fa-fire
+        %span.btn-text= t('.destroy')

data/app/views/cmor/showcase/items/_form.html.haml

@@ -3,4 +3,13 @@
 = form.input :name
 = form.input :body
 = form.input :published, as: :boolean
-= form.input :assets, as: :file, input_html: { multiple: true }
+- if form.object.assets.empty?
+  = form.input :assets, as: :file, input_html: { multiple: true }
+- else
+  .row.mb-4
+    .col-md-6
+      .bg-success.p-4
+        = form.input :append_assets, as: :file, input_html: { multiple: true }
+    .col-md-6
+      .bg-danger.p-4
+        = form.input :overwrite_assets, as: :file, input_html: { multiple: true }

data/app/views/cmor/showcase/items/_index_table.html.haml

@@ -1,7 +1,7 @@
 = table.acts_as_list_actions
 = table.thumbnail :preview_picture
-= table.association :category
-= table.column :identifier
-= table.column :name
-= table.timestamps
+= table.column :category, as: :association, label_method: :human, sort: { column_name: 'cmor_showcase_categories.name' }
+= table.column :identifier, sort: true
+= table.column :name, sort: true
+= table.timestamps sort: true
 = table.acts_as_published_actions

data/app/views/cmor/showcase/items/_show.html.haml

@@ -0,0 +1,6 @@
+= table.association :category, label_method: :name, url: ->(r) { url_for(r) }
+= table.row :identifier
+= table.row :name
+= table.row :description
+= table.row :published
+= table.timestamps

data/app/views/cmor/showcase/items/_show_table.html.haml

@@ -1,4 +1,4 @@
-= table.association :category
+= table.association :category, label_method: :name, link_to: ->(r) { url_for(r.category) }
 = table.row :identifier
 = table.row :name
 = table.row :body

data/config/locales/de.yml

@@ -6,6 +6,9 @@ de:
       cmor/showcase/category:
         one: Kategorie
         other: Kategorien
+      cmor/showcase/file_detail:
+        one: Anhang
+        other: Anhänge
       cmor/showcase/item:
         one: Eintrag
         other: Einträge
@@ -18,11 +21,20 @@ de:
       position: Position
       published_at: Veröffentlicht am
       published: Veröffentlicht
+      slug: Slug
       updated_at: Aktualisiert am
     attributes: 
       cmor/showcase/category:
         <<: *shared_attributes
         locale: Sprache
+      cmor/showcase/file_detail:
+        <<: *shared_attributes
+        description: Beschreibung
+        asset: Datei
+        asset_id: Datei
+        item: Eintrag
+        item_id: Eintrag
+        title: Titel
       cmor/showcase/item:
         <<: *shared_attributes
         category: Kategorie

data/config/locales/en.yml

@@ -6,6 +6,9 @@ en:
       cmor/showcase/category:
         one: Category
         other: Categories
+      cmor/showcase/file_detail:
+        one: File
+        other: Files
       cmor/showcase/item:
         one: Item
         other: Items
@@ -18,11 +21,20 @@ en:
       position: Position
       published_at: Published at
       published: Published
+      slug: Slug
       updated_at: Updated at
     attributes:
       cmor/showcase/category:
         <<: *shared_attributes
         locale: Locale
+      cmor/showcase/file_detail:
+        <<: *shared_attributes
+        description:  Description
+        asset: Asset
+        asset_id: Asset
+        item: Item
+        item_id: Item
+        title: Title
       cmor/showcase/item:
         <<: *shared_attributes
         category: Category

data/config/routes.rb

@@ -9,5 +9,10 @@ Cmor::Showcase::Engine.routes.draw do
     acts_as_list
   end
 
+  resources :file_details do
+    post :destroy_many, on: :collection
+    acts_as_list
+  end
+
   root to: 'home#index'
 end

data/db/migrate/20190728095810_create_cmor_showcase_categories.rb

@@ -7,8 +7,11 @@ class CreateCmorShowcaseCategories < ActiveRecord::Migration[5.2]
       t.text :body
       t.integer :position
       t.timestamp :published_at
+      t.string :slug
 
       t.timestamps
+
+      t.index :slug, unique: true
     end
   end
 end

data/db/migrate/20190728100031_create_cmor_showcase_items.rb

@@ -7,8 +7,11 @@ class CreateCmorShowcaseItems < ActiveRecord::Migration[5.2]
       t.text :body
       t.integer :position
       t.timestamp :published_at
+      t.string :slug
 
       t.timestamps
+
+      t.index :slug, unique: true
     end
   end
 end

data/db/migrate/20190815224535_create_cmor_showcase_file_details.rb

@@ -0,0 +1,13 @@
+class CreateCmorShowcaseFileDetails < ActiveRecord::Migration[5.2]
+  def change
+    create_table :cmor_showcase_file_details do |t|
+      t.references :item, foreign_key: false
+      t.references :asset, foreign_key: false
+      t.string :title
+      t.text :description
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/lib/cmor_showcase.rb

@@ -2,6 +2,7 @@ require "cmor_core"
 require "cmor_core_backend"
 require "acts_as_published"
 require "acts_as_list"
+require "friendly_id"
 require "markup-rails"
 
 require "cmor/showcase/version"

data/lib/generators/cmor/showcase/install/templates/initializer.rb

@@ -3,12 +3,14 @@ Cmor::Showcase.configure do |config|
   # 
   # Default: config.resources_controllers = -> {[
   #            Cmor::Showcase::CategoriesController,
-  #            Cmor::Showcase::ItemsController
+  #            Cmor::Showcase::ItemsController,
+  #            Cmor::Showcase::FileDetailsController
   #          ]}
   # 
   config.resources_controllers = -> {[
     Cmor::Showcase::CategoriesController,
-    Cmor::Showcase::ItemsController
+    Cmor::Showcase::ItemsController,
+    Cmor::Showcase::FileDetailsController
   ]}
 
   # Set the resources, that will be shown in the backend menu.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_showcase
 version: !ruby/object:Gem::Version
-  version: 0.0.36.pre
+  version: 0.0.37.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-10 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.36.pre
+        version: 0.0.37.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.36.pre
+        version: 0.0.37.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_backend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.36.pre
+        version: 0.0.37.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.36.pre
+        version: 0.0.37.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -346,6 +346,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootsnap
   requirement: !ruby/object:Gem::Requirement
@@ -393,16 +407,22 @@ files:
 - app/assets/stylesheets/cmor_showcase.css
 - app/controllers/cmor/showcase/application_controller.rb
 - app/controllers/cmor/showcase/categories_controller.rb
+- app/controllers/cmor/showcase/file_details_controller.rb
 - app/controllers/cmor/showcase/home_controller.rb
 - app/controllers/cmor/showcase/items_controller.rb
 - app/models/cmor/showcase/category.rb
+- app/models/cmor/showcase/file_detail.rb
 - app/models/cmor/showcase/item.rb
 - app/view_helpers/cmor/showcase/application_view_helper.rb
 - app/views/cmor/showcase/categories/_form.html.haml
 - app/views/cmor/showcase/categories/_index_table.html.haml
 - app/views/cmor/showcase/categories/_show_table.html.haml
+- app/views/cmor/showcase/file_details/_index_table.html.haml
+- app/views/cmor/showcase/file_details/_query_form.html.haml
+- app/views/cmor/showcase/items/_after_show_table.html.haml
 - app/views/cmor/showcase/items/_form.html.haml
 - app/views/cmor/showcase/items/_index_table.html.haml
+- app/views/cmor/showcase/items/_show.html.haml
 - app/views/cmor/showcase/items/_show_table.html.haml
 - config/initializers/assets.rb
 - config/initializers/cmor.rb
@@ -411,6 +431,7 @@ files:
 - config/routes.rb
 - db/migrate/20190728095810_create_cmor_showcase_categories.rb
 - db/migrate/20190728100031_create_cmor_showcase_items.rb
+- db/migrate/20190815224535_create_cmor_showcase_file_details.rb
 - lib/cmor/showcase/configuration.rb
 - lib/cmor/showcase/engine.rb
 - lib/cmor/showcase/version.rb
@@ -439,7 +460,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Cmor::Showcase Module.