refinerycms-images 0.9.9.21 → 0.9.9.22

data/app/controllers/admin/images_controller.rb

@@ -13,14 +13,14 @@ module Admin
     def new
       @image = Image.new if @image.nil?
 
-      @url_override = admin_images_url(:dialog => from_dialog?)
+      @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_url(request.query_parameters.merge(:insert => true))
+      @url_override = admin_images_path(request.query_parameters.merge(:insert => true))
 
       if params[:conditions].present?
         extra_condition = params[:conditions].split(',')

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

@@ -3,13 +3,13 @@
     <%= render :partial => "/shared/admin/search", :locals => {:url => admin_images_url} %>
   </li>
   <li>
-    <%= link_to t('.create_new_image'), new_admin_image_url(:dialog => true, :width => 600, :height => 300),
+    <%= 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_url(:view => image_view, :page => params[:page]),
+                  admin_images_path(:view => image_view, :page => params[:page]),
                   :class => "reorder_icon"  %>
     </li>
   <% end %>

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

@@ -1,6 +1,6 @@
 <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_url(params.dup.delete(:image))} %>
+             :locals => {:url => insert_admin_images_path(params.dup.delete(:image))} %>
   <input type='hidden' name='selected_image' id='selected_image' />
   <div id='existing_image_area_content' class='clearfix'>
 <% if @images.any? %>

data/config/locales/fi.yml

@@ -20,9 +20,9 @@ fi:
         no_images_yet: Kuvia ei ole vielä lisätty. Paina "Lisää uusi kuva-" nappia lisätäksesi ensimmäisen kuvan.
       index:
         view:
-          switch_to: "Siirry %{view_name}näkymään"
-          list: lista
-          grid: ruudukko
+          switch_to: "%{view_name}näkymä"
+          list: Lista
+          grid: Ruudukko
       grid_view:
         view_live_html: Katsele tätä kuvaa <br/><em>Avautuu uudessa ikkunassa</em>
       existing_image:
@@ -34,7 +34,7 @@ fi:
         new_image: Lisää
   activerecord:
     models:
-      image: image
+      image: kuva
     errors:
       models:
         image:

data/lib/gemspec.rb

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   ]
 
   s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
-  s.add_dependency 'dragonfly',        '~> 0.8.4'
+  s.add_dependency 'dragonfly',        '~> 0.9.0'
   s.add_dependency 'rack-cache',       '>= 0.5.3'
 end
 EOF

data/lib/refinerycms-images.rb

@@ -23,31 +23,32 @@ module Refinery
         app_images.configure_with(:imagemagick)
         app_images.configure_with(:rails) do |c|
           c.datastore.root_path = Rails.root.join('public', 'system', 'images').to_s
-          c.url_path_prefix = '/system/images'
+          # This url_format it so that dragonfly urls work in traditional
+          # situations where the filename and extension are required, e.g. lightbox.
+          # What this does is takes the url that is about to be produced e.g.
+          # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw
+          # and adds the filename onto the end (say the image was 'refinery_is_awesome.jpg')
+          # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.jpg
+          c.url_format = '/system/images/:job/:basename.:format'
           c.secret = RefinerySetting.find_or_set(:dragonfly_secret,
                                                 Array.new(24) { rand(256) }.pack('C*').unpack('H*').first)
         end
-        app_images.configure_with(:heroku, ENV['S3_BUCKET']) if Refinery.s3_backend
+
+        if Refinery.s3_backend
+          app_images.configure_with(:heroku, ENV['S3_BUCKET'])
+          # Dragonfly doesn't set the S3 region, so we have to do this manually
+          app_images.datastore.configure do |d|
+            d.region = ENV['S3_REGION'] if ENV['S3_REGION'] # otherwise defaults to 'us-east-1'
+          end
+        end
 
         app_images.define_macro(ActiveRecord::Base, :image_accessor)
-        app_images.analyser.register(Dragonfly::Analysis::ImageMagickAnalyser)
+        app_images.analyser.register(Dragonfly::ImageMagick::Analyser)
         app_images.analyser.register(Dragonfly::Analysis::FileCommandAnalyser)
 
-        # This url_suffix makes it so that dragonfly urls work in traditional
-        # situations where the filename and extension are required, e.g. lightbox.
-        # What this does is takes the url that is about to be produced e.g.
-        # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw
-        # and adds the filename onto the end (say the image was 'refinery_is_awesome.jpg')
-        # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.jpg
-        # Officially the way to do it, from: http://markevans.github.com/dragonfly/file.URLs.html
-        app_images.url_suffix = proc{|job|
-          object_file_name = job.uid_basename.gsub(%r{^(\d{4}|\d{2})[_/]\d{2}[_/]\d{2}[_/]\d{2,3}[_/](\d{2}/\d{2}/\d{3}/)?}, '')
-          "/#{object_file_name}#{job.encoded_extname || job.uid_extname}"
-        }
-
         ### Extend active record ###
 
-        app.config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :images, '/system/images'
+        app.config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :images
 
         app.config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
           :verbose     => Rails.env.development?,

data/refinerycms-images.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-images}
-  s.version           = %q{0.9.9.21}
+  s.version           = %q{0.9.9.22}
   s.summary           = %q{Images engine for Refinery CMS}
   s.description       = %q{Handles all image upload and processing functionality in Refinery CMS.}
-  s.date              = %q{2011-05-03}
+  s.date              = %q{2011-05-22}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -95,7 +95,7 @@ Gem::Specification.new do |s|
     'spec/uploads/beach.jpeg'
   ]
 
-  s.add_dependency 'refinerycms-core', '= 0.9.9.21'
-  s.add_dependency 'dragonfly',        '~> 0.8.4'
+  s.add_dependency 'refinerycms-core', '= 0.9.9.22'
+  s.add_dependency 'dragonfly',        '~> 0.9.0'
   s.add_dependency 'rack-cache',       '>= 0.5.3'
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-images
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.21
+  version: 0.9.9.22
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 Z
+date: 2011-05-22 00:00:00 +12:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-core
@@ -23,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -34,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.4
+        version: 0.9.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -113,6 +114,7 @@ files:
 - refinerycms-images.gemspec
 - spec/models/image_spec.rb
 - spec/uploads/beach.jpeg
+has_rdoc: true
 homepage: http://refinerycms.com
 licenses: 
 - MIT
@@ -136,10 +138,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Images engine for Refinery CMS
 test_files: []
 
-has_rdoc: