refinerycms-resources 0.9.9.21 → 0.9.9.22

data/app/controllers/admin/resources_controller.rb

@@ -10,7 +10,7 @@ module Admin
     def new
       @resource = Resource.new if @resource.nil?
 
-      @url_override = admin_resources_url(:dialog => from_dialog?)
+      @url_override = admin_resources_path(:dialog => from_dialog?)
     end
 
     def create
@@ -44,7 +44,7 @@ module Admin
     def insert
       self.new if @resource.nil?
 
-      @url_override = admin_resources_url(request.query_parameters.merge(:insert => true))
+      @url_override = admin_resources_path(request.query_parameters.merge(:insert => true))
 
       if params[:conditions].present?
         extra_condition = params[:conditions].split(',')

data/app/views/admin/resources/_resource.html.erb

@@ -6,7 +6,7 @@
   <span class='actions'>
     <%= link_to refinery_icon_tag('page_white_put.png'),  resource.url,
                 :title => t('.download', :size => number_to_human_size(resource.size)) %>
-    <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_resource_url(resource),
+    <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_resource_path(resource),
                 :title => t('edit', :scope => 'admin.resources') %>
     <%= link_to refinery_icon_tag('delete.png'), admin_resource_path(resource),
                 :class => "cancel confirm-delete",

data/config/locales/fi.yml

@@ -27,7 +27,7 @@ fi:
         button_text: Lisää
   activerecord:
     models:
-      resource: file
+      resource: tiedosto
     errors:
       models:
         resource:

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-resources.rb

@@ -22,31 +22,32 @@ module Refinery
         app_resources = Dragonfly[:resources]
         app_resources.configure_with(:rails) do |c|
           c.datastore.root_path = Rails.root.join('public', 'system', 'resources').to_s
-          c.url_path_prefix = '/system/resources'
+          # This url_format 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 file was 'refinery_is_awesome.pdf')
+          # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.pdf
+          c.url_format = '/system/resources/:job/:basename.:format'
           c.secret = RefinerySetting.find_or_set(:dragonfly_secret,
                                                  Array.new(24) { rand(256) }.pack('C*').unpack('H*').first)
         end
-        app_resources.configure_with(:heroku, ENV['S3_BUCKET']) if Refinery.s3_backend
+
+        if Refinery.s3_backend
+          app_resources.configure_with(:heroku, ENV['S3_BUCKET'])
+          # Dragonfly doesn't set the S3 region, so we have to do this manually
+          app_resources.datastore.configure do |d|
+            d.region = ENV['S3_REGION'] if ENV['S3_REGION'] # defaults to 'us-east-1'
+          end
+        end
 
         app_resources.define_macro(ActiveRecord::Base, :resource_accessor)
         app_resources.analyser.register(Dragonfly::Analysis::FileCommandAnalyser)
         app_resources.content_disposition = :attachment
 
-        # 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 file was 'refinery_is_awesome.pdf')
-        # /system/images/BAhbB1sHOgZmIiMyMDEwLzA5LzAxL1NTQ19DbGllbnRfQ29uZi5qcGdbCDoGcDoKdGh1bWIiDjk0MngzNjAjYw/refinery_is_awesome.pdf
-        # Officially the way to do it, from: http://markevans.github.com/dragonfly/file.URLs.html
-        app_resources.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', :resources, '/system/resources'
+        app.config.middleware.insert_after 'Rack::Lock', 'Dragonfly::Middleware', :resources
 
         app.config.middleware.insert_before 'Dragonfly::Middleware', 'Rack::Cache', {
           :verbose     => Rails.env.development?,

data/refinerycms-resources.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-resources}
-  s.version           = %q{0.9.9.21}
+  s.version           = %q{0.9.9.22}
   s.summary           = %q{Resources engine for Refinery CMS}
   s.description       = %q{Handles all file 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}
@@ -88,7 +88,7 @@ Gem::Specification.new do |s|
     'spec/uploads/refinery_is_awesome.txt'
   ]
 
-  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-resources
 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 
@@ -108,6 +109,7 @@ files:
 - refinerycms-resources.gemspec
 - spec/models/resource_spec.rb
 - spec/uploads/refinery_is_awesome.txt
+has_rdoc: true
 homepage: http://refinerycms.com
 licenses: 
 - MIT
@@ -131,10 +133,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: Resources engine for Refinery CMS
 test_files: []
 
-has_rdoc: