refinerycms-resources 4.0.3 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 541475b2762e29b98bed166abf3deaf928185554f3eab6e9d3df36978c3175d0
-  data.tar.gz: f60700c0fd97507a48bbfd768f999da97b6072d403041b12051d5a1a8c36c54c
+  metadata.gz: a15e938be73aa108af03594c3bcb68b6f721eba9318fd1d44efa37a67446e3ab
+  data.tar.gz: 8095ff93237239effda4fd3de0d298f01dca2d32a382068a889c3a86050b0c05
 SHA512:
-  metadata.gz: 0ea2919ec5fdb1657d80126ef6a1340c55569c4de4e6aa92ba5cb1c23ec1df8b3bd94140b7ca96cb9671ebd9d31fbff73e19628369b97500e920a91a61382367
-  data.tar.gz: e40dfae8d11a177511f9045850156eb42341272e7cbd6e796aa8b34ef5935bfb527e8e94b3eb7217ee2ae74b5a9082450d6a72676b8073d8ddbd407be3240fbe
+  metadata.gz: bb84a2c3f1d6232edce4a6af69d71fd776bf13f3fdbd26939166fe7b9ba720cfe67dc20364fc12ff32726e9d6e60ed4ef4d06540ec79ef5b9c0afc96607d7da3
+  data.tar.gz: e9b084f83aa1000f58f042994890021fede450dc4e72962f2de71ec37fe190e20090b60bf998740338180bb11a1d6b0bbba1fdcfd695f750c48d305f9c5b2db1

data/app/controllers/refinery/admin/resources_controller.rb

@@ -1,9 +1,11 @@
 module Refinery
   module Admin
     class ResourcesController < ::Refinery::AdminController
+      helper Refinery::Admin::ResourceHelper
 
       crudify :'refinery/resource',
               include: [:translations],
+              exclude_from_find: :show,
               order: "updated_at DESC",
               sortable: false
 
@@ -44,8 +46,7 @@ module Refinery
 
       def insert
         self.new if @resource.nil?
-
-        @url_override = refinery.admin_resources_path(request.query_parameters.merge(:insert => true))
+        @url_override = refinery.admin_resources_path(request.query_parameters.merge(insert: true))
 
         if params[:conditions].present?
           extra_condition = params[:conditions].split(',')
@@ -53,11 +54,20 @@ module Refinery
           extra_condition[1] = true if extra_condition[1] == "true"
           extra_condition[1] = false if extra_condition[1] == "false"
           extra_condition[1] = nil if extra_condition[1] == "nil"
-          paginate_resources({extra_condition[0] => extra_condition[1]})
+        end
+
+        find_all_resources(({extra_condition[0] => extra_condition[1]} if extra_condition.present?))
+        search_all_resources if searching?
+
+        paginate_resources
+
+        @resource_area_selected = from_dialog?
+
+        if params[:visual_editor]
+          render '/refinery/admin/pages_dialogs/link_to'
         else
-          paginate_resources
+          render 'insert'
         end
-        render 'insert'
       end
 
       protected
@@ -77,10 +87,8 @@ module Refinery
         super unless action_name == 'insert'
       end
 
-      def paginate_resources(conditions = {})
-        @resources = Resource.where(conditions).
-                              paginate(:page => params[:page], :per_page => Resource.per_page(from_dialog?)).
-                              order('created_at DESC')
+      def paginate_resources
+        @resources = @resources.paginate(page: params[:page], per_page: Resource.per_page(from_dialog?))
       end
 
       def resource_params

data/app/helpers/refinery/admin/resource_helper.rb

@@ -0,0 +1,10 @@
+module Refinery
+  module Admin
+    module ResourceHelper
+
+      def resource_meta_information(resource)
+        tag.span number_to_human_size(resource.size), class: [:label, :meta]
+      end
+    end
+  end
+end

data/app/models/refinery/resource.rb

@@ -1,21 +1,26 @@
+# frozen_string_literal: true
+
 require 'dragonfly'
 
 module Refinery
   class Resource < Refinery::Core::BaseModel
     include Resources::Validators
 
+    extend Mobility
     translates :resource_title
 
-    attribute :resource_title
-
-    dragonfly_accessor :file, :app => :refinery_resources
+    dragonfly_accessor :file, app: :refinery_resources
 
-    validates :file, :presence => true
+    validates :file, presence: true
     validates_with FileSizeValidator
+    validates_property :mime_type,
+                       of: :file,
+                       in: ::Refinery::Resources.whitelisted_mime_types,
+                       message: :incorrect_format
 
-    delegate :ext, :size, :mime_type, :url, :to => :file
+    delegate :ext, :size, :mime_type, :url, to: :file
 
-    before_destroy :cached_mime_type, :prepend => true
+    before_destroy :cached_mime_type, prepend: true
 
     def cached_mime_type
       @cached_mime_type ||= mime_type
@@ -23,18 +28,18 @@ module Refinery
 
     # used for searching
     def type_of_content
-      cached_mime_type.split("/").join(" ")
+      cached_mime_type.split('/').join(' ')
     end
 
     # Returns a titleized version of the filename
     # my_file.pdf returns My File
     def title
-      resource_title.presence || CGI::unescape(file_name.to_s).gsub(/\.\w+$/, '').titleize
+      resource_title.presence || CGI.unescape(file_name.to_s).gsub(/\.\w+$/, '').titleize
     end
 
     def update_index
-      return if self.aai_config.disable_auto_indexing
-      copy = self.dup.tap{ |r| r.file_uid = r.file_uid_was}
+      return if aai_config.disable_auto_indexing
+      copy = dup.tap { |r| r.file_uid = r.file_uid_was }
       self.class.index_remove(copy)
       self.class.index_add(self)
     end
@@ -48,9 +53,9 @@ module Refinery
       def create_resources(params)
         resources = []
 
-        if params.present? and params[:file].is_a?(Array)
+        if params.present? && params[:file].is_a?(Array)
           params[:file].each do |resource|
-            resources << create({:file => resource}.merge(params.except(:file).to_h))
+            resources << create({ file: resource }.merge(params.except(:file).to_h))
           end
         else
           resources << create(params)

data/app/views/refinery/admin/resources/_existing_resource.html.erb

@@ -1,20 +1,27 @@
 <div id="existing_resource_area" class="dialog_area" <%= 'style="display:none;"'.html_safe if @resource.errors.any? %>>
+  <%= render '/refinery/admin/search', url: refinery.insert_admin_resources_path(params.to_unsafe_h.dup.except('resource')) %>
+
   <input type="hidden" name="linked_resource" id="linked_resource" />
+
   <div id="existing_resource_area_content" class="clearfix">
-    <div id="pages_list" class="pages_list">
-      <ul class="link_list">
-        <% @resources.each do |resource| -%>
-          <% resource_linked = ((@resource_id.present? && @resource_id == resource.id) || (params[:current_link].present? && resource.url == params[:current_link])) %>
-          <li<%= ' class="linked"'.html_safe if resource_linked %>>
-            <%= link_to "#{resource.title} (#{resource.file_name})", path_to_asset(resource.url),
-                        :title => t('.link_to_file'),
-                        :rel => resource.title,
-                        :class => 'page_link',
-                        :id => "resource_#{resource.id}" %>
-          </li>
-        <% end %>
-      </ul>
-    </div>
+    <% if @resources.any? %>
+      <div id="pages_list" class="pages_list">
+        <ul class="link_list">
+          <% @resources.each do |resource| -%>
+            <% resource_linked = ((@resource_id.present? && @resource_id == resource.id) || (params[:current_link].present? && resource.url == params[:current_link])) %>
+            <li<%= ' class="linked"'.html_safe if resource_linked %>>
+              <%= link_to "#{resource.title} (#{resource.file_name})", path_to_asset(resource.url),
+                          :title => t('.link_to_file'),
+                          :rel => resource.title,
+                          :class => 'page_link',
+                          :id => "resource_#{resource.id}" %>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+    <% elsif searching? %>
+      <%= t('no_results', scope: 'refinery.admin.search') %>
+    <% end %>
   </div>
 
   <%= will_paginate @resources, :params => params.dup.merge(:action => "insert") %>

data/app/views/refinery/admin/resources/_form.html.erb

@@ -6,7 +6,7 @@
              :object => @resource,
              :include_object_name => false %>
 
-  <%= render '/refinery/admin/locale_picker', :current_locale => Globalize.locale if @resource.persisted? %>
+  <%= render '/refinery/admin/locale_picker', :current_locale => Mobility.locale if @resource.persisted? %>
 
   <div class="field" id="file">
     <span class='label_with_help'>
@@ -57,4 +57,4 @@
       link_dialog.init();
     });
   </script>
-<% end if from_dialog? %>
+<% end if from_dialog? %>

data/app/views/refinery/admin/resources/_resource.html.erb

@@ -1,33 +1,15 @@
 <%
+  # setup params for various action links
   edit_url =    refinery.edit_admin_resource_path(resource)
   delete_url =  refinery.admin_resource_path(resource)
-  delete_options = {data: {confirm: t('message',  scope: 'refinery.admin.delete', title: resource.title)}}
+  delete_options = {data: {confirm: t('message',  scope: 'refinery.admin.delete', title: translated_field(resource, :title))}}
+  translated_locales = locales_with_translated_field(resource, 'resource_title')
 %>
-<li class="clearfix record <%= cycle('on', 'on-hover') %>">
-
-  <span class="title <%= resource.ext.try(:downcase) %>">
-    <%= translated_field(resource, :title) %>
-  </span>
-
-  <% if Refinery::I18n.frontend_locales.many? %>
-    <span class='locales'>
-      <% resource.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
-        <% if translation.resource_title.present? %>
-          <%= link_to refinery.edit_admin_resource_path(resource, switch_locale: translation.locale),
-                      class: 'locale', title: translation.locale.upcase do %>
-
-            <div class="<%=translation.locale %> locale_marker">
-              <%= locale_text_icon(translation.locale.upcase) %>
-            </div>
-          <% end %>
-        <% end %>
-      <% end %>
-    </span>
-  <% end %>
-
-  <span class="preview">
-    <%= resource.file_name %> - <%= number_to_human_size(resource.size) %>
-  </span>
+<li class="record resource item <%= cycle('on', 'on-hover') %>">
+  <%= mime_type_icon(resource.mime_type) %>
+  <%= link_to translated_field(resource, :title), edit_url, class: [:title, :edit] %>
+  <%= resource_meta_information resource %>
+  <%= edit_in_locales(edit_url, translated_locales) %>
 
   <span class="actions">
     <%= action_icon :download,  resource.url, t('.download', size: number_to_human_size(resource.size)) %>

data/app/views/refinery/admin/resources/_resources.html.erb

@@ -1,7 +1,7 @@
 <%= will_paginate @resources if Refinery::Admin::ResourcesController.pageable? %>
 <div class="<%= ['clearfix', 'pagination_frame', pagination_css_class].compact.join(' ') %>">
-  <% group_by_date(@resources).each do |container|
-       date = Date.parse((resource_group = container.last).first.created_at.to_s) %>
+  <% group_by_date(@resources, :updated_at).each do |container|
+       date = Date.parse((resource_group = container.last).first.updated_at.to_s) %>
     <h3><%= l(date, :format => :long ) %></h3>
     <ul>
       <%= render :partial => 'resource', :collection => resource_group %>

data/config/locales/en.yml

@@ -36,4 +36,6 @@ en:
       models:
         refinery/resource:
           blank: You must specify file for upload
-          too_big: File should be smaller than %{size} bytes in size
+          incorrect_format: "File type is not allowed. Your file must be a MP4, MPEG, WMV, AVI, WAV,
+          GIF, JPEG, PNG, SVG, TIFF, PSD, CSV, PDF, TXT, RAR, ZIP, XLS, PPT or a DOC"
+          too_big: File should be smaller than %{size} bytes in size

data/config/locales/fr.yml

@@ -36,4 +36,6 @@ fr:
       models:
         refinery/resource:
           blank: Vous devez spécifier un fichier à télécharger
-          too_big: Le poids maximal des fichiers est de %{size} megaoctets
+          incorrect_format: "Type de fichier non autorisé. Votre fichier doit être un MP4, MPEG, WMV, AVI, WAV,
+          GIF, JPEG, PNG, SVG, TIFF, PSD, CSV, PDF, TXT, RAR, ZIP, XLS, PPT ou un DOC"
+          too_big: Le poids maximal des fichiers est de %{size} megaoctets

data/config/locales/sk.yml

@@ -13,6 +13,9 @@ sk:
           or: alebo
           replace: " nahradiť týmto..."
           maximum_file_size: Maximálna veľkosť súboru je %{bytes}.
+          resource_file: Súbor
+          resource_title: Názov
+          resource_title_help: Názov zobrazený návštevníkom stránky
         resource:
           download: Stiahnuť súbor (%{size})
         actions:
@@ -33,4 +36,6 @@ sk:
       models:
         refinery/resource:
           blank: Musíte vybrať súbor pre nahranie.
+          incorrect_format: "Typ súboru nie je povolený. Váš súbor musí byť typu MP4, MPEG, WMV, AVI, WAV,
+                GIF, JPEG, PNG, SVG, TIFF, PSD, CSV, PDF, TXT, RAR, ZIP, XLS, PPT alebo DOC"
           too_big: Maximálna veľkosť súboru je %{size} MB.

data/db/migrate/20150430180959_add_translated_title_to_refinery_resources.rb

@@ -1,11 +1,17 @@
 class AddTranslatedTitleToRefineryResources < ActiveRecord::Migration[4.2]
-  def self.up
-    Refinery::Resource.create_translation_table!({
-      resource_title: :string
-    })
-  end
+  def change
+    create_table :refinery_resource_translations do |t|
+
+      # Translated attribute(s)
+      t.string :resource_title
+
+      t.string  :locale, null: false
+      t.integer :refinery_resource_id, null: false
+
+      t.timestamps null: false
+    end
 
-  def self.down
-    Refinery::Resource.drop_translation_table!
+    add_index :refinery_resource_translations, :locale, name: :index_refinery_resource_translations_on_locale
+    add_index :refinery_resource_translations, [:refinery_resource_id, :locale], name: :index_35a57b749803d8437ea64c64da3fb2cb0fbf457a, unique: true
   end
 end

data/lib/generators/refinery/resources/templates/config/initializers/refinery/resources.rb.erb

@@ -9,6 +9,9 @@ Refinery::Resources.configure do |config|
   # Configure how many resources per page should be displayed in the list of resources in the admin area
   # config.pages_per_admin_index = <%= Refinery::Resources.pages_per_admin_index.inspect %>
 
+  # Configure allowed mime types for validation
+  # config.whitelisted_mime_types = <%= Refinery::Resources.whitelisted_mime_types.inspect %>
+
   # Configure Dragonfly.
   # Refer to config/initializers/refinery/dragonfly.rb for the full list of dragonfly configurations which can be used.
   # This includes all dragonfly config for Dragonfly v 1.1.1

data/lib/refinery/resources/configuration.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Refinery
   module Resources
-
     extend Refinery::Dragonfly::ExtensionConfiguration
     include ActiveSupport::Configurable
 
-    config_accessor :max_file_size, :pages_per_dialog, :pages_per_admin_index, :content_disposition
+    config_accessor :max_file_size, :pages_per_dialog, :pages_per_admin_index,
+                    :content_disposition, :whitelisted_mime_types
 
     self.content_disposition = :attachment
     self.max_file_size = 52_428_800
@@ -13,6 +15,40 @@ module Refinery
 
     self.dragonfly_name = :refinery_resources
 
-  end
-end
+    self.whitelisted_mime_types = %w[
+      audio/mp4
+      audio/mpeg
+      audio/wav
+      audio/x-wav
+
+      image/gif
+      image/jpeg
+      image/png
+      image/svg+xml
+      image/tiff
+      image/x-psd
+
+      video/mp4
+      video/mpeg
+      video/quicktime
+      video/x-msvideo
+      video/x-ms-wmv
 
+      text/csv
+      text/plain
+
+      application/pdf
+      application/rtf
+      application/x-rar
+      application/zip
+
+      application/vnd.ms-excel
+      application/vnd.ms-powerpoint
+      application/vnd.msword
+
+      application/vnd.openxmlformats-officedocument.presentationml.presentation
+      application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+      application/vnd.openxmlformats-officedocument.wordprocessingml.document
+    ]
+  end
+end

data/lib/refinery/resources/validators/file_size_validator.rb

@@ -7,12 +7,11 @@ module Refinery
           file = record.file
 
           if file.respond_to?(:length) && file.length > Resources.max_file_size
-            record.errors[:file] << ::I18n.t('too_big',
-                                             :scope => 'activerecord.errors.models.refinery/resource',
-                                             :size => Resources.max_file_size)
+            record.errors.add :file, ::I18n.t('too_big',
+                                              scope: 'activerecord.errors.models.refinery/resource',
+                                              size: Resources.max_file_size)
           end
         end
