spud_cms 0.8.17 → 0.9.0

data/app/views/spud/admin/pages/_page_partials_form.html.erb

@@ -1,9 +1,9 @@
-<div id="page_partials_form" class="formtabs">
-	<ul class="formtab_buttons">
+<div id="page_partials_form" class="formtabs tab-content">
+	<ul class="formtab_buttons nav nav-tabs">
 	</ul>
 	<% last_index = 0 %>
 	<% spud_page_partials.each_with_index do |spud_page_partial, index| %>
-		<div class="formtab">
+		<div class="formtab tab-pane">
 			<input type="hidden" class="tab_name" name="spud_page[spud_page_partials_attributes][<%= index %>][name]" value="<%= spud_page_partial.name %>" />
 			<textarea class="wysiwym tinymce" name="spud_page[spud_page_partials_attributes][<%= index %>][content]">
 				<%= spud_page_partial.content %>

data/app/views/spud/admin/pages/index.html.erb

@@ -1,5 +1,5 @@
 <%=content_for :data_controls do%>
-<%=link_to "New Page",new_spud_admin_page_path(),:class => "btn btn-primary",:title => "New Page"%>&nbsp;<%=link_to "Clear Cache",clear_spud_admin_pages_path(),:class => "btn btn-warning",:title => "Clear Page Cache" if Spud::Cms.enable_full_page_caching || Spud::Cms.enable_action_caching%>
+<%=link_to "New Page",new_spud_admin_page_path(),:class => "btn btn-primary",:title => "New Page"%>&nbsp;<%=link_to "Clear Cache",clear_spud_admin_pages_path(),:class => "btn btn-warning",:title => "Clear Page Cache" if Spud::Cms.cache_mode %>
 <%end%>
 
 <%=content_for :detail do%>

data/app/views/spud/admin/pages/show.html.erb

@@ -6,17 +6,15 @@
 <%end%>
 
 <%if !@inline.blank?%>
-	<%=render :inline => @inline%> 
-<%else%>
-	<h2><%=@page.name%></h2>
+	<%=render :inline => @inline%>
 <%end%>
 <%@page.spud_page_partials.each do |page_partial|%>
-	
+
 	<%if(page_partial.name.downcase == 'body' && Spud::Cms.yield_body_as_content_block == false)%>
-		<%=page_partial.content.html_safe%>
+		<%=page_partial.postprocess_content.html_safe%>
 	<%else%>
 		<%=content_for page_partial.name.parameterize.underscore.to_sym do%>
-			<%=page_partial.content.html_safe%>
+			<%=page_partial.postprocess_content.html_safe%>
 		<%end%>
 	<%end%>
 <%end%>

data/config/routes.rb

@@ -8,8 +8,8 @@ Rails.application.routes.draw do
              post 'preview'
            end
          end
-         resources :templates 
-   		
+         resources :templates
+
    		resources :menus do
    			resources :menu_items
    		end
@@ -20,7 +20,7 @@ Rails.application.routes.draw do
       end
    end
    root :to => 'pages#show'
-   
+
    # This is located in lib/spud_cms/page_route.rb to make sure it is loaded last
    # match "*id", :controller => "pages",:action => "show", :as => "page"
 

data/db/migrate/20120911190030_add_symbol_name_to_spud_page_partials.rb

@@ -0,0 +1,5 @@
+class AddSymbolNameToSpudPagePartials < ActiveRecord::Migration
+  def change
+    add_column :spud_page_partials, :symbol_name, :string
+  end
+end

data/db/migrate/20120912121313_modify_site_id_for_spud_pages.rb

@@ -0,0 +1,15 @@
+class ModifySiteIdForSpudPages < ActiveRecord::Migration
+  def up
+    change_column :spud_pages,:site_id,:integer,:default => 0,:null => false
+    change_column :spud_templates,:site_id,:integer,:default => 0,:null => false
+    change_column :spud_menus,:site_id,:integer,:default => 0,:null => false
+    SpudPage.where(:site_id => nil).each {|f| f.site_id = 0 ; f.save}
+    SpudMenu.where(:site_id => nil).each {|f| f.site_id = 0 ; f.save}
+  end
+
+  def down
+    change_column :spud_pages,:site_id,:integer,:default => nil,:null => true
+    change_column :spud_templates,:site_id,:integer,:default => nil,:null => true
+    change_column :spud_menus,:site_id,:integer,:default => nil,:null => true
+  end
+end

data/db/migrate/20121016233715_add_content_processed_to_spud_page_partials.rb

@@ -0,0 +1,5 @@
+class AddContentProcessedToSpudPagePartials < ActiveRecord::Migration
+  def change
+    add_column :spud_page_partials, :content_processed, :text
+  end
+end

data/db/migrate/20121112151110_add_layout_to_spud_pages.rb

@@ -0,0 +1,8 @@
+class AddLayoutToSpudPages < ActiveRecord::Migration
+  def change
+    add_column :spud_pages, :layout, :string
+
+    remove_column :spud_pages, :template_id
+    drop_table :spud_templates
+  end
+end

data/db/migrate/20121112212113_create_spud_page_liquid_tags.rb

@@ -0,0 +1,11 @@
+class CreateSpudPageLiquidTags < ActiveRecord::Migration
+  def change
+    create_table :spud_page_liquid_tags do |t|
+      t.integer :spud_page_partial_id
+      t.string :tag_name
+      t.string :value
+      t.timestamps
+    end
+    add_index :spud_page_liquid_tags, [:tag_name,:value]
+  end
+end

data/lib/spud_cms.rb

@@ -2,6 +2,7 @@
 module Spud
 	module Cms
 	   require 'spud_cms/configuration'
+     require 'spud_cms/template_parser'
 	   require 'spud_cms/engine' if defined?(Rails)
     end
 end

data/lib/spud_cms/configuration.rb

@@ -2,16 +2,13 @@ module Spud
   module Cms
     include ActiveSupport::Configurable
 
-    config_accessor :menus_enabled,:templates_enabled,:root_page_name,:default_page_parts,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:enable_full_page_caching,:enable_action_caching,:multisite_config,:max_revisions,:template_404
-
-    self.root_page_name = "home"
+    config_accessor :menus_enabled,:root_page_name,:yield_body_as_content_block,:default_page_layout,:enable_sitemap,:multisite_config,:max_revisions,:template_404, :cache_mode
     self.menus_enabled = true
-    self.templates_enabled = false
+    self.root_page_name = "home"
     self.default_page_layout = 'application'
-    self.default_page_parts = ["Body"]
   	self.yield_body_as_content_block = false
-    self.enable_full_page_caching = false
-    self.enable_action_caching = false
+    self.cache_mode = nil #Options :full_page, :action
+
     self.enable_sitemap = true
     self.max_revisions = 10
     self.template_404 = nil

data/lib/spud_cms/engine.rb

@@ -1,41 +1,62 @@
 require 'spud_core'
 require 'spud_permalinks'
 require 'codemirror-rails'
+require 'liquid'
+
 module Spud
   module Cms
     class Engine < Rails::Engine
-     engine_name :spud_cms
-     # config.autoload_paths << File.expand_path("../app/sweepers", __FILE__)
-    config.generators do |g|
-      g.test_framework :rspec, :view_specs => false
-    end
-     
+      engine_name :spud_cms
+
+      # config.active_record.observers = [] if config.active_record.observers.nil?
+      # config.active_record.observers += [:page_observer]
+
+      config.generators do |g|
+        g.test_framework :rspec, :view_specs => false
+      end
+
      initializer :admin do
       Spud::Core.configure do |config|
           config.admin_applications += [{:name => "Pages",:thumbnail => "spud/admin/pages_thumb.png",:url => "/spud/admin/pages",:order => 0}]
           if Spud::Cms.menus_enabled
             config.admin_applications += [{:name => "Menus",:thumbnail => "spud/admin/menus_thumb.png",:url => "/spud/admin/menus",:order => 2}]
           end
-          if Spud::Cms.templates_enabled
-            config.admin_applications += [{:name => "Templates",:thumbnail => "spud/admin/pages_thumb.png",:url => "/spud/admin/templates",:order => 4}]
-          end
+
           if Spud::Cms.enable_sitemap == true
             config.sitemap_urls += [:spud_cms_sitemap_url]
           end
-          
+
+      end
+     end
+    initializer :model_overrides_cms do |config|
+      ActiveRecord::Base.class_eval do
+        include Spud::Searchable
       end
      end
+    initializer :cms_sweepers do |config|
+      Spud::Admin::ApplicationController.instance_eval do
+        cache_sweeper :page_sweeper, :except => [:show,:index]
+      end
+    end
+
      initializer :spud_cms_routes do |config|
       config.routes_reloader.paths << File.expand_path('../page_route.rb', __FILE__)
      end
-     initializer :load_priority, :after => :load_environment_config do |config|
-      puts "Loading Railties Order"
-      # Rails.application.config.railties_order = [:main_app, :all,Spud::Core::Engine,Spud::Cms::Engine]
-     end
-     initializer :assets do |config| 
+
+     initializer :assets do |config|
     	Rails.application.config.assets.precompile += ["spud/admin/cms*"]
+      Spud::Core.append_admin_javascripts('spud/admin/cms/application')
+      Spud::Core.append_admin_stylesheets('spud/admin/cms/application')
   	 end
 
-  end 
+     initializer :template_parser do |config|
+      @template_parser = Spud::Cms::TemplateParser.new()
+     end
+
+     def template_parser
+      return @template_parser
+     end
+
+  end
  end
 end

data/lib/spud_cms/template_parser.rb

@@ -0,0 +1,121 @@
+module Spud
+  module Cms
+    class TemplateParser
+
+
+      def layouts(site_short_name=nil)
+        if(site_short_name != nil)
+          return all_layouts.select {|k,v| v[:sites].include?(site_short_name.to_s.downcase)}
+        else
+          return all_layouts
+        end
+      end
+
+      def all_layouts
+        if @layouts && Rails.env != 'development'
+          return @layouts
+        end
+        @layouts = {}
+        engines.each do |engine|
+          @layouts.merge! process_layouts(engine.root.join('app','views','layouts'))
+        end
+        @layouts.merge! process_layouts(Rails.application.root.join('app','views','layouts'))
+
+        check_for_defaults(@layouts)
+
+        return @layouts
+      end
+
+
+  private
+      def process_layouts(filepath)
+        layouts = {}
+        Dir.glob(filepath.join("**","*.html.*")) do |template|
+
+          layout = process_layout(template)
+          layouts[layout_path(template)] = layout if !layout.blank?
+
+        end
+        return layouts
+      end
+
+      def process_layout(template)
+        f = File.open(template)
+          header = []
+          f.each_line do |line|
+            header << line
+            break if line.blank?
+          end
+          f.close
+          # puts header
+          if header.blank? == false
+            layout = {:partials => []}
+
+            header.each do |header_line|
+              process_directive(header_line, layout)
+            end
+            layout[:partials] = ["Body"] if layout[:partials].blank?
+            layout[:sites] = [Spud::Core.config.short_name.downcase] if layout[:sites].blank?
+            if layout[:template_name].blank? == false
+              return layout
+            else
+              return nil
+            end
+          end
+          return nil
+      end
+
+      def check_for_defaults(layouts)
+        default_layout_path = layout_path(Rails.application.root.join('app','views','layouts',Spud::Cms.default_page_layout))
+        puts("Checking #{default_layout_path}")
+        puts(layouts)
+        if layouts[default_layout_path].blank?
+          layouts[default_layout_path] = {:template_name => "Default", :partials => ["Body"], :sites => [Spud::Core.short_name.downcase], :default => true}
+        else
+          layouts[default_layout_path][:default] = true
+        end
+
+        Spud::Core.multisite_config.each do |config|
+          cms_config = Spud::Cms.site_config_for_short_name(config[:short_name])
+          layout_path = cms_config.blank? == false && cms_config[:default_page_layout].blank? == false ? layout_path(Rails.application.root.join('app','views','layouts',cms_config[:default_page_layout])) : default_layout_path
+
+          layout = layouts[layout_path]
+          if layout.blank?
+            layouts[layout_path] = {:template_name => "Default", :partials => ["Body"], :sites => [config[:short_name].to_s.downcase], :default => true}
+          else
+            layout[layout_path][:sites] << config[:short_name].to_s.downcase
+            layout[layout_path][:default] = true
+          end
+        end
+
+      end
+
+      def layout_path(template)
+        dir, base = File.split(template)
+        path_components = dir.split("/")
+        component = path_components.shift
+        while component != "layouts" do
+          component = path_components.shift
+        end
+        path_components << base.downcase.split(".")[0]
+        return "#{path_components.join("/")}"
+      end
+
+      def process_directive(line,layout)
+        if template_matcher = line.match(/\-?\#template\_name\:(.*)/)
+          layout[:template_name] = template_matcher[1].strip
+        end
+        if template_matcher = line.match(/\-?\#html\:(.*)/)
+          layout[:partials] << template_matcher[1].strip
+        end
+        if template_matcher = line.match(/\-?\#site_name\:(.*)/)
+          layout[:sites] = template_matcher[1].split(",").collect {|s| s.strip.downcase}
+        end
+      end
+
+      def engines
+        Rails::Application::Railties.engines
+      end
+    end
+  end
+end

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "0.8.17"
+		VERSION = "0.9.0"
 	end
 end

data/spec/controllers/pages_controller_spec.rb

@@ -0,0 +1,108 @@
+require 'spec_helper'
+
+describe PagesController do
+  describe :show do
+    before(:each) do
+      Spud::Core.configure do |config|
+        config.site_name = "Test Site"
+        config.multisite_mode_enabled = false
+        config.multisite_config = []
+      end
+      Spud::Cms.configure do |config|
+        config.cache_mode = false
+      end
+    end
+    it "should render a page" do
+      page = FactoryGirl.create(:spud_page)
+      get :show ,:id => page.url_name
+      assigns(:layout).should render_template(:layout => "layouts/#{Spud::Cms.default_page_layout}")
+      response.should be_success
+    end
+
+    it "should render home page if id is blank" do
+      page = FactoryGirl.create(:spud_page,:name => "home")
+      get :show
+      assigns(:page).should == page
+      response.should be_success
+    end
+
+    it "should redirect to new page url from old page url if it was changed" do
+      page = FactoryGirl.create(:spud_page,:name => "about")
+      page.name = "about us"
+      page.save
+
+      get :show, :id => "about"
+
+     response.should redirect_to page_url(:id => "about-us")
+
+    end
+
+
+
+    it "should not allow access to private pages when logged out" do
+      page = FactoryGirl.create(:spud_page,:name => "about",:visibility => 1)
+
+      get :show, :id => "about"
+      response.should redirect_to new_spud_user_session_url()
+    end
+
+    describe "page caching" do
+      before(:each) do
+        Spud::Cms.configure do |config|
+          config.cache_mode = nil
+        end
+      end
+
+
+    end
+
+    describe "authorized login" do
+       before(:each) do
+        activate_authlogic
+        u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
+        u.super_admin = true
+        u.save
+        @user = SpudUserSession.create(u)
+      end
+
+      it "should allow access to private pages when logged in" do
+        page = FactoryGirl.create(:spud_page,:name => "about",:visibility => 1)
+
+        get :show, :id => "about"
+        response.should be_success
+      end
+    end
+
+    describe "multisite enabled" do
+        before(:each) do
+          Spud::Core.configure do |config|
+            config.site_name = "Test Site"
+            config.multisite_mode_enabled = true
+            config.multisite_config = [{:hosts => ["test.host"], :site_name =>"Site B", :site_id => 1}]
+          end
+        end
+
+        it "should not show a page on a different site" do
+          page = FactoryGirl.create(:spud_page,:name => "about",:site_id => 0)
+          get :show,:id=>"about"
+          response.response_code.should == 404
+        end
+
+        it "should show the right page" do
+          page = FactoryGirl.create(:spud_page,:name => "about",:site_id => 0)
+          page2 = FactoryGirl.create(:spud_page,:name => "about",:site_id => 1)
+          get :show,:id=>"about"
+          assigns(:page).should == page2
+        end
+
+        it "should return the homepage of the current site" do
+          page = FactoryGirl.create(:spud_page,:name => "home",:site_id => 0)
+          page_site1 = FactoryGirl.create(:spud_page,:name => "home",:site_id => 1)
+
+          get :show
+          assigns(:page).should == page_site1
+        end
+
+    end
+  end
+end