refinerycms-images 1.0.11 → 2.0.0

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

@@ -0,0 +1,110 @@
+module ::Refinery
+  module Admin
+    class ImagesController < ::Refinery::AdminController
+
+      crudify :'refinery/image',
+              :order => "created_at DESC",
+              :sortable => false,
+              :xhr_paging => true
+
+      before_filter :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?)
+      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))
+
+        if params[:conditions].present?
+          extra_condition = params[:conditions].split(',')
+
+          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"
+        end
+
+        find_all_images(({extra_condition[0].to_sym => extra_condition[1]} if extra_condition.present?))
+        search_all_images if searching?
+
+        paginate_images
+
+        render :action => "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
+            params[:image][:image].each do |image|
+              @images << (@image = ::Refinery::Image.create(:image => image))
+            end
+          end
+        rescue Dragonfly::FunctionManager::UnableToHandle
+          logger.warn($!.message)
+          @image = ::Refinery::Image.new
+        end
+
+        unless params[:insert]
+          if @images.all?(&:valid?)
+            flash.notice = t('created', :scope => 'refinery.crudify', :what => "'#{@images.map(&:title).join("', '")}'")
+            if from_dialog?
+              @dialog_successful = true
+              render :nothing => true, :layout => true
+            else
+              redirect_to refinery.admin_images_path
+            end
+          else
+            self.new # important for dialogs
+            render :action => '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
+
+            self.insert
+          end
+        end
+      end
+
+    protected
+
+      def init_dialog
+        @app_dialog = params[:app_dialog].present?
+        @field = params[:field]
+        @update_image = params[:update_image]
+        @thumbnail = params[:thumbnail]
+        @callback = params[:callback]
+        @conditions = params[:conditions]
+      end
+
+      def change_list_mode_if_specified
+        if action_name == 'index' && params[:view].present? && Refinery::Images.image_views.include?(params[:view].to_sym)
+           Refinery::Images.preferred_image_view = params[:view]
+        end
+      end
+
+      def paginate_images
+        @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 store_current_location!
+        super unless action_name == 'insert' or from_dialog?
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Refinery
+  module Admin
+    module ImagesHelper
+      def other_image_views
+        Refinery::Images.image_views.reject { |image_view|
+          image_view.to_s == Refinery::Images.preferred_image_view.to_s
+        }
+      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('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(pixels).url, '')
+        end
+
+        thumbnail_urls
+      end
+    end
+  end
+end

data/app/models/refinery/image.rb

@@ -0,0 +1,96 @@
+module Refinery
+  class Image < Refinery::Core::BaseModel
+    include Images::Validators
+
+    image_accessor :image
+
+    validates :image, :presence  => true
+    validates_with ImageSizeValidator
+    validates_property :mime_type, :of => :image, :in => %w(image/jpeg image/png image/gif image/tiff),
+                       :message => :incorrect_format
+
+    # Docs for acts_as_indexed http://github.com/dougal/acts_as_indexed
+    acts_as_indexed :fields => [:title]
+
+    # 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
+            Images.pages_per_dialog_that_have_size_options
+          end
+        else
+          Images.pages_per_admin_index
+        end
+      end
+    end
+
+    # Get a thumbnail job object given a geometry.
+    def thumbnail(geometry = nil)
+      if geometry.is_a?(Symbol) and Refinery::Images.user_image_sizes.keys.include?(geometry)
+        geometry = Refinery::Images.user_image_sizes[geometry]
+      end
+
+      if geometry.present? && !geometry.is_a?(Symbol)
+        image.thumb(geometry)
+      else
+        image
+      end
+    end
+
+    # Intelligently works out dimensions for a thumbnail of this image based on the Dragonfly geometry string.
+    def thumbnail_dimensions(geometry)
+      geometry = geometry.to_s
+      width = original_width = self.image_width.to_f
+      height = original_height = self.image_height.to_f
+      geometry_width, geometry_height = geometry.to_s.split(%r{\#{1,2}|\+|>|!|x}im)[0..1].map(&:to_f)
+      if (original_width * original_height > 0) && geometry =~ ::Dragonfly::ImageMagick::Processor::THUMB_GEOMETRY
+        if geometry =~ ::Dragonfly::ImageMagick::Processor::RESIZE_GEOMETRY
+          if geometry !~ %r{\d+x\d+>} || (geometry =~ %r{\d+x\d+>} && (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)).ceil
+            wf_height = (original_height * (geometry_width / width)).ceil
+
+            # Scale with height factor (hf = height factor)
+            hf_width = (original_width * (geometry_height / height)).ceil
+            hf_height = (original_height * (geometry_height / height)).ceil
+
+            # 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 }
+    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
+    end
+
+  end
+end

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

@@ -0,0 +1,15 @@
+<ul>
+  <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" %>
+  </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"  %>
+    </li>
+  <% end %>
+</ul>

data/app/views/{admin → refinery/admin}/images/_existing_image.html.erb

@@ -1,36 +1,26 @@
 <div id='existing_image_area' class='dialog_area' <%= "style='display:none;'" if @image.errors.any? %>>
-  <%= render :partial => '/shared/admin/search',
-             :locals => {:url => insert_admin_images_path(params.dup.delete(:image))} %>
+  <%= render '/refinery/admin/search', :url => refinery.insert_admin_images_path(params.dup.except('image')) %>
   <input type='hidden' name='selected_image' id='selected_image' />
   <div id='existing_image_area_content' class='clearfix'>
 <% if @images.any? %>
     <ul>
-<%
-      @images.each do |image|
-        thumbnail_urls = {
-          :"data-original" => compute_public_path(image.url, ''),
-          :"data-grid" => compute_public_path(image.thumbnail('135x135#c').url, '')
-        }
-        ::Image.user_image_sizes.sort_by{|key,geometry| geometry}.each do |size, pixels|
-          thumbnail_urls[:"data-#{size.to_s.parameterize}"] = compute_public_path(image.thumbnail(pixels).url, '')
-        end
--%>
+      <% @images.each do |image| -%>
         <li<%= " class='selected'" if @image_id == image.id %>>
           <%= image_fu(image, '106x106#c', {
                          :alt => image.title,
                          :title => image.title,
                          :id => "image_#{image.id}",
                          :'data-id' => image.id
-                       }.merge(thumbnail_urls)) -%>
+                       }.merge(thumbnail_urls(image))) -%>
         </li>
       <% end -%>
     </ul>
 <% elsif searching? %>
-    <%= t('no_results', :scope => 'shared.admin.search') %>
+    <%= t('no_results', :scope => 'refinery.admin.search') %>
 <% end %>
   </div>
 
-  <%= images_paginator @images, from_dialog? %>
+  <%= will_paginate @images, :params => params.dup %>
 
   <% unless @app_dialog or @images.empty? %>
     <div id='existing_image_size_area' class='clearfix'>
@@ -43,7 +33,7 @@
       </p>
       <ul>
         <%
-          ::Image.user_image_sizes.sort_by { |key, geometry| geometry }.each_with_index do |(size, pixels), index|
+          Refinery::Images.user_image_sizes.sort_by { |key, geometry| geometry }.each_with_index do |(size, pixels), index|
             safe_pixels = pixels.to_s.gsub(/[<>=]/, '')
             # (parndt): ' selected' if size.to_s == 'medium' is not very generic, but I
             # can't think of a decent way of making it so for even sets (e.g. 2,4,6,8,etc image sizes).
@@ -60,14 +50,11 @@
     </div>
   <% end %>
 
-  <%= render :partial => "/shared/admin/form_actions",
-             :locals => {
-               :f => nil,
-               :cancel_url => '',
-               :submit_button_text => t('.button_text'),
-               :hide_submit => @images.empty?,
-               :hide_cancel => false,
-               :hide_delete => true,
-               :cancel_title => nil
-             } if @app_dialog or @images.any? or searching? %>
+  <%= render '/refinery/admin/form_actions', :f => nil,
+             :cancel_url => '',
+             :submit_button_text => t('.button_text'),
+             :hide_submit => @images.empty?,
+             :hide_cancel => false,
+             :hide_delete => true,
+             :cancel_title => nil if @app_dialog or @images.any? or searching? %>
 </div>

data/app/views/{admin → refinery/admin}/images/_form.html.erb

@@ -1,10 +1,9 @@
-<%= form_for [:admin, @image], :url => @url_override || @url, :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 :partial => "/shared/admin/error_messages",
-             :locals => {
-               :object => @image,
-               :include_object_name => false
-             } %>
+  <%= render '/refinery/admin/error_messages',
+             :object => @image,
+             :include_object_name => false %>
 
   <div class='field'>
     <% if action_name =~ /(edit)|(update)/ %>
@@ -22,19 +21,16 @@
   </div>
 
   <div class='field'>
-    <label><%= t('.maximum_image_size', :megabytes => Image::MAX_SIZE_IN_MB) %></label>
+    <label><%= t('.maximum_image_size', :bytes => number_to_human_size(Refinery::Images.max_image_size)) %></label>
   </div>
 
   <input type='hidden' name='wymeditor' value='<%= params[:wymeditor] %>'>
 
-  <%= render :partial => "/shared/admin/form_actions",
-             :locals => {
-               :f => f,
-               :continue_editing => false,
-               :hide_cancel => (@app_dialog or action_name == "insert" or from_dialog?),
-               :delete_title => t('delete', :scope => 'admin.images'),
-               :delete_confirmation => t('message', :scope => 'shared.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) -%>
 
   <% if @app_dialog %>
     <input type='hidden' name='app_dialog' value='<%= @app_dialog %>' />

data/app/views/{admin → refinery/admin}/images/_grid_view.html.erb

@@ -6,12 +6,14 @@
         <%= link_to refinery_icon_tag('eye.png'), image.url,
                     :target => "_blank",
                     :title => t('.view_live_html') %>
-        <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(image),
-                    :title => t('edit', :scope => 'admin.images') %>
-        <%= link_to refinery_icon_tag('delete.png'), admin_image_path(image),
+        <%= 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),
                     :class => "cancel confirm-delete",
-                    :title => t('delete', :scope => 'admin.images'),
-                    :confirm => t('message', :scope => 'shared.admin.delete', :title => image.title),
+                    :title => t('delete', :scope => 'refinery.admin.images'),
+                    :confirm => t('message', :scope => 'refinery.admin.delete', :title => image.title),
                     :method => :delete %>
       </span>
     </li>

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

@@ -0,0 +1,2 @@
+<%= will_paginate @images if Refinery::Admin::ImagesController.pageable? %>
+<%= render "#{Refinery::Images.preferred_image_view}_view" %>

data/app/views/{admin → refinery/admin}/images/_list_view_image.html.erb

@@ -6,12 +6,14 @@
     <%= link_to refinery_icon_tag('eye.png'), list_view_image.url,
                 :target => "_blank",
                 :title => "#{image_fu list_view_image, '96x96#c', :size => '96x96'}" %>
-    <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_image_path(list_view_image),
-                :title => t('edit', :scope => 'admin.images') %>
-    <%= link_to refinery_icon_tag('delete.png'), admin_image_path(list_view_image),
+    <%= 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 => 'admin.images'),
-                :confirm => t('message', :scope => 'shared.admin.delete', :title => list_view_image.title),
+                :title => t('delete', :scope => 'refinery.admin.images'),
+                :confirm => t('message', :scope => 'refinery.admin.delete', :title => list_view_image.title),
                 :method => :delete %>
   </span>
 </li>

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

@@ -0,0 +1,18 @@
+<% if searching? %>
+  <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
+<% end %>
+<div class='pagination_container'>
+  <% if @images.any? %>
+    <%= render 'images' %>
+  <% else %>
+    <p>
+      <% unless searching? %>
+        <strong>
+          <%= t('.no_images_yet') %>
+        </strong>
+      <% else %>
+        <%= t('no_results', :scope => 'refinery.admin.search') %>
+      <% end %>
+    </p>
+  <% end %>
+</div>

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

@@ -0,0 +1 @@
+<%= render 'form' %>

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

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

data/app/views/{admin → refinery/admin}/images/insert.html.erb

@@ -16,25 +16,22 @@
 
 <div id='dialog_main'>
   <% if any_images or user_can_modify_images %>
-    <%= render :partial => "existing_image" if any_images or searching? %>
+    <%= render 'existing_image' if any_images or searching? %>
 
     <% if user_can_modify_images %>
       <div id='upload_image_area' class='dialog_area'<%= " style='display:none;'" if any_images and (no_errors or searching?) %>>
-        <%= render :partial => "form", :locals => {:insert => true} %>
+        <%= render 'form', :insert => true %>
       </div>
     <% end %>
   <% else %>
-    <% flash.now[:error] = t('no_images_yet', :scope => 'admin.images.records').split('.').first.html_safe + "." %>
-    <%= render :partial => "/shared/admin/form_actions",
-               :locals => {
-                 :f => nil,
-                 :cancel_url => '',
-                 :hide_cancel => false,
-                 :hide_delete => true,
-                 :hide_submit => true,
-                 :cancel_button_text => t('close', :scope => 'shared.admin.form_actions'),
-                 :cancel_title => nil
-               } %>
+    <% flash.now[:error] = t('no_images_yet', :scope => 'refinery.admin.images.records').split('.').first.html_safe + "." %>
+    <%= render '/refinery/admin/form_actions', :f => nil,
+               :cancel_url => '',
+               :hide_cancel => false,
+               :hide_delete => true,
+               :hide_submit => true,
+               :cancel_button_text => t('close', :scope => 'refinery.admin.form_actions'),
+               :cancel_title => nil %>
   <% end %>
 </div>