imagine_cms 3.0.0.beta9 → 3.0.0.beta10

data/.rvmrc

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-ruby_string="ruby-1.9.3-p286"
+ruby_string="ruby-1.9.3-p327"
 gemset_name="imagine_cms"
 
 alias rails='bundle exec rails'

data/Gemfile.lock

@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    imagine_cms (3.0.0.beta9)
-      acts_as_tree (~> 1.2)
-      mini_magick (~> 3.4)
+    imagine_cms (3.0.0.beta10)
+      acts_as_tree (~> 1.1)
+      aws-s3 (~> 0.6.3)
+      mini_magick (~> 3.3)
       net-dns (~> 0.7.1)
-      prototype-rails
-      rails (~> 3.2.8)
+      prototype-rails (~> 3.2.0)
+      rails (~> 3.2.0)
       rinku (~> 1.7.2)
+      rmagick
 
 GEM
   remote: http://rubygems.org/
@@ -42,6 +44,10 @@ GEM
     acts_as_tree (1.2.0)
       activerecord (>= 3.0.0)
     arel (3.0.2)
+    aws-s3 (0.6.3)
+      builder
+      mime-types
+      xml-simple
     builder (3.0.4)
     erubis (2.7.0)
     hike (1.2.1)
@@ -89,6 +95,7 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     rinku (1.7.2)
+    rmagick (2.13.1)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -101,6 +108,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
+    xml-simple (1.1.2)
 
 PLATFORMS
   ruby

data/README.rdoc

@@ -30,26 +30,50 @@ Imagine 4 will be a clean break from all of these "traditions," and thus will be
 
 Get paid support and hosting for Imagine CMS straight from the people who made it: {Bigger Bird Creative, Inc.}[https://www.biggerbird.com] Neither is required, of course. :-) Free support is up top (Issues).
 
-=Contributing
+=Customizing & Contributing
 
 Pull requests always appreciated (recommend getting in touch first). If companies or individuals are willing to sponsor major features on the roadmap (or features that meet their own needs) development can proceed more quickly.
 
-=License and Copyright
-
-Imagine 3 is licensed under AGPLv3, meaning that if you run a modified version on a publicly-accessible server, you need to offer source code. With Github, that's quite easy: just don't make any private forks, and link to your Github site.
-
-imagine_cms - The Imagine Content Management System
-Copyright (c) 2012 Aaron Namba (aaron@biggerbird.com)
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+=Migrating from Imagine 2.x
+
+Putting this at the end because this information may not useful to the general public at the moment. It will evolve over time into a general getting started guide.
+
+File/code changes:
+* Rename all .rhtml files to .html.erb, .rxml to .xml.builder
+* Find and replace: RAILS_ROOT => Rails.root
+* Find and replace: SITE_ROOT => Rails.root
+* Find and replace: RAILS_ENV => Rails.env (not all instances: constants only, leave environment variables)
+
+Assets:
+* Delete prototype.js, effect.js, controls.js, dragdrop.js, imagine.js, reset.css, manage.css; move everything else to assets
+* Create symlinks to assets in public (images, javascripts, stylesheets, files)
+
+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)
+
+Third party libraries no longer included:
+* Install fop in vendor/ if needed.
+
+Layout changes:
+* Under app/views/application: Update three partial paths: 'shared/ccs_header' => 'imagine_cms/header', 'shared/ccs_toolbar' => 'imagine_cms/toolbar', '/management/dialogs' => 'imagine_cms/dialogs'
+* Add: <%= csrf_meta_tags %>
+* Change to standard Rails includes, plus print:
+    <%= stylesheet_link_tag 'application', :media => 'all' %>
+    <%= stylesheet_link_tag 'print', :media => 'print' %>
+    <%= javascript_include_tag 'application' %>
+
+View changes:
+* Change <% form_tag do %> and similar to <%= form_tag %>
+
+Major functions that were (re)moved, and how to get them back:
+* script/clear_cache: Use rake imagine_cms:cache:clear
+* Exception emails: Install exception_notifier gem and add to config/environments/production.rb:
+  config.middleware.use ExceptionNotifier,
+    :email_prefix => "[EXCEPTION] ",
+    :sender_address => %{"Exception Notifier" <sender@example.com>},
+    :exception_recipients => %w{recipient@example.com}
+
+Recommended Rails config changes:
+* config.assets.compile = true (optional, easy way out for sites with a lot of customizations)
+* config.assets.precompile += %w( ... ) (if compile = false, this must be updated properly)

data/app/controllers/management/cms_controller.rb

@@ -602,6 +602,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         @pg.published_version = params[:pg][:published_version]
         @pg.update_index
         @pg.save_without_revision
+        logger.debug @pg.errors.full_messages.inspect
       end
     end
     
@@ -713,51 +714,24 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   
   def receive_image
     @pg = CmsPage.find_by_id(params[:id])
-    begin
-      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)
-      
-      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
+    
+    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
-    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."
+    FileUtils.cp(data.tempfile, localfile)
+    
     finish_upload_status "'#{File.basename(localfile)}'" and return
   end
   
@@ -768,6 +742,8 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     # get out now if user clicked finish
     if params[:next_clicked].to_i != 1
       @image_file = localfile
+      upload_to_s3(localfile, @pg)
+      
       render :partial => 'crop_results' and return
     end
     
@@ -832,6 +808,7 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     orig_im.write(localfile) if dirty
     @image_file = localfile
     File.unlink testfile
+    upload_to_s3(localfile, @pg)
     
     render :partial => 'crop_results'
   end
@@ -883,8 +860,6 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
         entries.each_with_index do |zipentry, index|
           upload_progress.message = "Extracting #{File.basename(zipentry.name)}"
           ext = File.extname(zipentry.name)
-          #name = File.basename(zipentry.name, ext)
-          #localfile = File.join(localdir, 'temp', name.downcase.gsub(/[^\w\d]/, '') + ext.downcase)
           localfile = File.join(localdir, 'temp', (index+1).to_s + ext.downcase)
           jpgfile = File.join(localdir, 'temp', (index+1).to_s + '.jpg')
           
@@ -1396,8 +1371,6 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     x1 = params[:image][:x1].to_i * scale
     y1 = params[:image][:y1].to_i * scale
-    # x2 = params[:image][:x2].to_i * scale
-    # y2 = params[:image][:y2].to_i * scale
     width = params[:image][:width].to_i * scale
     height = params[:image][:height].to_i * scale
     
@@ -1480,8 +1453,6 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
     
     x1 = params[:image][:x1].to_i * scale
     y1 = params[:image][:y1].to_i * scale
-    # x2 = params[:image][:x2].to_i * scale
-    # y2 = params[:image][:y2].to_i * scale
     width = params[:image][:width].to_i * scale
     height = params[:image][:height].to_i * scale
     
@@ -1515,168 +1486,188 @@ class Management::CmsController < Management::ApplicationController # :nodoc:
   end
   
   
-  private
+  protected
   
-  def load_page_objects
-    @page_objects = HashObject.new
-    @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
-      end
-      @parent.objects.find(:all, :conditions => [ "obj_type = 'option'" ]).each do |obj|
-        key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
-        @page_objects[key] = obj.content
-      end
-    else
-      @tags = @pg.tags.collect { |t| t.name }.join(', ')
-      @pg.objects.find(:all, :conditions => [ "obj_type = 'attribute'" ]).each do |obj|
-        key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
-        @page_objects[key] = obj.content
-      end
-      @pg.objects.find(:all, :conditions => [ "obj_type = 'option'" ]).each do |obj|
-        key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
-        @page_objects[key] = obj.content
+    def load_page_objects
+      @page_objects = HashObject.new
+      @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
+        end
+        @parent.objects.find(:all, :conditions => [ "obj_type = 'option'" ]).each do |obj|
+          key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
+          @page_objects[key] = obj.content
+        end
+      else
+        @tags = @pg.tags.collect { |t| t.name }.join(', ')
+        @pg.objects.find(:all, :conditions => [ "obj_type = 'attribute'" ]).each do |obj|
+          key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
+          @page_objects[key] = obj.content
+        end
+        @pg.objects.find(:all, :conditions => [ "obj_type = 'option'" ]).each do |obj|
+          key = "obj-#{obj.obj_type.to_s}-#{obj.name}"
+          @page_objects[key] = obj.content
+        end
       end
     end
-  end
-  
-  def load_template_options
-    begin
-      render_to_string :inline => @pg.template.content
-    rescue Exception => e
-      logger.debug e
-    end
-  end
-  
-  def garbage_collect
-    GC.start
-  end
-  
-  def create_captions_file(pg_id, options = {})
-    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)
-    gallery_dir = File.join(galleries_dir, gallery_id)
-    captions_location = File.join(gallery_dir, 'captions.yml')
-    
-    return if File.exists?(captions_location)
-    
-    File.open(captions_location, 'w') { |f| YAML.dump([0], f) }
-  end
-  
-  # prerequisites: @pg (CmsPage)
-  def load_gallery_settings_from_file(gallery_id, options = {})
-    galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
-    gallery_dir = File.join(galleries_dir, gallery_id)
-    settings_location = File.join(gallery_dir, 'settings.yml')
     
-    ret = {}
-    
-    if File.exists?(settings_location)
-      File.open(settings_location, 'r') { |f| ret = YAML.load(f.read) }
-    else
-      File.open(settings_location, 'w') { |f| YAML.dump({}, f) }
+    def load_template_options
+      begin
+        render_to_string :inline => @pg.template.content
+      rescue Exception => e
+        logger.debug e
+      end
     end
     
-    # set a few defaults
-    ret[:slide_duration] ||= 0
-    ret[:show_thumbs] ||= true
-    
-    return HashObject.new(ret)
-  end
-  
-  # prerequisites: @pg (CmsPage)
-  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)
-    gallery_dir = File.join(galleries_dir, gallery_id)
-    settings_location = File.join(gallery_dir, 'settings.yml')
-    
-    File.open(settings_location, 'w') { |f| YAML.dump(settings_hash, f) }
-  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)
+    def garbage_collect
+      GC.start
+    end
     
-    if im[:width] > GalleryMaxWidth || im[:height] > GalleryMaxHeight
-      im.resize("#{GalleryMaxWidth}x#{GalleryMaxHeight}")
-      im.write(filename)
-    elsif filename != localfile
-      im.write(filename)
+    def create_captions_file(pg_id, options = {})
+      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)
+      gallery_dir = File.join(galleries_dir, gallery_id)
+      captions_location = File.join(gallery_dir, 'captions.yml')
+      
+      return if File.exists?(captions_location)
+      
+      File.open(captions_location, 'w') { |f| YAML.dump([0], f) }
     end
     
-    File.unlink(localfile) unless localfile == filename
+    # prerequisites: @pg (CmsPage)
+    def load_gallery_settings_from_file(gallery_id, options = {})
+      galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+      gallery_dir = File.join(galleries_dir, gallery_id)
+      settings_location = File.join(gallery_dir, 'settings.yml')
+      
+      ret = {}
+      
+      if File.exists?(settings_location)
+        File.open(settings_location, 'r') { |f| ret = YAML.load(f.read) }
+      else
+        File.open(settings_location, 'w') { |f| YAML.dump({}, f) }
+      end
+      
+      # set a few defaults
+      ret[:slide_duration] ||= 0
+      ret[:show_thumbs] ||= true
+      
+      return HashObject.new(ret)
+    end
     
-    filename
-  end
-  
-  def create_preview_image(src_file, dest, force = 0, overlay = 'gallery_small_overlay.png', thumb_size = 90)
-    require 'RMagick'
+    # prerequisites: @pg (CmsPage)
+    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)
+      gallery_dir = File.join(galleries_dir, gallery_id)
+      settings_location = File.join(gallery_dir, 'settings.yml')
+      
+      File.open(settings_location, 'w') { |f| YAML.dump(settings_hash, f) }
+    end
     
-    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]
+    def resize_image(localfile)
+      ext = File.extname(localfile)
       
-      im.crop_resized!(thumb_size, thumb_size)
-      im = im.composite(im_overlay, Magick::CenterGravity, Magick::OverCompositeOp)
+      # 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.write(dest)
-      File.chmod(0644, dest)
+      im = MiniMagick::Image::from_file(localfile)
       
-      im = im_overlay = nil
-      GC.start
+      if im[:width] > GalleryMaxWidth || im[:height] > GalleryMaxHeight
+        im.resize("#{GalleryMaxWidth}x#{GalleryMaxHeight}")
+        im.write(filename)
+      elsif filename != localfile
+        im.write(filename)
+      end
+      
+      File.unlink(localfile) unless localfile == filename
       
-      nil
+      filename
     end
-  end
-  
-  def create_preview_images(options = {})
-    # assumes @pg has already been set before calling
     
-    galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
-    session[:broken_galleries] = []
-    
-    # create preview images if not already made
-    Dir.glob("#{galleries_dir}/gallery_*").each do |g|
-      begin
-        management_dir = File.join(g, 'management')
-        FileUtils.mkdir_p(management_dir) unless File.exists?(management_dir)
-        
-        images = Dir.glob("#{g}/*.{jpg,jpeg,png,gif}")
-        preview_images = []
-        images.each { |img| preview_images << img unless File.basename(img).include?('thumb') }
+    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]
         
-        # gallery preview image
-        preview_image_location = File.join(management_dir, 'preview.jpg')
-        unless File.exists?(preview_image_location)
-          preview_image = preview_images.first
-          create_preview_image(preview_image, preview_image_location, options[:force], 'gallery_preview_overlay.png', 130)
-        end
+        im.crop_resized!(thumb_size, thumb_size)
+        im = im.composite(im_overlay, Magick::CenterGravity, Magick::OverCompositeOp)
         
-        # photo preview images
-        preview_images.each { |img| create_preview_image(img, management_dir, options[:force]) }
+        im.write(dest)
+        File.chmod(0644, dest)
         
-      rescue Exception => e
-        # some error handling here
-        session[:broken_galleries] << File.basename(g)
+        im = im_overlay = nil
+        GC.start
         
-        log_error(e)
+        nil
       end
     end
