spud_cms 0.8.15 → 0.8.17

data/spec/models/spud_page_spec.rb

@@ -37,6 +37,7 @@ describe SpudPage do
       }.should change(SpudPagePartial, :count).from(1).to(0)
 		end
 
+
 	end
 
 	describe "scopes" do
@@ -53,6 +54,111 @@ describe SpudPage do
 			SpudPage.public.to_sql.should == SpudPage.where(:visibility => 0).to_sql
 		end
 
+		it "should group pages by parent" do
+			parent_page = Factory.build(:spud_page,:name => "parent")
+			parent_page.save
+
+			page = Factory.build(:spud_page,:name => "Page 1")
+			page.spud_page = parent_page
+			page.save
+			page2 = Factory.build(:spud_page,:name => "Page 2")
+			page2.spud_page = parent_page
+			page2.save
+
+			SpudPage.grouped()[parent_page.id].count.should == 2
+
+
+		end
+
+		it "should return private if visibility is == 1" do
+			parent_page = Factory.build(:spud_page,:name => "parent",:visibility => 1)
+
+			parent_page.is_private?.should == true
+
+			parent_page.visibility = 0
+			parent_page.is_private?.should == false
+		end
+
+
 	end
 
-end
+	describe "generate_url_name" do
+		it "should add the parent url name if a page has a parent" do
+			# Factory(:spud_page, :name => "test")
+			parent_page = Factory.build(:spud_page,:name => "about")
+			parent_page.save
+			t = Factory.build(:spud_page, :name => "test")
+			t.spud_page = parent_page
+			t.valid?
+
+			t.url_name.should == 'about/test'
+
+		end
+
+		it "should add a counter to url_name if the url_name is already in use" do
+			page = Factory.build(:spud_page,:name => "testimonials")
+			page.save
+
+			page2 = Factory.build(:spud_page,:name => "testimonials")
+			page2.valid?
+
+			page2.url_name.should == 'testimonials-1'
+		end
+
+		it "should add a counter to url_name if the url_name was once in use by another page that was renamed" do
+			page = Factory.build(:spud_page,:name => "another")
+			page.save
+			page.name = "again"
+			page.save
+
+			page2 = Factory.build(:spud_page,:name => "another")
+			page2.valid?
+
+			page2.url_name.should == 'another-1'
+		end
+
+		it "should destroy historical permalink if a page is renamed back to its previous name" do
+			page = Factory.build(:spud_page,:name => "permapage")
+			page.save
+
+			page.name = 'permapage new'
+			page.save
+
+			page.name = 'permapage'
+
+			basecount = SpudPermalink.count
+
+      lambda {
+  			page.valid?
+      }.should change(page.spud_permalinks.where(:url_name => 'permapage'), :count).from(1).to(0)
+		end
+
+		it "should not allow a custom url to be reused by another page" do
+			page = Factory.build(:spud_page,:name => "original")
+			page.save
+
+			page = Factory.build(:spud_page,:name => "new",:use_custom_url_name => true,:url_name => "original")
+
+			page.valid?.should == false
+		end
+
+		it "should not allow a custom url to be reused by another page even if it is a historical permalink" do
+			page = Factory.build(:spud_page,:name => "original")
+			page.save
+			page.name = "original2"
+			page.save
+
+			page = Factory.build(:spud_page,:name => "new")
+			page.save
+			page.use_custom_url_name = true
+			page.url_name = 'original'
+			page.valid?.should == false
+		end
+
+
+	end
+
+
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spud_cms
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.8.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,6 +226,7 @@ files:
 - app/assets/images/spud/admin/pages_thumb.png
 - app/assets/images/spud/admin/templates_thumb.png
 - app/assets/javascripts/spud/admin/cms/application.js
+- app/assets/javascripts/spud/admin/cms/menu_items.js
 - app/assets/stylesheets/spud/admin/cms/application.css
 - app/assets/stylesheets/spud/admin/cms.css
 - app/controllers/pages_controller.rb
@@ -294,12 +295,14 @@ files:
 - Rakefile
 - README.markdown
 - spec/controllers/spud/admin/cms_controller_spec.rb
+- spec/controllers/spud/admin/pages_controller_spec.rb
 - spec/controllers/spud/cms/sitemaps_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/content_left.html.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -323,7 +326,7 @@ files:
 - spec/dummy/db/migrate/20120610123556_add_scope_to_spud_admin_permissions.spud_core.rb
 - spec/dummy/db/migrate/20120610123557_create_spud_user_settings.spud_core.rb
 - spec/dummy/db/migrate/20120610123615_add_site_id_to_spud_permalinks.spud_permalinks.rb
-- spec/dummy/db/schema.rb
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -350,7 +353,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -992118473304497830
+      hash: 736450693392698425
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -359,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -992118473304497830
+      hash: 736450693392698425
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -368,12 +371,14 @@ specification_version: 3
 summary: Modular CMS Engine
 test_files:
 - spec/controllers/spud/admin/cms_controller_spec.rb
+- spec/controllers/spud/admin/pages_controller_spec.rb
 - spec/controllers/spud/cms/sitemaps_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/layouts/content_left.html.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -397,7 +402,7 @@ test_files:
 - spec/dummy/db/migrate/20120610123556_add_scope_to_spud_admin_permissions.spud_core.rb
 - spec/dummy/db/migrate/20120610123557_create_spud_user_settings.spud_core.rb
 - spec/dummy/db/migrate/20120610123615_add_site_id_to_spud_permalinks.spud_permalinks.rb
