refinerycms-resources 2.1.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52b752937e49a6295dc68ea8646ab75b04cefdd8
-  data.tar.gz: 08388a4a7bb1c37b95d49b434760bbffc8f129e9
+  metadata.gz: ca9497cf65163418c0e30b2a708903d562a9272e
+  data.tar.gz: dc0bad5b6f5b2023eb690cb847c465b30b6ef49f
 SHA512:
-  metadata.gz: 78a7abc45c8a9103e96319cbd966d16b9799a91a66119ab849f992ad66b50783b4325fb15636ef8ef6d012ad4496af89f0cfdfc4f879c4f5ea3abe5d2d2ae7d8
-  data.tar.gz: bd1ff9b16185c35b5941e808ad4d1cb83e7827db7904693c1eb7482e3131c7094aa5838593583ba182f318cd29c4a36297adc516bac8b6d217cb68a1a25b2203
+  metadata.gz: 827a5475cb6cc2f21a4b37854a50b9cc7826ca5857e9e1cb226f675b8b681958ce2dca59f700b89f6c5643a6403c5e8f5a243ce8959472572f389a2dcde1cea0
+  data.tar.gz: 49f6f6352e102e0d982e460bfe8c0fa22bfd990c8b92c7aeac3bdb423b9ee33e39589e30cfa7402e50460e04e8ab55a74eccef557145b721ae0d1d6cb90482d3

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

@@ -3,10 +3,11 @@ module Refinery
     class ResourcesController < ::Refinery::AdminController
 
       crudify :'refinery/resource',
-              :order => "updated_at DESC",
-              :xhr_paging => true
+              include: [:translations],
+              order: "updated_at DESC",
+              sortable: false
 
-      before_filter :init_dialog
+      before_action :init_dialog
 
       def new
         @resource = Resource.new if @resource.nil?
@@ -15,28 +16,28 @@ module Refinery
       end
 
       def create
-        @resources = Resource.create_resources(params[:resource])
+        @resources = Resource.create_resources(resource_params)
         @resource = @resources.detect { |r| !r.valid? }
 
-        unless params[:insert]
+        if params[:insert]
+          if @resources.all?(&:valid?)
+            @resource_id = @resources.detect(&:persisted?).id
+            @resource = nil
+
+            self.insert
+          end
+        else
           if @resources.all?(&:valid?)
             flash.notice = t('created', :scope => 'refinery.crudify', :what => "'#{@resources.map(&:title).join("', '")}'")
             if from_dialog?
               @dialog_successful = true
-              render :nothing => true, :layout => true
+              render '/refinery/admin/dialog_success', layout: true
             else
               redirect_to refinery.admin_resources_path
             end
           else
             self.new # important for dialogs
-            render :action => 'new'
-          end
-        else
-          if @resources.all?(&:valid?)
-            @resource_id = @resources.detect(&:persisted?).id
-            @resource = nil
-
-            self.insert
+            render 'new'
           end
         end
       end
@@ -56,10 +57,10 @@ module Refinery
         else
           paginate_resources
         end
-        render :action => "insert"
+        render 'insert'
       end
 
-    protected
+      protected
 
       def init_dialog
         @app_dialog = params[:app_dialog].present?
@@ -76,12 +77,35 @@ module Refinery
         super unless action_name == 'insert'
       end
 
-      def paginate_resources(conditions={})
+      def paginate_resources(conditions = {})
         @resources = Resource.where(conditions).
                               paginate(:page => params[:page], :per_page => Resource.per_page(from_dialog?)).
                               order('created_at DESC')
       end
 
+      def resource_params
+        # update only supports a single file, create supports many.
+        if action_name == 'update'
+          params.require(:resource).permit(permitted_update_resource_params)
+        else
+          params.require(:resource).permit(permitted_resource_params)
+        end
+      end
+
+      private
+
+      def permitted_resource_params
+        [
+          :resource_title, :file => []
+        ]
+      end
+
+      def permitted_update_resource_params
+        [
+          :resource_title, :file
+        ]
+      end
+
     end
   end
 end

data/app/models/refinery/resource.rb

@@ -2,28 +2,39 @@ require 'dragonfly'
 
 module Refinery
   class Resource < Refinery::Core::BaseModel
-    ::Refinery::Resources::Dragonfly.setup!
-
     include Resources::Validators
 
-    attr_accessible :id, :file
+    translates :resource_title
 
-    resource_accessor :file
+    dragonfly_accessor :file, :app => :refinery_resources
 
     validates :file, :presence => true
     validates_with FileSizeValidator
 
     delegate :ext, :size, :mime_type, :url, :to => :file
 
+    before_destroy :cached_mime_type, :prepend => true
+
+    def cached_mime_type
+      @cached_mime_type ||= mime_type
+    end
+
     # used for searching
     def type_of_content
-      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
-      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}
+      self.class.index_remove(copy)
+      self.class.index_add(self)
     end
 
     class << self
@@ -35,12 +46,12 @@ module Refinery
       def create_resources(params)
         resources = []
 
-        unless params.present? and params[:file].is_a?(Array)
-          resources << create(params)
-        else
+        if params.present? and params[:file].is_a?(Array)
           params[:file].each do |resource|
             resources << create({:file => resource}.merge(params.except(:file)))
           end
+        else
+          resources << create(params)
         end
 
         resources

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

@@ -1,8 +1,6 @@
 <ul>
+  <li><%= render '/refinery/admin/search', :url => refinery.admin_resources_path -%></li>
   <li>
-    <%= render '/refinery/admin/search', :url => refinery.admin_resources_path %>
-  </li>
-  <li>
-    <%= link_to t('.upload_new'), refinery.new_admin_resource_path(:dialog => true), :class => "add_icon" %>
+    <%= action_label(:upload,  refinery.new_admin_resource_path(:dialog => true), t('.upload_new'))%>
   </li>
 </ul>

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

@@ -6,7 +6,7 @@
         <% @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})", asset_paths.compute_public_path(resource.url, ''),
+            <%= link_to "#{resource.title} (#{resource.file_name})", path_to_asset(resource.url),
                         :title => t('.link_to_file'),
                         :rel => resource.title,
                         :class => 'page_link',

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

@@ -6,10 +6,16 @@
              :object => @resource,
              :include_object_name => false %>
 
-  <div class="field">
+  <%= render '/refinery/admin/locale_picker', :current_locale => Globalize.locale if @resource.persisted? %>
+
+  <div class="field" id="file">
+    <span class='label_with_help'>
+      <%= f.label :file, t('.resource_file') %>
+      <%= refinery_help_tag t('.maximum_file_size', :bytes => number_to_human_size(Refinery::Resources.max_file_size)) %>
+    </span>
+
     <% if action_name =~ /(edit)|(update)/ %>
-      <%= link_to t('.download_current'), @resource.url,
-                  :title => @resource.title %>
+      <%= action_label :download, @resource.url, @resource.title, { tooltip: t('.download_current') } %>
       <em><%= t('.or')%></em><%= t('.replace') %>
       <%= f.file_field :file %>
     <% else %>
@@ -18,10 +24,12 @@
     <% end %>
   </div>
 
-  <div class="field" id="maximum_file_size">
-    <label>
-      <%= t('.maximum_file_size', :bytes => number_to_human_size(Refinery::Resources.max_file_size)) %>
-    </label>
+  <div class="field" id="title">
+    <span class='label_with_help'>
+      <%= f.label :resource_title, t('.resource_title') %>
+      <%= refinery_help_tag t('.resource_title_help') %>
+    </span>
+    <%= f.text_field :resource_title, placeholder: t('.resource_title') %>
   </div>
 
   <%= render '/refinery/admin/form_actions', :f => f,
@@ -29,7 +37,8 @@
              :hide_cancel => (@app_dialog or action_name == 'insert' or from_dialog?),
              :delete_title => t('delete', :scope => 'refinery.admin.resources'),
              :delete_confirmation => (t('message', :scope => 'refinery.admin.delete',
-                                      :title => @resource.title) if @resource.persisted?) %>
+                                      :title => @resource.title) if @resource.persisted?),
+             cancel_url: refinery.admin_resources_path -%>
 
   <% if @app_dialog -%>
     <input type="hidden" name="app_dialog" value="<%= @app_dialog %>" />
@@ -48,4 +57,4 @@
       link_dialog.init();
     });
   </script>
-<% end if from_dialog? %>
+<% end if from_dialog? %>

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

@@ -4,10 +4,10 @@
     <%= render 'resources' %>
   <% else %>
     <p>
-      <% unless searching? %>
-        <strong><%= t('.no_files_yet') %></strong>
-      <% else %>
+      <% if searching? %>
         <%= t('no_results', :scope => 'refinery.admin.search') %>
+      <% else %>
+        <strong><%= t('.no_files_yet') %></strong>
       <% end %>
     </p>
   <% end %>

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

@@ -1,22 +1,37 @@
+<%
+  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)}}
+%>
 <li class="clearfix record <%= cycle('on', 'on-hover') %>">
+
   <span class="title <%= resource.ext.try(:downcase) %>">
-    <%= resource.title %><%= ".#{resource.ext}" if resource.ext %>
-    <span class="preview">- <%= number_to_human_size(resource.size) %></span>
+    <%= 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>
+
   <span class="actions">
-    <%= link_to refinery_icon_tag('page_white_put.png'),
-                resource.url,
-                :title => t('.download', :size => number_to_human_size(resource.size)) %>
-    <%= link_to refinery_icon_tag('application_edit.png'),
-                refinery.edit_admin_resource_path(resource),
-                :title => t('edit', :scope => 'refinery.admin.resources') %>
-    <%= link_to refinery_icon_tag('delete.png'),
-                refinery.admin_resource_path(resource),
-                :class => "cancel confirm-delete",
-                :title => t('delete', :scope => 'refinery.admin.resources'),
-                :data => {
-                  :confirm => t('message', :scope => 'refinery.admin.delete', :title => resource.title)
-                },
-                :method => :delete %>
+    <%= action_icon :download,  resource.url, t('.download', size: number_to_human_size(resource.size)) %>
+    <%= action_icon :edit,      edit_url,     t('edit', scope: 'refinery.admin.resources') %>
+    <%= action_icon :delete,    delete_url,   t('delete', scope: 'refinery.admin.resources'), delete_options %>
   </span>
 </li>

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

@@ -1,4 +1,4 @@
-<% user_can_modify_resources = ::Refinery::Plugins.active.names.include?("refinery_files") %>
+<% user_can_modify_resources = current_refinery_user.has_plugin?("refinery_files") %>
 <div class="clearfix">
   <div id="dialog_menu_left">
     <% if (any_resources = @resources.any?) %>

data/config/locales/ca.yml

@@ -0,0 +1,36 @@
+ca:
+  refinery:
+    plugins:
+      refinery_files:
+        title: Arxius
+        description: Pujar i enllaçar arxius
+    admin:
+      resources:
+        delete: Esborrar aquest arxiu per sempre
+        edit: Editar aquest arxiu
+        form:
+          download_current: Descarregar arxiu actual
+          or: o
+          replace: " reemplaçar-ho per aquest altre..."
+          maximum_file_size: "El pes màxim per a l'arxiu és de %{bytes}."
+        resource:
+          download: "Descarregar aquest arxiu (%{size})"
+        actions:
+          upload_new: Pujar nou arxiu
+        records:
+          no_files_yet: Encara no hi ha arxius. Prem "Pujar nou arxiu" per afegir el teu primer arxiu.
+        insert:
+          existing: Arxiu existent
+          new: Nou arxiu
+          no_files: No hi ha arxius.
+        existing_resource:
+          link_to_file: Enllaçar aquest arxiu
+          button_text: Inserir
+  activerecord:
+    models:
+      refinery/resource: "arxiu"
+    errors:
+      models:
+        refinery/resource:
+          blank: Selecciona quin arxiu vols pujar
+          too_big: "L'arxiu ha de pesar menys de %{size} bytes"

