refinerycms-images 2.1.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a9716eb904f61c3ff4856a2b22006036233e16
-  data.tar.gz: c0ae0f912c6adea630e3ca712916429cedc61d46
+  metadata.gz: 6520739bb59acf9b68122d223d3df823f96d8d18
+  data.tar.gz: 7845f6b085ab9282114f097f00e477c43a3c6704
 SHA512:
-  metadata.gz: 345fdcd45d4d46f77287c56ac29aa315b39ae2b02a3013bd7095fbbed44de0a31917a7def064b3548cc1dd1bbd359fe4429f6d5d59c16aca3711eabfb0538eed
-  data.tar.gz: 5f749f072bc2b9e3748da2ca94ac0761cc4c4aa6a62ea7d92d392587fd8eb47d2d18aa1b4cfbcda250f366a0c6445fe99c6d206162082a9f1e6da456c88c23e3
+  metadata.gz: 6f5983c92699bdec5da908a307ec6797da7ed711197e260b0a7b20024bed246dfbd5b2cb2bf37691ec7b57c143c49ddd4fdfe8e7b6c61e1a07b66b982911b585
+  data.tar.gz: 49e4348699512a24ba728f8affa5bf49d7e1dbcb45573e79f57f77928e5151a67de95b85b6402737d4bc6913a1516dbaa22f9eaca9de9e492b4f0d33b07df151

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

@@ -3,23 +3,23 @@ module Refinery
     class ImagesController < ::Refinery::AdminController
 
       crudify :'refinery/image',
-              :order => "created_at DESC",
-              :sortable => false,
-              :xhr_paging => true
+              include: [:translations],
+              order: "updated_at DESC",
+              sortable: false
 
-      before_filter :change_list_mode_if_specified, :init_dialog
+      before_action :change_list_mode_if_specified, :init_dialog
 
       def new
         @image = ::Refinery::Image.new if @image.nil?
 
-        @url_override = refinery.admin_images_path(:dialog => from_dialog?)
+        @url_override = refinery.admin_images_path(dialog: from_dialog?)
       end
 
       # This renders the image insert dialog
       def insert
         self.new if @image.nil?
 
-        @url_override = refinery.admin_images_path(request.query_parameters.merge(:insert => true))
+        @url_override = refinery.admin_images_path(request.query_parameters.merge(insert: true))
 
         if params[:conditions].present?
           extra_condition = params[:conditions].split(',')
@@ -34,86 +34,83 @@ module Refinery
 
         paginate_images
 
-        render :action => "insert"
+        render 'insert'
       end
 
       def create
         @images = []
         begin
-          unless params[:image].present? and params[:image][:image].is_a?(Array)
-            @images << (@image = ::Refinery::Image.create(params[:image]))
-          else
+          if params[:image].present? && params[:image][:image].is_a?(Array)
             params[:image][:image].each do |image|
-              @images << (@image = ::Refinery::Image.create({:image => image}.merge(params[:image].except(:image))))
+              params[:image][:image_title] = params[:image][:image_title].presence || auto_title(image.original_filename)
+              @images << (@image = ::Refinery::Image.create({image: image}.merge(image_params.except(:image))))
             end
+          else
+            @images << (@image = ::Refinery::Image.create(image_params))
           end
-        rescue Dragonfly::FunctionManager::UnableToHandle
+        rescue NotImplementedError
           logger.warn($!.message)
           @image = ::Refinery::Image.new
         end
 
-        unless params[:insert]
+        if params[:insert]
+          # if all uploaded images are ok redirect page back to dialog, else show current page with error
           if @images.all?(&:valid?)
-            flash.notice = t('created', :scope => 'refinery.crudify', :what => "'#{@images.map(&:title).join("', '")}'")
+            @image_id = @image.id if @image.persisted?
+            @image = nil
+          end
+
+          self.insert
+        else
+          if @images.all?(&:valid?)
+            flash.notice = t('created', scope: 'refinery.crudify', what: "'#{@images.map(&:image_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_images_path
             end
           else
             self.new # important for dialogs
-            render :action => 'new'
+            render 'new'
           end
-        else
-          # if all uploaded images are ok redirect page back to dialog, else show current page with error
-          if @images.all?(&:valid?)
-            @image_id = @image.id if @image.persisted?
-            @image = nil
-          end
-
-          self.insert
         end
       end
 
       def update
-        attributes_before_assignment = @image.attributes
-        @image.attributes = params[:image]
+        @image.attributes = image_params
         if @image.valid? && @image.save
-          flash.notice = t(
-            'refinery.crudify.updated',
-            :what => "'#{@image.title}'"
-          )
+          flash.notice = t('refinery.crudify.updated', what: "'#{@image.title}'")
 
-          unless from_dialog?
-            unless params[:continue_editing] =~ /true|on|1/
-              redirect_back_or_default refinery.admin_images_path
-            else
-              unless request.xhr?
-                redirect_to :back
-              else
-                render :partial => '/refinery/message'
-              end
-            end
-          else
+          if from_dialog?
             self.index
             @dialog_successful = true
             render :index
+          else
+            if params[:continue_editing] =~ /true|on|1/
+              if request.xhr?
+                render partial: '/refinery/message'
+              else
+                redirect_to :back
+              end
+            else
+              redirect_back_or_default refinery.admin_images_path
+            end
           end
         else
           @thumbnail = Image.find params[:id]
-          unless request.xhr?
-            render :action => 'edit'
-          else
-            render :partial => '/refinery/admin/error_messages', :locals => {
-                     :object => @image,
-                     :include_object_name => true
+          if request.xhr?
+            render partial: '/refinery/admin/error_messages', locals: {
+                     object: @image,
+                     include_object_name: true
                    }
+          else
+            render 'edit'
           end
         end
       end
 
-    protected
+      protected
 
       def init_dialog
         @app_dialog = params[:app_dialog].present?
@@ -132,13 +129,29 @@ module Refinery
       end
 
       def paginate_images
-        @images = @images.paginate(:page => params[:page], :per_page => Image.per_page(from_dialog?, !@app_dialog))
+        @images = @images.paginate(page: params[:page], per_page: Image.per_page(from_dialog?, !@app_dialog))
       end
 
       def restrict_controller
         super unless action_name == 'insert'
       end
 
+      def auto_title(filename)
+        CGI::unescape(filename.to_s).gsub(/\.\w+$/, '').titleize
+      end
+
+      def image_params
+        params.require(:image).permit(permitted_image_params)
+      end
+
+      private
+
+      def permitted_image_params
+        [
+          :image, :image_size, :image_title, :image_alt
+        ]
+      end
+
     end
   end
 end

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

@@ -2,19 +2,19 @@ module Refinery
   module Admin
     module ImagesHelper
       def other_image_views
-        Refinery::Images.image_views.reject { |image_view|
+        Refinery::Images.image_views.reject do |image_view|
           image_view.to_s == Refinery::Images.preferred_image_view.to_s
-        }
+        end
       end
 
       def thumbnail_urls(image)
         thumbnail_urls = {
-          :"data-original" => asset_paths.compute_public_path(image.url, ''),
-          :"data-grid" => asset_paths.compute_public_path(image.thumbnail(:geometry => '135x135#c').url, '')
+          :"data-original" => image_path(image.url),
+          :"data-grid" => image_path(image.thumbnail(:geometry => '135x135#c').url)
         }
 
-        Refinery::Images.user_image_sizes.sort_by{|key,geometry| geometry}.each do |size, pixels|
-          thumbnail_urls[:"data-#{size.to_s.parameterize}"] = asset_paths.compute_public_path(image.thumbnail(:geometry => pixels).url, '')
+        Refinery::Images.user_image_sizes.sort_by{ |key, geometry| geometry}.each do |size, pixels|
+          thumbnail_urls[:"data-#{size.to_s.parameterize}"] = image_path(image.thumbnail(:geometry => pixels).url)
         end
 
         thumbnail_urls

data/app/models/refinery/image.rb

@@ -2,11 +2,11 @@ require 'dragonfly'
 
 module Refinery
   class Image < Refinery::Core::BaseModel
-    ::Refinery::Images::Dragonfly.setup!
+    translates :image_title, :image_alt
 
-    include Images::Validators
+    dragonfly_accessor :image, :app => :refinery_images
 
-    image_accessor :image
+    include Images::Validators
 
     validates :image, :presence  => true
     validates_with ImageSizeValidator
@@ -16,19 +16,16 @@ module Refinery
                        :in => ::Refinery::Images.whitelisted_mime_types,
                        :message => :incorrect_format
 
-    # allows Mass-Assignment
-    attr_accessible :id, :image, :image_size
-
     delegate :size, :mime_type, :url, :width, :height, :to => :image
 
     class << self
       # How many images per page should be displayed?
       def per_page(dialog = false, has_size_options = false)
         if dialog
-          unless has_size_options
-            Images.pages_per_dialog
-          else
+          if has_size_options
             Images.pages_per_dialog_that_have_size_options
+          else
+            Images.pages_per_dialog
           end
         else
           Images.pages_per_admin_index
@@ -38,71 +35,29 @@ module Refinery
 
     # Get a thumbnail job object given a geometry and whether to strip image profiles and comments.
     def thumbnail(options = {})
-      if options.is_a?(String) || options.is_a?(Symbol)
-        Refinery.deprecate 'Refinery::Image#thumbnail(geometry)',
-                           :when => '2.2',
-                           :replacement => 'Refinery::Image#thumbnail(:geometry => value)'
-        options = { :geometry => options }
-      end
-
-      options = { :geometry => :no_geometry, :strip => true }.merge(options)
+      options = { :geometry => nil, :strip => false }.merge(options)
       geometry = convert_to_geometry(options[:geometry])
       thumbnail = image
-      thumbnail = thumbnail.thumb(geometry) unless geometry.is_a?(Symbol)
+      thumbnail = thumbnail.thumb(geometry) if geometry
       thumbnail = thumbnail.strip if options[:strip]
       thumbnail
     end
 
     # Intelligently works out dimensions for a thumbnail of this image based on the Dragonfly geometry string.
     def thumbnail_dimensions(geometry)
-      geometry = if geometry.is_a?(Symbol) && Refinery::Images.user_image_sizes.keys.include?(geometry)
-        Refinery::Images.user_image_sizes[geometry]
-      else
-        geometry.to_s
-      end
-
-      width = original_width = self.image_width.to_f
-      height = original_height = self.image_height.to_f
-      geometry_width, geometry_height = geometry.split(%r{\#{1,2}|\+|>|!|x}im)[0..1].map(&:to_f)
-      if (original_width * original_height > 0) && ::Dragonfly::ImageMagick::Processor::THUMB_GEOMETRY === geometry
-        if ::Dragonfly::ImageMagick::Processor::RESIZE_GEOMETRY === geometry
-          if geometry !~ %r{\d+x\d+>} || (%r{\d+x\d+>} === geometry && (width > geometry_width.to_f || height > geometry_height.to_f))
-            # Try scaling with width factor first. (wf = width factor)
-            wf_width = (original_width * geometry_width / width).round
-            wf_height = (original_height * geometry_width / width).round
-
-            # Scale with height factor (hf = height factor)
-            hf_width = (original_width * geometry_height / height).round
-            hf_height = (original_height * geometry_height / height).round
-
-            # Take the highest value that doesn't exceed either axis limit.
-            use_wf = wf_width <= geometry_width && wf_height <= geometry_height
-            if use_wf && hf_width <= geometry_width && hf_height <= geometry_height
-              use_wf = wf_width * wf_height > hf_width * hf_height
-            end
-
-            if use_wf
-              width = wf_width
-              height = wf_height
-            else
-              width = hf_width
-              height = hf_height
-            end
-          end
-        else
-          # cropping
-          width = geometry_width
-          height = geometry_height
-        end
-      end
-
-      { :width => width.to_i, :height => height.to_i }
+      dimensions = ThumbnailDimensions.new(geometry, image.width, image.height)
+      { :width => dimensions.width, :height => dimensions.height }
     end
 
     # Returns a titleized version of the filename
     # my_file.jpg returns My File
+
     def title
-      CGI::unescape(image_name.to_s).gsub(/\.\w+$/, '').titleize
+      image_title.presence || CGI::unescape(image_name.to_s).gsub(/\.\w+$/, '').titleize
+    end
+
+    def alt
+      image_alt.presence || title
     end
 
     private

data/app/models/refinery/thumbnail_dimensions.rb

@@ -0,0 +1,97 @@
+module Refinery
+  class ThumbnailDimensions
+
+    attr_accessor :width, :height, :geometry, :original_width, :original_height
+
+    def initialize(geometry, original_width, original_height)
+      @geometry = Geometry.new(geometry)
+
+      @original_width = original_width.to_f
+      @original_height = original_height.to_f
+
+      process
+    end
+
+    def process
+      if valid_geometry && resize_geometry && resize_necessary
+        scale
+      elsif valid_geometry && !resize_geometry
+        crop
+      else
+        original_dimensions
+      end
+    end
+
+    def valid_geometry
+      (original_width * original_height > 0) && thumb_geometry === geometry.geometry
+    end
+
+    def resize_geometry
+      ::Dragonfly::ImageMagick::Processors::Thumb::RESIZE_GEOMETRY === geometry.geometry
+    end
+
+    def resize_necessary
+      !geometry.custom? ||
+          (geometry.custom? &&
+            (original_width > geometry.width ||
+              original_height > geometry.height))
+    end
+
+    def original_dimensions
+      @width = original_width
+      @height = original_height
+    end
+
+    def crop
+      @width = geometry.width
+      @height = geometry.height
+    end
+
+    def scale
+      # Try scaling with width factor first. (wf = width factor)
+      wf_width = geometry.width.round
+      wf_height = (original_height * geometry.width / original_width).round
+
+      # Scale with height factor (hf = height factor)
+      hf_width = (original_width * geometry.height / original_height).round
+      hf_height = geometry.height.round
+
+      # Take the highest value that doesn't exceed either axis limit.
+      use_wf = wf_width > 0 && wf_width <= geometry.width && wf_height <= geometry.height
+      if use_wf && hf_width <= geometry.width && hf_height <= geometry.height
+        use_wf = wf_width * wf_height > hf_width * hf_height
+      end
+
+      if use_wf
+        @width = wf_width
+        @height = wf_height
+      else
+        @width = hf_width
+        @height = hf_height
+      end
+    end
+
+    def thumb_geometry
+      Regexp.union(::Dragonfly::ImageMagick::Processors::Thumb::RESIZE_GEOMETRY,
+                   ::Dragonfly::ImageMagick::Processors::Thumb::CROPPED_RESIZE_GEOMETRY,
+                   ::Dragonfly::ImageMagick::Processors::Thumb::CROP_GEOMETRY)
+    end
+
+    class Geometry
+      attr_reader :geometry, :height, :width
+      def initialize(geometry)
+        @geometry = if geometry.is_a?(Symbol) && Refinery::Images.user_image_sizes.keys.include?(geometry)
+          Refinery::Images.user_image_sizes[geometry]
+        else
+          geometry.to_s
+        end
+
+        @width, @height = @geometry.split(%r{\#{1,2}|\+|>|!|x}im)[0..1].map(&:to_f)
+      end
+
+      def custom?
+        %r{\d+x\d+>} === geometry
+      end
+    end
+  end
+end

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

@@ -1,15 +1,14 @@
 <ul>
+  <li><%= render '/refinery/admin/search', url: refinery.admin_images_path -%></li>
   <li>
-    <%= render '/refinery/admin/search', :url => refinery.admin_images_path %>
-  </li>
-  <li>
-    <%= link_to t('.create_new_image'), refinery.new_admin_image_path(:dialog => true), :class => 'add_icon' %>
+    <%= action_label :add, refinery.new_admin_image_path(dialog: true), t('.create_new_image') %>
   </li>
   <% other_image_views.each do |image_view| %>
     <li>
-      <%= link_to t('switch_to', :scope => 'refinery.admin.images.index.view', :view_name => t("#{image_view}", :scope => 'refinery.admin.images.index.view')),
-                  refinery.admin_images_path(:view => image_view, :page => params[:page]),
-                  :class => 'reorder_icon'  %>
+      <%= action_label :"switch_view_#{image_view}",
+                        refinery.admin_images_path(view: image_view, page: params[:page]),
+                        t('switch_to', scope: 'refinery.admin.images.index.view', view_name: t("#{image_view}", scope: 'refinery.admin.images.index.view'))
+      %>
     </li>
   <% end %>
 </ul>