imagine_cms 3.0.0.beta11 → 3.0.0.beta12

data/README.rdoc

@@ -2,6 +2,13 @@
 
 Imagine CMS is a content management system developed by {Bigger Bird Creative, Inc.}[https://www.biggerbird.com] in 2006 for its clients. Other systems came with a learning curve: fine for daily users, but clients who only used it once a month or so would never remember how to use the system the next time they logged in. Simpler systems didn't allow us enough flexibility as designers and developers.
 
+=Usage & Demo
+
+Add to your Gemfile:
+gem 'imagine_cms'
+
+Working on the demo... it needs to be fairly resilient to hacking attempts, not a trivial thing to set up.
+
 =History and Roadmap
 
 Thus, Imagine was created in the Rails 1.0 days, to run a large number of technically simple content-based sites (versus the one or two highly customized web applications most Rails developers were building at the time). We wanted to provide a way to create and manage static content while also allowing some automation (navigation, RSS feeds, etc.) while also allowing limitless custom development. However, because plugins/engines were quite limited in those days, Imagine was implemented by monkey-patching core parts of Rails and creating a new framework on top of Rails. Although this allowed us great insight into the inner workings of Rails (and led to a minor contribution to Rails core), this approach proved extremely difficult to port to Rails 2. Thus, sites using Imagine have been stuck on Rails 1.2 since time immemorial.
@@ -50,7 +57,7 @@ Assets:
 
 Config changes:
 * Move constants from config/environment.rb to config/initializers/imagine_cms.rb. Use Object.send(:remove_const, :ConstantName) as needed to override default values (bit of a stupid workaround but it works).
-* Create config/amazon_s3.yml and add AWS account credentials (preferably IAM, not master account)
+* [To enable S3 asset storage] Create config/imagine_cms.yml (see sample in test/dummy/config) and add AWS account credentials (preferably IAM, not master account). If using CloudFront, enable "Forward Query Strings" (Behaviors > Edit) to make sure visitors see the latest versions of uploaded assets.
 
 Third party libraries no longer included:
 * Install fop in vendor/ if needed.

data/app/controllers/management/cms_controller.rb

@@ -434,6 +434,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
           @pg.published_version = @pg.version
         end
         
+        @pg.updated_on = Time.now.utc
         @pg.save
         
         # do a little bit of classification... for now, just identify page lists
@@ -703,7 +704,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def upload_image
     @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     
     if File.exists?(target_dir)
       redirect_to :action => 'select_gallery', :id => @pg, :gallery_id => params[:gallery_id]
@@ -715,33 +716,24 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   def receive_image
     @pg = CmsPage.find_by_id(params[:id])
     
-    data = params[:file][:data]
-    original_filename = data.original_filename
     target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
-    localfile = File.join(target_dir, original_filename)
-    
     FileUtils.mkdir_p target_dir
     
-    unless params[:overwrite].to_i == 1
-      count = 0
-      while File.exists?(localfile)
-        count += 1
-        localfile = File.join(target_dir, File.basename(original_filename, File.extname(original_filename))) + "-#{count}" + File.extname(original_filename)
-      end
-    end
-    
+    data = params[:file][:data]
+    original_filename = data.original_filename.strip.gsub(/[\?\s\/\:\\]+/, '-').gsub(/^-/, '').gsub(/-$/, '')
+    localfile = File.join(target_dir, original_filename)
     FileUtils.cp(data.tempfile, localfile)
     
-    finish_upload_status "'#{File.basename(localfile)}'" and return
+    finish_upload_status "'#{File.basename(localfile)}'"
   end
   
   def crop_image
     @pg = CmsPage.find_by_id(params[:id])
-    localfile = File.basename(params[:filename])
+    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
     
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
-      @image_file = localfile
+      @image_file = localfile + "?#{File.mtime(localfile).to_i}"
       upload_to_s3(localfile, @pg)
       
       render :partial => 'crop_results' and return
@@ -749,8 +741,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     
     # if we're still here... let's crop!
-    target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
-    localfile = File.join(target_dir, localfile)
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     testfile = File.join(target_dir, File.basename(localfile, File.extname(localfile))) + '-croptest' + File.extname(localfile)
     
     # make a smaller version to help with cropping
@@ -770,7 +761,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def save_crop
     @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     testfile = File.join(target_dir, File.basename(params[:filename]))
     localfile = testfile.split(/-croptest/).join('')
     
@@ -806,7 +797,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     end
     
     orig_im.write(localfile) if dirty
-    @image_file = localfile
+    @image_file = localfile + "?#{File.mtime(localfile).to_i}"
     File.unlink testfile
     upload_to_s3(localfile, @pg)
     
@@ -815,78 +806,57 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def receive_gallery
     @pg = CmsPage.find_by_id(params[:id])
-    begin
-      data = params[:gallery_file][:data]
-      target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
-      localdir = File.join(target_dir, 'gallery_1')
-      
-      begin
-        FileUtils.mkdir_p target_dir
-      rescue Exception => e
-        logger.debug "Exception: #{e}"
-        log_error(e)
-        finish_upload_status "''" and return
-      end
-      
-      unless params[:overwrite].to_i == 1
-        count = 1
-        while File.exists?(localdir)
-          count += 1
-          localdir = File.join(target_dir, "gallery_#{count}")
-        end
-      end
-      
-      begin
-        FileUtils.mkdir_p File.join(localdir, 'temp')
-      rescue Exception => e
-        logger.debug "Exception: #{e}"
-        log_error(e)
-        finish_upload_status "''" and return
-      end
+    
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    FileUtils.mkdir_p target_dir
+    
+    count = 1
+    localdir = File.join(target_dir, 'gallery_1')
+    while File.exists?(localdir) && count < 100
+      count += 1
+      localdir = File.join(target_dir, "gallery_#{count}")
+    end
+    FileUtils.mkdir_p File.join(localdir, 'temp')
+    
+    data = params[:gallery_file][:data]
+    # read zip file
+    
+    entries = []
+    Zip::ZipFile.foreach(data.path) do |zipentry|
+      next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
+      next if File.basename(zipentry.name) =~ /^\._/
       
-      # read zip file
-      entries = []
-      Zip::ZipFile.foreach(data.path) do |zipentry|
-        next if ![ '.jpg', '.jpeg', '.png', '.gif' ].include?(File.extname(zipentry.name).downcase) || zipentry.size < 1000
-        next if File.basename(zipentry.name) =~ /^\._/
+      entries << zipentry
+    end
+    entries.sort! { |a,b| File.basename(a.name).downcase <=> File.basename(b.name).downcase }
+    
+    Zip::ZipFile.open(data.path) do |zipfile|
+      entries.each_with_index do |zipentry, index|
+        upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
+        ext = File.extname(zipentry.name)
+        localfile = File.join(localdir, 'temp', (index+1).to_s + ext.downcase)
+        jpgfile = File.join(localdir, 'temp', (index+1).to_s + '.jpg')
         
-        entries << zipentry
-      end
-      entries.sort! { |a,b| File.basename(a.name).downcase <=> File.basename(b.name).downcase }
-      
-      Zip::ZipFile.open(data.path) do |zipfile|
-        entries.each_with_index do |zipentry, index|
-          upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
-          ext = File.extname(zipentry.name)
-          localfile = File.join(localdir, 'temp', (index+1).to_s + ext.downcase)
-          jpgfile = File.join(localdir, 'temp', (index+1).to_s + '.jpg')
+        begin
+          zipentry.extract(localfile)
           
-          begin
-            zipentry.extract(localfile)
-            
-            im = MiniMagick::Image.from_file(localfile)
-            im.write(jpgfile)
-            
-            File.unlink(localfile) if localfile != jpgfile
-            
-          rescue Exception => e
-            log_error(e)
-          end
+          im = MiniMagick::Image.from_file(localfile)
+          im.write(jpgfile)
+          
+          File.unlink(localfile) if localfile != jpgfile
+          
+        rescue Exception => e
+          log_error(e)
         end
       end
-    rescue Exception => e
-      logger.debug params.inspect
-      log_error(e)
-      finish_upload_status "''" and return
     end
     
-    upload_progress.message = "File received successfully."
-    finish_upload_status "'#{File.basename(localdir)}'" and return
+    finish_upload_status "'#{File.basename(localdir)}'"
   end
   
   def gallery_setup
     @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join('images', 'content', @pg.path)
+    target_dir = File.join('assets', 'content', @pg.path)
     @dirname = File.join(target_dir, File.basename(params[:dirname]), 'temp')
     Dir.chdir(File.join(Rails.root, 'public'))
     @images = Dir.glob("#{@dirname}/*.{jpg,jpeg,png,gif}").sort
@@ -915,9 +885,10 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     render :partial => 'gallery_setup'
   end
   
+  
   def complete_gallery
     @pg = CmsPage.find(params[:id])
-    target_dir = File.join('images', 'content', @pg.path)
+    target_dir = File.join('assets', 'content', @pg.path)
     @dirname = File.join(target_dir, File.basename(params[:dirname]))
     @thumbs = session[:gallery_thumbs_ordered]
     max_width = params[:max_width].to_i
@@ -968,7 +939,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
 
   def gallery_management
     @pg = CmsPage.find_by_id(params[:id])
-    galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     @galleries = Dir.glob("#{galleries_dir}/gallery_*")
     gallery_dir = File.join(galleries_dir, params[:gallery_id].to_s)
     
@@ -990,7 +961,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def select_gallery
     @pg = CmsPage.find_by_id(params[:id])
-    @target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+    @target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     @galleries = Dir.glob("#{@target_dir}/gallery_*")
     
     create_preview_images
@@ -1017,7 +988,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def sort_images
     @pg = CmsPage.find_by_id(params[:id])
-    gallery_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path, params[:gallery_id])
+    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
     
     @images = Dir.glob("#{gallery_dir}/*.{jpg,jpeg,png,gif}").reject { |img| img.include?('thumb') }.map { |img| File.basename(img).split('.').first.to_i }.sort
     
@@ -1031,7 +1002,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def sort_images_save
     @pg = CmsPage.find_by_id(params[:id])
-    gallery_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path, params[:gallery_id])
+    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, params[:gallery_id])
     temp_dir = File.join(gallery_dir, 'temp')
     sorted_images = session[:gallery_images_sorted] || []
     
@@ -1081,7 +1052,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   end
   
   def image_details
-    gallery_dir = File.join(Rails.root, 'public', 'images', 'content', params[:path].to_s, params[:gallery_id])
+    gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', params[:path].to_s, params[:gallery_id])
     
     # create blank captions.yml if it doesn't already exist
     create_captions_file(params[:id])
@@ -1095,7 +1066,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def update_caption
     if request.post?
-      gallery_dir = File.join(Rails.root, 'public', 'images', 'content', params[:path].to_s, params[:gallery_id])
+      gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', params[:path].to_s, params[:gallery_id])
       
       image_id = params[:image].split('.')[0].to_i
       
@@ -1113,7 +1084,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def add_to_gallery
     @pg = CmsPage.find_by_id(params[:id])
-    galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     @galleries = Dir.entries(galleries_dir).sort
     @gallery_dir = File.join(galleries_dir, params[:gallery_id])    
     images = Dir.glob("#{@gallery_dir}/*-thumb.{jpg,jpeg,png,gif}")
@@ -1202,7 +1173,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def delete_photo
     if request.post?
-      gallery_dir = File.join(Rails.root, 'public', 'images', 'content', params[:path].to_s, params[:gallery_id])
+      gallery_dir = File.join(Rails.root, 'public', 'assets', 'content', params[:path].to_s, params[:gallery_id])
       
       image_id = params[:image].split('.')[0].to_i
       
@@ -1245,7 +1216,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def delete_gallery
     @pg = CmsPage.find_by_id(params[:id])
-    galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+    galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     gallery_dir = File.join(galleries_dir, params[:gallery_id])
     
     FileUtils.rm_rf(gallery_dir)
@@ -1261,58 +1232,26 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def receive_file
     @pg = CmsPage.find_by_id(params[:id])
-    begin
-      data = params[:file][:data]
-      original_filename = data.original_filename.downcase.gsub(/[^\.\w\d]+/, '_')
-      target_dir = File.join(Rails.root, 'public', 'files', 'content', @pg.path)
-      localfile = File.join(target_dir, original_filename)
-      
-      begin
-        FileUtils.mkdir_p target_dir
-      rescue Exception => e
-        logger.debug "Exception: #{e}"
-        log_error(e)
-        finish_upload_status "''" and return
-      end
-      
-      unless params[:overwrite].to_i == 1
-        count = 0
-        while File.exists?(localfile)
-          count += 1
-          localfile = File.join(target_dir, File.basename(original_filename, File.extname(original_filename))) + "-#{count}" + File.extname(original_filename)
-        end
-      end
-      
-      begin
-        File.open(localfile, 'wb') { |f| f.write('test') }
-      rescue Exception => e
-        logger.debug "Exception: #{e}"
-        log_error(e)
-        finish_upload_status "''" and return
-      end
-      
-      begin
-        File.open(localfile, 'wb') { |f| f.write(data.read) }
-      rescue Exception => e
-        logger.debug "Exception: #{e}"
-        log_error(e)
-        finish_upload_status "''" and return
-      end
-    rescue Exception => e
-      logger.debug params.inspect
-      # logger.debug "Exception: #{e}"
-      log_error(e)
-      finish_upload_status "''" and return
-    end
     
-    upload_progress.message = "File received successfully."
-    finish_upload_status "'#{File.basename(localfile)}'" and return
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
+    FileUtils.mkdir_p target_dir
+    
+    data = params[:file][:data]
+    original_filename = data.original_filename.strip.gsub(/[\?\s\/\:\\]+/, '-').gsub(/^-/, '').gsub(/-$/, '')
+    localfile = File.join(target_dir, original_filename)
+    FileUtils.cp(data.tempfile, localfile)
+    
+    finish_upload_status "'#{File.basename(localfile)}'"
   end
   
   def create_file_link
     @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join('files', 'content', @pg.path)
-    @filename = File.join(target_dir, File.basename(params[:filename]))
+    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
+    
+    @filename = localfile + "?#{File.mtime(localfile).to_i}"
+    upload_to_s3(localfile, @pg, ImagineCmsConfig['amazon_s3'][Rails.env]['file_bucket'],
+                                 ImagineCmsConfig['amazon_s3']['file_prefix'])
+    
     render :partial => 'create_file_link'
   end
   
@@ -1324,19 +1263,18 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def crop_thumb
     @pg = CmsPage.find_by_id(params[:id])
-    localfile = File.basename(params[:filename])
+    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
     
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
-      @image_file = localfile
+      @image_file = localfile + "?#{File.mtime(localfile).to_i}"
       upload_to_s3(localfile, @pg)
       render :partial => 'crop_results_thumb' and return
     end
     
     
     # if we're still here... let's crop!
-    target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
-    localfile = File.join(target_dir, localfile)
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     testfile = File.join(target_dir, File.basename(localfile, File.extname(localfile))) + '-croptest' + File.extname(localfile)
     
     # make a smaller version to help with cropping
@@ -1356,7 +1294,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def save_crop_thumb
     @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     testfile = File.join(target_dir, File.basename(params[:filename]))
     localfile = testfile.split(/-croptest/).join('')
     
@@ -1394,7 +1332,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     orig_im.write(localfile) if dirty
     File.chmod(0644, localfile)
     
-    @image_file = localfile
+    @image_file = localfile + "?#{File.mtime(localfile).to_i}"
     File.unlink testfile
     upload_to_s3(localfile, @pg)
     
@@ -1408,19 +1346,18 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def crop_feature_image
     @pg = CmsPage.find_by_id(params[:id])
-    localfile = File.basename(params[:filename])
+    localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
     
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
-      @image_file = localfile
+      @image_file = localfile + "?#{File.mtime(localfile).to_i}"
       upload_to_s3(localfile, @pg)
       render :partial => 'crop_results_feature_image' and return
     end
     
     
     # if we're still here... let's crop!