data/config/locales/cs.yml

@@ -31,7 +31,6 @@ cs:
       refinery/resource: soubor
     errors:
       models:
-        refinery:
-          resource:
-            blank: Musíte vybrat soubor pro nahrání
-            too_big: Maximální velikost souboru je %{size} MB
+        refinery/resource:
+          blank: Musíte vybrat soubor pro nahrání
+          too_big: Maximální velikost souboru je %{size} MB

data/config/locales/en.yml

@@ -13,6 +13,9 @@ en:
           or: or
           replace: " replace it with this one..."
           maximum_file_size: The maximum file size is %{bytes}.
+          resource_file: File
+          resource_title: Title
+          resource_title_help: The title visible to users.
         resource:
           download: Download this file (%{size})
         actions:

data/config/locales/fr.yml

@@ -13,6 +13,9 @@ fr:
           or: ou
           replace: " le remplacer par celui-ci..."
           maximum_file_size: "La taille du fichier ne doit pas excéder %{bytes}."
+          resource_file: Fichier
+          resource_title: Titre
+          resource_title_help: Le titre visible pour les utilisateurs.
         resource:
           download: Télécharger ce fichier (%{size})
         actions:

data/config/locales/id.yml

@@ -0,0 +1,36 @@
+id:
+  refinery:
+    plugins:
+      refinery_files:
+        title: Berkas
+        description: Unggah dan link ke berkas
+    admin:
+      resources:
+        delete: Hapus berkas ini
+        edit: Ubah berkas
+        form:
+          download_current: Unduh berkas ini
+          or: atau
+          replace: " ganti berkas..."
+          maximum_file_size: Maksimal berkas adalah %{bytes}.
+        resource:
+          download: Unduh berkas ini (%{size})
+        actions:
+          upload_new: Unggah berkas baru
+        records:
+          no_files_yet: Tidak ada berkas. Klik "Unggah berkas baru" untuk menambahkan berkas.
+        insert:
+          existing: Berkas sudah ada
+          new: Berkas Baru
+          no_files: Tidak ada berkas.
+        existing_resource:
+          link_to_file: Link ke berkas
+          button_text: Sisipkan
+  activerecord:
+    models:
+      refinery/resource: berkas
+    errors:
+      models:
+        refinery/resource:
+          blank: Tentukan berkas untuk diunggah
+          too_big: Berkas harus lebih kecil dari %{size} byte

data/config/locales/it.yml

@@ -3,22 +3,18 @@ it:
     plugins:
       refinery_files:
         title: Risorse
+        description: Carica ed effettua il link a dei file
     admin:
       resources:
         delete: Elimina il file corrente
         edit: Modifica il file corrente
         form:
-          file_to_upload: File da caricare
           download_current: Scarica il file corrente
           or: o
           replace: ", sostituirlo con questo..."
           maximum_file_size: "La dimensione massima consentita è %{bytes}."
         resource:
           download: Scarica il file corrente (%{size})
-          edit: Modifica il file corrente
-          delete:
-            message: Sei sicuro di voler eliminare '%{title}'?
-            title: Elimina il file corrente
         actions:
           upload_new: Carica un nuovo file
         records:
@@ -27,20 +23,14 @@ it:
           existing: File esistente
           new: Nuovo file
           no_files: Non ci sono files.
-          existing_file: File esistente
-          link_to_resource: 'Link a questa risorsa'
-          previous: Precedente
-          next: Successivo
-          submit_insert: Carica
-          or: o
-          cancel: Annulla
         existing_resource:
           link_to_file: Collegamento a questo file
           button_text: Inserisci
   activerecord:
+    models:
+      refinery/resource: file
     errors:
       models:
-        refinery:
-          resource:
-            blank: Devi selezionare un file da caricare
-            too_big: Le dimensioni del file devono essere inferiori a %{size} bytes
+        refinery/resource:
+          blank: Devi selezionare un file da caricare
+          too_big: Le dimensioni del file devono essere inferiori a %{size} bytes