imagine_cms 3.0.22 → 3.0.23

data/.ruby-gemset

@@ -0,0 +1 @@
+imagine_cms

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p429

data/app/assets/javascripts/imagine.js

@@ -3,6 +3,9 @@
  * in application.js            *
  ********************************/
 
+// Fixes gallery reordering (Scriptaculous Sortable)
+Position.includeScrollOffsets = true;
+
 var defaultXMenuOffset = 0;
 var defaultYMenuOffset = 0;
 var defaultXOffset = 0;

data/app/controllers/cms/content_controller.rb

@@ -259,6 +259,9 @@ module Cms # :nodoc:
         render :text => '', :status => '304 Not Modified' and return
       end
       
+      @@cms_page_table_exists ||= CmsPage.table_exists?
+      return not_found unless @@cms_page_table_exists
+      
       @pg = CmsPage.find_by_id(params[:page_id])
       render :nothing => true and return unless @pg && params[:page_list_name]
       key = "obj-page_list-#{params[:page_list_name].gsub(/[^\w]/, '_')}"

data/app/controllers/management/cms_controller.rb

@@ -1004,7 +1004,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
       captions = YAML.load_file(File.join(gallery_dir, 'captions.yml')).to_a
       captions[image_id] = params[:caption]
       
-      File.open(File.join(gallery_dir, 'captions.yml'), "w") { |f| YAML.dump(captions, f) }
+      File.open(File.join(gallery_dir, 'captions.yml'), "w") { |f| f << captions.to_yaml }
     end
     
     redirect_to :action => 'gallery_management', :id => params[:id], :gallery_id => params[:gallery_id]
@@ -1177,11 +1177,12 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     @pg = CmsPage.find_by_id(params[:id])
     localfile = File.join(Rails.root, 'public', 'assets', 'content', @pg.path, File.basename(params[:filename]))
     
-    @filename = localfile + "?#{File.mtime(localfile).to_i}"
     bucket = ImagineCmsConfig['amazon_s3'][Rails.env]['file_bucket'] rescue nil
     prefix = ImagineCmsConfig['amazon_s3']['file_prefix'] rescue nil
     upload_to_s3(localfile, @pg, bucket, prefix)
     
+    @filename = localfile.split('/').map { |s| CGI::escape(s) }.join('/') + "?#{File.mtime(localfile).to_i}"
+    
     render :partial => 'create_file_link'
   end
   

data/lib/extensions/action_controller.rb

@@ -150,7 +150,7 @@ module ActionControllerExtensions
         content << '<td>Page:&nbsp;</td>'
         num_segments.times do |seg|
           start = seg * limit
-          content << "<td><div"
+          content << "<td><a href=\"#\""
           if offset >= start && offset < (start + limit)
             content << " class=\"page_list_segment page_list_segment_selected\""
           else
@@ -161,7 +161,7 @@ module ActionControllerExtensions
             content << remote_function(:update => key, :url => { :content_path => @pg.path.split('/').concat([ 'segment', start.to_s, name ]) })
             content << "; return false;\""
           end
-          content << ">#{seg+1}</div></td>"
+          content << ">#{seg+1}</a></td>"
         end
         content << '</tr></table>'
       end

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.22"
+  VERSION = "3.0.23"
 end

data/lib/tasks/imagine_cms_tasks.rake

@@ -7,8 +7,12 @@ namespace :imagine_cms do
       include ActionDispatch::Routing::UrlFor
       include Rails.application.routes.url_helpers
       
-      CmsPage.find_each do |page|
-        ActionController::Base.expire_page url_for(:controller => 'cms/content', :action => 'show', :content_path => page.path, :only_path => true)
+      # expire home page
+      ActionController::Base.expire_page url_for(:controller => 'cms/content', :action => 'show', :content_path => nil, :only_path => true)
+      
+      # expire all other pages
+      CmsPage.select([ :id, :path ]).find_each do |page|
+        ActionController::Base.expire_page url_for(:controller => 'cms/content', :action => 'show', :content_path => page.path.split('/'), :only_path => true)
       end
       
       puts "Cache cleared."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.22
+  version: 3.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -178,7 +178,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - README.rdoc
 - Rakefile

data/.rvmrc

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-ruby_string="ruby-1.9.3-p392"
-gemset_name="imagine_cms"
-
-alias rails='bundle exec rails'
-
-if rvm list strings | grep -q "${ruby_string}" ; then
-  # Load or create the specified environment
-  if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-    && -s "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}" ]] ; then
-    \. "${rvm_path:-$HOME/.rvm}/environments/${ruby_string}@${gemset_name}"
-  else
-    rvm --create  "${ruby_string}@${gemset_name}"
-  fi
-else
-  # Notify the user to install the desired interpreter before proceeding.
-  echo "${ruby_string} was not found, please run 'rvm install ${ruby_string}' and then cd back into the project directory."
-fi