-    target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
-    localfile = File.join(target_dir, localfile)
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     testfile = File.join(target_dir, File.basename(localfile, File.extname(localfile))) + '-croptest' + File.extname(localfile)
     
     # make a smaller version to help with cropping
@@ -1440,7 +1377,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def save_crop_feature_image
     @pg = CmsPage.find_by_id(params[:id])
-    target_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+    target_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
     testfile = File.join(target_dir, File.basename(params[:filename]))
     localfile = testfile.split(/-croptest/).join('')
     
@@ -1478,7 +1415,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     orig_im.write(localfile) if dirty
     File.chmod(0644, localfile)
     
-    @image_file = localfile
+    @image_file = localfile + "?#{File.mtime(localfile).to_i}"
     File.unlink testfile
     upload_to_s3(localfile, @pg)
     
@@ -1493,8 +1430,6 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       @template_options = HashObject.new
       
       if @pg.new_record? && @parent
-        # This does not appear to be a beneficial feature any longer
-        # @tags = @parent.tags.collect { |t| t.name }.join(', ')
         @parent.objects.find(:all, :conditions => [ "obj_type = 'attribute'" ]).each do |obj|
           key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
           @page_objects[key] = obj.content
@@ -1532,7 +1467,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       gallery_id = (!options[:gallery_id] ? params[:gallery_id] : options[:gallery_id])
       
       @pg = CmsPage.find_by_id(pg_id)
-      galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+      galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
       gallery_dir = File.join(galleries_dir, gallery_id)
       captions_location = File.join(gallery_dir, 'captions.yml')
       
@@ -1543,7 +1478,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     # prerequisites: @pg (CmsPage)
     def load_gallery_settings_from_file(gallery_id, options = {})
-      galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+      galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
       gallery_dir = File.join(galleries_dir, gallery_id)
       settings_location = File.join(gallery_dir, 'settings.yml')
       
@@ -1566,7 +1501,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     def save_gallery_settings_to_file(gallery_id, settings_hash, options = {})
       settings_hash = settings_hash.hash if settings_hash.kind_of?(HashObject)
       
-      galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+      galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
       gallery_dir = File.join(galleries_dir, gallery_id)
       settings_location = File.join(gallery_dir, 'settings.yml')
       
@@ -1574,33 +1509,21 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     end
     
     def resize_image(localfile)
-      ext = File.extname(localfile)
-      
-      # AKN: this would change all files to jpeg format... commenting out for now
-      # filename = File.join(File.dirname(localfile), File.basename(localfile, ext) + '.jpg')
-      filename = localfile
-      
       im = MiniMagick::Image::from_file(localfile)
       
       if im[:width] > GalleryMaxWidth || im[:height] > GalleryMaxHeight
         im.resize("#{GalleryMaxWidth}x#{GalleryMaxHeight}")
-        im.write(filename)
-      elsif filename != localfile
-        im.write(filename)
+        im.write(localfile)
       end
       
-      File.unlink(localfile) unless localfile == filename
-      
-      filename
+      localfile
     end
     
     def create_preview_image(src_file, dest, force = 0, overlay = 'gallery_small_overlay.png', thumb_size = 90)
-      require 'RMagick'
-      
       dest = File.join(dest, File.basename(src_file)) if File.directory?(dest)
       if !File.exists?(dest) || force == 1
         im = Magick::Image::read(src_file)[0]
-        im_overlay = Magick::Image::read(File.join(Rails.root, 'public', 'images', 'management', overlay))[0]
+        im_overlay = Magick::Image::read(File.join(ImagineCms::Engine.root, 'assets', 'images', 'management', overlay))[0]
         
         im.crop_resized!(thumb_size, thumb_size)
         im = im.composite(im_overlay, Magick::CenterGravity, Magick::OverCompositeOp)
@@ -1615,10 +1538,9 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       end
     end
     
+    # prerequisites: @pg (CmsPage)
     def create_preview_images(options = {})
-      # assumes @pg has already been set before calling
-      
-      galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+      galleries_dir = File.join(Rails.root, 'public', 'assets', 'content', @pg.path)
       session[:broken_galleries] = []
       
       # create preview images if not already made
@@ -1650,16 +1572,20 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       end
     end
     
-    def upload_to_s3(filename, page)
+    def upload_to_s3(filename, page, bucket = nil, prefix = nil)
       s3retries = 0
       s3success = false
       
       if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
-        filename = File.join(Rails.root, 'public', 'assets', 'content', page.path, File.basename(filename))
-        prefix = ImagineCmsConfig['amazon_s3'][Rails.env]['image_prefix']
-        bucket = ImagineCmsConfig['amazon_s3'][Rails.env]['image_bucket']
+        bucket ||= ImagineCmsConfig['amazon_s3'][Rails.env]['image_bucket']
+        prefix ||= ImagineCmsConfig['amazon_s3']['image_prefix']
+        
+        # set options + metadata
+        options = ImagineCmsConfig['amazon_s3']['metadata']
+        options[:access] = :public_read
+        
         while s3retries < 2 && !s3success
-          response = AWS::S3::S3Object.store("#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}", open(filename), bucket, :access => :public_read)
+          response = AWS::S3::S3Object.store("#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}", open(filename), bucket, options)
           s3success = response.code == 200
           s3retries += 1
         end
@@ -1670,3 +1596,21 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     end
     
 end
+
+module MiniMagick
+  class Image
+    def crop_resized(ncols, nrows, gravity='Center')
+      columns = self[:width].to_i
+      rows = self[:height].to_i
+
+      if ncols != columns || nrows != rows
+        scale = [ncols/columns.to_f, nrows/rows.to_f].max
+        resize("#{scale*(columns+0.5).to_i}x#{scale*(rows+0.5).to_i}")
+      end
+      
+      columns = self[:width].to_i
+      rows = self[:height].to_i
+      crop("#{ncols}x#{nrows}+0+0", "-gravity", "#{gravity}") if ncols != columns || nrows != rows
+    end
+  end
+end

data/app/helpers/cms_application_helper.rb

@@ -1096,11 +1096,25 @@ EOF
     ret += javascript_tag("cropper = new Cropper.Img('testImage', { minWidth: 0, minHeight: 0, captureKeys: false, onEndCrop: onEndCrop });")
   end
   
+  # filename should include version number in query string
+  def page_file_path(page, filename)
+    if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
+      prefix = ImagineCmsConfig['amazon_s3']['file_prefix']
+      hostname = ImagineCmsConfig['amazon_s3'][Rails.env]['file_hostname']
+      filename, timestamp = File.basename(filename).split('?')
+      "//#{hostname}/#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{ERB::Util.url_encode filename}?#{timestamp}"
+    else
+      "/#{File.join('assets', 'content', page.path, File.basename(filename))}"
+    end
+  end
+  
+  # filename should include version number in query string
   def page_image_path(page, filename)
     if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
-      prefix = ImagineCmsConfig['amazon_s3'][Rails.env]['image_prefix']
+      prefix = ImagineCmsConfig['amazon_s3']['image_prefix']
       hostname = ImagineCmsConfig['amazon_s3'][Rails.env]['image_hostname']
-      "//#{hostname}/#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}"
+      filename, timestamp = File.basename(filename).split('?')
+      "//#{hostname}/#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{ERB::Util.url_encode filename}?#{timestamp}"
     else
       "/#{File.join('assets', 'content', page.path, File.basename(filename))}"
     end

data/app/views/management/cms/_create_file_link.html.erb

@@ -1,6 +1,6 @@
 <%-
-	ext = File.extname(@filename)
-	ext = (ext.blank? ? 'generic' : ext.gsub(/\./, ''))
+  ext = File.extname(@filename).gsub(/\?\d+/, '')
+  ext = (ext.blank? ? 'generic' : ext.gsub(/\./, ''))
 -%>
 <%= javascript_tag <<-EOF
 var curInst = dojo.widget.Editor2Manager.getCurrentInstance();
@@ -15,7 +15,7 @@ if (!linkNode) {
     dojo.withGlobal(curInst.window, 'selectElement', dojo.html.selection, [linkNode]);
 }
 
