cmor_files 0.0.52.pre → 0.0.57.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b4749c426409136f626da21f0524c3252cb263e885c6295bfdb596d4d475d2
-  data.tar.gz: a35736f55efe085f2f9c8cc2ff6178290aa40452c44e480258ffc54b02bcadae
+  metadata.gz: de313087b0cb2538b0ebf14a13fbce25eb0d63c986fd5007e5fffc02914604f3
+  data.tar.gz: '09cc0eb9d71adc3d2b2684b4dd0cbe41d0d88b3d33a799cab78e12a16e5e0f84'
 SHA512:
-  metadata.gz: 10e9f950d420ed6926a07637d5d8669b112a597766995dd5987542a359c5ff0c2880c5a22c8c45d5995a95d37c6236cb5dc1b68c41e270a8b2f0251a30f6d041
-  data.tar.gz: a372935fc8b53e269447d8b1e8209f9a1f8d8b05fb798a0dadecb853528244aa7aed6d6dc161e59870d8078ebea1bf62dac0e584265633f03d438c43766f57b0
+  metadata.gz: d8f648884103e211e6c1c46995d5555d639c15b2857a367302b716a8344ddf2f2976b7596faca21e66bf5cb76a89a0778c136ab8e66527ffefd12077bde4a3b2
+  data.tar.gz: c9816a0590814535cef8591215c6e7efd0f17977eb1bfd94a496fa0ae953eaa9a84ba75c2ad65ae5294a8726563a409138a5895672f6e0367bf1bbd1124a28a1

data/app/view_helpers/cmor/files/application_view_helper.rb

@@ -11,11 +11,33 @@ module Cmor
       # Example:
       #
       #     # app/views/layouts/application.html.haml
-      #     = files_helper(self).render_download(name: 'Quick reference manual')
+      #     = files_helper(self).render_file(identifier: 'Quick reference manual')
       #
       def render_file(identifier:)
-        resource = Cmor::Files::FileDetail.where(identifier: identifier).first
-        render resource: resource
+        resource = Cmor::Files::FileDetail.published.where(identifier: identifier).first
+        if resource.nil?
+          "Could not find published file detail with identifier: '#{identifier}'."
+        else
+          render resource: resource
+        end
+      end
+
+      # Example:
+      #
+      #     # app/views/layouts/application.html.haml
+      #     = files_helper(self).render_folder(identifier: 'Manuals')
+      #
+      def render_folder(identifier:)
+        resource = Cmor::Files::Folder.published.where(identifier: identifier).first
+        if resource.nil?
+          "Could not find published folder with identifier: '#{identifier}'."
+        else
+          render resource: resource
+        end
+      end
+
+      def asset_download_button_label(asset)
+        "#{c.t(".download")} (#{asset.blob.content_type.split('/').last}, #{c.number_to_human_size(asset.blob.byte_size)})"
       end
     end
   end

data/app/views/cmor/files/application_view_helper/_render_folder.html.haml

@@ -0,0 +1,15 @@
+.row
+  .col-12
+    %h4= resource.name
+
+.row
+  .col-12
+    .table-responsive
+      = collection_table(collection: resource.file_details, resource_class: Cmor::Files::FileDetail, header: false) do |table|
+        = table.column :filename do |resource|
+          - resource.asset.blob.filename.to_s.truncate(64)
+        = table.column :actions, html: "text-right" do |resource|
+          - capture_haml do
+            .text-right
+              = link_to(main_app.url_for(resource.asset), class: 'btn btn-primary') do
+                = files_helper(self).asset_download_button_label(resource.asset)

data/app/views/cmor/files/folders/index.html.haml

@@ -5,5 +5,5 @@
     = collection_table(collection: @collection, resource_class: resource_class) do |t|
       = t.column :name
       = t.column :assets_count
-      = t.column :actions do |resource|
+      = t.column :actions, title: false do |resource|
         - link_to(t('.show'), [resource], class: 'btn btn-primary')

data/app/views/cmor/files/folders/show.html.haml

@@ -1,15 +1,20 @@
-%h1= @resource.name
+.row
+  .col-12
+    %h1= @resource.name
 
 .row
   .col-12
