page_engine 0.0.3 → 0.0.4

data/app/assets/javascripts/page_engine.js

@@ -6,6 +6,9 @@
 //= require markitup/sets/css/set
 //= require markitup/sets/javascript/set
 //= require jquery.ui.nestedSortable
+//= require codemirror/codemirror
+//= require codemirror/modes/javascript
+//= require codemirror/modes/css
 
 $(document).ready(function(){
   
@@ -50,6 +53,14 @@ $(document).ready(function(){
     return false;
   });
   
+  $('select.filter').live('change', function(){
+    check_filter($(this));
+  });
+  
+  $('select.filter').each(function(){
+    check_filter($(this));
+  });
+  
   $('textarea[data-filter=css]').each(function(){
     add_css($(this));
   });  
@@ -57,50 +68,6 @@ $(document).ready(function(){
   $('textarea[data-filter=javascript]').each(function(){
     add_javascript($(this));
   });  
-
-  $('textarea[data-filter=textile]').each(function(){
-    add_textile($(this));
-  });  
-  
-  $('textarea[data-filter=markdown]').each(function(){
-    add_markdown($(this));
-  });  
-  
-  $('textarea[data-filter=html]').each(function(){
-    add_html($(this));
-  });  
-  
-  $('select.filter').live('change', function(){
-    textarea = $('#' + $(this).attr('rel'));
-    filter = textarea.attr('data-filter');
-    
-    switch ($(this).val()){
-      case 'html':
-        add_html(textarea)
-        textarea.attr('data-filter', 'html');
-        break;
-      case 'textile':
-        add_textile(textarea);
-        textarea.attr('data-filter', 'textile');
-        break;
-      case 'markdown':
-        add_markdown(textarea);
-        textarea.attr('data-filter', 'markdown');
-        break;
-      case 'erb':
-        remove_editors(textarea);
-        textarea.attr('data-filter', 'erb');
-        break;
-      case 'erb+textile':
-        add_textile(textarea)
-        textarea.attr('data-filter', 'erb+textile');
-        break;
-      case 'none':
-        remove_editors(textarea);
-        textarea.attr('data-filter', 'none');
-        break;
-    }
-  });
   
   $('#page_no_publish_window').change(function(){
     $('.edit_page .field.publish_from').toggle('slide');
@@ -129,6 +96,37 @@ $(document).ready(function(){
   });
 });
 
+check_filter = function(filter){
+  textarea = $('#' + filter.attr('rel'));
+  
+  switch (filter.val()){
+    case 'html':
+      add_html(textarea)
+      textarea.attr('data-filter', 'html');
+      break;
+    case 'textile':
+      add_textile(textarea);
+      textarea.attr('data-filter', 'textile');
+      break;
+    case 'markdown':
+      add_markdown(textarea);
+      textarea.attr('data-filter', 'markdown');
+      break;
+    case 'erb':
+      remove_editors(textarea);
+      textarea.attr('data-filter', 'erb');
+      break;
+    case 'erb+textile':
+      add_textile(textarea)
+      textarea.attr('data-filter', 'erb+textile');
+      break;
+    case 'none':
+      remove_editors(textarea);
+      textarea.attr('data-filter', 'none');
+      break;
+  }
+}
+
 add_html = function(textarea){
   remove_editors(textarea);
   textarea.markItUp(markitup_html_settings);
@@ -148,15 +146,19 @@ add_markdown = function(textarea){
 }
 
 add_css = function(textarea){
-  remove_editors(textarea);
-  textarea.markItUp(markitup_css_settings);
-  textarea.parents('.markItUp').addClass('css');
+  CodeMirror.fromTextArea(document.getElementById(textarea.attr('id')), {
+    lineNumbers: true,
+    matchBrackets: true,
+    mode: 'css'
+  });
 }
 
 add_javascript = function(textarea){
-  remove_editors(textarea);
-  textarea.markItUp(markitup_javascript_settings);
-  textarea.parents('.markItUp').addClass('javascript');
+  CodeMirror.fromTextArea(document.getElementById(textarea.attr('id')), {
+    lineNumbers: true,
+    matchBrackets: true,
+    mode: 'javascript'
+  });
 }
 
 remove_editors = function(textarea){
@@ -185,5 +187,6 @@ add_fields = function(link, association, content){
   } else {
     alert('You need to specify a name');
   }
+  return false;
 }
 

data/app/assets/stylesheets/page_engine.css

@@ -6,6 +6,8 @@
  *= require markitup/sets/markdown/style
  *= require markitup/sets/css/style
  *= require markitup/sets/javascript/style
+ *= require codemirror/codemirror
+ *= require codemirror/themes/default
 */
 
 .js .hidden {

data/app/controllers/admin/pages_controller.rb

@@ -26,10 +26,9 @@ class Admin::PagesController < ApplicationController
   # GET /pages/new.xml
   def new
     @page = Page.new
-    Page.page_parts.collect { |page_part| @page.page_parts.build(:title => page_part) }
+    PageEngine.page_parts.collect { |page_part| @page.page_parts.build(:title => page_part) }
     @parent = Page.find_by_permalink(params[:page_id])
     @roles = PageEngine.class_exists?('Role') ? Role.all : []
-    @page_part_index = 0
 
     respond_to do |format|
       format.html # new.html.erb
@@ -44,7 +43,6 @@ class Admin::PagesController < ApplicationController
     @page = @page.first
     @parent = @page.parent
     @roles = PageEngine.class_exists?('Role') ? Role.all : []
-    @page_part_index = 0
   end
 
   # POST /pages

data/app/helpers/pages_helper.rb

@@ -10,11 +10,11 @@ module PagesHelper
   end
   
   def page_js(options={})
-    default_options = {
-      'with_tags' => true
-    }.merge(options.stringify_keys)
+    options = {
+      :with_tags => true
+    }.with_indifferent_access.merge(options)
     
-    if default_options['with_tags']
+    if options[:with_tags]
       if @page && !@page.js.blank?
         javascript_tag do 
           @page.js
@@ -26,11 +26,11 @@ module PagesHelper
   end
   
   def page_css(options={})
-    default_options = {
-      'with_tags' => true
-    }.merge(options.stringify_keys)
+    options = {
+      :with_tags => true
+    }.with_indifferent_access.merge(options)
   
-    if default_options['with_tags']
+    if options[:with_tags]
       if @page && !@page.css.blank?
         content_tag :style do
           @page.css
@@ -97,30 +97,30 @@ module PagesHelper
   
   # Return the specified page part content
   def page_content(options={})
-    default_options = {
-      'page' => @page,
-      'part' => 'body'
-    }.merge!(options.stringify_keys)
+    options = {
+      :page => @page,
+      :part => 'body'
+    }.with_indifferent_access.merge(options)
     
-    default_options['page'].page_parts.detect { |p| p.title == default_options['part'].to_s } if default_options['page']
+    options[:page].page_parts.detect { |p| p.title == options[:part].to_s } if options[:page]
   end
   
   def page_snippet(name, options={})
-    default_options = {
-      'default_text' => 'Page snippet not found',
-      'tag' => nil,
-      'class' => ['page_snippet'],
-      'id' => nil
-    }.merge(options.stringify_keys)
+    options = {
+      :default_text => 'Page snippet not found',
+      :tag => nil,
+      :class => ['page_snippet'],
+      :id => nil
+    }.with_indifferent_access.merge(options)
   
     page_snippet = PageSnippet.find_by_name(name.to_s)
     
-    if default_options['tag']
-      content_tag default_options['tag'], :class => default_options['class'], :id => default_options['id'] do 
-        page_snippet ? page_snippet : default_options['default_text']
+    if options[:tag]
+      content_tag options[:tag], :class => options[:class], :id => options[:id] do 
+        page_snippet ? page_snippet : options[:default_text]
       end
     else
-      page_snippet ? page_snippet : default_options['default_text']
+      page_snippet ? page_snippet : options[:default_text]
     end
   end
 
@@ -142,76 +142,69 @@ module PagesHelper
   # * seperator: The text or character that will seperate the breadcrumbs. Defaults to " » "
   # * format: choices are "ul" or "inline". "ul" displays the breadcrumb links in an unordered list whilst "inline" displays them inline in a containing div. Defaults to "ul"
   def breadcrumbs(options={})
-    default_options = {
-      'breadcrumbs' => @breadcrumbs,
-      'page' => @page,
-      'seperator' => ' » ',
-      'format' => 'ul'
-    }.merge!(options.stringify_keys)
+    options = {
+      :breadcrumbs => @breadcrumbs,
+      :page => @page,
+      :seperator => ' » ',
+      :format => :ul
+    }.with_indifferent_access.merge(options)
 
-    case default_options['format'].to_s
-      when 'inline'
-        content_tag :div, :class => 'breadcrumbs' do
-          links = default_options['breadcrumbs'].collect.with_index { |breadcrumb, i| link_to_page(breadcrumb, :class => "crumb_#{i}") + default_options['seperator'].html_safe }.join().html_safe
-          links += content_tag(:span, replace_title_for(default_options['page']), :class => 'current_page') if default_options['page']
+    case options[:format]
+      when :inline
+        content_tag :div, :class => :breadcrumbs do
+          links = options[:breadcrumbs].collect.with_index { |breadcrumb, i| link_to_page(breadcrumb, :class => "crumb_#{i}") + options[:seperator].html_safe }.join().html_safe
+          links += content_tag(:span, replace_title_for(options[:page]), :class => 'current_page') if options[:page]
         end
         
-      when 'ul'
-        content_tag :ul, :class => 'breadcrumbs' do
-          links = default_options['breadcrumbs'].collect.with_index { |breadcrumb, i| content_tag(:li, link_to_page(breadcrumb, :class => "crumb_#{i}")) }.join().html_safe
-          links += content_tag(:li, replace_title_for(default_options['page']), :class => 'current_page') if default_options['page']
+      when :ul
+        content_tag :ul, :class => :breadcrumbs do
+          links = options[:breadcrumbs].collect.with_index { |breadcrumb, i| content_tag(:li, link_to_page(breadcrumb, :class => "crumb_#{i}")) }.join().html_safe
+          links += content_tag(:li, replace_title_for(options[:page]), :class => 'current_page') if options[:page]
         end
         
       else
-        'Please choose one of \'inline\' or \'ul\' as a format'
+        'Please choose one of :inline or :ul as a format'
     end
   end
 
   # Options:
+  # * root: The root of the navigation structure
   # * current: The current_page if not @page
   # * depth: The number of levels in the tree to traverse. Defaults to 2
   # * class: The class of the containing ul. Defaults to ""
   # * id: The id of the containing id. Defaults to ""
-  # * link_current: Set to true if the current page should have a link. Defaults to false
-  def navigation(permalink, options={})
-    default_options = {
-      'current' => @page,
-      'class' => 'nav', 
-      'id' => '',
-      'include_root' => false,
-      'link_current' => false,
-      'depth' => 2
-    }.merge!(options.stringify_keys)
+  # * link_current: Set to true if the current page should have a link. Defaults to false  
+  def navigation(options={})
+    options = {
+      :root => nil,
+      :current => @page,
+      :class => 'nav', 
+      :id => '',
+      :include_root => false,
+      :link_current => false,
+      :depth => 2
+    }.with_indifferent_access.merge(options)
 
     current_user = nil unless defined?(current_user)
-
-    root_page = Page.published_or_hidden.viewable_by(current_user)
     
-    if permalink
-      root_page = root_page.find_by_permalink(permalink.to_s)
+    if options[:root].is_a?(NilClass)
+      root_page = Page.published_or_hidden.viewable_by(current_user).root_only.first
+    elsif options[:root].is_a?(Page)
+      root_page = options[:root]
+    elsif options[:root].is_a?(String)
+      root_page = Page.published_or_hidden.viewable_by(current_user).where('pages.url = :root or pages.permalink = :root', :root => options[:root]).first
+    elsif options[:root].is_a?(Hash)
+      options[:root].stringify_keys!
+      root_page = Page.published_or_hidden.viewable_by(current_user).where(:controller => options[:root][:controller], :action => options[:root][:action]).first
     else
-      root_page = root_page.first
+      return "<p><em>Error:</em> Root must be a page, a permalink, a url or a hash containing the controller and action, got: #{root.class.to_s}.</p>".html_safe
     end
     
-    return "<p><em>Error:</em> Root page not found</p>".html_safe unless root_page
+    return "<p><em>Error:</em> Root page not found: #{options[:root]}</p>".html_safe unless root_page
 
-    grouped_pages = root_page.self_and_descendants.viewable_by(current_user).shown_in_menu.published.group_by(&:parent_id)
+    grouped_pages = root_page.self_and_descendants.viewable_by(current_user).shown_in_menu.published.for_nav.group_by(&:parent_id)
 
-    render 'pages/navigation', :options => default_options, :root_page => root_page, :grouped_pages => grouped_pages, :level => 1
-  end
-  
-  def filter_select(target, options={})
-    default_options = {
-      'builder' => nil,
-      'object' => nil,
-      'attribute' => nil  
-    }.merge!(options.stringify_keys)
-    
-    if default_options['builder']
-      default_options['builder'].select(default_options['attribute'], Page.filters, {}, { :class => 'filter', :rel => target })
-    else
-      select_tag(default_options['object'], default_options['attribute'], Page.filters, {}, { :class => 'filter', :rel => target })
-    end
+    render 'pages/navigation', :options => options, :root_page => root_page, :grouped_pages => grouped_pages, :level => 1
   end
 
   private

data/app/models/page.rb

@@ -42,6 +42,7 @@ class Page < ActiveRecord::Base
   scope :shown_in_sitemap, where({ :display_in_sitemap => true })
   scope :shown_in_menu, where({ :display_in_menu => true })
   scope :just_controller_and_actions, select("controller || '|' || action as taken").group('taken')
+  scope :for_nav, select([:id, :title, :parent_id, :menu_css_class, :no_link, :url, :controller, :action, :permalink])
 
   attr_accessor :no_publish_window, :controller_action  
 
@@ -112,7 +113,7 @@ class Page < ActiveRecord::Base
     page
   end
 
-  def is_viewable_by? user
+  def is_viewable_by?(user)
     if PageEngine.class_exists?('Role')
       if PageEngine.class_exists?('User') && user
         return true if self.roles.length == 0
@@ -151,27 +152,14 @@ class Page < ActiveRecord::Base
   end
 
   class << self
-    attr_accessor :layouts
     
-    def breadcrumbs_for user, url
+    def breadcrumbs_for(user, url)
       root = Page.published.viewable_by(user).find_by_url(url)
       root.nil? ? [] : root.self_and_ancestors
     end
-
-    def status_values
-      ["Draft", "Published", "Review", "Hidden"]
-    end
     
     def default_layout
-      Page.layouts.first
-    end
-
-    def filters
-      %w{ none html textile markdown erb erb+textile }
-    end
-
-    def page_parts
-      %w{ body left right header footer }
+      PageEngine.layouts.first
     end
 
     # Scopes
@@ -189,7 +177,7 @@ class Page < ActiveRecord::Base
       end      
     end
 
-    def with_roles roles
+    def with_roles(roles)
       if Extras.class_exists?('Role')
         includes(:roles).where([ "roles.id IN (?)", roles.join(',') ])
       else
@@ -197,7 +185,7 @@ class Page < ActiveRecord::Base
       end
     end
 
-    def with_url request, params
+    def with_url(request, params)
       url = request.fullpath
       url.gsub!(/\?.*/, '') # Strip away anything after the ? as it's not needed
 

data/app/views/admin/pages/_form.html.haml

@@ -29,20 +29,20 @@
     = f.input :js, :label => 'Javascript', :input_html => { 'data-filter' => 'javascript' }
     = f.input :meta_description
     = f.input :meta_keywords
-    = f.input :status, :as => :select, :collection => Page.status_values, :include_blank => false
+    = f.input :status, :as => :select, :collection => PageEngine.statuses, :include_blank => false
     = f.input :no_publish_window, :as => :boolean
     = f.input :publish_from, :order => [:day, :month, :year]
     = f.input :publish_to, :order => [:day, :month, :year]
     = f.input :url
     
-    = f.input :controller_action do 
+    = f.input :controller_action, :as => :select do 
       = f.select :controller_action, grouped_options_for_select(@routes), :include_blank => true
         
     = f.input :display_in_menu
     = f.input :display_in_sitemap
     = f.input :menu_css_class
     = f.input :no_link
-    = f.input :layout, :as => :select, :collection => Page.layouts, :include_blank => false
+    = f.input :layout, :as => :select, :collection => PageEngine.layouts, :include_blank => false
   
   - if PageEngine.class_exists?('Asset')
     .field.attached_assets

data/app/views/admin/pages/_page_part_fields.html.haml

@@ -5,5 +5,5 @@
 = f.error_notification
 
 = f.input :title, :class => 'page_part_title'
-= f.input :filter, :collection => Page.filters, :include_blank => false, :class => 'filter', :input_html => { :class => 'filter', :rel => "page_part_content_#{f.object.id}" }
+= f.input :filter, :collection => PageEngine.filters, :include_blank => false, :class => 'filter', :input_html => { :class => 'filter', :rel => "page_part_content_#{f.object.id}" }
 = f.input :content, :input_html => { 'data-filter' => f.object.filter, :class => 'editor ignore_tab', :id => "page_part_content_#{f.object.id}" }

data/app/views/admin/pages/duplicate.js.erb

@@ -1,5 +1 @@
 $('#page_<%= @original_page.id %>').after('<%= escape_javascript(render @page) %>');
-page_sort();
-<% flash.each do |level, message| -%>
-  flash_message('<%= escape_javascript(message) %>', '<%= level %>');
-<% end -%>

data/app/views/admin/pages/index.html.haml

@@ -1,6 +1,6 @@
 %h2 Pages
 %p
-  = link_to 'New root page', new_admin_page_path, :class => 'icon_left add'
+  = link_to('New root page', new_admin_page_path, :class => 'icon_left add')
   
 %ol#page_engine.list{ 'data-href' => sort_admin_pages_path }
   = render @pages[nil] if @pages[nil]

data/app/views/pages/_nav_item.html.haml

@@ -1,5 +1,5 @@
 %li{ :class => page_menu_class(page) }
-  - if page.no_link || (page == options[:current] && !options[:link_current])
+  - if page.no_link || (page == options['current'] && !options['link_current'])
     %span= replace_title_for(page)
   - else 
     = link_to_page(page)

data/lib/generators/page_engine/install/install_generator.rb

@@ -0,0 +1,64 @@
+module PageEngine
+  module Generators
+    require 'rails/generators'
+    require 'rails/generators/migration'
+
+    class InstallGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      desc "This generator installs PageEngine supporting assets"
+
+      source_root File.expand_path('../../../../', __FILE__) 
+      
+      def self.next_migration_number(path)
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      end
+      
+      def install
+        create_migrations
+        copy_stylesheets
+        copy_javascripts
+        copy_images
+        
+        copy_file 'app/views/layouts/admin.html.haml', 'app/views/layouts/admin.html.haml'
+      end
+
+      private
+      
+        def create_migrations
+          begin
+            migration_template 'db/migrate/20110814185929_create_page_engine.rb', 'db/migrate/create_page_engine.rb'
+          rescue Exception => e
+            puts e
+          end  
+        end
+        
+        def copy_stylesheets
+          directory 'app/assets/stylesheets', 'public/stylesheets'
+          directory 'vendor/assets/stylesheets', 'public/stylesheets'
+          
+          puts 'Updating image location'
+          ['css', 'textile', 'markdown', 'html', 'javascript'].each do |area|
+            gsub_file "public/stylesheets/markitup/sets/#{area}/style.css", /\/assets\//, '/images/'
+          end
+          
+          ['markitup', 'simple'].each do |area|
+            gsub_file "public/stylesheets/markitup/skins/#{area}/style.css", /\/assets\//, '/images/'
+          end
+          
+          gsub_file "public/stylesheets/jquery-ui.css", /\/assets\//, '/images/'
+          gsub_file "public/stylesheets/page_engine.css", /\/assets\//, '/images/'
+        end
+        
+        def copy_javascripts
+          directory 'app/assets/javascripts', 'public/javascripts'
+          directory 'vendor/assets/javascripts', 'public/javascripts'      
+        end
+        
+        def copy_images
+          directory 'app/assets/images', 'public/images'
+          directory 'vendor/assets/images', 'public/images'            
+        end
+
+    end
+  end
+end if Rails.version < "3.1"

data/lib/page_engine/extensions.rb

@@ -4,14 +4,18 @@ require 'page_engine/exceptions'
 
 class << ActionController::Base
   def page_engine(options = {})
+#    # Check options
+#    raise PageEngine::PageEngineException.new("Options for page_engine must be in a hash.") unless options.is_a? Hash
+#    
+#    options = {
+#      :layouts = ['application']
+#    }.merge(options)
     
-    # Check options
-    raise PageEngine::PageEngineException.new("Options for page_engine must be in a hash.") unless options.is_a? Hash
-    options.each do |key, value|
-      unless [:layouts].include?(key)
-        raise PageEngine::PageEngineException.new("Unknown option for page_engine: #{key.inspect} => #{value.inspect}.")
-      end
-    end
+#    options.each do |key, value|
+#      unless [:layouts].include?(key)
+#        raise PageEngine::PageEngineException.new("Unknown option for page_engine: #{key.inspect} => #{value.inspect}.")
+#      end
+#    end
   
     include PageEngine::InstanceMethods
     extend PageEngine::ClassMethods
@@ -19,6 +23,6 @@ class << ActionController::Base
     before_filter :find_page
     layout :get_layout
     
-    Page.layouts = options[:layouts].is_a?(Array) ? options[:layouts] : ['application']
+#    PageEngine.layouts = options[:layouts].is_a?(Array) ? options[:layouts] : ['application']
   end
 end

data/lib/page_engine/instance_methods.rb

@@ -2,13 +2,13 @@ module PageEngine
   module InstanceMethods
     def get_layout
       if @page 
-        @page.layout.blank? ? Page.default_layout : @page.layout
+        @page.layout.blank? ? Page.default_layout.to_s : @page.layout.to_s
       else
-        Page.default_layout
+        Page.default_layout.to_s
       end      
     end
     
-    def find_page permalink=nil
+    def find_page(permalink=nil)
       current_user = nil unless defined?(current_user)
       
       unless params[:controller].split('/').first == "admin"
@@ -23,7 +23,7 @@ module PageEngine
       end
     end
 
-    def page_title_replace models=[]
+    def page_title_replace(models=[])
       models.each do |m|
         key = m.class.to_s.underscore
         @page.title.scan(/\{\{#{key}_([_a-z]*)\}\}/).uniq.flatten.each do |attribute|
@@ -43,7 +43,7 @@ module PageEngine
       end
     end
 
-    def breadcrumb_replace models=[]
+    def breadcrumb_replace(models=[])
       models.each do |m|
         key = m.class.to_s.underscore
         @breadcrumbs.each do |breadcrumb|
@@ -72,7 +72,7 @@ module PageEngine
       def get_breadcrumbs
         current_user = nil unless defined?(current_user)
         if @page
-          @breadcrumbs = @page.ancestors.published.viewable_by(current_user).all
+          @breadcrumbs = @page.ancestors.for_nav.published.viewable_by(current_user).all
         else
           @breadcrumbs = []
         end