liquid_cms 0.2.0.4 → 0.2.0.5

data/Rakefile

@@ -7,23 +7,13 @@ 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_types.collect{|t| ["test:#{t}", "test:#{t}:no_context"]}.flatten
+task :test => ['test:unit', 'test:functional', 'test:integration']
 
-test_types.each do |test|
-  desc "Run the #{test} tests for the liquid_cms gem"
+%w(unit functional integration).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,11 +1,6 @@
 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
@@ -91,23 +86,7 @@ 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)) rescue nil
-          h[style] = {'width' => g.width.to_i, 'height' => g.height.to_i, 'url' => self.url(style)} unless g.nil?
+          g = Paperclip::Geometry.from_file(self.path(style))
+          h[style] = {'width' => g.width.to_i, 'height' => g.height.to_i, 'url' => self.url(style)}
         end
       end
     end

data/generators/liquid_cms/liquid_cms_generator.rb

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

data/lib/liquid_cms.rb

@@ -1,3 +1,2 @@
 require 'liquid_cms/role_authentication'
 require 'liquid_cms/configuration'
-require 'liquid_cms/cache_sweeper'

data/lib/liquid_cms/configuration.rb

@@ -9,8 +9,6 @@ module Cms
   mattr_reader :context_class
   def self.context_class=(klass)
     @@context_class = klass
-    return if klass.nil? || ENV['NO_CONTEXT'] == 'true'
-
     Dispatcher.to_prepare {
       eval(klass.to_s).extend Cms::ContextAssociation
 
@@ -21,7 +19,6 @@ module Cms
   @@context_class = nil
 
   def self.set_context(context, bind_to)
-    return if @@context_class.nil?
     bind_to.instance_variable_set :@cms_context, context
   end
 

data/lib/liquid_cms/context.rb

@@ -5,7 +5,7 @@ module Cms
     attr_reader :object
 
     def initialize(context = nil)
-      @object = Cms.context_class ? context : nil
+      @object = context
     end
 
     def pages

data/lib/liquid_cms/version.rb

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.2.0.4"
+  VERSION = "0.2.0.5"
 end

data/test/factories/company.rb

@@ -3,7 +3,7 @@ Factory.define :company do |c|
   c.domain_name 'acme.com'
   c.subdomain 'test'
   c.after_create do |c|
-    Factory(:home_page, Cms.context_class ? {:context => c} : {})
+    Factory(:home_page, :context => c)
   end
   c.after_create do |c|
     Factory(:user, :company => c)

data/test/integration/pages_test.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../test_helpers/cache_helper'
 
 class Cms::PagesTest < ActionController::IntegrationTest
 
@@ -280,49 +279,4 @@ class Cms::PagesTest < ActionController::IntegrationTest
       assert_response 404
     end
   end
-
-  context "caching" do
-    setup do
-      ActionController::Base.perform_caching = true
-      Rails.cache.clear
-      @page = Factory(:page, :context => @company)
-    end
-
-    teardown do
-      ActionController::Base.perform_caching = false
-    end
-
-    should "expire the cache when the page is updated" do
-      assert_cache_empty
-
-      get @page.url
-      assert_cache_present
-
-      # updating the page will remove the cache
-      put cms_page_path(@page), :content => 'new content'
-      assert_cache_empty
-
-      get @page.url
-      assert_cache_present
-
-      # destroying the page will remove the cache
-      delete cms_page_path(@page)
-      assert_cache_empty
-    end
-
-    should "generate a cache key" do
-      get '/'
-      assert_cache_key "views/CONTEXT_PATH_#{@company.id}"
-
-      get @page.url
-      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page"
-
-      get @page.url+'?page=1&test=abcde'
-      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page/page=1&test=abcde"
-
-      # different order sent via url, but the path params will be sorted in the path
-      get @page.url+'?test=abcde&page=1'
-      assert_cache_key "views/CONTEXT_PATH_#{@company.id}/page/page=1&test=abcde"
-    end
-  end
 end

data/test/test_helper.rb

@@ -5,12 +5,6 @@ $:.unshift File.dirname(__FILE__)
 require "rails_app/config/environment"
 require 'test_help'
 
-if ENV['NO_CONTEXT'] == 'true'
-  Cms.setup do |config|
-    config.context_class = nil
-  end
-end
-
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")

data/test/test_helpers/login_methods.rb

@@ -51,3 +51,4 @@ class ActionController::IntegrationTest
     end
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: liquid_cms
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - 4
-  version: 0.2.0.4
+  - 5
+  version: 0.2.0.5
 platform: ruby
 authors: 
 - Andrew Kaspick