refinerycms-images 2.1.5 → 3.0.0

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

@@ -1,9 +1,11 @@
-<%= form_for @image, :url => (@url_override or @image.persisted? ? refinery.admin_image_path(@image) : refinery.admin_images_path),
-             :html => { :multipart => true } do |f| %>
+<%= form_for @image, url: (@url_override or @image.persisted? ? refinery.admin_image_path(@image) : refinery.admin_images_path),
+             html: { multipart: true } do |f| %>
 
   <%= render '/refinery/admin/error_messages',
-             :object => @image,
-             :include_object_name => false %>
+             object: @image,
+             include_object_name: false %>
+
+  <%= render '/refinery/admin/locale_picker', :current_locale => Globalize.locale if @image.persisted? %>
 
   <div class="field">
     <% if action_name =~ /(edit)|(update)/ %>
@@ -16,21 +18,37 @@
       </p>
     <% else %>
       <% # we must only hint at multiple when it's a new record otherwise update fails. %>
-      <%= f.file_field :image, :multiple => true %>
+      <%= f.file_field :image, multiple: true %>
     <% end %>
   </div>
 
   <div class="field">
-    <label><%= t('.maximum_image_size', :bytes => number_to_human_size(Refinery::Images.max_image_size)) %></label>
+    <label><%= t('.maximum_image_size', bytes: number_to_human_size(Refinery::Images.max_image_size)) %></label>
+  </div>
+  <div class="field" id="title">
+    <span class='label_with_help'>
+      <%= f.label :image_title, t('.image_title') %>
+      <%= refinery_help_tag t('.image_title_help') %>
+    </span>
+    <%= f.text_field :image_title, placeholder: t('.image_title') %>
+  </div>
+
+  <div class="field" id="alt">
+    <span class='label_with_help'>
+      <%= f.label :image_alt, t('.image_alt') %>
+      <%= refinery_help_tag t('.image_alt_help') %>
+    </span>
+    <%= f.text_field :image_alt, placeholder: t('.image_alt') %>
   </div>
 
   <input type="hidden" name="wymeditor" value="<%= params[:wymeditor] %>">
 
-  <%= render '/refinery/admin/form_actions', :f => f,
-             :continue_editing => false,
-             :hide_cancel => (@app_dialog or action_name == 'insert' or from_dialog?),
-             :delete_title => t('delete', :scope => 'refinery.admin.images'),
-             :delete_confirmation => t('message', :scope => 'refinery.admin.delete', :title => @image.image_name) -%>
+  <%= render '/refinery/admin/form_actions', f: f,
+             continue_editing: false,
+             hide_cancel: (@app_dialog or action_name == 'insert' or from_dialog?),
+             delete_title: t('delete', scope: 'refinery.admin.images'),
+             delete_confirmation: t('message', scope: 'refinery.admin.delete', title: @image.image_name),
+             cancel_url: refinery.admin_images_path -%>
 
   <% if @app_dialog %>
     <input type="hidden" name="app_dialog" value="<%= @app_dialog %>" />
@@ -45,6 +63,6 @@
 <% if action_name =~ /(edit)|(update)/ %>
   <div id="existing_image">
     <label><%=t('.current_image') %></label>
-    <%= image_fu @thumbnail || @image, '225x255>', :class => 'brown_border' %>
+    <%= image_fu @thumbnail || @image, '225x255>', class: 'brown_border' %>
   </div>
 <% end %>

data/app/views/refinery/admin/images/_grid_view.html.erb

@@ -1,22 +1,15 @@
-<ul id="image_grid" class="<%= ['clearfix', 'pagination_frame', pagination_css_class].compact.join(' ') %>">
+<ul id="image_grid" class="<%= ['clearfix', 'pagination_frame', 'images_list', pagination_css_class].compact.join(' ') %>">
   <% @images.each_with_index do |image, index| -%>
     <li id="image_<%= image.id %>" class="image_<%= index % 5 %>">
-      <%= image_fu image, '135x135#c', :title => image.title %>
+      <%= image_fu image, '135x135#c', title: image.title %>
       <span class="actions">
-        <%= link_to refinery_icon_tag('eye.png'), image.url,
-                    :target => '_blank',
-                    :title => t('view_live_html', :scope => 'refinery.admin.images') %>
-        <%= link_to refinery_icon_tag('application_edit.png'),
-                    refinery.edit_admin_image_path(image),
-                    :title => t('edit', :scope => 'refinery.admin.images') %>
-        <%= link_to refinery_icon_tag('delete.png'),
-                    refinery.admin_image_path(image, params.slice(:page)),
-                    :class => 'cancel confirm-delete',
-                    :title => t('delete', :scope => 'refinery.admin.images'),
-                    :data => {
-                      :confirm => t('message', :scope => 'refinery.admin.delete', :title => image.title)
-                    },
-                    :method => :delete %>
+
+       <%= action_icon :preview, image.url, t('view_live_html', scope: 'refinery.admin.images') %>
+       <%= action_icon :edit,    refinery.edit_admin_image_path(image), t('edit', scope: 'refinery.admin.images') %>
+       <%= action_icon :delete,  refinery.admin_image_path(image, params.slice(:page)),  t('delete', scope: 'refinery.admin.images'), class: 'confirm-delete',
+                           data: { confirm: t('message', scope: 'refinery.admin.delete', title: image.title) } %>
+       <%= action_icon :info,    '#', "Title: #{image.title} Alt text: #{image.alt}" %>
+
       </span>
     </li>
   <% end -%>

data/app/views/refinery/admin/images/_list_view.html.erb

@@ -1,10 +1,10 @@
-<div class="<%= ['clearfix', 'pagination_frame', pagination_css_class].compact.join(' ') %>">
+<div id= 'image_list' class="<%= ['clearfix', 'pagination_frame', pagination_css_class].compact.join(' ') %>">
   <% group_by_date(@images).each do |container| %>
     <% date_time = (image_group = container.last).first.created_at %>
     <% date = Date.parse(date_time.to_s) %>
-    <h3><%= l(date, :format => :long ) %></h3>
-    <ul>
-      <%= render :partial => 'list_view_image', :collection => image_group %>
+    <h3><%= l(date, format: :long ) %></h3>
+    <ul class='images_list'>
+      <%= render partial: 'list_view_image', collection: image_group %>
     </ul>
   <% end %>
 </div>

data/app/views/refinery/admin/images/_list_view_image.html.erb

@@ -1,21 +1,30 @@
 <li id="sortable_<%= list_view_image.id %>" class="clearfix record <%= cycle('on', 'on-hover') %>">
   <span class="title">
-    <%= list_view_image.title %> <span class="preview">&nbsp;</span>
+    <%= list_view_image.title %>
   </span>
+
+  <% if Refinery::I18n.frontend_locales.many? %>
+    <span class='locales'>
+      <% list_view_image.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
+        <% if translation.image_title.present? %>
+          <%= link_to refinery.edit_admin_image_path(list_view_image, 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"><%= list_view_image.image_name %></span>
   <span class="actions">
-    <%= link_to refinery_icon_tag('eye.png'), list_view_image.url,
-                :target => '_blank',
-                :title => t('view_live_html', :scope => 'refinery.admin.images') %>
-    <%= link_to refinery_icon_tag('application_edit.png'),
-                refinery.edit_admin_image_path(list_view_image),
-                :title => t('edit', :scope => 'refinery.admin.images') %>
-    <%= link_to refinery_icon_tag('delete.png'),
-                refinery.admin_image_path(list_view_image),
-                :class => 'cancel confirm-delete',
-                :title => t('delete', :scope => 'refinery.admin.images'),
-                :data => {
-                  :confirm => t('message', :scope => 'refinery.admin.delete', :title => list_view_image.title)
-                },
-                :method => :delete %>
+
+    <%= action_icon :preview, list_view_image.url, t('view_live_html', scope: 'refinery.admin.images') %>
+    <%= action_icon :edit,    refinery.edit_admin_image_path(list_view_image), t('edit', scope: 'refinery.admin.images') %>
+    <%= action_icon :delete,  refinery.admin_image_path(list_view_image),  t('delete', scope: 'refinery.admin.images'), class: 'confirm-delete',
+                           data: { confirm: t('message', scope: 'refinery.admin.delete', title: list_view_image.title)} %>
   </span>
 </li>

data/app/views/refinery/admin/images/index.html.erb

@@ -1,6 +1,6 @@
-<section id="records">
-  <%= render 'records' %>
+<section id="records" class="images">
+  <%= render "records" %>
 </section>
 <section id="actions">
-  <%= render 'actions' %>
+  <%= render "actions" %>
 </section>

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

@@ -1,4 +1,4 @@
-<% user_can_modify_images = ::Refinery::Plugins.active.names.include?('refinery_images') %>
+<% user_can_modify_images = current_refinery_user.has_plugin?('refinery_images') %>
 <div id="dialog_menu_left">
   <% if (any_images = @images.any?) or searching? %>
     <span id="existing_image_radio" class="radio<%= ' selected_radio' if (no_errors = @image.errors.empty?) %>">

data/config/locales/ca.yml

@@ -0,0 +1,44 @@
+ca:
+  refinery:
+    plugins:
+      refinery_images:
+        title: Imatges
+        description: Gestionar imatges
+        article: femení
+    admin:
+      images:
+        delete: Esborrar aquesta imatge per sempre
+        edit: Editar aquesta imatge
+        form:
+          image: Imatge
+          use_current_image: Usar imatge actual
+          or: o
+          replace_image: " reemplaçar-la amb aquesta altra..."
+          current_image: Imatge actual
+          maximum_image_size: "El pes màxim per a una imatge són %{bytes}."
+        actions:
+          create_new_image: Crear nova imatge
+        records:
+          no_images_yet: Encara no hi ha imatges. Fes clic a "Crear nova imatge" per afegir la primera.
+        index:
+          view:
+            switch_to: "Canviar a vista %{view_name}"
+            list: llista
+            grid: quadrícula
+        view_live_html: Veure imatge <br/><em>Obre en finestra nova</em>
+        existing_image:
+          button_text: Inserir
+          resize_image: Redimensionar la imatge?
+          size: Mida
+        insert:
+          existing_image: Imatge existent
+          new_image: Nova imatge
+  activerecord:
+    models:
+      refinery/image: "imatge"
+    errors:
+      models:
+        refinery/image:
+          blank: Has d'indicar què imatge vols pujar
+          too_big: "La imatge ha de pesar menys de %{size} bytes"
+          incorrect_format: "La teva imatge ha de ser un arxiu JPG, PNG o GIF"

data/config/locales/cs.yml

@@ -15,6 +15,10 @@ cs:
           replace_image: " nahradit jej tímto..."
           current_image: Vybraný obrázek
           maximum_image_size: Maximální velikost obrázku je %{bytes}.
+          image_title: Název
+          image_title_help: Extra informace o obrázku
+          image_alt: Alternativní text
+          image_alt_help: "Text místo obrázku, když nemůže být obrázek zobrazen."
         actions:
           create_new_image: Přidat nový obrázek
         records:
@@ -41,3 +45,4 @@ cs:
           blank: Musíte zadat obrázek který chcete nahrát
           too_big: Maximální velikost obrázku je %{size} MB
           incorrect_format: 'Obrázek musí být ve formátu JPG, PNG nebo GIF'
+          different_file_name: Nový obrázek nesmí mít jiný název

data/config/locales/de.yml

@@ -15,6 +15,10 @@ de:
           replace_image: " mit diesem ersetzen..."
           current_image: Aktuelles Bild
           maximum_image_size: Die maximale Größe eines Bildes beträgt %{bytes}.
+          image_title: Titel
+          image_title_help: Zusatzinformationen über das Bild
+          image_alt: Alt-Attribut
+          image_alt_help: Platzhalter-Text, der angezeigt wird, wenn Bild nicht ordenltich dargestellt werden kann.
         actions:
           create_new_image: Neues Bild anlegen
         records:
@@ -41,3 +45,4 @@ de:
           blank: Sie müssen ein Bild zum Hochladen angeben
           too_big: Bild sollte kleiner als %{size} Megabytes sein
           incorrect_format: 'Ihr Bild sollte ein JPG, PNG oder GIF sein'
+          different_file_name: Neues Bild kann keinen anderen Dateinamen haben

data/config/locales/en.yml

@@ -15,6 +15,10 @@ en:
           replace_image: " replace it with this one..."
           current_image: Current Image
           maximum_image_size: The maximum image size is %{bytes}.
+          image_title: Title
+          image_title_help: Extra information about the image
+          image_alt: Alt
+          image_alt_help: Text to use if the image cannot be displayed.
         actions:
           create_new_image: Add new image
         records:

data/config/locales/fr.yml

@@ -15,6 +15,10 @@ fr:
           replace_image: " la remplacer par celle-ci..."
           current_image: Image actuelle
           maximum_image_size: "La taille de l'image ne doit pas excéder %{bytes}."
+          image_title: Titre
+          image_title_help: Information complémentaire sur l'image
+          image_alt: Alt
+          image_alt_help: Texte utilise si l'image ne peut pas être affichée.
         actions:
           create_new_image: Ajouter une image
         records:

data/config/locales/it.yml

@@ -24,28 +24,18 @@ it:
             switch_to: 'Passa alla modalità di visualizzazione "%{view_name}"'
             list: Lista
             grid: Griglia
-        grid_view:
-          edit: Modifica questa immagine
         view_live_html: Visualizza questa immagine <br/><em>Apri in una nuova finestra</em>
         existing_image:
           button_text: Inserisci
           resize_image: "Ridimensionare l'immagine?"
           size: Dimensioni
-        list_view_image:
-          edit_this_image: Modifica questa immagine
         insert:
           existing_image: Immagine Esistente
           new_image: Nuova immagine
-          previous: Precedente
-          next: Successivo
-          submit_insert: Inserire
-          or: o
-          cancel: Annullare
   activerecord:
     errors:
       models:
-        refinery:
-          image:
-            blank: "Devi selezionare un'immagine da caricare"
-            too_big: 'I files devono essere di dimensioni inferiori a %{size} bytes'
-            incorrect_format: "L'immagine deve essere in formato JPEG, PNG o GIF"
+        refinery/image:
+          blank: "Devi selezionare un'immagine da caricare"
+          too_big: 'I files devono essere di dimensioni inferiori a %{size} bytes'
+          incorrect_format: "L'immagine deve essere in formato JPEG, PNG o GIF"

data/config/locales/nl.yml

@@ -18,7 +18,7 @@ nl:
         actions:
           create_new_image: Nieuwe afbeelding toevoegen
         records:
-          no_images_yet: Er zijn nog geen afbeeldingen. Klik op "Nieuwe afbeelding toevoegen" om uw eerste afbleelding toe te voegen.
+          no_images_yet: Er zijn nog geen afbeeldingen. Klik op "Nieuwe afbeelding toevoegen" om uw eerste afbeelding toe te voegen.
         index:
           view:
             switch_to: De %{view_name}versie bekijken

data/config/routes.rb

@@ -1,5 +1,5 @@
 Refinery::Core::Engine.routes.draw do
-  get '/system/images/*dragonfly', :to => Dragonfly[:refinery_images]
+  get '/system/images/*dragonfly', :to => Dragonfly.app(:refinery_images)
 
   namespace :admin, :path => Refinery::Core.backend_route do
     resources :images, :except => :show do

data/db/migrate/20140814073957_add_title_and_alt_to_refinery_images.rb

@@ -0,0 +1,8 @@
+class AddTitleAndAltToRefineryImages < ActiveRecord::Migration
+  def change
+    change_table :refinery_images do |t|
+      t.string :image_title
+      t.string :image_alt
+    end
+  end
+end

data/db/migrate/20150430171341_translate_refinery_images.rb

@@ -0,0 +1,22 @@
+class TranslateRefineryImages < ActiveRecord::Migration
+  def self.up
+    begin
+      ::Refinery::Image.create_translation_table!({
+        image_alt: :string,
+        image_title: :string
+      }, {
+        :migrate_data => true
+      })
+    rescue NameError
+      warn "Refinery::Image was not defined!"
+    end
+  end
+
+  def self.down
+    begin
+      Refinery::Image.drop_translation_table! migrate_data: true
+    rescue NameError
+      warn "Refinery::Image was not defined!"
+    end
+  end
+end

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

@@ -34,14 +34,11 @@ Refinery::Images.configure do |config|
   # config.s3_region = ENV['S3_REGION']
 
   # Configure Dragonfly
-  # This is where in the middleware stack to insert the Dragonfly middleware
-  # config.dragonfly_insert_before = <%= Refinery::Images.dragonfly_insert_before.inspect %>
-  # config.dragonfly_secret = <%= Refinery::Images.dragonfly_secret.inspect %>
-  # If you decide to trust file extensions replace :ext below with :format
+  # config.dragonfly_verify_urls = <%= Refinery::Images.dragonfly_verify_urls %>
+  config.dragonfly_secret = <%= Refinery::Images.dragonfly_secret.inspect %>
   # config.dragonfly_url_format = <%= Refinery::Images.dragonfly_url_format.inspect %>
   # config.dragonfly_url_host = <%= Refinery::Images.dragonfly_url_host.inspect %>
   # config.datastore_root_path = <%= Refinery::Images.datastore_root_path.inspect %>
-  # config.trust_file_extensions = <%= Refinery::Images.trust_file_extensions.inspect %>
 
   # Configure Dragonfly custom storage backend
   # The custom_backend setting by default defers to the core setting for this but can be set just for images.

data/lib/refinery/images.rb

@@ -1,6 +1,5 @@
 require 'refinerycms-core'
 require 'dragonfly'
-require 'rack/cache'
 
 module Refinery
   autoload :ImagesGenerator, 'generators/refinery/images/images_generator'
@@ -23,3 +22,7 @@ module Refinery
     end
   end
 end
+
+ActiveSupport.on_load(:active_record) do
+  require 'globalize'
+end

data/lib/refinery/images/configuration.rb

@@ -2,23 +2,21 @@ module Refinery
   module Images
     include ActiveSupport::Configurable
 
-    config_accessor :dragonfly_insert_before, :dragonfly_secret, :dragonfly_url_format, :dragonfly_url_host,
+    config_accessor :dragonfly_secret, :dragonfly_url_format, :dragonfly_url_host, :dragonfly_verify_urls,
                     :max_image_size, :pages_per_dialog, :pages_per_admin_index,
                     :pages_per_dialog_that_have_size_options, :user_image_sizes,
                     :image_views, :preferred_image_view, :datastore_root_path,
                     :s3_backend, :s3_bucket_name, :s3_region,
-                    :s3_access_key_id, :s3_secret_access_key, :trust_file_extensions,
+                    :s3_access_key_id, :s3_secret_access_key,
                     :whitelisted_mime_types,
                     :custom_backend_class, :custom_backend_opts
 
-    self.dragonfly_insert_before = 'ActionDispatch::Callbacks'
     self.dragonfly_secret = Core.dragonfly_secret
-    # If you decide to trust file extensions replace :ext below with :format
     self.dragonfly_url_format = '/system/images/:job/:basename.:ext'
     self.dragonfly_url_host = ''
-    self.trust_file_extensions = false
+    self.dragonfly_verify_urls = true
 
-    self.max_image_size = 5242880
+    self.max_image_size = 5_242_880
     self.pages_per_dialog = 18
     self.pages_per_dialog_that_have_size_options = 12
     self.pages_per_admin_index = 20

data/lib/refinery/images/dragonfly.rb

@@ -5,35 +5,39 @@ module Refinery
     module Dragonfly
 
       class << self
-        def setup!
-          app_images = ::Dragonfly[:refinery_images]
-
-          app_images.define_macro(::Refinery::Image, :image_accessor)
+        def configure!
+          ActiveRecord::Base.extend ::Dragonfly::Model
+          ActiveRecord::Base.extend ::Dragonfly::Model::Validations
 
-          app_images.analyser.register(::Dragonfly::ImageMagick::Analyser)
-          app_images.analyser.register(::Dragonfly::Analysis::FileCommandAnalyser)
-        end
+          app_images = ::Dragonfly.app(:refinery_images)
 
-        def configure!
-          app_images = ::Dragonfly[:refinery_images]
-          app_images.configure_with(:imagemagick)
-          app_images.configure_with(:rails) do |c|
-            c.datastore.root_path = Refinery::Images.datastore_root_path
-            c.url_format = Refinery::Images.dragonfly_url_format
-            c.url_host = Refinery::Images.dragonfly_url_host
-            c.secret = Refinery::Images.dragonfly_secret
-            c.trust_file_extensions = Refinery::Images.trust_file_extensions
+          app_images.configure do
+            plugin :imagemagick
+            datastore :file, {
+              :root_path => Refinery::Images.datastore_root_path
+            }
+            url_format Refinery::Images.dragonfly_url_format
+            url_host Refinery::Images.dragonfly_url_host
+            verify_urls Refinery::Images.dragonfly_verify_urls
+            if Refinery::Images.dragonfly_verify_urls
+              secret Refinery::Images.dragonfly_secret
+            end
+            dragonfly_url nil
+            processor :strip do |content|
+              content.process!(:convert, '-strip')
+            end
           end
 
           if ::Refinery::Images.s3_backend
-            app_images.datastore = ::Dragonfly::DataStorage::S3DataStore.new
-            app_images.datastore.configure do |s3|
-              s3.bucket_name = Refinery::Images.s3_bucket_name
-              s3.access_key_id = Refinery::Images.s3_access_key_id
-              s3.secret_access_key = Refinery::Images.s3_secret_access_key
-              # S3 Region otherwise defaults to 'us-east-1'
-              s3.region = Refinery::Images.s3_region if Refinery::Images.s3_region
-            end
+            require 'dragonfly/s3_data_store'
+            options = {
+              bucket_name: Refinery::Images.s3_bucket_name,
+              access_key_id: Refinery::Images.s3_access_key_id,
+              secret_access_key: Refinery::Images.s3_secret_access_key
+            }
+            # S3 Region otherwise defaults to 'us-east-1'
+            options.update(region: Refinery::Images.s3_region) if Refinery::Images.s3_region
+            app_images.use_datastore :s3, options
           end
 
           if Images.custom_backend?
@@ -44,10 +48,17 @@ module Refinery
         ##
         # Injects Dragonfly::Middleware for Refinery::Images into the stack
         def attach!(app)
-          if ::Rails.application.config.action_controller.perform_caching
-            app.config.middleware.insert_after 'Rack::Cache', 'Dragonfly::Middleware', :refinery_images
+          if defined?(::Rack::Cache)
+            unless app.config.action_controller.perform_caching && app.config.action_dispatch.rack_cache
+              app.config.middleware.insert 0, ::Rack::Cache, {
+                verbose: true,
+                metastore: URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
+                entitystore: URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
+              }
+            end
+            app.config.middleware.insert_after ::Rack::Cache, ::Dragonfly::Middleware, :refinery_images
           else
-            app.config.middleware.use 'Dragonfly::Middleware', :refinery_images
+            app.config.middleware.use ::Dragonfly::Middleware, :refinery_images
           end
         end
       end