imagine_cms 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e500475b1ddfb528dc258d4f907a31e18d9bd7
-  data.tar.gz: 8099e1954f829ec6db3c812f72f30f6de6723a1c
+  metadata.gz: f7658b9addaabd953d8c18db700bc5f7427e1cbf
+  data.tar.gz: 28c763b3918693f7dcb478fc50ff78ef50b8dee4
 SHA512:
-  metadata.gz: 85375bc7487b034d1efdc17ee520b5ff84a5187c5f7f16048c31f52bb15782d969d5a79d02013fd4b82d95922b7af4ec9fe20838cdd998554205e69e6b4b8359
-  data.tar.gz: 2c364e718150c9cfc680e82454aed93fbb3deca7d1761d8ce18e93c96055382a7d98ed3ff93b07b665ba2c89931374424d61420a2271955872fbf241f29be00d
+  metadata.gz: 0162958281fff2fd3cca5d8565bdfaefbbb389abf383a1c5afbf19bf429569e79fd76ddc3791974fcb0c0bd6d6757018175d26f1bf96fc0f184c90c2c24de1e1
+  data.tar.gz: 6212bc0fd92158503fe5149f1ee28d3e4fe59dd81df2af39f1270279ab4cab4b6bfbe20936bf9af5627b886af0dfdf4325b21db11d8f1954ec21ae70d9b8d829

data/lib/extensions/action_controller_caching_extensions.rb

@@ -0,0 +1,19 @@
+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/extensions/action_controller_extensions.rb

@@ -277,23 +277,3 @@ EOT
   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

@@ -16,10 +16,46 @@ module ImagineCms
       ActionController::Base.send :include, CmsApplicationHelper
     end
     
-    initializer 'imagine_cms.caching_extensions' do |app|
+    initializer 'imagine_cms.action_controller_extensions' do |app|
+      require 'extensions/action_controller_extensions'
+      ActionController::Base.send :extend, ActionControllerExtensions::ClassMethods
+      ActionController::Base.send :include, ActionControllerExtensions::InstanceMethods
+      
+      require 'extensions/action_controller_caching_extensions'
       ActionController::Base.send :extend, ActionControllerCachingExtensions::ClassMethods
+      
+      ActionController::Base.send :helper_method, :user_has_permission?
+      ActionController::Base.send :helper_method, :user_has_permissions?
+      ActionController::Base.send :helper_method, :insert_object, :text_editor, :texteditor, :page_list, :pagelist, :snippet
+      
+      # before_filter :create_settings_object, :set_default_session_values, :check_ssl_requirement, :expire_session_data
+      ActionController::Base.send :before_filter, :expire_session_data
+    end
+    
+    initializer 'imagine_cms.prototype_legacy_helper' do |app|
+      require 'prototype_legacy_helper/lib/prototype_legacy_helper'
+      ActionController::Base.send :include, PrototypeHelper
+      ActionController::Base.send :helper, PrototypeHelper
     end
     
+    initializer 'imagine_cms.acts_as_versioned' do |app|
+      require 'acts_as_versioned/lib/acts_as_versioned'
+    end
+    
+    initializer 'imagine_cms.upload_progress' do |app|
+      require 'upload_progress/lib/multipart_progress'
+      require 'upload_progress/lib/progress'
+      require 'upload_progress/lib/upload_progress'
+      require 'upload_progress/lib/upload_progress_helper'
+      ActionController::Base.send(:include, UploadProgress)
+      ActionView::Base.send(:include, UploadProgress::UploadProgressHelper)
+    end
+    
+    initializer 'imagine_cms.auto_link_email_addresses' do |app|
+      require 'auto_link_email_addresses'
+    end
+    
+    
     def self.activate
       Dir.glob(File.join(Rails.root, "app/overrides/*.rb")) do |c|
         Rails.application.config.cache_classes ? require(c) : load(c)
@@ -51,19 +87,6 @@ module ImagineCms
     require 'mini_magick'
     require 'non-stupid-digest-assets'
     
-    #
-    # rails plugins
-    # 
-    require 'acts_as_versioned/lib/acts_as_versioned'
-    require 'prototype_legacy_helper/lib/prototype_legacy_helper'
-    
-    require 'upload_progress/lib/multipart_progress'
-    require 'upload_progress/lib/progress'
-    require 'upload_progress/lib/upload_progress'
-    require 'upload_progress/lib/upload_progress_helper'
-    
-    require 'auto_link_email_addresses'
-    
     #
     # load provided classes
     #
@@ -74,27 +97,6 @@ module ImagineCms
     # load extensions
     #
     require 'extensions/array_extensions'
-    
-    ActiveSupport.on_load(:action_controller) do
-      require 'extensions/action_controller_extensions'
-      extend ActionControllerExtensions::ClassMethods
-      include ActionControllerExtensions::InstanceMethods
-      
-      include UploadProgress
-      helper UploadProgress::UploadProgressHelper
-      
-      # include + helper: allow use both in controllers and views
-      
-      include PrototypeHelper  # from prototype_legacy_helper
-      helper PrototypeHelper
-      
-      helper_method :user_has_permission?
-      helper_method :user_has_permissions?
-      helper_method :insert_object, :text_editor, :texteditor, :page_list, :pagelist, :snippet
-      
-      # before_filter :create_settings_object, :set_default_session_values, :check_ssl_requirement, :expire_session_data
-      before_filter :expire_session_data
-    end
   end
   
 end

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagine_cms
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -507,6 +507,7 @@ files:
 - lib/acts_as_versioned/test/versioned_test.rb
 - lib/auto_link_email_addresses.rb
 - lib/dynamic_methods.rb
+- lib/extensions/action_controller_caching_extensions.rb
 - lib/extensions/action_controller_extensions.rb
 - lib/extensions/array_extensions.rb
 - lib/hash_object.rb