tb_cms 1.0 → 1.0.1

data/config/routes.rb

@@ -1,29 +1,28 @@
 Rails.application.routes.draw do
-   namespace :spud do
-   	namespace :admin do
-         resources :pages do
-           get :page_parts, :on => :collection
-           get :clear, :on => :collection
-           member do
-             post 'preview'
-           end
-         end
 
-         resources :snippets
-
-   		resources :menus do
-   			resources :menu_items
-   		end
-   		resources :contacts
-   	end
-      namespace :cms do
-         resource :sitemap,:only => "show"
-      end
+  namespace :admin do
+   resources :pages do
+     get :page_parts, :on => :collection
+     get :clear, :on => :collection
+     member do
+       post 'preview'
+     end
    end
-   root :to => 'pages#show'
+   resources :snippets
+ 		resources :menus do
+ 			resources :menu_items
+ 		end
+ 		resources :contacts
+ 	end
+
+  namespace :cms do
+    resource :sitemap,:only => "show"
+  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"
+  # 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"
 
 end
 

data/lib/spud_cms/engine.rb

@@ -14,17 +14,17 @@ module Spud
 
     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}]
+          config.admin_applications += [{:name => "Pages",:thumbnail => "spud/admin/pages_thumb.png",:url => "/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}]
+            config.admin_applications += [{:name => "Menus",:thumbnail => "spud/admin/menus_thumb.png",:url => "/admin/menus",:order => 2}]
           end
 
           if Spud::Cms.snippets_enabled
-            config.admin_applications += [{:name => "Snippets",:thumbnail => "spud/admin/snippets_thumb.png",:url => "/spud/admin/snippets",:order => 3}]
+            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 += [:spud_cms_sitemap_url]
+            config.sitemap_urls += [:cms_sitemap_url]
           end
       end
     end
@@ -36,7 +36,7 @@ module Spud
      end
     initializer :cms_sweepers do |config|
       if ActiveRecord::Base.connection.tables.include?('spud_pages')
-        Spud::Admin::ApplicationController.instance_eval do
+        Admin::ApplicationController.instance_eval do
           cache_sweeper :page_sweeper, :except => [:show,:index]
         end
       end
@@ -47,9 +47,9 @@ module Spud
      end
 
      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')
+    	Rails.application.config.assets.precompile += ["admin/cms*"]
+      Spud::Core.append_admin_javascripts('admin/cms/application')
+      Spud::Core.append_admin_stylesheets('admin/cms/application')
   	 end
 
      initializer :liquid do |config|

data/lib/spud_cms/template_parser.rb

@@ -73,7 +73,7 @@ module Spud
 
       def check_for_defaults(layouts)
         default_layout_path = layout_path(Rails.application.root.join('app','views','layouts',Spud::Cms.default_page_layout))
-        puts(layouts)
+        #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

data/lib/spud_cms/version.rb

@@ -1,5 +1,5 @@
 module Spud
 	module Cms
-		VERSION = "1.0"
+		VERSION = "1.0.1"
 	end
 end

data/spec/controllers/{spud/admin → admin}/menu_items_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spud::Admin::MenuItemsController do
+describe Admin::MenuItemsController do
   before(:each) do
     ActiveRecord::Base.observers.disable(:page_sweeper)
 
@@ -28,7 +28,7 @@ describe Spud::Admin::MenuItemsController do
     end
     it "should redirect if the menu is not found" do
       get :index,:menu_id => @menu.id + 1
-      response.should redirect_to spud_admin_menus_url
+      response.should redirect_to admin_menus_url
       flash[:error].should_not be_blank
     end
   end
@@ -87,7 +87,7 @@ describe Spud::Admin::MenuItemsController do
 
     it "should redirect_to index if menu item not found" do
       get :edit,:menu_id => @menu.id,:id => "345"
-      response.should redirect_to spud_admin_menu_menu_items_url(:menu_id => @menu.id)
+      response.should redirect_to admin_menu_menu_items_url(:menu_id => @menu.id)
     end
   end
 
@@ -139,7 +139,7 @@ describe Spud::Admin::MenuItemsController do
         it "should not allow editing of a menu_item in a menu that is different from the current admin site" do
           menu_item = FactoryGirl.create(:spud_menu_item)
           get :edit,:id => menu_item.id,:menu_id => @menu.id
-          response.should redirect_to spud_admin_menus_url
+          response.should redirect_to admin_menus_url
           flash[:warning].should_not be_blank
         end
       end

data/spec/controllers/{spud/admin → admin}/menus_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spud::Admin::MenusController do
+describe Admin::MenusController do
   before(:each) do
     activate_authlogic
     u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
@@ -63,7 +63,7 @@ describe Spud::Admin::MenusController do
       menu2 = FactoryGirl.create(:spud_menu,:site_id => 1)
       get :edit,:id => menu2.id
 
-      response.should redirect_to spud_admin_menus_url
+      response.should redirect_to admin_menus_url
     end
   end
 
@@ -76,7 +76,7 @@ describe Spud::Admin::MenusController do
     end
     it "should redirect to index if menu not found" do
       get :edit,:id => 3
-      response.should redirect_to spud_admin_menus_url
+      response.should redirect_to admin_menus_url
     end
 
   end
@@ -96,7 +96,7 @@ describe Spud::Admin::MenusController do
       menu = FactoryGirl.create(:spud_menu)
       put :update,:id => menu.id,:spud_menu => menu.attributes.merge!(:name => "MyMenu").reject{|k,v| k == 'site_id' || k == 'id'}
 
-      response.should redirect_to(spud_admin_menu_menu_items_url(:menu_id => menu.id))
+      response.should redirect_to(admin_menu_menu_items_url(:menu_id => menu.id))
     end
   end
 

data/spec/controllers/{spud/admin → admin}/pages_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spud::Admin::PagesController do
+describe Admin::PagesController do
   before(:each) do
     activate_authlogic
     u = SpudUser.new(:login => "testuser",:email => "test@testuser.com",:password => "test",:password_confirmation => "test")
@@ -9,6 +9,14 @@ describe Spud::Admin::PagesController do
     @user = SpudUserSession.create(u)
   end
 
+  it "should return site_config by short_name" do
+    Spud::Cms.configure do |config|
+      config.multisite_config = [{:short_name => "siteb",:site_name => "Test Site B",:site_id => 2}]
+    end
+
+    Spud::Cms.site_config_for_short_name(:siteb)[:site_id].should == 2
+  end
+
   describe :index do
     it "should return an array of parent pages" do
       2.times {|x|  s = FactoryGirl.create(:spud_page)}
@@ -39,7 +47,7 @@ describe Spud::Admin::PagesController do
     # it "should redirect if no id specified" do
     #   get :show,:id => nil
 
-    #   response.should redirect_to spud_admin_pages_url
+    #   response.should redirect_to admin_pages_url
     # end
 
   end
@@ -86,7 +94,7 @@ describe Spud::Admin::PagesController do
       new_name = "Adam"
       put :update, :id => page.id, :spud_page => page.attributes.merge!(:name => new_name).reject{ |key,value| key == 'id' || key == 'created_at' || key == 'updated_at' || key == 'site_id'}
 
-      response.should redirect_to(spud_admin_pages_url)
+      response.should redirect_to(admin_pages_url)
     end
   end
 

data/spec/controllers/admin/snippets_controller_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Admin::SnippetsController do
+
+end

data/spec/controllers/{spud/cms → cms}/sitemaps_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Spud::Cms::SitemapsController do
+describe Cms::SitemapsController do
   describe :show do
     before(:each) do
         Spud::Core.configure do |config|

data/spec/controllers/pages_controller_spec.rb

@@ -43,7 +43,7 @@ describe PagesController do
       page = FactoryGirl.create(:spud_page,:name => "about",:visibility => 1)
 
       get :show, :id => "about"
-      response.should redirect_to new_spud_user_session_url()
+      response.should redirect_to login_path
     end
 
     describe "page caching" do

data/spec/dummy/db/migrate/20120307003559_create_spud_permalinks.spud_permalinks.rb

@@ -1,7 +1,7 @@
 # This migration comes from spud_permalinks (originally 20120306195503)
 class CreateSpudPermalinks < ActiveRecord::Migration
   def change
-    create_table :spud_permalinks do |t|
+    create_table :spud_admin_permalinks do |t|
       t.string :url_name
       t.string :attachment_type
       t.integer :attachment_id

data/spec/dummy/db/migrate/20120610123556_add_scope_to_spud_admin_permissions.spud_core.rb

@@ -1,7 +1,7 @@
 # This migration comes from spud_core (originally 20120328235431)
 class AddScopeToSpudAdminPermissions < ActiveRecord::Migration
   def change
-    add_column :spud_admin_permissions, :scope, :string
+    add_column :admin_permissions, :scope, :string
 
   end
 end

data/spec/dummy/db/schema.rb

@@ -13,7 +13,7 @@
 
 ActiveRecord::Schema.define(:version => 20121119030136) do
 
-  create_table "spud_admin_permissions", :force => true do |t|
+  create_table "admin_permissions", :force => true do |t|
     t.integer  "user_id"
     t.string   "name"
     t.boolean  "access"