liquid_cms 0.2.0.3 → 0.2.0.4

data/Rakefile

@@ -7,13 +7,23 @@ require 'rake/testtask'
 desc 'Default: run tests.'
 task :default => :test
 
+test_types = %w(unit functional integration)
+
 desc 'Test the liquid_cms gem.'
-task :test => ['test:unit', 'test:functional', 'test:integration']
+task :test => test_types.collect{|t| ["test:#{t}", "test:#{t}:no_context"]}.flatten
 
-%w(unit functional integration).each do |test|
-  desc "Run the #{test} tests for the liquid_cms gem."
+test_types.each do |test|
+  desc "Run the #{test} tests for the liquid_cms gem"
   Rake::TestTask.new("test:#{test}") do |t|
     t.pattern = "test/#{test}/*_test.rb"
     t.verbose = true
   end
 end
+
+test_types.each do |test|
+  desc "Run the #{test} tests for the liquid_cms gem (no context)"
+  Rake::TestTask.new("test:#{test}:no_context") do |t|
+    t.pattern = "test/#{test}/*_test_no_context.rb"
+    t.verbose = true
+  end
+end

data/app/controllers/cms/pages_controller.rb

@@ -1,6 +1,11 @@
 class Cms::PagesController < Cms::MainController
   skip_before_filter :verify_authenticity_token, :only => [:load, :page_asset]
 
+  caches_action :load, :cache_path => :cache_value
+  #caches_action :page_asset, :cache_path => :cache_value
+
+  cache_sweeper Cms::CacheSweeper, :only => %w(update destroy)
+
   authenticate_user :all, :except => %w(load page_asset)
 
   def new
@@ -86,7 +91,23 @@ class Cms::PagesController < Cms::MainController
   end
 
 protected
+  # the current url with the last level of the path removed which essentially allows a page to be loaded with anything (wilcard) one level deeper
+  # ex. normal page at /page will also accept /page/test, /page/abcd, etc.
   def wildcard_path
     '/'+params[:url].slice(0..-2).join('/')
   end
+
+  def cache_value_url
+    extra_params = params.except(:controller, :action, :url)
+
+    # sort the parameters so we can have the same url if the params are given to us in a different order
+    extra_values = extra_params.present? ? extra_params.sort{|a,b| a.first <=> b.first}.collect{|elem| "#{elem[0]}=#{elem[1]}"}.join('&') : nil
+
+    [context_cache_path, params[:url], extra_values].flatten.compact.join('/')
+  end
+
+  # a unique string used to help expire the cache
+  def context_cache_path
+    Cms.context_class && @cms_context.present? ? "CONTEXT_PATH_#{@cms_context.id}" : 'NO_CONTEXT'
+  end
 end

data/app/liquid/cms_paperclip_extension.rb

@@ -6,8 +6,8 @@ module Paperclip
       {}.tap do |h|
         all_styles = self.styles.keys + ['original']
         all_styles.each do |style|
-          g = Paperclip::Geometry.from_file(self.path(style))
-          h[style] = {'width' => g.width.to_i, 'height' => g.height.to_i, 'url' => self.url(style)}
+          g = Paperclip::Geometry.from_file(self.path(style)) rescue nil
+          h[style] = {'width' => g.width.to_i, 'height' => g.height.to_i, 'url' => self.url(style)} unless g.nil?
         end
       end
     end

data/generators/liquid_cms/lib/insert_commands.rb

@@ -0,0 +1,29 @@
+require 'fileutils'
+
+Rails::Generator::Commands::Create.class_eval do
+  def copy_files(base, source)
+    logger.copy "Copying '#{source}' to '#{base}'"
+    FileUtils.cp_r File.join(source_root, base, source), File.join(destination_root, base)
+  end
+
+  # override the migration template method so that we can continue the generation and not fail if the migration already exists
+  def migration_template(relative_source, relative_destination, template_options = {})
+    migration_directory relative_destination
+    migration_file_name = template_options[:migration_file_name] || file_name
+    puts "Another migration is already named #{migration_file_name}: #{existing_migrations(migration_file_name).first}... skipping" and return if migration_exists?(migration_file_name)
+    template(relative_source, "#{relative_destination}/#{next_migration_string}_#{migration_file_name}.rb", template_options)
+  end
+end
+
+Rails::Generator::Commands::Destroy.class_eval do
+  def copy_files(base, source)
+    logger.copy "Removing '#{source}' from '#{base}'"
+    FileUtils.rm_rf File.join(destination_root, base, source)
+  end
+end
+
+Rails::Generator::Commands::List.class_eval do
+  def copy_files(base, source)
+    logger.copy "Copying '#{source}' to '#{base}'"
+  end
+end

data/{lib/generators → generators}/liquid_cms/liquid_cms_generator.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'lib', 'insert_commands')
+require File.expand_path('../lib/insert_commands', __FILE__)
 
 class LiquidCmsGenerator < Rails::Generator::Base
   def manifest