-  end
-  
+    
+    def create_preview_images(options = {})
+      # assumes @pg has already been set before calling
+      
+      galleries_dir = File.join(Rails.root, 'public', 'images', 'content', @pg.path)
+      session[:broken_galleries] = []
+      
+      # create preview images if not already made
+      Dir.glob("#{galleries_dir}/gallery_*").each do |g|
+        begin
+          management_dir = File.join(g, 'management')
+          FileUtils.mkdir_p(management_dir) unless File.exists?(management_dir)
+          
+          images = Dir.glob("#{g}/*.{jpg,jpeg,png,gif}")
+          preview_images = []
+          images.each { |img| preview_images << img unless File.basename(img).include?('thumb') }
+          
+          # gallery preview image
+          preview_image_location = File.join(management_dir, 'preview.jpg')
+          unless File.exists?(preview_image_location)
+            preview_image = preview_images.first
+            create_preview_image(preview_image, preview_image_location, options[:force], 'gallery_preview_overlay.png', 130)
+          end
+          
+          # photo preview images
+          preview_images.each { |img| create_preview_image(img, management_dir, options[:force]) }
+          
+        rescue Exception => e
+          # some error handling here
+          session[:broken_galleries] << File.basename(g)
+          
+          log_error(e)
+        end
+      end
+    end
+    
+    def upload_to_s3(filename, page)
+      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']
+        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)
+          s3success = response.code == 200
+          s3retries += 1
+        end
+        File.unlink(filename) if s3success
+      end
+      
+      s3success
+    end
+    
 end

data/app/helpers/cms_application_helper.rb

@@ -1097,7 +1097,13 @@ EOF
   end
   
   def page_image_tag(page, filename)
-    "<img id=\"testImage\" src=\"/#{File.join('assets', 'content', page.path, File.basename(filename))}\" alt=\"#{File.basename(filename, '.*').sub(/-[[:xdigit:]]{32}\z/, '').capitalize}\" />".html_safe
+    if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
+      prefix = ImagineCmsConfig['amazon_s3'][Rails.env]['image_prefix']
+      hostname = ImagineCmsConfig['amazon_s3'][Rails.env]['image_hostname']
+      "<img src=\"//#{hostname}/#{prefix}/#{page.path.blank? ? 'index' : page.path}/#{File.basename(filename)}\" alt=\"#{File.basename(filename, '.*').sub(/-[[:xdigit:]]{32}\z/, '').capitalize}\" />".html_safe
+    else
+      "<img src=\"/#{File.join('assets', 'content', page.path, File.basename(filename))}\" alt=\"#{File.basename(filename, '.*').sub(/-[[:xdigit:]]{32}\z/, '').capitalize}\" />".html_safe
+    end
   end
   
   def copyright_year(year)

data/app/models/cms_page.rb

@@ -88,6 +88,8 @@ class CmsPage < ActiveRecord::Base
   def set_parent_id!(new_id)
     self.parent_id = new_id
     self.save_without_revision
+    pg.children.each { |subpg| subpg.save_without_revision }
+    self.valid?
   end
   
   

data/app/{models → sweepers}/cms_content_sweeper.rb

@@ -10,12 +10,9 @@ class CmsContentSweeper < ActionController::Caching::Sweeper
   end
   
   def delete_all_cached_pages
-    CmsPage.find(:all).each do |page|
+    CmsPage.find_each do |page|
       expire_page :controller => 'cms/content', :action => 'show', :content_path => page.path.split('/')
     end
-    
-    # also delete RSS feed caches
-    expire_fragment %r{rss/\d+/}
   end
   
-end
+end

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

@@ -1,4 +1,4 @@
-<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('view_link').href = '/<%= list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>'; $('new_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :mode => 'ajax_new', :parent_id => list_page, :authenticity_token => form_authenticity_token.to_s %>', 'Create New Page under /<%= list_page.path %>'); return false; }; $('edit_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :id => list_page, :mode => 'ajax_edit', :authenticity_token => form_authenticity_token.to_s %>', 'Page Properties: <%= list_page.name %>'); return false; }; $('edit_content_link').href = '<%=raw url_for :action => 'edit_page_content', :id => list_page, :authenticity_token => form_authenticity_token.to_s %>'; $('delete_form').action = '<%=raw url_for :action => 'delete_page', :id => list_page.id, :authenticity_token => form_authenticity_token.to_s %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages', :level => @page_level + 1, :parent_id => list_page.id, :authenticity_token => form_authenticity_token.to_s %>\');', 200);" ondblclick="$('edit_content_form').onsubmit(); $('edit_content_form').submit();">
+<div id="<%= "cb_item_#{list_page.id}" %>" class="cb_item" style="width: 148px; overflow: hidden; margin: 2px; float: left; cursor: pointer" onclick="$('view_link').href = '<%= list_page.path.blank? ? '' : '/' + list_page.path %>/version/<%= list_page.published_version > 0 ? list_page.published_version : list_page.version %>'; $('new_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :mode => 'ajax_new', :parent_id => list_page, :authenticity_token => form_authenticity_token.to_s %>', 'Create New Page under /<%= list_page.path %>'); return false; }; $('edit_link').onclick = function () { editProperties('<%=raw url_for :action => 'edit_page', :id => list_page, :mode => 'ajax_edit', :authenticity_token => form_authenticity_token.to_s %>', 'Page Properties: <%= list_page.name %>'); return false; }; $('edit_content_link').href = '<%=raw url_for :action => 'edit_page_content', :id => list_page, :authenticity_token => form_authenticity_token.to_s %>'; $('delete_form').action = '<%=raw url_for :action => 'delete_page', :id => list_page.id, :authenticity_token => form_authenticity_token.to_s %>'; setTimeout('cbSelectItem(\'' + this.id + '\', <%= @page_level %>, \'<%=raw url_for :action => 'list_pages', :level => @page_level + 1, :parent_id => list_page.id, :authenticity_token => form_authenticity_token.to_s %>\');', 200);" ondblclick="$('edit_content_form').onsubmit(); $('edit_content_form').submit();">
   <table cellpadding="0" cellspacing="0" border="0">
     <tr>
       <td valign="top"><img src="/assets/management/icon_page.gif" style="margin: 2px 5px 0 0; "/></td>

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

@@ -1,13 +1,8 @@
 <div id="delete_gallery_container">
-  <%- unless @galleries.size > 0 -%>
-  <div id="save_errors" class="error"></div>
-  <h3 style="margin-bottom: 10px;">Insert Image</h3>
-  <%- end -%>
-
   <div id="select_gallery_container">
   
   <%- if session[:broken_galleries] and session[:broken_galleries].size > 0 -%>
-    <div id="borken_galleries" style="margin-bottom: 10px; padding: 10px; background-color: #ffa7b9; border: 2px solid #f03;">
+    <div id="broken_galleries" style="margin-bottom: 10px; padding: 10px; background-color: #ffa7b9; border: 2px solid #f03;">
       <p><b>The following galleries have problems and require fixing:</b></p>
       <ul style="padding: 0; margin: 0 0 0 15px; list-style-type: disc;">
         <%- session[:broken_galleries].sort.each do |g| -%>
@@ -20,9 +15,7 @@
     </div>
   <%- end -%>
   
-  <%-
-    if @galleries.size > 0
-  -%>
+  <%- if @galleries.size > 0 -%>
     <div id="select_gallery">
       <h2>Select gallery</h2>
     <%-
@@ -44,74 +37,6 @@
       <br style="clear: both" />
     </div>
   <%- end -%>
-
-    <fieldset>
-      <legend>Single Image</legend>
-
-      <p>Select an image, then click "Finish" to upload and insert it if you are
-      certain your image is already web-ready. Otherwise, click "Next" to crop and
-      resize your image before using it.</p>
-
-      <%= form_tag_with_upload_progress({ :action => 'receive_image', :id => @pg },
-                                        { :finish => "if (arguments[0]) { $('filename').value = arguments[0]; $('mainform').onsubmit(); }" }) do -%>
-      <table>
-        <tr>
-          <td width="70">Image file:</td>
-          <td><%= file_field 'file', 'data', :class => 'form', :style => 'margin-bottom: 0; width: 150px' %></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td><span style="color: #888888">Valid image types: jpeg, png, gif</span></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>
-            <div id="upload_status_div" class="error"><%= upload_status_tag %></div>
-            <%= submit_tag 'Next', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; $('next_clicked_upload').value = '1'; $('next_clicked').value = '1'; this.disabled = true; this.value = 'Uploading...';" %>
-            <%= submit_tag 'Finish', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('file_data').value == '') return false; this.disabled = true; this.value = 'Uploading...';" %>
-            <%= link_to_function "Cancel", "cancelInsertImage()" %>
-            <%= text_field_tag 'next_clicked_upload', '0', :style => 'display: none' %>
-          </td>
-        </tr>
-      </table>
-      <%- end -%>
-    </fieldset><br/>
   
-    <fieldset>
-      <legend>New Photo Gallery</legend>
-
-      <p>Upload a zip file of images to create a photo gallery.</p>
-
-      <%= form_tag_with_upload_progress({ :action => 'receive_gallery', :id => @pg },
-                                        { :finish => "if (arguments[0]) { $('dirname').value = arguments[0]; $('mainform_gallery').onsubmit(); }" }) do -%>
-      <table>
-        <tr>
-          <td width="70">Zip file:</td>
-          <td>
-            <%= file_field 'gallery_file', 'data', :class => 'form', :style => 'margin-bottom: 0; width: 150px' %><br/>
-          </td>
-        </tr>
-        <tr>
-          <td></td>
-          <td>
-            <div id="upload_status_div" class="error"><%= upload_status_tag %></div>
-            <%= submit_tag 'Next', :class => 'form_button', :style => 'width: 70px;', :onclick => "if ($('gallery_file_data').value == '') return false; this.disabled = true; this.value = 'Uploading...';" %>
-            <%= link_to_function "Cancel", "cancelInsertImage()" %>
-          </td>
-        </tr>
-      </table>
-      <%- end -%>
-    </fieldset><br/>
-
-    <%= form_remote_tag(:update => 'insert_image_dialog_content', :html => { :id => 'mainform' },
-                        :url => { :action => 'crop_image', :id => @pg }) do -%>
-      <%= text_field_tag 'next_clicked', '0', :style => 'display: none' %>
-      <%= text_field_tag 'filename', '', :style => 'display: none' %>
-    <%- end -%>
-
-    <%= form_remote_tag(:update => 'insert_image_dialog_content', :html => { :id => 'mainform_gallery' },
-                        :url => { :action => 'gallery_setup', :id => @pg }) do -%>
-      <%= text_field_tag :dirname, '', :style => 'display: none' %>
-    <%- end -%>
-  </div>
+  <%= render :partial => 'upload_image' %>
 </div>

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

@@ -5,14 +5,14 @@
 
 <fieldset>
   <legend>Single Image</legend>
-  
+
   <p>Select an image, then click "Finish" to upload and insert it if you are
   certain your image is already web-ready. Otherwise, click "Next" to crop and
   resize your image before using it.</p>
-  
+
   <%= form_tag_with_upload_progress({ :action => 'receive_image', :id => @pg },
-                                    { :finish => "if (arguments[0] == 'success') { $('filename').value = arguments[0]; $('mainform').submit(); }" }) do -%>
-<table>
+                                    { :finish => "if (arguments[0]) { $('filename').value = arguments[0]; $('mainform').onsubmit(); }" }) do -%>
+  <table>
     <tr>
       <td width="70">Image file:</td>
       <td><%= file_field 'file', 'data', :class => 'form', :style => 'margin-bottom: 0; width: 150px' %></td>
@@ -33,14 +33,13 @@
     </tr>
   </table>
   <%- end -%>
-</fieldset>
-<br/>
+</fieldset><br/>
 
 <fieldset>
-  <legend>Photo Gallery</legend>
-  
+  <legend>New Photo Gallery</legend>
+
   <p>Upload a zip file of images to create a photo gallery.</p>
-  
+
   <%= form_tag_with_upload_progress({ :action => 'receive_gallery', :id => @pg },
                                     { :finish => "if (arguments[0]) { $('dirname').value = arguments[0]; $('mainform_gallery').onsubmit(); }" }) do -%>
   <table>
@@ -60,7 +59,7 @@
     </tr>
   </table>
   <%- end -%>
-</fieldset>
+</fieldset><br/>
 
 <%= form_remote_tag(:update => 'insert_image_dialog_content', :html => { :id => 'mainform' },
                     :url => { :action => 'crop_image', :id => @pg }) do -%>

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

@@ -86,4 +86,4 @@ EOF
     $('delete_form').action = '<%=raw url_for :action => 'delete_page', :id => list_page.id %>';
 </script>
 
-<%= render :partial => 'dialogs' %>
+<%= render :partial => '/imagine_cms/dialogs' %>

data/config/initializers/config_file.rb

@@ -0,0 +1,14 @@
+config_file = File.join(Rails.root, 'config', 'imagine_cms.yml')
+
+if File.exists?(config_file)
+  ImagineCmsConfig = YAML.load(File.read(config_file))
+  
+  if ImagineCmsConfig['amazon_s3'] && ImagineCmsConfig['amazon_s3']['enabled']
+    AWS::S3::Base.establish_connection!(
+      :access_key_id     => ImagineCmsConfig['amazon_s3'][Rails.env]['access_key_id'],
+      :secret_access_key => ImagineCmsConfig['amazon_s3'][Rails.env]['secret_access_key']
+    )
+  end
+else
+  ImagineCmsConfig = {}
+end

data/db/migrate/20121108004747_add_settings_table.rb

@@ -0,0 +1,18 @@
+class AddSettingsTable < ActiveRecord::Migration
+  
+  def up
+    create_table "settings" do |t|
+      t.column "name",              :string, :null => false
+      t.column "value",             :text
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    add_index "settings", ["name"], :name => "UN_settings_name", :unique => true
+  end
+  
+  def down
+    drop_table "settings"
+  end
+  
+end

data/db/migrate/20121108005110_add_tasks_table.rb

@@ -0,0 +1,17 @@
+class AddTasksTable < ActiveRecord::Migration
+  
+  def up
+    create_table "tasks" do |t|
+      t.column "name",              :string, :null => false
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    add_index "tasks", ["name"], :name => "UN_tasks_name", :unique => true
+  end
+  
+  def down
+    drop_table "tasks"
+  end
+  
+end

data/db/migrate/20121115083748_add_logs_table.rb

