imagine_cms 3.0.0.beta3 → 3.0.0.beta4

data/README.rdoc

@@ -21,10 +21,10 @@ be a good time to get on board.
 
 =Roadmap
 
-Here's what's coming up:
-
 Current status: Original functionality 25% restored
 
+Here's what's coming up:
+
 * Imagine 3.0 (Rails 3.2): 90% restored functionality, can function on existing sites with no database changes
 * Imagine 3.1 (Rails 3.2): 100% restored functionality, may require a few simple migrations
 * Imagine 4.0 (Rails 4.0): Refactoring & rewriting of the worst parts (substitutions); move away from ERB templating, to something like Liquid; switch to a cross-browser editor; switch to jQuery

data/app/controllers/cms/content_controller.rb

@@ -1,7 +1,6 @@
 module Cms # :nodoc:
   class ContentController < ::ApplicationController # :nodoc:
     caches_action :rss_feed
-    helper CmsApplicationHelper
     
     before_filter :convert_content_path
     
@@ -58,31 +57,5 @@ module Cms # :nodoc:
       false
     end
     
-    ### COMPAT: convert_content_path
-    def convert_content_path
-      logger.debug "DEPRECATION WARNING: convert_content_path called"
-      params[:content_path] = params[:content_path].to_s.split('/')
-    end
-    
-    ### COMPAT - template_exists?
-    def template_exists?(template, extension = nil)
-      # ignore extension
-      logger.debug("DEPRECATION WARNING: template_exists? called")
-      lookup_context.find_all(template).any?
-    end
-    helper_method :template_exists?
-    
-    def url_for_current
-      request.fullpath
-    end
-    helper_method :url_for_current
-    
-    ### COMPAT - log_error
-    def log_error(e)
-      # noop
-      logger.debug("DEPRECATION WARNING: log_error called")
-      logger.error(e)
-    end
-    
   end
 end

data/app/helpers/cms_application_helper.rb

@@ -75,14 +75,13 @@ module CmsApplicationHelper
   # Display any available flash messages (:error, :notice), 
   #
   # NOTE: @error and @notice are deprecated, use flash.now[:error] and flash.now[:notice] instead.
-  def flash_message(message = 'Please review the following messages:')
+  def flash_message
     output = ''.html_safe
     if (flash[:error] || @error || '') != ''
-      output << content_tag('p') { message }
-      output << content_tag('p', :class => 'error') { flash[:error] || @error }
+      output << content_tag('div', :class => 'alert alert-error') { flash[:error] || @error }
     end
     if (flash[:notice] || @notice || '') != ''
-      output << content_tag('p', :class => 'notice') { flash[:notice] || @notice }
+      output << content_tag('div', :class => 'alert alert-info') { flash[:notice] || @notice }
     end
     output
   end

data/lib/extensions/action_controller.rb

@@ -3,6 +3,7 @@ module ActionControllerExtensions
   end
   
   module InstanceMethods
+    
     # Determines whether the input string is a valid email address per RFC specification
     def valid_email_address?(addr, perform_mx_lookup = false)
       valid = true
@@ -24,5 +25,32 @@ module ActionControllerExtensions
       
       valid
     end
+    
+    ### COMPAT: convert_content_path
+    def convert_content_path
+      logger.debug "DEPRECATION WARNING: convert_content_path called"
+      params[:content_path] = params[:content_path].to_s.split('/')
+    end
+    
+    ### COMPAT - template_exists?
+    def template_exists?(template, extension = nil)
+      # ignore extension
+      logger.debug("DEPRECATION WARNING: template_exists? called")
+      lookup_context.find_all(template).any?
+    end
+    
+    ### COMPAT - template_exists?
+    def url_for_current
+      logger.debug("DEPRECATION WARNING: url_for_current called")
+      request.fullpath
+    end
+    
+    ### COMPAT - log_error
+    def log_error(e)
+      # noop
+      logger.debug("DEPRECATION WARNING: log_error called")
+      logger.error(e)
+    end
+    
   end
 end

data/lib/imagine_cms/engine.rb

@@ -26,6 +26,11 @@ module ImagineCms
       require 'extensions/action_controller'
       extend ActionControllerExtensions::ClassMethods
       include ActionControllerExtensions::InstanceMethods
+      
+      helper CmsApplicationHelper
+      helper_method :template_exists?
+      helper_method :url_for_current
+      
       # before_filter :create_settings_object, :set_default_session_values, :check_ssl_requirement, :expire_session_data
       # after_filter :compress_output    
     end

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.0.beta3"
+  VERSION = "3.0.0.beta4"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: imagine_cms
 version: !ruby/object:Gem::Version 
-  hash: 62196421
+  hash: 62196427
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - beta
-  - 3
-  version: 3.0.0.beta3
+  - 4
+  version: 3.0.0.beta4
 platform: ruby
 authors: 
 - Aaron Namba
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-15 00:00:00 Z
+date: 2012-04-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails