imagine_cms 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbb42b1861f2db7db2704b150934135fa51145c4
-  data.tar.gz: 6ec23d6cbea4d1635c872100e0aeaaf0e1d48ae5
+  metadata.gz: 4f0d5cf95b43319edcfeb2bc6f1f5b24dcd099a7
+  data.tar.gz: 31b68c19f5d22a5fc68d4f1b55186b18ac622247
 SHA512:
-  metadata.gz: 2bea586993f3de37aa8f9a86661a6c0ffeace09e7377d81a8644e64c61f8f5de778af287b89e237791e12c04948db33b2b36ee78299cf0f0e17da2eb03b0779f
-  data.tar.gz: 7999134849b43caa223e14644b05afb4d9228ab1c12ecdc98f917f9d731f96305e7eee6dde46fc3af11c41067f0d599bf0823724bbeebc673ef3b4d71b99af38
+  metadata.gz: ea47210e4226ac55d7857770942202c4b6b502bbf876246e71e89f06d7df767c1e11649fc7a315a59bf9cbd9f8f7439ed15daabe2bd55a9b046ddc0104512f14
+  data.tar.gz: 0563088dc9ec65791dbae76d6a54bf2050f9d80c065f506defeed969532e4297c90181a8cfa7e4e67c8141ab90dd5652ed10cb579a9f6d71763a89509f7dd0dc

data/README.rdoc

@@ -15,8 +15,7 @@ All that is now firmly in the past. By extracting Imagine functionality into a g
 * Imagine 3.0 (Rails 3.2, Ruby 1.9): [DONE] 90% restored functionality, no database changes.
 * Imagine 3.1 (Rails 3.2, Ruby 1.9/2.0): [DONE, but released as 3.0.x] 100% restored functionality, plus a few extras and fixes.
 * Imagine 4.0 (Rails 4.0, Ruby 2.1): [DONE] Compatibility with Rails 4.0
-* Imagine 4.1 (Rails 4.1, Ruby 2.1): [DONE]
-* Imagine 4.2 (Rails 4.2, Ruby 2.1): [in progress on master]
+* Imagine 4.1 (Rails 4.1, Ruby 2.1): [IN PROGRESS]
 * Imagine 5.0 (Rails 5.0, Ruby 2.2): [PLANNED, Mid 2015] Compatibility with Rails 5.0, switch to a cross-browser editor
 
 In the future, there are plans to:

data/app/sweepers/cms_content_sweeper.rb

@@ -10,16 +10,20 @@ class CmsContentSweeper < ActionController::Caching::Sweeper
   end
   
   def delete_all_cached_pages
-    if File.expand_path(Management::CmsController.page_cache_directory) == File.expand_path("#{Rails.root}/public")
-      # expire home page
-      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('/')
+    begin
+      if File.expand_path(Management::CmsController.page_cache_directory) == File.expand_path("#{Rails.root}/public")
+        # expire home page
+        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('/')
+        end
+      else
+        FileUtils.rm_r(Dir.glob("#{cache_dir}/*")) rescue Errno::ENOENT
       end
-    else
-      FileUtils.rm_r(Dir.glob("#{cache_dir}/*")) rescue Errno::ENOENT
+    rescue Exception => e
+      Rails.logger.error "Error while clearing cache: #{e.message}" unless e.is_a?(NoMethodError)
     end
   end
   

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -612,7 +612,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: imagine_cms
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Imagine Content Management System for Rails