@@ -0,0 +1,28 @@
+class AddLogsTable < ActiveRecord::Migration
+  
+  def up
+    create_table "logs" do |t|
+      t.column "name",              :string
+      t.column "description",       :text
+      
+      t.column "created_on",        :timestamp
+    end
+    
+    create_table "log_entries" do |t|
+      t.column "log_id",            :integer, :null => false
+      
+      t.column "type",              :string, :null => false
+      t.column "description",       :text
+      t.column "data",              :text
+      
+      t.column "created_on",        :timestamp
+    end
+    add_index "log_entries", ["type"], :name => "IDX_log_entries_type"
+  end
+  
+  def down
+    drop_table "log_entries"
+    drop_table "logs"
+  end
+  
+end

data/db/migrate/20121115083811_add_users_tables.rb

@@ -0,0 +1,43 @@
+class AddUsersTables < ActiveRecord::Migration
+  
+  def self.up
+    create_table "users" do |t|
+      t.column "username",          :string
+      t.column "password_hash",     :string, :limit => 100
+      
+      t.column "first_name",        :string, :limit => 100
+      t.column "last_name",         :string, :limit => 100
+      
+      t.column "dynamic_fields",    :text
+      
+      t.column "active",            :integer, :default => 1, :null => false
+      t.column "is_superuser",      :integer, :default => 0, :null => false
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    add_index "users", ["username"], :name => "UN_users_username", :unique => true
+    
+    create_table "user_groups" do |t|
+      t.column "name",              :string
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    add_index "user_groups", ["name"], :name => "UN_user_groups_name", :unique => true
+    
+    create_table "user_group_memberships", :id => false do |t|
+      t.column "user_id",           :integer, :null => false
+      t.column "user_group_id",     :integer, :null => false
+      t.column "created_on",        :timestamp
+    end
+    execute 'alter table user_group_memberships add constraint PK_user_group_memberships primary key (user_id, user_group_id)'
+  end
+  
+  def self.down
+    drop_table "user_group_memberships"
+    drop_table "user_groups"
+    drop_table "users"
+  end
+  
+end

data/db/migrate/20121115084028_add_cms_tables.rb

@@ -0,0 +1,138 @@
+class AddCmsTables < ActiveRecord::Migration
+  
+  class CmsTemplate < ActiveRecord::Base ; acts_as_versioned ; end
+  class CmsSnippet < ActiveRecord::Base ; acts_as_versioned ; end
+  class CmsPage < ActiveRecord::Base ; acts_as_versioned ; end
+  
+  def self.up
+    create_table "cms_templates" do |t|
+      t.column "name",              :string
+      t.column "content",           :text
+      t.column "options_yaml",      :text
+      
+      t.column "version",           :integer, :default => 0, :null => false
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    CmsTemplate.create_versioned_table  # => CmsTemplateVersions
+    
+    create_table "cms_snippets" do |t|
+      t.column "name",              :string
+      t.column "content",           :text
+      
+      t.column "version",           :integer, :default => 0, :null => false
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    CmsSnippet.create_versioned_table  # => CmsSnippetVersions
+    
+    create_table "cms_pages" do |t|
+      t.column "cms_template_id",   :integer, :null => false
+      t.column "cms_template_version", :integer, :null => false
+      
+      t.column "parent_id",         :integer, :references => :cms_pages
+      
+      t.column "name",              :string
+      t.column "title",             :string
+      t.column "path",              :text
+      t.column "article_date",      :datetime
+      t.column "article_end_date",  :datetime
+      
+      t.column "summary",           :text
+      t.column "thumbnail_path",    :string, :limit => 255
+      t.column "feature_image_path", :string, :limit => 255
+      t.column "position",          :integer, :default => 0
+      t.column "comment_count",     :integer, :default => 0
+      
+      t.column "version",           :integer, :default => 0, :null => false
+      t.column "published_version", :integer, :default => 0, :null => false
+      t.column "published_date",    :datetime, :null => false
+      t.column "expiration_date",   :datetime
+      t.column "expires",           :boolean, :default => false
+      t.column "search_index",      :text
+      t.column "html_head",         :text
+      
+      t.column "updated_by",        :integer, :null => false
+      t.column "updated_by_username", :string, :null => false
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    CmsPage.create_versioned_table  # => CmsPageVersions
+    
+    create_table "cms_page_objects" do |t|
+      t.column "cms_page_id",       :integer, :null => false
+      t.column "cms_page_version",  :integer, :null => false
+      
+      t.column "name",              :string
+      t.column "obj_type",          :string # one of [ :text, :asset ]
+      t.column "content",           :text   # if :text, then text; if :asset, then asset_id
+      t.column "options",           :text   # options hash
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    
+    create_table "cms_page_tags" do |t|
+      t.column "cms_page_id",       :integer, :null => false
+      t.column "name",              :string, :null => false
+      t.column "created_on",        :timestamp
+    end
+    
+    create_table "cms_page_comments" do |t|
+      t.column "cms_page_id",       :integer, :null => false
+      
+      t.column "owner",             :string, :null => false
+      t.column "owner_url",         :string, :limit => 255
+      t.column "owner_email",       :string, :limit => 255
+      t.column "content",           :text
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    
+    create_table "cms_assets" do |t|
+      t.column "name",              :string
+      t.column "content_type",      :string
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    
+    create_table "cms_asset_tags" do |t|
+      t.column "cms_asset_id",      :integer, :null => false
+      t.column "user_id",           :integer, :null => false
+      t.column "name",              :string
+      
+      t.column "created_on",        :timestamp
+      t.column "updated_on",        :timestamp
+    end
+    
+    execute 'create index cms_snippets_name_index on cms_snippets (name(255))'
+    execute 'create index cms_pages_path_index on cms_pages (path(255))'
+    execute 'create index cms_page_objects_cms_page_id_obj_type_index on cms_page_objects (cms_page_id, obj_type)'
+    execute 'create index cms_page_objects_cms_page_id_cms_page_version_index on cms_page_objects (cms_page_id, cms_page_version)'
+  end
+  
+  def self.down
+    execute 'drop index cms_page_objects_cms_page_id_cms_page_version_index on cms_page_objects'
+    execute 'drop index cms_page_objects_cms_page_id_obj_type_index on cms_page_objects'
+    execute 'drop index cms_pages_path_index on cms_pages'
+    execute 'drop index cms_snippets_name_index on cms_snippets'
+    
+    drop_table "cms_asset_tags"
+    drop_table "cms_assets"
+    drop_table "cms_page_comments"
+    drop_table "cms_page_tags"
+    drop_table "cms_page_objects"
+    drop_table "cms_page_versions"
+    drop_table "cms_pages"
+    drop_table "cms_snippet_versions"
+    drop_table "cms_snippets"
+    drop_table "cms_template_versions"
+    drop_table "cms_templates"
+  end
+  
+end

