tb_cms 1.2.0.beta1 → 1.2.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d493436489707a83b24c42f45f4c28da810f6eb
-  data.tar.gz: 0b85e51660ae264c80f50e063fa2ebca8538cf02
+  metadata.gz: 603c1fdda41198a90994c4437b1ef98b77c2d53e
+  data.tar.gz: 6b7756d1a544e4d0cd23435bb471085d1b5a7020
 SHA512:
-  metadata.gz: 9106c75d5cd3f91334426eb8dd51e4006bb9cfbe04d6b8c5d1a8569e76537e2302361bc9dcf396ce0976045712ca4b58ac0f01f50604b4d9d22c44eda5295d64
-  data.tar.gz: 89588fb1c7d5ccf19e299ea1b6c076e41564a45a0268781df4b124d3d1085f89459100dab67752cba18f5dd55e24cf7011b68b59480c81a540f122dc2840dd84
+  metadata.gz: 0b6bf5a0086d59e8d294a82172f556658f38de6bd0bd20ed850cb3cf04257dc56ca8f5816abdb7f885877e107cd4d02c8f79427e67fb2f5dea550cd7f3b4b8b4
+  data.tar.gz: 42fbc6c40d02f55d97b4acd74a9c0bd707c2f521fedfbc8fe00933e2764c5c875fc439d329f2891fbf529ee45e41d134df9e8c8cebb7673eca51d58846a8254e

data/app/controllers/admin/menu_items_controller.rb

@@ -92,9 +92,6 @@ private
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
 			redirect_to admin_menus_url() and return false
-		elsif Spud::Core.multisite_mode_enabled && @menu.site_id != session[:admin_site]
-			flash[:warning] = "Site Context Changed. The menu you were viewing is not associated with the current site. Redirected back to menu selections."
-			redirect_to admin_menus_url() and return false
 		end
 		add_breadcrumb "#{@menu.name}", :admin_menu_menu_items_path
 	end

data/app/controllers/admin/menus_controller.rb

@@ -4,11 +4,10 @@ class Admin::MenusController < Admin::ApplicationController
 	before_filter :load_menu,:only => [:edit,:update,:show,:destroy]
 
 	def index
-		@menus = SpudMenu.site(session[:admin_site]).order(:name).paginate :page => params[:page]
+		@menus = SpudMenu.all.paginate(:page => params[:page])
 		respond_with @menus
 	end
 
-
 	def new
 		add_breadcrumb "New", :new_admin_menu_path
 		@menu = SpudMenu.new
@@ -18,7 +17,6 @@ class Admin::MenusController < Admin::ApplicationController
 	def create
 		add_breadcrumb "New", :new_admin_menu_path
 		@menu = SpudMenu.new(menu_params)
-		@menu.site_id = session[:admin_site]
 		flash[:notice] = "New menu created" if @menu.save
 		respond_with @menu,:location => @menu.id != nil ? admin_menu_menu_items_url(:menu_id => @menu.id) : admin_menus_url
 	end
@@ -47,9 +45,6 @@ private
 		if @menu.blank?
 			flash[:error] = "Menu not found!"
 			redirect_to admin_menus_url() and return false
-		elsif Spud::Core.multisite_mode_enabled && @menu.site_id != session[:admin_site]
-			flash[:warning] = "Site Context Changed. The menu you were viewing is not associated with the current site. Redirected back to menu selections."
-			redirect_to admin_menus_url() and return false
 		end
 	end
 

data/app/controllers/admin/pages_controller.rb

@@ -22,7 +22,7 @@ class Admin::PagesController < Admin::ApplicationController
 	def new
 		add_breadcrumb "New", :new_admin_page_path
 
-    layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
+    layouts = Spud::Cms::Engine.template_parser.layouts
     layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
 		@page = SpudPage.new(:layout => layout)
 		parts = layout_info[:partials]
@@ -35,7 +35,6 @@ class Admin::PagesController < Admin::ApplicationController
 
 	def create
 		@page = SpudPage.new(page_params)
-		@page.site_id = session[:admin_site]
 		if params[:preview] && params[:preview].to_i == 1
 			preview
 			return
@@ -47,7 +46,7 @@ class Admin::PagesController < Admin::ApplicationController
 	def edit
 		add_breadcrumb @page.name, :edit_admin_page_path
 
-    layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
+    layouts = Spud::Cms::Engine.template_parser.layouts
     layout, layout_info = layouts.select{|k,v| k == @page.layout}.flatten  if @page.layout.blank? == false
     if layout.blank?
       layout, layout_info = layouts.select{|k,v| v[:default]}.flatten
@@ -100,7 +99,7 @@ class Admin::PagesController < Admin::ApplicationController
 	end
 
   def page_parts
-    layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
+    layouts = Spud::Cms::Engine.template_parser.layouts
     template =  params[:template] && !params[:template].blank? ? layouts[params[:template]] : nil
     page = SpudPage.where(:id => params[:page]).includes(:spud_page_partials).first
     page = SpudPage.new if page.blank?
@@ -152,9 +151,6 @@ private
 		if @page.blank?
 			flash[:error] = "Page not found!"
 			redirect_to admin_pages_url() and return false
-		elsif Spud::Core.multisite_mode_enabled && @page.site_id != session[:admin_site]
-			flash[:warning] = "Site Context Changed. The page you were viewing is not associated with the current site. Redirected back to page selections."
-			redirect_to admin_pages_url() and return false
 		end
 		return true
 	end

data/app/controllers/admin/snippets_controller.rb

@@ -18,7 +18,6 @@ class Admin::SnippetsController < Admin::ApplicationController
   def create
     add_breadcrumb "New", :new_admin_snippet_url
     @snippet = SpudSnippet.new(snippet_params)
-    @snippet.site_id = session[:admin_site]
 
     @snippet.save
 
@@ -49,9 +48,6 @@ private
     if @snippet.blank?
       flash[:error] = "Snippet does not exist!"
       redirect_to admin_snippets_url and return false
-    elsif Spud::Core.multisite_mode_enabled && @snippet.site_id != session[:admin_site]
-      flash[:warning] = "This snippet is for a different site"
-      redirect_to admin_snippets_url and return false
     end
   end
 

data/app/controllers/cms/sitemaps_controller.rb

@@ -2,10 +2,6 @@ class Cms::SitemapsController < Spud::ApplicationController
 	respond_to :xml
 	def show
 		@pages = SpudPage.published_pages.viewable.order(:spud_page_id)
-		if Spud::Core.multisite_mode_enabled
-			site_config = Spud::Core.site_config_for_host(request.host_with_port)
-			@pages = @pages.site(!site_config.blank? ? site_config[:site_id] : 0)
-		end
 		respond_with @pages
 	end
 end

data/app/controllers/pages_controller.rb

@@ -12,33 +12,10 @@ class PagesController < ApplicationController
 		end
 
 		url_name = !params[:id].blank? ? params[:id] : Spud::Cms.root_page_name
+		@page = SpudPage.published_pages.find_by(:url_name => url_name)
 
-		# MultiSite Code Block
-		if params[:id].blank? && Spud::Core.multisite_mode_enabled
-			site_config = Spud::Core.site_config_for_host(request.host_with_port)
-			if !site_config.blank?
-				cms_config = Spud::Cms.site_config_for_short_name(site_config[:short_name])
-				url_name = cms_config[:root_page_name] if !cms_config.blank? && !cms_config[:root_page_name].blank?
-			end
-		end
-
-		@page = SpudPage.published_pages.where(:url_name => url_name)
-
-		# MultiSite Code Block
-		if Spud::Core.multisite_mode_enabled
-			site_config = Spud::Core.site_config_for_host(request.host_with_port)
-			@page = @page.site(!site_config.blank? ? site_config[:site_id] : nil)
-		end
-
-		@page = @page.first
 		if @page.blank?
-			@permalink = SpudPermalink.where(:url_name => url_name)
-
-			# MultiSite Code Block
-			if Spud::Core.multisite_mode_enabled
-				@permalink = @permalink.site(!site_config.blank? ? site_config[:site_id] : nil)
-			end
-			@permalink = @permalink.first
+			@permalink = SpudPermalink.find_by(:url_name => url_name)
 
 			if !@permalink.blank? && @permalink.attachment_type == 'SpudPage'
 				redirect_to @permalink.attachment.url_name == Spud::Cms.root_page_name ? root_url() : page_url(:id => @permalink.attachment.url_name) , :status => :moved_permanently and return
@@ -52,15 +29,7 @@ class PagesController < ApplicationController
 			return if defined?(require_user) && require_user == false
 		end
 
-		layout = Spud::Cms.default_page_layout
-
-		# MultiSite Code Block
-		if Spud::Core.multisite_mode_enabled && !site_config.blank?
-			cms_config = Spud::Cms.site_config_for_short_name(site_config[:short_name])
-			layout = cms_config[:default_page_layout] if !cms_config.blank? && !cms_config[:default_page_layout].blank?
-		end
-
-		layout = @page.layout || layout
+		layout = @page.layout || Spud::Cms.default_page_layout
 
 		action_name = "#{layout}_action"
 		if respond_to?(action_name)

data/app/helpers/cms/application_helper.rb

@@ -24,10 +24,6 @@ module Cms::ApplicationHelper
 
 		pages = SpudPage.viewable.published_pages
 
-		if Spud::Core.multisite_mode_enabled
-			site_config = Spud::Core.site_config_for_host(request.host_with_port)
-			pages = pages.site(site_config[:site_id]) if !site_config.blank?
-		end
 		start_page = nil
 		max_depth = 0
 		active_class = "menu-active"
@@ -93,12 +89,7 @@ module Cms::ApplicationHelper
     menu_id = nil
     link_options = {}
     start_menu_item = nil
-
-    if Spud::Core.multisite_mode_enabled
-      menu = SpudMenu.where(:name => options[:name], :site_id => current_site_id).first
-    else
-      menu = SpudMenu.where(:name => options[:name]).first
-    end
+    menu = SpudMenu.where(:name => options[:name]).first
 
     if menu.blank?
       return ''
@@ -172,12 +163,7 @@ module Cms::ApplicationHelper
 			seperator = options[:seperator]
 		end
 
-		menu = SpudMenu.where(:name => options[:name])
-		if Spud::Core.multisite_mode_enabled
-			site_config = Spud::Core.site_config_for_host(request.host_with_port)
-			menu = menu.site(site_config[:site_id]) if !site_config.blank?
-		end
-		menu = menu.first
+		menu = SpudMenu.find_by(:name => options[:name])
 		if(menu.blank?)
 			return ""
 		end
@@ -294,8 +280,6 @@ private
   end
 
 	def layout_options
-    layouts = Spud::Cms::Engine.template_parser.layouts(Spud::Core.site_config_for_id(session[:admin_site] || 0)[:short_name])
-
 		layouts = Spud::Cms::Engine.template_parser.layouts
 		layout_options = []
 		layouts.each_pair do |key,value|

data/app/models/concerns/cms_deprecated_multisite.rb

@@ -0,0 +1,21 @@
+module CmsDeprecatedMultisite
+  extend ActiveSupport::Concern
+
+  included do
+    scope :site, ->(sid){
+      ActiveSupport::Deprecation.warn 'Model.site scope is deprecated and will be removed in the future'
+      self.all()
+    }
+  end
+
+  def site_id
+    ActiveSupport::Deprecation.warn '#site_id is deprecated and will be removed in the future'
+    return 0
+  end
+
+  def site_id=(id)
+    ActiveSupport::Deprecation.warn '#site_id is deprecated and will be removed in the future'
+    return nil
+  end
+
+end

data/app/models/spud_menu.rb

@@ -1,9 +1,9 @@
 class SpudMenu < ActiveRecord::Base
+  include CmsDeprecatedMultisite
+
 	validates :name,:presence => true
-	validates_uniqueness_of :name, :scope => [:site_id]
+	validates_uniqueness_of :name
 
 	has_many :spud_menu_items, :as => :parent, :dependent => :destroy
 	has_many :spud_menu_items_combined, :class_name => "SpudMenuItem", :foreign_key => :spud_menu_id, :dependent => :destroy
-	
-	scope :site, lambda {|sid| where(:site_id => sid)}
 end

data/app/models/spud_page.rb

@@ -1,4 +1,6 @@
 class SpudPage < ActiveRecord::Base
+	include CmsDeprecatedMultisite
+
 	spud_searchable
 	belongs_to :spud_page
 	has_many :spud_page_partial_revisions
@@ -10,14 +12,13 @@ class SpudPage < ActiveRecord::Base
 
 	before_validation :generate_url_name
 	validates :name,:presence => true
-	validates_uniqueness_of :name, :scope => [:site_id,:spud_page_id]
+	validates_uniqueness_of :name, :scope => [:spud_page_id]
 	validates :url_name,:presence => true
-	validates_uniqueness_of :url_name, :scope => :site_id
+	validates_uniqueness_of :url_name
 
 	accepts_nested_attributes_for :spud_page_partials, :allow_destroy => true
 
 	scope :parent_pages, ->{ where(:spud_page_id => nil)}
-	scope :site, lambda {|sid| where(:site_id => sid)}
 	scope :published_pages, ->{ where(:published => true) }
 	scope :viewable, ->{ where(:visibility => 0) }
 
@@ -25,15 +26,6 @@ class SpudPage < ActiveRecord::Base
 		self.spud_page_partials.collect{|partial| partial.content_processed }.join(' ')
 	end
 
-	def self.grouped(site_id=0)
-
-		if(Spud::Core.multisite_mode_enabled)
-			return site(site_id).to_a.group_by(&:spud_page_id)
-		else
-			return all.group_by(&:spud_page_id)
-		end
-	end
-
 	def to_liquid
 		return {'name' => self.name, 'url_name' => self.url_name}
 	end
@@ -42,7 +34,7 @@ class SpudPage < ActiveRecord::Base
 	# 	:fitler Filters out a page by ID, and all of its children
 	#   :value Pick an attribute to be used in the value field, defaults to ID
 	def self.options_tree_for_page(config={})
-		collection = config[:collection] || self.grouped(config[:site_id])
+		collection = config[:collection] || self.all.group_by(&:spud_page_id)
 		level 		 = config[:level] 		 || 0
 		parent_id  = config[:parent_id]  || nil
 		filter 		 = config[:filter] 		 || nil
@@ -69,12 +61,12 @@ class SpudPage < ActiveRecord::Base
      	  end
      	  url_name += self.name.parameterize.downcase
 			if !self.use_custom_url_name
-				pages = SpudPage
+				pages = SpudPage.all
 
 				if !self.id.blank?
 					pages = pages.where("id != #{self.id}")
 				end
-				url_names = pages.site(self.site_id).load.collect{|p| p.url_name}
+				url_names = pages.to_a.collect{|p| p.url_name}
 
 				counter = 1
 				url_name_new = url_name
@@ -85,7 +77,7 @@ class SpudPage < ActiveRecord::Base
 				# url_name = url_name_new
 				# Check Permalinks List
 
-				permalink = SpudPermalink.site(self.site_id).where(:url_name => url_name_new).first
+				permalink = SpudPermalink.where(:url_name => url_name_new).first
 				counter = 1
 				while permalink.blank? == false
 
@@ -95,20 +87,20 @@ class SpudPage < ActiveRecord::Base
 					else
 						url_name_new = url_name + "-#{counter}"
 			     	  	counter += 1
- 	  					permalink = SpudPermalink.site(self.site_id).where(:url_name => url_name_new).first
+ 	  					permalink = SpudPermalink.where(:url_name => url_name_new).first
 					end
 				end
 				url_name = url_name_new
 	     	end
 	      if self.url_name.blank? == false && url_name != self.url_name
-	      	self.spud_permalinks.create(:url_name => self.url_name,:site_id => self.site_id)
+	      	self.spud_permalinks.create(:url_name => self.url_name)
 	      end
           self.url_name = url_name
           self.use_custom_url_name = false
     	elsif self.id.to_i > 0
 				page = SpudPage.where(:id => self.id).first
 				if page.url_name.blank? == false && page.url_name != self.url_name
-					permalink = SpudPermalink.site(self.site_id).where(:url_name => self.url_name).first
+					permalink = SpudPermalink.where(:url_name => self.url_name).first
 					if permalink.blank? == false
 						if permalink.attachment == self
 							permalink.destroy
@@ -117,7 +109,7 @@ class SpudPage < ActiveRecord::Base
 							return false
 						end
 					end
-					self.spud_permalinks.create(:url_name => page.url_name,:site_id => self.site_id)
+					self.spud_permalinks.create(:url_name => page.url_name)
 				end
     	end
     	return true

data/app/models/spud_snippet.rb

@@ -1,9 +1,8 @@
 class SpudSnippet < ActiveRecord::Base
+  include CmsDeprecatedMultisite
 
   validates :name, :presence => true
-  validates_uniqueness_of :name, :scope => :site_id
-
-  scope :site, lambda {|sid| where(:site_id => sid)}
+  validates_uniqueness_of :name
 
   acts_as_tb_liquid_content
 

data/app/views/admin/menu_items/_form.html.erb

@@ -17,7 +17,7 @@
 <div class="form-group">
 	<%=f.label :spud_page_id, "Page", :class=>"col-sm-2 control-label"%>
 	<div class="col-sm-10">
-		<%=	f.select :spud_page_id,	options_for_select(SpudPage.options_tree_for_page(:site_id => session[:admin_site]), @menu_item.spud_page_id), {:include_blank => 'Use URL instead'}, {:class=>'form-control',:title => "", :onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
+		<%=	f.select :spud_page_id,	options_for_select(SpudPage.options_tree_for_page(), @menu_item.spud_page_id), {:include_blank => 'Use URL instead'}, {:class=>'form-control',:title => "", :onchange => "if($(this).val() != '') {$('#spud_menu_item_url').val('');}"}%>
 	</div>  
 </div>
 

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

@@ -35,7 +35,7 @@
 <div class="form-group">
   <%= f.label :spud_page_id, "Parent Page", :class=>"col-lg-2 control-label"%>
   <div class="col-lg-10">
-    <%= f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page,:site_id => session[:admin_site]),@page.spud_page_id),{:include_blank => 'None'},{:title => "", :class=>'form-control' }%>
+    <%= f.select :spud_page_id,options_for_select(SpudPage.options_tree_for_page(:filter => @page), @page.spud_page_id),{:include_blank => 'None'},{:title => "", :class=>'form-control' }%>
   </div>
 </div>
 

data/db/migrate/20121119030136_change_liquid_tags_to_polymorphic.rb

@@ -2,9 +2,7 @@ class ChangeLiquidTagsToPolymorphic < ActiveRecord::Migration
   def up
     rename_column :spud_page_liquid_tags, :spud_page_partial_id, :attachment_id
     add_column :spud_page_liquid_tags, :attachment_type, :string
-
-    add_index :spud_page_liquid_tags, [:attachment_type,:attachment_id]
-
+    add_index :spud_page_liquid_tags, [:attachment_type, :attachment_id], :name => 'inde_spud_page_liquid_tags_on_attachment'
     if defined?(SpudPageLiquidTag)
       SpudPageLiquidTag.all.each do |f|
         f.update_attributes(:attachment_type => "SpudPagePartial")

data/db/migrate/20150108162839_remove_site_id_from_cms_tables.rb

@@ -0,0 +1,12 @@
+class RemoveSiteIdFromCmsTables < ActiveRecord::Migration
+  def up
+    remove_column :spud_menus, :site_id
+    remove_column :spud_pages, :site_id
+    remove_column :spud_snippets, :site_id
+  end
+  def down
+    add_column :spud_menus, :site_id, :integer
+    add_column :spud_pages, :site_id, :integer
+    add_column :spud_snippets, :site_id, :integer
+  end
+end

data/lib/spud_cms/engine.rb

@@ -21,10 +21,6 @@ module Spud
           if Spud::Cms.snippets_enabled
             config.admin_applications += [{:name => "Snippets",:thumbnail => "spud/admin/snippets_thumb.png",:url => "/admin/snippets",:order => 3}]
           end
-
-          if Spud::Cms.enable_sitemap == true
-            config.sitemap_urls += [:cms_sitemap_url]
-          end
       end
     end
 

data/lib/spud_cms/template_parser.rb

@@ -3,21 +3,7 @@ module Spud
     class TemplateParser
 
 
-      def layouts(site_short_name=nil)
-        if(site_short_name != nil)
-          filtered_layouts = {}
-          all_layouts.each do |key,value|
-            if value[:sites].include?(site_short_name.to_s.downcase)
-              filtered_layouts[key] = value
-            end
-          end
-          return filtered_layouts
-        else
-          return all_layouts
-        end
-      end
-
-      def all_layouts
+      def layouts
         if @layouts && Rails.env != 'development'
           return @layouts
         end
@@ -32,8 +18,8 @@ module Spud
         return @layouts
       end
 
-
   private
+
       def process_layouts(filepath)
         layouts = {}
         Dir.glob(filepath.join("**","*.html.*")) do |template|
@@ -79,20 +65,6 @@ module Spud
         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
-            layouts[layout_path][:sites] << config[:short_name].to_s.downcase
-            layouts[layout_path][:default] = true
-          end
-        end
-
       end
 
       def layout_path(template)

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.2.0.beta1"
+		VERSION = "1.2.0.beta3"
 	end
 end

data/spec/{support/authlogic_helper.rb → authlogic_helper.rb}

@@ -1,2 +1,2 @@
 require 'authlogic/test_case'
-include Authlogic::TestCase
+include Authlogic::TestCase