-    = collection_table(collection: @resource.file_details, resource_class: Cmor::Files::FileDetail, header: false) do |table|
-      = table.column :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 :actions do |resource|
-        - capture_haml do
-          = link_to(t('.download'), main_app.url_for(resource.asset), class: 'btn btn-primary')
+    .table-responsive
+      = collection_table(collection: @resource.file_details, resource_class: Cmor::Files::FileDetail, header: false) do |table|
+        = table.column :filename do |resource|
+          - resource.asset.blob.filename.to_s.truncate(64)
+        = table.column :blob_byte_size do |resource|
+          - number_to_human_size(resource.asset.blob.byte_size)
+        = table.column :actions do |resource|
+          - capture_haml do
+            .text-right
+              = link_to(main_app.url_for(resource.asset), class: 'btn btn-primary') do
+                = files_helper(self).asset_download_button_label(resource.asset)
 
 
 .row.mt-4

data/config/locales/de.yml

@@ -18,10 +18,15 @@ de:
         id: ID
         asset: Datei
         asset_id: Datei
+        asset_permanent_path: Permanenter Datei-Pfad
+        asset_permanent_url: Permanente Datei-URL
         blob_byte_size: Dateigröße
         blob_checksum: Checksumme
+        blob_content_type: Dateityp
+        blob_created_at: Datei erstellt am
         blob_filename: Dateiname
         description: Beschreibung
+        filename: Dateiname
         folder: Ordner
         folder_id: Ordner
         identifier: Bezeichner
@@ -34,12 +39,14 @@ de:
         updated_at: Aktualisiert am
       cmor/files/folder:
         id: ID
+        append_assets: Dateien hinzufügen
         assets: Dateien
         assets_count: Dateien
         description: Beschreibung
         identifier: Bezeichner
         locale: Sprache
         name: Name
+        overwrite_assets: Dateien ersetzen
         position: Position
         published: Veröffentlicht
         published_at: Veröffentlicht am

data/config/locales/en.yml

@@ -18,10 +18,15 @@ en:
         id: ID
         asset: Asset
         asset_id: Asset
+        asset_permanent_path: Permanent asset path
+        asset_permanent_url: Permanent asset ur
         blob_byte_size: Filesize
         blob_checksum: Checksum
+        blob_content_type: Content-Type
+        blob_created_at: File created at
         blob_filename: Filename
         description: Description
+        filename: Filename
         folder: Folder
         folder_id: Folder
         identifier: Identifier
@@ -34,12 +39,14 @@ en:
         updated_at: Updated at
       cmor/files/folder:
         id: ID
+        append_assets: Append files
         assets: Files
         assets_count: Files
         description: Description
         identifier: Identifier
         locale: Locale
         name: Name
+        overwrite_assets: Overwrite files
         position: Position
         published: Published
         published_at: Published at

data/spec/factories/cmor_files_file_details.rb

@@ -0,0 +1,17 @@
+FactoryBot.define do
+  factory :cmor_files_file_detail, class: 'Cmor::Files::FileDetail' do
+    association :folder, factory: :cmor_files_folder
+    after(:build) { |resource| 
+      assets = resource.folder.assets.attach(
+        io:           File.open(File.join(Cmor::Files::Engine.root.join(*%w( spec files cmor files file_details example.png)))),
+        filename:     'example.png',
+        content_type: 'image/png'
+      )
+      if Rails.version < "6.0.0"
+        resource.asset = assets.first
+      else
+        resource.asset = resource.folder.assets.first
+      end
+    }
+  end
+end

data/spec/factories/cmor_files_folders.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :cmor_files_folder, class: 'Cmor::Files::Folder' do
+    sequence(:name) { |i| "Folder ##{i}" }
+    sequence(:identifier) { |i| "folder-#{i}" }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_files
 version: !ruby/object:Gem::Version
-  version: 0.0.52.pre
+  version: 0.0.57.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-07-15 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.52.pre
+        version: 0.0.57.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.52.pre
+        version: 0.0.57.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.52.pre
+        version: 0.0.57.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.52.pre
+        version: 0.0.57.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -401,6 +401,7 @@ files:
 - app/models/cmor/files/folder.rb
 - app/view_helpers/cmor/files/application_view_helper.rb
 - app/views/cmor/files/application_view_helper/_render_file.html.haml
+- app/views/cmor/files/application_view_helper/_render_folder.html.haml
 - app/views/cmor/files/file_details/index.html.haml
 - app/views/cmor/files/file_details/show.html.haml
 - app/views/cmor/files/folders/index.html.haml
@@ -429,6 +430,8 @@ files:
 - lib/generators/cmor/files/install/templates/initializer.rb
 - lib/generators/cmor/files/install/templates/routes.source
 - lib/tasks/cmor_files_tasks.rake
+- spec/factories/cmor_files_file_details.rb
+- spec/factories/cmor_files_folders.rb
 - spec/files/cmor/files/file_details/example.png
 homepage: https://github.com/content-management-on-rails
 licenses:
@@ -449,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Cmor Files Module.