data/imagine_cms.gemspec

@@ -22,13 +22,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "rails",               "~> 3.2.8"
-  s.add_dependency "prototype-rails"
-  # s.add_dependency "redactor-rails"
-  s.add_dependency "mini_magick",         "~> 3.4"
+  s.add_dependency "rails",               "~> 3.2.0"
+  s.add_dependency "prototype-rails",     "~> 3.2.0"
+  s.add_dependency "aws-s3",              "~> 0.6.3"
+  s.add_dependency "rmagick"
+  s.add_dependency "mini_magick",         "~> 3.3"
   s.add_dependency "rinku",               "~> 1.7.2"
   s.add_dependency "net-dns",             "~> 0.7.1"
-  s.add_dependency "acts_as_tree",        "~> 1.2"
+  s.add_dependency "acts_as_tree",        "~> 1.1"
   
   s.add_development_dependency "sqlite3"
 end

data/lib/imagine_cms/engine.rb

@@ -14,7 +14,8 @@ module ImagineCms
     # activate gems as needed
     #
     require 'prototype-rails'
-    # require 'redactor-rails'
+    require 'aws/s3'
+    require 'RMagick'
     require 'mini_magick'
     require 'rails_rinku'
     require 'net/dns'

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.0.beta9"
+  VERSION = "3.0.0.beta10"
 end

data/lib/tasks/imagine_cms_tasks.rake

@@ -1,4 +1,19 @@
-# desc "Explaining what the task does"
-# task :test123 do
-#   # Task goes here
-# end
+namespace :imagine_cms do
+  
+  namespace :cache do
+    
+    desc "Clear CMS cache (generated .html files)"
+    task :clear => :environment 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)
+      end
+      
+      puts "Cache cleared."
+    end
+    
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta9
+  version: 3.0.0.beta10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,9 +26,41 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: prototype-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -50,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rinku
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +325,6 @@ files:
 - app/controllers/management/users_controller.rb
 - app/controllers/util_controller.rb
 - app/helpers/cms_application_helper.rb
-- app/models/cms_content_sweeper.rb
 - app/models/cms_page.rb
 - app/models/cms_page_object.rb
 - app/models/cms_page_tag.rb
@@ -301,6 +332,7 @@ files:
 - app/models/cms_snippet.rb
 - app/models/cms_template.rb
 - app/models/user.rb
+- app/sweepers/cms_content_sweeper.rb
 - app/views/errors/404.html.erb
 - app/views/errors/permission_denied.html.erb
 - app/views/imagine_cms/_dialogs.html.erb
@@ -366,8 +398,14 @@ files:
 - app/views/util/_message.html.erb
 - app/views/util/_show_message.js.erb
 - app/views/util/_tab.html.erb
+- config/initializers/config_file.rb
 - config/initializers/constants.rb
 - config/routes.rb
+- db/migrate/20121108004747_add_settings_table.rb
+- db/migrate/20121108005110_add_tasks_table.rb
+- db/migrate/20121115083748_add_logs_table.rb
+- db/migrate/20121115083811_add_users_tables.rb
+- db/migrate/20121115084028_add_cms_tables.rb
 - imagine_cms.gemspec
 - lib/acts_as_versioned/.document
 - lib/acts_as_versioned/.gitignore