refinerycms-images 1.0.11 → 2.0.0

data/app/controllers/admin/images_controller.rb

@@ -1,106 +0,0 @@
-module Admin
-  class ImagesController < Admin::BaseController
-
-    include Admin::ImagesHelper
-
-    crudify :image,
-            :order => "created_at DESC",
-            :sortable => false,
-            :xhr_paging => true
-
-    before_filter :change_list_mode_if_specified, :init_dialog
-
-    def new
-      @image = Image.new if @image.nil?
-
-      @url_override = admin_images_path(:dialog => from_dialog?)
-    end
-
-    # This renders the image insert dialog
-    def insert
-      self.new if @image.nil?
-
-      @url_override = 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 = Image.create(params[:image]))
-        else
-          params[:image][:image].each do |image|
-            @images << (@image = Image.create(:image => image))
-          end
-        end
-      rescue Dragonfly::FunctionManager::UnableToHandle
-        logger.warn($!.message)
-        @image = Image.new
-      end
-
-      unless params[:insert]
-        if @images.all?{|i| i.valid?}
-          flash.notice = t('created', :scope => 'refinery.crudify', :what => "'#{@images.collect{|i| i.title}.join("', '")}'")
-          unless from_dialog?
-            redirect_to :action => 'index'
-          else
-            render :text => "<script>parent.window.location = '#{admin_images_url}';</script>"
-          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?{|i| i.valid?}
-          @image_id = @image.id if @image.persisted?
-          @image = nil
-
-          redirect_to request.query_parameters.merge(:action => 'insert')
-        else
-          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 paginate_images
-      @images = @images.paginate(:page => (@paginate_page_number ||= 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

data/app/helpers/admin/images_helper.rb

@@ -1,27 +0,0 @@
-module Admin
-  module ImagesHelper
-
-    def image_views
-      RefinerySetting.find_or_set(:image_views, [:grid, :list])
-    end
-
-    def current_image_view
-      RefinerySetting.find_or_set(:preferred_image_view, :grid)
-    end
-
-    def other_image_views
-      image_views.reject {|image_view| image_view.to_s == current_image_view.to_s }
-    end
-
-    def change_list_mode_if_specified
-      if action_name == 'index' and params[:view].present? and image_views.include?(params[:view].to_sym)
-        RefinerySetting.set(:preferred_image_view, params[:view])
-      end
-    end
-
-    def images_paginator(collection, dialog = false)
-      will_paginate collection
-    end
-
-  end
-end

data/app/models/image.rb

@@ -1,116 +0,0 @@
-# encoding: utf-8
-
-class Image < ActiveRecord::Base
-
-  # What is the max image size a user can upload
-  MAX_SIZE_IN_MB = 5
-
-  image_accessor :image
-
-  validates :image, :presence  => {},
-                    :length    => { :maximum => MAX_SIZE_IN_MB.megabytes }
-  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]
-
-  # when a dialog pops up with images, how many images per page should there be
-  PAGES_PER_DIALOG = 18
-
-  # when a dialog pops up with images, but that dialog has image resize options
-  # how many images per page should there be
-  PAGES_PER_DIALOG_THAT_HAS_SIZE_OPTIONS = 12
-
-  # when listing images out in the admin area, how many images should show per page
-  PAGES_PER_ADMIN_INDEX = 20
-
-  # 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
-          PAGES_PER_DIALOG
-        else
-          PAGES_PER_DIALOG_THAT_HAS_SIZE_OPTIONS
-        end
-      else
-        PAGES_PER_ADMIN_INDEX
-      end
-    end
-
-    def user_image_sizes
-      RefinerySetting.find_or_set(:user_image_sizes, {
-        :small => '110x110>',
-        :medium => '225x255>',
-        :large => '450x450>'
-      }, :destroyable => false)
-    end
-  end
-
-  # Get a thumbnail job object given a geometry.
-  def thumbnail(geometry = nil)
-    if geometry.is_a?(Symbol) and self.class.user_image_sizes.keys.include?(geometry)
-      geometry = self.class.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

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

@@ -1,16 +0,0 @@
-<ul>
-  <li>
-    <%= render :partial => "/shared/admin/search", :locals => {:url => admin_images_url} %>
-  </li>
-  <li>
-    <%= link_to t('.create_new_image'), new_admin_image_path(:dialog => true, :width => 600, :height => 300),
-                :class => "add_icon" %>
-  </li>
-  <% other_image_views.each do |image_view| %>
-    <li>
-      <%= link_to t('switch_to', :scope => 'admin.images.index.view', :view_name => t("#{image_view}", :scope => 'admin.images.index.view')),
-                  admin_images_path(:view => image_view, :page => params[:page]),
-                  :class => "reorder_icon"  %>
-    </li>
-  <% end %>
-</ul>

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

@@ -1,2 +0,0 @@
-<%= will_paginate @images %>
-<%= render :partial => "#{current_image_view}_view" %>

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

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

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

@@ -1 +0,0 @@
-<%= render :partial => "form" %>

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

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

data/app/views/admin/images/new.html.erb

@@ -1 +0,0 @@
-<%= render :partial => "/admin/images/form" %>

data/config/locales/jp.yml

@@ -1,43 +0,0 @@
-jp:
-  plugins:
-    refinery_images:
-      title: 画像
-      description: 画像の編集
-  admin:
-    images:
-      delete: この画像を削除
-      edit: 画像を編集
-      form:
-        image: 画像
-        use_current_image: この画像を使用する
-        or: または
-        replace_image: " この画像と差し替える"
-        current_image: 選択されている画像
-        maximum_image_size: '画像は最大で %{megabytes}MB　までです。'
-      actions:
-        create_new_image: 画像を追加する
-      records:
-        no_images_yet: まだ画像はありません。「画像を追加する」をクリックして下さい。
-      index:
-        view:
-          switch_to: '%{view_name}表示に切り替え'
-          list: リスト
-          grid: グリッド
-      grid_view:
-        view_live_html: 'この画像を<br/><em>新しいウィンドウで開く</em>'
-      existing_image:
-        button_text: 挿入
-        resize_image: サイズ変更
-        size: サイズ
-      insert:
-        existing_image: ライブラリ
-        new_image: アップロード
-  activerecord:
-    models:
-      image: 画像
-    errors:
-      models:
-        image:
-          blank: アップロードする画像を選択して下さい。
-          too_long: '画像は最大で%{count}までです。'
-          incorrect_format: '使用出来る画像のフォーマットはJPG、GIFまたはPNGです。'

data/config/locales/lolcat.yml

@@ -1,43 +0,0 @@
-lolcat:
-  plugins:
-    refinery_images:
-      title: IMAGEZ
-      description: MANAGE IMAGEZ
-  admin:
-    images:
-      delete: REMOOV DIS IMAGE FOREVR
-      edit: EDIT DIS IMAGE
-      form:
-        image: IMAGE
-        use_current_image: USE CURRENT IMAGE
-        or: OR
-        replace_image: " REPLACE IT WIF DIS WAN..."
-        current_image: CURRENT IMAGE
-        maximum_image_size: TEH MAXIMUM IMAGE SIZE IZ %{megabytes} MEGABYTEZ.
-      actions:
-        create_new_image: ADD NEW IMAGE
-      records:
-        no_images_yet: THAR R NO IMAGEZ YET. CLICK "ADD NEW IMAGE" 2 ADD UR FURST IMAGE.
-      index:
-        view:
-          switch_to: SWITCH 2 %{view_name} VIEW
-          list: LIST
-          grid: GRID
-      grid_view:
-        view_live_html: VIEW DIS IMAGE <BR/><EM>OPENS IN NEW WINDOW</EM>
-      existing_image:
-        button_text: INSERT
-        resize_image: RESIZE TEH IMAGE?
-        size: SIZE
-      insert:
-        existing_image: EXISTIN IMAGE
-        new_image: NEW IMAGE
-  activerecord:
-    models:
-      image: IMAGE
-    errors:
-      models:
-        image:
-          blank: U MUST SPECIFY AN IMAGE 4 UPLOAD
-          too_long: IMAGE SHUD BE SMALLR THAN %{count} IN SIZE
-          incorrect_format: UR IMAGE MUST BE EITHR JPG, PNG OR GIF

data/features/manage_images.feature

@@ -1,49 +0,0 @@
-@refinerycms @images @images-manage
-Feature: Manage Images
-  In order to control the content on my website
-  As an administrator
-  I want to create and manage images
-
-  Background:
-    Given I am a logged in refinery user
-    And I have no images
-
-  @images-valid @valid
-  Scenario: Create Valid Image
-    When I go to the list of images
-    And I follow "Add new image"
-    And I attach the image at "beach.jpeg"
-    And I press "Save"
-    Then the image "beach.jpeg" should have uploaded successfully
-    And I should have 1 image
-    And the image should have size "254718"
-    And the image should have width "500"
-    And the image should have height "375"
-    And the image should have mime_type "image/jpeg"
-
-  @images-invalid @invalid
-  Scenario: Create Invalid Image (format)
-    When I go to the list of images
-    And I follow "Add new image"
-    And I upload the image at "refinery_is_awesome.txt"
-    And I press "Save"
-    Then I should not see "successfully added"
-    And I should have 0 images
-
-  @images-edit @edit
-  Scenario: Edit Existing Image
-    When I upload the image at "beach.jpeg"
-    And I go to the list of images
-    And I follow "Edit this image"
-    And I attach the image at "id-rather-be-here.jpg"
-    And I press "Save"
-    Then I should see "'Id Rather Be Here' was successfully updated."
-    And I should have 1 image
-
-  @images-delete @delete
-  Scenario: Delete Image
-    When I upload the image at "beach.jpeg"
-    When I go to the list of images
-    And I follow "Remove this image forever"
-    Then I should see "'Beach' was successfully removed."
-    And I should have 0 images