-- spec/dummy/db/schema.rb
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html

data/spec/dummy/db/schema.rb

@@ -1,156 +0,0 @@
-# encoding: UTF-8
-# This file is auto-generated from the current state of the database. Instead
-# of editing this file, please use the migrations feature of Active Record to
-# incrementally modify your database, and then regenerate this schema definition.
-#
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
-#
-# It's strongly recommended to check this file into your version control system.
-
-ActiveRecord::Schema.define(:version => 20120610123615) do
-
-  create_table "spud_admin_permissions", :force => true do |t|
-    t.integer  "user_id"
-    t.string   "name"
-    t.boolean  "access"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-    t.string   "scope"
-  end
-
-  create_table "spud_menu_items", :force => true do |t|
-    t.string   "parent_type"
-    t.integer  "parent_id"
-    t.integer  "item_type"
-    t.integer  "spud_page_id"
-    t.integer  "menu_order",   :default => 0
-    t.string   "url"
-    t.datetime "created_at",                  :null => false
-    t.datetime "updated_at",                  :null => false
-    t.string   "name"
-    t.integer  "spud_menu_id"
-    t.string   "classes"
-  end
-
-  add_index "spud_menu_items", ["menu_order"], :name => "index_spud_menu_items_on_menu_order"
-  add_index "spud_menu_items", ["parent_type", "parent_id"], :name => "index_spud_menu_items_on_parent_type_and_parent_id"
-  add_index "spud_menu_items", ["spud_menu_id"], :name => "index_spud_menu_items_on_spud_menu_id"
-
-  create_table "spud_menus", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "site_id"
-  end
-
-  add_index "spud_menus", ["site_id"], :name => "index_spud_menus_on_site_id"
-
-  create_table "spud_page_partial_revisions", :force => true do |t|
-    t.string   "name"
-    t.text     "content"
-    t.string   "format"
-    t.integer  "spud_page_id"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "spud_page_partial_revisions", ["spud_page_id", "name"], :name => "revision_idx"
-
-  create_table "spud_page_partials", :force => true do |t|
-    t.integer  "spud_page_id"
-    t.string   "name"
-    t.text     "content"
-    t.string   "format"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "spud_page_partials", ["spud_page_id"], :name => "index_spud_page_partials_on_spud_page_id"
-
-  create_table "spud_pages", :force => true do |t|
-    t.string   "name"
-    t.string   "url_name"
-    t.datetime "publish_at"
-    t.integer  "created_by"
-    t.integer  "updated_by"
-    t.string   "format",              :default => "html"
-    t.integer  "spud_page_id"
-    t.text     "meta_description"
-    t.string   "meta_keywords"
-    t.integer  "page_order"
-    t.integer  "template_id"
-    t.datetime "created_at",                              :null => false
-    t.datetime "updated_at",                              :null => false
-    t.integer  "visibility",          :default => 0
-    t.boolean  "published",           :default => true
-    t.boolean  "use_custom_url_name", :default => false
-    t.text     "notes"
-    t.integer  "site_id"
-  end
-
-  add_index "spud_pages", ["site_id"], :name => "index_spud_pages_on_site_id"
-
-  create_table "spud_permalinks", :force => true do |t|
-    t.string   "url_name"
-    t.string   "attachment_type"
-    t.integer  "attachment_id"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
-    t.integer  "site_id"
-  end
-
-  add_index "spud_permalinks", ["attachment_type", "attachment_id"], :name => "index_spud_permalinks_on_attachment_type_and_attachment_id"
-  add_index "spud_permalinks", ["site_id"], :name => "index_spud_permalinks_on_site_id"
-
-  create_table "spud_templates", :force => true do |t|
-    t.string   "name"
-    t.string   "base_layout"
-    t.text     "content"
-    t.text     "page_parts"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.integer  "site_id"
-  end
-
-  add_index "spud_templates", ["site_id"], :name => "index_spud_templates_on_site_id"
-
-  create_table "spud_user_settings", :force => true do |t|
-    t.integer  "spud_user_id"
-    t.string   "key"
-    t.string   "value"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  create_table "spud_users", :force => true do |t|
-    t.string   "first_name"
-    t.string   "last_name"
-    t.boolean  "super_admin"
-    t.string   "login",                              :null => false
-    t.string   "email",                              :null => false
-    t.string   "crypted_password",                   :null => false
-    t.string   "password_salt",                      :null => false
-    t.string   "persistence_token",                  :null => false
-    t.string   "single_access_token",                :null => false
-    t.string   "perishable_token",                   :null => false
-    t.integer  "login_count",         :default => 0, :null => false
-    t.integer  "failed_login_count",  :default => 0, :null => false
-    t.datetime "last_request_at"
-    t.datetime "current_login_at"
-    t.datetime "last_login_at"
-    t.string   "current_login_ip"
-    t.string   "last_login_ip"
-    t.datetime "created_at",                         :null => false
-    t.datetime "updated_at",                         :null => false
-    t.string   "time_zone"
-  end
-
-  add_index "spud_users", ["email"], :name => "index_spud_users_on_email"
-  add_index "spud_users", ["login"], :name => "index_spud_users_on_login"
-
-end