udongo 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7758e4a1bfb4e24e8b4ff54ba00225802be713
-  data.tar.gz: 2c45f1de07eac96c9127c5bfb0c338bec8754f51
+  metadata.gz: e6a22b011bc3569827aedbcdd99d353e735fae6e
+  data.tar.gz: 3202da4e9d86005256c04c4826bc9b0b3eaede7b
 SHA512:
-  metadata.gz: 3f2a7cbd3e48e5a773ed2bfe24ccbcc0eeb10ae6570b32bea19381875e30ebb710bbd4761cd6063aeee7ff41912dc52923a057ea6986f33ae48dff0771985d59
-  data.tar.gz: 7291bf66476a79eba40459c33e5234ed20679f9c37177d0f1e6ed22ad061edce684c3730b7f2a396f7008037b676a0af08d616394023edf69fd0729d65487781
+  metadata.gz: 0a90d20c8888527092dea454829c2f04cf507f7af964d1d747b3fa10e4473b5dd1753d2051295d7a6ed727d868f5f72a1ce8571f16425b3f1ae1731aa5728792
+  data.tar.gz: ce3492185bef64ce7b2ccc6786a41089560ac1555a0814ff7ae26c5ba4e92941d15b7f278639652c9b3a9fcc187677d3224a06796c3b8b9a5ec02a7ced5bb802

data/app/assets/javascripts/backend/application.js

@@ -10,7 +10,7 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
+//= require jquery3
 //= require jquery_ujs
 //= require jquery-ui/autocomplete
 //= require jquery-ui.autocomplete.html.js

data/app/controllers/backend/assets_controller.rb

@@ -0,0 +1,52 @@
+class Backend::AssetsController < Backend::BaseController
+  include Concerns::PaginationController
+
+  before_action :find_model, only: [:show, :edit, :update, :destroy]
+  before_action -> { breadcrumb.add t('b.files'), backend_assets_path }
+
+  def index
+    @search = Asset.ransack params[:q]
+    @assets = @search.result(distinct: true).order('id DESC').page(page_number).per_page(per_page)
+  end
+
+  def show
+    redirect_to @model.filename.url
+  end
+
+  def new
+    @model = Asset.new
+  end
+
+  def create
+    @model = Asset.new allowed_params
+
+    if @model.save
+      redirect_to backend_assets_path, notice: translate_notice(:added, :file)
+    else
+      render :new
+    end
+  end
+
+  def update
+    if @model.update_attributes allowed_params
+      redirect_to backend_assets_path, notice: translate_notice(:edited, :file)
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @model.destroy if @model.deletable?
+    redirect_to backend_assets_path, notice: translate_notice(:deleted, :file)
+  end
+
+  private
+
+  def find_model
+    @model = Asset.find params[:id]
+  end
+
+  def allowed_params
+    params[:asset].permit(:filename, :description)
+  end
+end

data/app/models/asset.rb

@@ -0,0 +1,37 @@
+class Asset < ApplicationRecord
+  include Concerns::Taggable
+
+  mount_uploader :filename, AssetUploader
+
+  has_many :images, dependent: :destroy
+
+  before_save :update_filesize, :update_content_type
+
+  validates :filename, presence: true
+
+  def image?
+    content_type.to_s.include?('image')
+  end
+
+  def image
+    AssetImage.new(self) if image?
+  end
+
+  def actual_filename
+    read_attribute(:filename)
+  end
+
+  def deletable?
+    images.empty?
+  end
+
+  private
+
+  def update_filesize
+    self.filesize = filename.size
+  end
+
+  def update_content_type
+    self.content_type = filename.content_type
+  end
+end

data/app/models/asset_image.rb

@@ -0,0 +1,172 @@
+require 'mini_magick'
+require 'fileutils'
+
+class AssetImage
+  def initialize(asset)
+    @asset = asset
+  end
+
+  def filename(width = nil, height = nil, options = {})
+    options[:action] = :resize_to_limit unless options.key?(:action)
+
+    str = options[:action].to_s.split('_').last
+
+    if options[:quality]
+      str << '-q' + options[:quality].to_s
+    end
+
+    if options[:gravity]
+      str << '-g' + options[:gravity].to_s.underscore.split('_').map { |s| s[0,1] }.join
+    end
+
+    if options[:background]
+      str << '-b' + options[:background].to_s.parameterize
+    end
+
+    str << "-#{width}x#{height}-#{@asset.actual_filename}"
+  end
+
+  def url(width = nil, height = nil, options = {})
+    options[:action] = :resize_to_limit unless options.key?(:action)
+
+    if width.nil? && height.nil?
+      return "/uploads/assets/#{main_dir}/#{second_dir}/#{@asset.actual_filename}"
+    end
+
+    name = filename(width, height, options)
+
+    unless File.exists?(actual_path(name))
+      FileUtils.mkpath(File.dirname(actual_path(name)))
+
+      case options[:action].to_sym
+        when :resize_to_limit then resize_to_limit(width, height, options)
+        when :resize_to_fit then resize_to_fit(width, height, options)
+        when :resize_to_fill then resize_to_fill(width, height, options)
+        when :resize_and_pad then resize_and_pad(width, height, options)
+        else
+          raise "No such resize action '#{options[:action].to_s}'. Available are: resize_to_limit, resize_to_fit, resize_to_fill and resize_and_pad."
+      end
+    end
+
+    actual_url(name)
+  end
+
+  def actual_url(calculated_filename)
+    "/uploads/assets/_cache/#{main_dir}/#{second_dir}/#{calculated_filename}"
+  end
+
+  def path(width = nil, height = nil, options = {})
+    url(width, height, options) # Trigger the actual resize
+    actual_path(filename(width, height, options))
+  end
+
+  def actual_path(calculated_filename)
+    "#{Rails.root}/public/uploads/assets/_cache/#{main_dir}/#{second_dir}/#{calculated_filename}"
+  end
+
+  private
+
+  # Resize the image to fit within the specified dimensions while retaining
+  # the original aspect ratio. Will only resize the image if it is larger than the
+  # specified dimensions. The resulting image may be shorter or narrower than specified
+  # in the smaller dimension but will not be larger than the specified values.
+  #
+  def resize_to_limit(width, height, options = {})
+    img = MiniMagick::Image.open(@asset.filename.path)
+    img.combine_options do |c|
+      c.quality options[:quality] if options[:quality]
+      c.resize "#{width}x#{height}>"
+    end
+
+    img.write(actual_path(filename(width, height, options)))
+  end
+
+  # Resize the image to fit within the specified dimensions while retaining
+  # the original aspect ratio. The image may be shorter or narrower than
+  # specified in the smaller dimension but will not be larger than the specified values.
+  #
+  def resize_to_fit(width, height, options = {})
+    img = MiniMagick::Image.open(@asset.filename.path)
+    img.combine_options do |c|
+      c.quality options[:quality] if options[:quality]
+      c.resize "#{width}x#{height}"
+    end
+
+    img.write(actual_path(filename(width, height, options)))
+  end
+
+  # Resize the image to fit within the specified dimensions while retaining
+  # the aspect ratio of the original image. If necessary, crop the image in the
+  # larger dimension.
+  #
+  # Possible values for options[:gravity] are:
+  # NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast
+  #
+  def resize_to_fill(width, height, options = {})
+    gravity = options.key?(:gravity) ? options[:gravity] : 'Center'
+
+    img = MiniMagick::Image.open(@asset.filename.path)
+    cols, rows = img[:dimensions]
+
+    img.combine_options do |cmd|
+      if width != cols || height != rows
+        scale_x = width/cols.to_f
+        scale_y = height/rows.to_f
+
+        if scale_x >= scale_y
+          cols = (scale_x * (cols + 0.5)).round
+          rows = (scale_x * (rows + 0.5)).round
+          cmd.resize "#{cols}"
+        else
+          cols = (scale_y * (cols + 0.5)).round
+          rows = (scale_y * (rows + 0.5)).round
+          cmd.resize "x#{rows}"
+        end
+      end
+
+      cmd.quality options[:quality] if options.key?(:quality)
+      cmd.gravity gravity
+      cmd.background 'rgba(255,255,255,0.0)'
+      cmd.extent "#{width}x#{height}" if cols != width || rows != height
+    end
+
+    img.write(actual_path(filename(width, height, options)))
+  end
+
+  # Resize the image to fit within the specified dimensions while retaining
+  # the original aspect ratio. If necessary, will pad the remaining area
+  # with the given color, which defaults to transparent (for gif and png,
+  # white for jpeg).
+  #
+  # Possible values for options[:gravity] are:
+  # NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast
+  #
+  def resize_and_pad(width, height, options = {})
+    gravity = options.key?(:gravity) ? options[:gravity] : 'Center'
+    background = options.key?(:background) ? options[:background] : :transparant
+
+    img = MiniMagick::Image.open(@asset.filename.path)
+    img.combine_options do |cmd|
+      cmd.thumbnail "#{width}x#{height}>"
+
+      if background.to_sym == :transparent
+        cmd.background 'rgba(255, 255, 255, 0.0)'
+      else
+        cmd.background background
+      end
+
+      cmd.gravity gravity
+      cmd.extent "#{width}x#{height}"
+    end
+
+    img.write(actual_path(filename(width, height, options)))
+  end
+
+  def main_dir
+    @main_dir ||= Digest::MD5.hexdigest(@asset.id.to_s)[0,2]
+  end
+
+  def second_dir
+    @second_dir ||= Digest::MD5.hexdigest(@asset.id.to_s)[2,2]
+  end
+end

data/app/models/concerns/imageable.rb

@@ -0,0 +1,13 @@
+module Concerns
+  module Imageable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :images, as: :imageable
+    end
+
+    def imageable?
+      true
+    end
+  end
+end

data/app/models/image.rb

@@ -0,0 +1,11 @@
+class Image < ApplicationRecord
+  include Concerns::Visible
+
+  include Concerns::Sortable
+  sortable scope: [:asset_id]
+
+  belongs_to :asset
+  belongs_to :imageable, polymorphic: true
+
+  validates :asset, presence: true
+end

data/app/uploaders/asset_uploader.rb

@@ -0,0 +1,36 @@
+class AssetUploader < CarrierWave::Uploader::Base
+  include CarrierWave::RMagick
+
+  storage :file
+
+  def filename
+    @name ||= "#{secure_token}.#{file.extension.downcase}" if original_filename
+  end
+
+  private
+
+  def extension_white_list
+    if model.image?
+      Udongo.config.assets.image_white_list
+    else
+      (Udongo.config.assets.image_white_list + Udongo.config.assets.file_white_list).flatten
+    end
+  end
+
+  def secure_token
+    ivar = "@#{mounted_as}_secure_token"
+    token = model.instance_variable_get(ivar)
+    token ||= model.instance_variable_set(ivar, SecureRandom.hex(4))
+  end
+
+  def store_dir
+    md5 = Digest::MD5.hexdigest(model.id.to_s)
+    "uploads/assets/#{md5[0,2]}/#{md5[2,2]}"
+  end
+
+  def image?(new_file)
+    new_file.content_type.include? 'image'
+  end
+
+  process resize_to_limit: [2560, 2560], if: :image?
+end

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

@@ -0,0 +1,17 @@
+<div class="card filter">
+  <div class="card-block">
+    <%= search_form_for [:backend, @search] do |f| %>
+      <div class="row">
+        <div class="col-md-6 form-group">
+          <%= f.search_field :description_cont, placeholder: t('b.description'), class: 'form-control' %>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-6">
+          <%= f.submit class: 'btn btn-primary btn-sm' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,28 @@
+<%= render 'backend/general_form_error', object: @model %>
+
+<%= simple_form_for [:backend, @model] do |f| %>
+  <div class="row">
+    <div class="col-md-6">
+      <div class="card">
+        <div class="card-header">
+          <%= t 'b.general' %>
+        </div>
+
+        <div class="card-block">
+          <%= f.input :filename, as: :file, label: false, required: @model.new_record? %>
+          <%= f.input :description, as: :string %>
+        </div>
+      </div>
+    </div>
+
+    <% unless @model.new_record? %>
+      <div class="col-md-6">
+        <!-- Tags -->
+        <%= render 'backend/tags', model: @model, locale: Udongo.config.i18n.app.default_locale %>
+      </div>
+    <% end %>
+  </div>
+
+
+  <%= render 'backend/form_actions', cancel_url: backend_assets_path %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% breadcrumb.add truncate(@model.description, length: 20), edit_backend_snippet_path(@model) %>
+<% breadcrumb.add t('b.edit') %>
+<%= render 'backend/breadcrumbs' %>
+
+<%= render 'form' %>

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

@@ -0,0 +1,48 @@
+<%= render 'backend/breadcrumbs' %>
+<%= render 'filter' %>
+
+<p class="text-xs-right">
+  <%= link_to icon(:plus, t('b.add')), new_backend_asset_path, class: 'btn btn-primary btn-sm' %>
+</p>
+
+<% if @assets.any? %>
+  <table class="table table-striped table-hover">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.file' %></th>
+        <th><%= t 'g.type' %></th>
+        <th><%= t 'b.size' %></th>
+        <th><%= t 'b.description' %></th>
+        <th><%= t 'b.last_changed_at' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @assets.each do |a| %>
+        <tr>
+          <td>
+            <% if a.image? %>
+              <%= image_tag a.image.url(150, 150), alt: '', class: 'img-fluid' %>
+            <% else %>
+              <%= link_to icon(:download, t('b.download')), a.filename.url %>
+            <% end %>
+          </td>
+          <td><%= a.actual_filename.split('.').last.upcase %></td>
+          <td><%= number_to_human_size a.filesize %></td>
+          <td><%= simple_format a.description %></td>
+          <td><%= l a.updated_at %></td>
+          <td class="text-xs-right">
+            <%= link_to_edit [:backend, a] %>
+            <%= link_to_delete [:backend, a] if a.deletable? %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <%= udongo_paginate @assets %>
+
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>