-
       end
     end
   end

data/lib/refinery/resources.rb

@@ -1,5 +1,5 @@
-require 'refinerycms-core'
-require 'refinerycms-dragonfly'
+require 'refinerycms/core'
+require 'refinerycms/dragonfly'
 
 module Refinery
   autoload :ResourcesGenerator, 'generators/refinery/resources/resources_generator'
@@ -24,5 +24,5 @@ module Refinery
 end
 
 ActiveSupport.on_load(:active_record) do
-  require 'globalize'
+  require 'mobility'
 end

data/lib/refinerycms/resources.rb

@@ -0,0 +1 @@
+require_relative '../refinery/resources'

data/refinerycms-resources.gemspec

@@ -1,35 +1,26 @@
-# Encoding: UTF-8
-require File.expand_path('../../core/lib/refinery/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('../core/lib/refinery/version', __dir__)
 
 version = Refinery::Version.to_s
 
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
-  s.name              = %q{refinerycms-resources}
+  s.name              = 'refinerycms-resources'
   s.version           = version
-  s.summary           = %q{Resources extension for Refinery CMS}
-  s.description       = %q{Handles all file upload and processing functionality in Refinery CMS.}
-  s.email             = %q{refinerycms@p.arndt.io}
-  s.homepage          = %q{https://www.refinerycms.com}
-  s.rubyforge_project = %q{refinerycms}
-  s.authors           = ['Philip Arndt', 'Uģis Ozols', 'Rob Yurkowski']
-  s.license           = %q{MIT}
-  s.require_paths     = %w(lib)
+  s.summary           = 'Resources extension for Refinery CMS'
+  s.description       = 'Handles all file upload and processing functionality in Refinery CMS.'
+  s.email             = 'gems@p.arndt.io'
+  s.homepage          = 'https://www.refinerycms.com'
+  s.authors           = ['Philip Arndt', 'David Jones', 'Uģis Ozols', 'Brice Sanchez']
+  s.license           = 'MIT'
+  s.require_paths     = %w[lib]
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency 'acts_as_indexed',         '~> 0.8.0'
-  s.add_dependency 'dragonfly',               '~> 1.1', '>= 1.1.0'
-  s.add_dependency 'globalize',               ['>= 5.1.0.beta1', '< 5.2']
-  s.add_dependency 'activemodel-serializers-xml', '~> 1.0', '>= 1.0.1'
-  s.add_dependency 'refinerycms-core',        version
-  s.add_dependency 'refinerycms-dragonfly',   '~> 1.0'
+  s.add_dependency 'refinerycms-core', version
+  s.add_dependency 'refinerycms-dragonfly', '~> 1.0'
 
   s.required_ruby_version = Refinery::Version.required_ruby_version
-
-  s.cert_chain  = [File.expand_path("../../certs/parndt.pem", __FILE__)]
-  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
-    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
-  end
 end

data/spec/factories/resource.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
-  factory :resource, :class => Refinery::Resource do
-    file Refinery.roots('refinery/resources').join("spec/fixtures/refinery_is_awesome.txt")
+  factory :resource, class: Refinery::Resource do
+    file { Refinery.roots('refinery/resources').join('spec/fixtures/cape-town-tide-table.pdf') }
   end
 end

data/spec/fixtures/refinery_is_secure.html

@@ -0,0 +1 @@
+https://www.refinerycms.com/

data/spec/lib/refinery/resources/engine_spec.rb

@@ -4,5 +4,17 @@ module Refinery
   describe Resources do
     it_has_behaviour 'Creates a dragonfly App:'
     it_has_behaviour 'adds the dragonfly app to the middleware stack'
+
+    it 'calls dragonfly#before_serve to set configuration' do
+      dummy_proc = -> (_job, _env) {}
+      expect_any_instance_of(::Dragonfly::Server).to(
+        receive(:before_serve) { |&block| expect(block).to be(dummy_proc) }
+      )
+      ::Refinery::Resources.configure do |config|
+        config.dragonfly_before_serve = dummy_proc
+      end
+
+      ::Refinery::Dragonfly.configure!(::Refinery::Resources)
+    end
   end
 end