imagine_cms 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19660898df43518871e1d89a20319eb784f06308
-  data.tar.gz: 53f2ea2aa6774d9987641c8ff2148032c5b6a124
+  metadata.gz: 7901f9485760be5cf335debb90d505feb76e66e4
+  data.tar.gz: ca8bbfb24c3caebc655447d98d3832e93aefb6bc
 SHA512:
-  metadata.gz: 7bb0f4b43d50fdb5b35f31e74bfb088984aa8e938b39f68a6c5a4341b342a9b3b135969e09911d87731b7c054ba7c44c675e84c478ab8a8e5dd1732307c064bb
-  data.tar.gz: ac7fad0d469699fe4fb4b81f6719eb11c4f846ffc6d1f3338432e075a8f26b99fe7ad3ce7d9b5c284fec84a56fcc411d70e0912d1c10d5bbf0b9d859affc1bc3
+  metadata.gz: 12177249b22e35b6882180a83ddbef2eda148d2fde9d04661d6bbb29b42ba49310bf9f21857fb17efd74000c49530024c90039e117fb7ee9467da5fdf2362d9c
+  data.tar.gz: 09b2f980f7274949f579ad5156df3d2fd6886f00f117586bffd391a874cc3346d9e6dbe2312bac2cc272a96e794706e35da99d07d64b0c8ae0b2fddfb1c367e3

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+2.2.2

data/app/sweepers/cms_content_sweeper.rb

@@ -10,15 +10,55 @@ class CmsContentSweeper < ActionController::Caching::Sweeper
   end
   
   def delete_all_cached_pages
+    cache_dir = File.expand_path(Management::CmsController.page_cache_directory)
+    public_dir = File.expand_path("#{Rails.root}/public")
+    
+    # this could throw Errno::ENOENT
     begin
-      if File.expand_path(Management::CmsController.page_cache_directory) == File.expand_path("#{Rails.root}/public")
+      cache_dir = File.realpath cache_dir
+      public_dir = File.realpath public_dir
+    end
+    
+    begin
+      if cache_dir == public_dir
         # expire home page
-        expire_page :controller => 'cms/content', :action => 'show', :content_path => nil
+        expire_page controller: 'cms/content', action: 'show', content_path: nil
         
         # expire all other pages
-        CmsPage.select([ :id, :path ]).find_each do |page|
-          expire_page :controller => 'cms/content', :action => 'show', :content_path => page.path.split('/')
+        
+        # original method is too slow for large sites:
+        # CmsPage.select([ :id, :path ]).find_each do |page|
+        #   expire_page controller: 'cms/content', action: 'show', content_path: page.path.split('/')
+        # end
+        
+        # quicker method: remove entire directory trees when possible
+        dangerous_names = [ 'assets', 'images', 'javascripts', 'media', 'stylesheets' ]
+        home_page = CmsPage.find_by_path('')
+        CmsPage.where(parent_id: home_page.id).each do |page|
+          if dangerous_names.include?(page.path)
+            # expire pages the old way
+            Rails.logger.info "Expire tree #{path} using safe method"
+            sub_page_paths(page).each do |path|
+              expire_page controller: 'cms/content', action: 'show', content_path: path.split('/')
+            end
+          else
+            # first clear this page
+            expire_page controller: 'cms/content', action: 'show', content_path: page.path.split('/')
+            
+            # then attempt to remove entire directory tree, after sanity check
+            path = File.expand_path(File.join(Management::CmsController.page_cache_directory, page.path))
+            Dir.chdir Rails.root
+            Dir.glob(Pathname.new(path).relative_path_from(Pathname.new(Rails.root)).to_s, File::FNM_CASEFOLD).each do |path|
+              path = File.realpath(File.expand_path(path, Rails.root))
+              if path && File.directory?(path) # could be nil if realpath threw an Errno::ENOENT
+                raise "Cache directory name #{path} failed sanity check" unless path =~ /^#{public_dir}/
+                Rails.logger.info "Expire tree #{path} using rm -rf"
+                FileUtils.rm_rf(path, secure: true)
+              end
+            end
+          end
         end
+        
       else
         FileUtils.rm_r(Dir.glob("#{cache_dir}/*")) rescue Errno::ENOENT
       end
@@ -27,4 +67,16 @@ class CmsContentSweeper < ActionController::Caching::Sweeper
     end
   end
   
+  
+  private
+    
+    def sub_page_paths(page)
+      paths = [ page.path ]
+      CmsPage.where(parent_id: page.id).each do |pg|
+        paths << pg.path
+        paths.concat sub_page_paths(pg)
+      end
+      paths
+    end
+    
 end

data/imagine_cms.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency "actionpack-page_caching", "~> 1.0"
   s.add_dependency "non-stupid-digest-assets", "~> 1.0"
   s.add_dependency "prototype-rails",     "~> 4.0.0"
-  s.add_dependency "aws-sdk",             "~> 2.0.0.pre"
+  s.add_dependency "aws-sdk",             "~> 2.0.0"
   s.add_dependency "rmagick",             [ ">= 1.15.0", "< 3.0" ]
   s.add_dependency "mini_magick",         "~> 3.3"
   s.add_dependency "rubyzip",             "~> 1.0"

data/lib/extensions/action_controller_extensions.rb

@@ -244,4 +244,25 @@ module ActionControllerExtensions
     end
     
   end
+  
+end
+
+module ActionControllerCachingExtensions
+  
+  module ClassMethods
+    
+    def expire_page(path)
+      return unless perform_caching
+      
+      path = Pathname.new(page_cache_path(path)).relative_path_from(Pathname.new(Rails.root))
+      Dir.chdir Rails.root
+      
+      instrument_page_cache :expire_page, path do
+        Dir.glob(path, File::FNM_CASEFOLD).each { |f| File.delete(f) }
+        Dir.glob(path + '.gz', File::FNM_CASEFOLD).each { |f| File.delete(f) }
+      end
+    end
+    
+  end
+  
 end

data/lib/imagine_cms/engine.rb

@@ -13,7 +13,10 @@ module ImagineCms
     
     initializer 'imagine_cms.load_helpers' do |app|
       ActionController::Base.send :include, CmsApplicationHelper
-      # ActionView::Base.send :include, CmsApplicationHelper
+    end
+    
+    initializer 'imagine_cms.caching_extensions' do |app|
+      ActionController::Base.send :extend, ActionControllerCachingExtensions::ClassMethods
     end
     
     def self.activate

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "4.1.2"
+  VERSION = "4.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -106,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
@@ -612,7 +612,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: imagine_cms
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Imagine Content Management System for Rails