-curInst.execCommand('inserthtml', '<a href=\"/#{@filename}\" class=\"file-#{ext}\" target=\"_blank\">'+html+'</a>');
+curInst.execCommand('inserthtml', '<a href=\"#{page_file_path(@pg, @filename)}\" class=\"file-#{ext}\" target=\"_blank\">'+html+'</a>');
 cancelInsertFile();
 EOF
 %>

data/app/views/management/cms/_crop_feature_image.html.erb

@@ -182,7 +182,7 @@ Pressing "Save Feature Image" will crop the image and set it as the new feature
       </tr>
     </table>
     
-    <%= submit_tag 'Save Feature Image', :class => 'form_button', :style => 'width: 90px;', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+    <%= submit_tag 'Save Feature Image', :class => 'form_button', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
     <%= link_to_function "Cancel", "cancelSelectThumbnail()" %>
   <%- end -%>
 </center>

data/app/views/management/cms/_crop_thumb.html.erb

@@ -182,7 +182,7 @@ Pressing "Save Thumbnail" will crop the thumbnail and set it as the new thumbnai
       </tr>
     </table>
     
-    <%= submit_tag 'Save Thumbnail', :class => 'form_button', :style => 'width: 90px;', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
+    <%= submit_tag 'Save Thumbnail', :class => 'form_button', :onclick => 'cropper.remove(); this.disabled = true; this.value = "Saving...";' %>
     <%= link_to_function "Cancel", "cancelSelectThumbnail()" %>
   <%- end -%>
 </center>

data/app/views/management/cms/_edit_page.html.erb

@@ -106,7 +106,7 @@
       <%- if @pg.new_record? -%>
         A thumbnail cannot be added until you save this page.
       <%- else -%>
-      <div id="thumbnail_preview" style="width: 100%; overflow: auto;">
+      <div id="thumbnail_preview" style="width: 385px; overflow: auto;">
         <%- if @pg.thumbnail_path.empty? -%>
           no thumbnail image selected
         <%- else -%>
@@ -127,7 +127,7 @@
       <%- if @pg.new_record? -%>
         A feature image cannot be added until you save this page.
       <%- else -%>
-      <div id="feature_image_preview" style="width: 100%; overflow: auto;">
+      <div id="feature_image_preview" style="width: 385px; overflow: auto;">
         <%- if @pg.feature_image_path.empty? -%>
           no feature image selected
         <%- else -%>

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.0.beta11"
+  VERSION = "3.0.0.beta12"
 end

data/test/dummy/config/imagine_cms.yml

@@ -0,0 +1,39 @@
+amazon_s3:
+  enabled: true
+  
+  metadata:
+    'Cache-Control': 'max-age=2592000'
+    
+  image_prefix: site1/images
+  file_prefix: site1/files
+  media_prefix: site1/media
+  
+  development:
+    access_key_id: 
+    secret_access_key: 
+    image_bucket: abc-dev
+    file_bucket: abc-dev
+    media_bucket: abc-dev
+    image_hostname: abc-dev.s3.amazonaws.com
+    file_hostname: abc-dev.s3.amazonaws.com
+    media_hostname: abc-dev.s3.amazonaws.com
+    
+  test:
+    access_key_id: AKIAIBZNS5FMNCMWOQCQ
+    secret_access_key: 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
+    image_bucket: abc-test
+    file_bucket: abc-test
+    media_bucket: abc-test
+    image_hostname: abc-test.s3.amazonaws.com
+    media_hostname: abc-test.s3.amazonaws.com
+    media_hostname: abc-test.s3.amazonaws.com
+    
+  production:
+    access_key_id: AKIAJG6SL2GZP4C6GYFA
+    secret_access_key: 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
+    image_bucket: abc
+    file_bucket: abc
+    media_bucket: abc
+    image_hostname: abc123.cloudfront.net
+    file_hostname: abc123.cloudfront.net
+    media_hostname: abc123.cloudfront.net

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta11
+  version: 3.0.0.beta12
   prerelease: 6
 platform: ruby
 authors:
@@ -497,6 +497,7 @@ files:
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
+- test/dummy/config/imagine_cms.yml
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
@@ -558,6 +559,7 @@ test_files:
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
+- test/dummy/config/imagine_cms.yml
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb