udongo 7.5.1 → 7.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4177132fc9f3839266578b24b8bc6fbf4e089668
-  data.tar.gz: c162d73c7d75c2548d75e5f4ea373717427300d9
+  metadata.gz: 2e20d783baae057351c563f2514db5462a72d8c0
+  data.tar.gz: 940bd8b8561b52694055008c8c05439ed0c9133a
 SHA512:
-  metadata.gz: 63a75acceeae182eed74dd8179808ab06eceb45a2087a5efc225688200bba608ff7d6a9e155e5197f2b6880799511133b67210e57000433c710c6c673527008e
-  data.tar.gz: e5ac2f9ccaad7c46a2409cbb57de43eb555c6748bb86806b4709b1e99149bb6e386485edfc3dc2703c37f799011ec00960d6306d9ad39a7e14fbb758e21fb9de
+  metadata.gz: c17c2da16a1c5aa122a21960dfe71ab5f5835942017022dbb5ed2d92cc57d2bdf920141c71347566c59fce9c04f006bf8eafef212c5cc9eb69812d2e25880f43
+  data.tar.gz: 37adb92ec5869a8c74b78384e3b66d748805309fd9d1cd319bb0796145c1fed9f198a82d1d899e69fd558f8901b13cff29bb267d6170eb6593b1fca2a56bc7ee

data/app/controllers/backend/assets_controller.rb

@@ -10,7 +10,11 @@ class Backend::AssetsController < Backend::BaseController
   end
 
   def show
-    redirect_to @model.filename.url
+    send_data(
+      File.open(@model.filename.path).read,
+      filename: @model.read_attribute(:filename),
+      type: @model.content_type
+    )
   end
 
   def new

data/app/models/asset.rb

@@ -5,6 +5,7 @@ class Asset < ApplicationRecord
 
   has_many :images, dependent: :destroy
   has_many :content_pictures, dependent: :destroy
+  has_many :attachments, dependent: :destroy
 
   scope :image, -> { where(content_type: %w(image/gif image/jpeg image/png)) }
 
@@ -25,7 +26,7 @@ class Asset < ApplicationRecord
   end
 
   def deletable?
-    images.empty? && content_pictures.empty?
+    images.empty? && content_pictures.empty? && attachments.empty?
   end
 
   private

data/app/models/attachment.rb

@@ -0,0 +1,7 @@
+class Attachment < ApplicationRecord
+  include Concerns::Sortable
+  include Concerns::Visible
+
+  belongs_to :asset
+  belongs_to :attachable, polymorphic: true
+end

data/app/models/concerns/attachable.rb

@@ -0,0 +1,9 @@
+module Concerns
+  module Attachable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :attachments, as: :attachable, dependent: :destroy
+    end
+  end
+end

data/app/views/backend/assets/_asset_usages.html.erb

@@ -1,4 +1,4 @@
-<% count = asset.images.count + asset.content_pictures.count %>
+<% count = asset.images.count + asset.content_pictures.count + asset.attachments.count %>
 <% lbl = "#{t(true.to_s)} (#{count})" %>
 <%= link_to icon(:search, lbl), '#', data: { toggle: 'modal', target: "#asset-usages-#{asset.id}" }%>
 
@@ -26,6 +26,13 @@
               <%= link_to_edit_with_label [:backend, picture.parent], default_app_locale %>
             </li>
           <% end %>
+
+          <% asset.attachments.each do |attachment| %>
+            <li>
+              <%= t "b.#{attachment.attachable.class.name.underscore}" %> &gt;
+              <%= link_to_edit_with_label [:backend, attachment.attachable], attachment.locale %>
+            </li>
+          <% end %>
         </ul>
       </div>
       <div class="modal-footer">

data/app/views/backend/assets/index.html.erb

@@ -24,9 +24,9 @@
         <tr>
           <td>
             <% if a.image? %>
-              <%= image_tag a.image.url(150, 150), alt: '', class: 'img-fluid' %>
+              <%= link_to image_tag(a.image.url(150, 150), alt: '', class: 'img-fluid'), backend_asset_path(a) %>
             <% else %>
-              <%= link_to icon(:download, t('b.download')), a.filename.url %>
+              <%= link_to icon(:download, t('b.download')), backend_asset_path(a) %>
             <% end %>
           </td>
           <td><%= a.actual_filename.split('.').last.upcase %></td>

data/changelog.md

@@ -1,3 +1,10 @@
+7.6.0 - 2018-08-22
+--
+* Add the 'Attachment' model that makes it easier to link your own models to
+  assets from the media module.
+* Make it easier to download the original file in the asset module.
+
+
 7.5.1 - 2018-07-26
 --
 * Let Udongo search ignore diacritics in search terms.

data/db/migrate/20180821135446_create_attachments.rb

@@ -0,0 +1,19 @@
+class CreateAttachments < ActiveRecord::Migration[5.0]
+  def change
+    create_table :attachments do |t|
+      t.string :attachable_type
+      t.integer :attachable_id
+      t.references :asset
+      t.integer :position
+      t.boolean :visible
+      t.string :locale
+
+      t.timestamps
+    end
+
+    add_index :attachments, [:attachable_type, :attachable_id]
+    add_index :attachments, :position
+    add_index :attachments, :visible
+    add_index :attachments, :locale
+  end
+end

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.5.1'
+  VERSION = '7.6.0'
 end

data/readme.md

@@ -267,6 +267,9 @@ u.address
 u.address(:personal)
 ```
 
+# Attachments
+There's an ```Attachment``` model that links to the assets. If an asset is linked to an attachment it can't be deleted. You can use this feature to use files linked to the asset module that can't be deleted when in use.
+
 # Queue
 ## Add tasks to the queue
 You can add tasks to the queue by executing:

data/spec/factories/attachments.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :attachment do
+    asset
+  end
+end

data/spec/support/concerns/attachable.rb

@@ -0,0 +1,10 @@
+require 'rails_helper'
+
+shared_examples_for :attachable do
+  let(:model) { described_class }
+  let(:klass) { model.to_s.underscore.to_sym }
+
+  it '#respond_to?' do
+    expect(model.new).to respond_to(:attachable)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.5.1
+  version: 7.6.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -545,12 +545,14 @@ files:
 - app/models/application_record.rb
 - app/models/article.rb
 - app/models/asset.rb
+- app/models/attachment.rb
 - app/models/ckeditor/asset.rb
 - app/models/ckeditor/attachment_file.rb
 - app/models/ckeditor/picture.rb
 - app/models/comment.rb
 - app/models/concerns/addressable.rb
 - app/models/concerns/addressable/config.rb
+- app/models/concerns/attachable.rb
 - app/models/concerns/cacheable.rb
 - app/models/concerns/commentable.rb
 - app/models/concerns/content_type.rb
@@ -873,6 +875,7 @@ files:
 - db/migrate/20180613113816_add_content_picture_bg_image_fields.rb
 - db/migrate/20180719160953_create_searches.rb
 - db/migrate/20180719164016_rename_search_to_search_terms.rb
+- db/migrate/20180821135446_create_attachments.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -925,6 +928,7 @@ files:
 - spec/factories/admins.rb
 - spec/factories/articles.rb
 - spec/factories/assets.rb
+- spec/factories/attachments.rb
 - spec/factories/comments.rb
 - spec/factories/content_columns.rb
 - spec/factories/content_forms.rb
@@ -960,6 +964,7 @@ files:
 - spec/factories/tags.rb
 - spec/factories/translation_with_seo_forms.rb
 - spec/factories/users.rb
+- spec/support/concerns/attachable.rb
 - spec/support/concerns/cacheable.rb
 - spec/support/concerns/commentable.rb
 - spec/support/concerns/content_type.rb