tb_cms 1.2.0.beta1 → 1.2.0.beta3

data/spec/dummy/db/migrate/{20140110051484_drop_spud_page_liquid_tags.tb_cms.rb → 20141231214481_drop_spud_page_liquid_tags.tb_cms.rb}

@@ -1,17 +1,19 @@
-# This migration comes from tb_cms (originally 20140110041105)
+# This migration comes from tb_cms (originally 20140110142037)
 class DropSpudPageLiquidTags < ActiveRecord::Migration
 
   class SpudPageLiquidTag < ActiveRecord::Base
   end
 
   def up
-    SpudPageLiquidTag.all.each do |tag|
-      SpudLiquidTag.create({
-        :attachment_id => tag.attachment_id,
-        :attachment_type => tag.attachment_type,
-        :tag_name => tag.tag_name,
-        :value => tag.value
-      })
+    if defined?(SpudLiquidTag)
+      SpudPageLiquidTag.all.each do |tag|
+        SpudLiquidTag.create({
+          :attachment_id => tag.attachment_id,
+          :attachment_type => tag.attachment_type,
+          :tag_name => tag.tag_name,
+          :value => tag.value
+        })
+      end
     end
     drop_table :spud_page_liquid_tags
   end

data/spec/dummy/db/migrate/20150108164814_remove_site_id_from_cms_tables.tb_cms.rb

@@ -0,0 +1,13 @@
+# This migration comes from tb_cms (originally 20150108162839)
+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/spec/dummy/db/schema.rb

@@ -11,118 +11,112 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140110051484) do
+ActiveRecord::Schema.define(version: 20150108164814) do
 
-  create_table "spud_liquid_tags", force: true do |t|
-    t.integer  "attachment_id"
-    t.string   "attachment_type"
-    t.string   "tag_name"
-    t.string   "value"
+  create_table "spud_liquid_tags", force: :cascade do |t|
+    t.integer  "attachment_id",   limit: 4
+    t.string   "attachment_type", limit: 255
+    t.string   "tag_name",        limit: 255
+    t.string   "value",           limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "spud_liquid_tags", ["tag_name", "value"], name: "index_spud_liquid_tags_on_tag_name_and_value", using: :btree
 
-  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"
+  create_table "spud_menu_items", force: :cascade do |t|
+    t.string   "parent_type",  limit: 255
+    t.integer  "parent_id",    limit: 4
+    t.integer  "item_type",    limit: 4
+    t.integer  "spud_page_id", limit: 4
+    t.integer  "menu_order",   limit: 4,   default: 0
+    t.string   "url",          limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "name"
-    t.integer  "spud_menu_id"
-    t.string   "classes"
+    t.string   "name",         limit: 255
+    t.integer  "spud_menu_id", limit: 4
+    t.string   "classes",      limit: 255
   end
 
   add_index "spud_menu_items", ["menu_order"], name: "index_spud_menu_items_on_menu_order", using: :btree
   add_index "spud_menu_items", ["parent_type", "parent_id"], name: "index_spud_menu_items_on_parent_type_and_parent_id", using: :btree
   add_index "spud_menu_items", ["spud_menu_id"], name: "index_spud_menu_items_on_spud_menu_id", using: :btree
 
-  create_table "spud_menus", force: true do |t|
-    t.string   "name"
-    t.text     "description"
+  create_table "spud_menus", force: :cascade do |t|
+    t.string   "name",        limit: 255
+    t.text     "description", limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "site_id",     default: 0, null: false
   end
 
-  add_index "spud_menus", ["site_id"], name: "index_spud_menus_on_site_id", using: :btree
-
-  create_table "spud_page_partial_revisions", force: true do |t|
-    t.string   "name"
-    t.text     "content"
-    t.string   "format"
-    t.integer  "spud_page_id"
+  create_table "spud_page_partial_revisions", force: :cascade do |t|
+    t.string   "name",         limit: 255
+    t.text     "content",      limit: 65535
+    t.string   "format",       limit: 255
+    t.integer  "spud_page_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "spud_page_partial_revisions", ["spud_page_id", "name"], name: "revision_idx", using: :btree
 
-  create_table "spud_page_partials", force: true do |t|
-    t.integer  "spud_page_id"
-    t.string   "name"
-    t.text     "content"
-    t.string   "format"
+  create_table "spud_page_partials", force: :cascade do |t|
+    t.integer  "spud_page_id",      limit: 4
+    t.string   "name",              limit: 255
+    t.text     "content",           limit: 65535
+    t.string   "format",            limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "symbol_name"
-    t.text     "content_processed"
+    t.string   "symbol_name",       limit: 255
+    t.text     "content_processed", limit: 65535
   end
 
   add_index "spud_page_partials", ["spud_page_id"], name: "index_spud_page_partials_on_spud_page_id", using: :btree
 
-  create_table "spud_pages", force: true do |t|
-    t.string   "name"
-    t.string   "url_name"
+  create_table "spud_pages", force: :cascade do |t|
+    t.string   "name",                limit: 255
+    t.string   "url_name",            limit: 255
     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  "created_by",          limit: 4
+    t.integer  "updated_by",          limit: 4
+    t.string   "format",              limit: 255,   default: "html"
+    t.integer  "spud_page_id",        limit: 4
+    t.text     "meta_description",    limit: 65535
+    t.string   "meta_keywords",       limit: 255
+    t.integer  "page_order",          limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    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",             default: 0,      null: false
-    t.string   "layout"
+    t.integer  "visibility",          limit: 4,     default: 0
+    t.boolean  "published",           limit: 1,     default: true
+    t.boolean  "use_custom_url_name", limit: 1,     default: false
+    t.text     "notes",               limit: 65535
+    t.string   "layout",              limit: 255
   end
 
-  add_index "spud_pages", ["site_id"], name: "index_spud_pages_on_site_id", using: :btree
-
-  create_table "spud_permalinks", force: true do |t|
-    t.string   "url_name"
-    t.string   "attachment_type"
-    t.integer  "attachment_id"
+  create_table "spud_permalinks", force: :cascade do |t|
+    t.string   "url_name",        limit: 255
+    t.string   "attachment_type", limit: 255
+    t.integer  "attachment_id",   limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "site_id",         default: 0, null: false
+    t.integer  "site_id",         limit: 4,   default: 0, null: false
   end
 
   add_index "spud_permalinks", ["attachment_type", "attachment_id"], name: "idx_permalink_attachment", using: :btree
   add_index "spud_permalinks", ["site_id"], name: "idx_permalinks_site_id", using: :btree
 
-  create_table "spud_permissions", force: true do |t|
-    t.string   "name",       null: false
-    t.string   "tag",        null: false
+  create_table "spud_permissions", force: :cascade do |t|
+    t.string   "name",       limit: 255, null: false
+    t.string   "tag",        limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "spud_permissions", ["tag"], name: "index_spud_permissions_on_tag", unique: true, using: :btree
 
-  create_table "spud_role_permissions", force: true do |t|
-    t.integer  "spud_role_id",        null: false
-    t.string   "spud_permission_tag", null: false
+  create_table "spud_role_permissions", force: :cascade do |t|
+    t.integer  "spud_role_id",        limit: 4,   null: false
+    t.string   "spud_permission_tag", limit: 255, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -130,55 +124,53 @@ ActiveRecord::Schema.define(version: 20140110051484) do
   add_index "spud_role_permissions", ["spud_permission_tag"], name: "index_spud_role_permissions_on_spud_permission_tag", using: :btree
   add_index "spud_role_permissions", ["spud_role_id"], name: "index_spud_role_permissions_on_spud_role_id", using: :btree
 
-  create_table "spud_roles", force: true do |t|
-    t.string   "name"
+  create_table "spud_roles", force: :cascade do |t|
+    t.string   "name",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "spud_snippets", force: true do |t|
-    t.string   "name"
-    t.text     "content"
-    t.string   "format"
-    t.text     "content_processed"
-    t.integer  "site_id",           default: 0
+  create_table "spud_snippets", force: :cascade do |t|
+    t.string   "name",              limit: 255
+    t.text     "content",           limit: 65535
+    t.string   "format",            limit: 255
+    t.text     "content_processed", limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "spud_snippets", ["name"], name: "index_spud_snippets_on_name", using: :btree
-  add_index "spud_snippets", ["site_id"], name: "index_spud_snippets_on_site_id", using: :btree
 
-  create_table "spud_user_settings", force: true do |t|
-    t.integer  "spud_user_id"
-    t.string   "key"
-    t.string   "value"
+  create_table "spud_user_settings", force: :cascade do |t|
+    t.integer  "spud_user_id", limit: 4
+    t.string   "key",          limit: 255
+    t.string   "value",        limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   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
+  create_table "spud_users", force: :cascade do |t|
+    t.string   "first_name",          limit: 255
+    t.string   "last_name",           limit: 255
+    t.boolean  "super_admin",         limit: 1
+    t.string   "login",               limit: 255,             null: false
+    t.string   "email",               limit: 255,             null: false
+    t.string   "crypted_password",    limit: 255,             null: false
+    t.string   "password_salt",       limit: 255,             null: false
+    t.string   "persistence_token",   limit: 255,             null: false
+    t.string   "single_access_token", limit: 255,             null: false
+    t.string   "perishable_token",    limit: 255,             null: false
+    t.integer  "login_count",         limit: 4,   default: 0, null: false
+    t.integer  "failed_login_count",  limit: 4,   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.string   "current_login_ip",    limit: 255
+    t.string   "last_login_ip",       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "time_zone"
-    t.integer  "spud_role_id"
+    t.string   "time_zone",           limit: 255
+    t.integer  "spud_role_id",        limit: 4
   end
 
   add_index "spud_users", ["email"], name: "index_spud_users_on_email", using: :btree

data/spec/helpers/cms/application_helper_spec.rb

@@ -1,22 +1,17 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Cms::ApplicationHelper do
+describe Cms::ApplicationHelper, :type => :helper do
   before(:each) do
     helper.output_buffer = ''
-    Spud::Core.configure do |config|
-        config.site_name = "Test Site"
-        config.multisite_mode_enabled = false
-        config.multisite_config = []
-    end
   end
 
-  describe :sp_list_menu do
+  describe '#sp_list_menu' do
     it "should be able to find a menu by its name" do
       menu = FactoryGirl.create(:spud_menu, :name => "Main")
       2.times { |x| FactoryGirl.create(:spud_menu_item, :parent_id => menu.id, :spud_menu_id => menu.id, :url => "/") }
 
       helper.sp_list_menu(:name => "Main", :active_class => "active")
-      helper.output_buffer.should match /\<li/
+      expect(helper.output_buffer).to match /\<li/
     end
 
     it "should assign id to ul block" do
@@ -24,7 +19,7 @@ describe Cms::ApplicationHelper do
       2.times {|x|  s = FactoryGirl.create(:spud_menu_item,:parent_id => menu.id,:spud_menu_id => menu.id,:url => "/")}
 
       helper.sp_list_menu(:name => menu.name,:id => "nav")
-      helper.output_buffer.should match /id=\'nav\'/
+      expect(helper.output_buffer).to match /id=\'nav\'/
     end
 
     it "should render nested menu items" do
@@ -34,7 +29,7 @@ describe Cms::ApplicationHelper do
       s3 = FactoryGirl.create(:spud_menu_item,:parent_type => "SpudMenuItem",:parent_id => s.id,:spud_menu_id => menu.id,:url => "/",:name => "SubItem")
 
       helper.sp_list_menu(:name => "Main2")
-      helper.output_buffer.should match /SubItem/
+      expect(helper.output_buffer).to match /SubItem/
     end
 
     it "should respect max depth" do
@@ -44,24 +39,11 @@ describe Cms::ApplicationHelper do
       s3 = FactoryGirl.create(:spud_menu_item,:parent_type => "SpudMenuItem",:parent_id => s.id,:spud_menu_id => menu.id,:url => "/",:name => "SubItem")
 
       helper.sp_list_menu(:name => "Main4",:max_depth => 1)
-      helper.output_buffer.should_not match /SubItem/
-    end
-
-    it "should not load menu from different site_id" 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
-      menu = FactoryGirl.create(:spud_menu,:site_id => 0)
-      s = FactoryGirl.create(:spud_menu_item,:parent_id => menu.id,:spud_menu_id => menu.id,:url => "/")
-
-      helper.sp_list_menu(:name => menu.name).should be_blank
-
+      expect(helper.output_buffer).to_not match /SubItem/
     end
   end
 
-  describe :sp_menu_with_seperator do
+  describe '#sp_menu_with_seperator' do
     it "should render a flattened list of links" do
       menu = FactoryGirl.create(:spud_menu,:name => "Main3")
       s = FactoryGirl.create(:spud_menu_item,:parent_id => menu.id,:spud_menu_id => menu.id,:url => "/")
@@ -69,27 +51,12 @@ describe Cms::ApplicationHelper do
       s3 = FactoryGirl.create(:spud_menu_item,:parent_type => "SpudMenuItem",:parent_id => s.id,:spud_menu_id => menu.id,:url => "/",:name => "SubItem")
 
       content = helper.sp_menu_with_seperator(:name => "Main3")
-      content.should match /SubItem/
-      content.should_not match /\<li/
-    end
-
-    it "should not load menu from different site_id" 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
-      menu = FactoryGirl.create(:spud_menu,:site_id => 0)
-      s = FactoryGirl.create(:spud_menu_item,:parent_id => menu.id,:spud_menu_id => menu.id,:url => "/")
-      helper.sp_menu_with_seperator(:name => menu.name).should be_blank
-
+      expect(content).to match /SubItem/
+      expect(content).to_not match /\<li/
     end
-
-
   end
 
-  describe :sp_list_pages do
+  describe '#sp_list_pages' do
     it "should be able to list created pages" do
       page = FactoryGirl.create(:spud_page)
       page2 = FactoryGirl.create(:spud_page)
@@ -97,9 +64,9 @@ describe Cms::ApplicationHelper do
 
 
       content = helper.sp_list_pages(:active_class => "active")
-      content.should match /#{page.name}/
-      content.should match /#{page2.name}/
-      content.should match /#{page3.name}/
+      expect(content).to match /#{page.name}/
+      expect(content).to match /#{page2.name}/
+      expect(content).to match /#{page3.name}/
     end
 
     it "should assign id" do
@@ -107,7 +74,7 @@ describe Cms::ApplicationHelper do
       page2 = FactoryGirl.create(:spud_page)
 
       content = helper.sp_list_pages(:id => "page_nav")
-      content.should match /id=\'page_nav\'/
+      expect(content).to match /id=\'page_nav\'/
 
     end
 
@@ -116,8 +83,8 @@ describe Cms::ApplicationHelper do
       page2 = FactoryGirl.create(:spud_page)
 
       content = helper.sp_list_pages(:exclude => [page2.name])
-      content.should match /#{page.name}/
-      content.should_not match /#{page2.name}/
+      expect(content).to match /#{page.name}/
+      expect(content).to_not match /#{page2.name}/
     end
     it "should respect max depth" do
       page = FactoryGirl.create(:spud_page)
@@ -126,37 +93,19 @@ describe Cms::ApplicationHelper do
 
 
       content = helper.sp_list_pages(:max_depth => 1)
-      content.should match /#{page.name}/
-      content.should match /#{page2.name}/
-      content.should_not match /#{page3.name}/
+      expect(content).to match /#{page.name}/
+      expect(content).to match /#{page2.name}/
+      expect(content).to_not match /#{page3.name}/
     end
 
-
     it "should be able to list sub pages of a particular page" do
       page = FactoryGirl.create(:spud_page)
       page2 = FactoryGirl.create(:spud_page)
       page3 = FactoryGirl.create(:spud_page,:spud_page_id => page.id)
       content = helper.sp_list_pages(:start_page_id => page.id)
-      content.should_not match /#{page.name}/
-      content.should_not match /#{page2.name}/
-      content.should match /#{page3.name}/
-    end
-
-    it "should not load pages from different site_id" 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
-      page = FactoryGirl.create(:spud_page,:site_id => 0)
-      page2 = FactoryGirl.create(:spud_page,:site_id => 1)
-
-      content = helper.sp_list_pages()
-      content.should_not match /#{page.name}/
-      content.should match /#{page2.name}/
-
+      expect(content).to_not match /#{page.name}/
+      expect(content).to_not match /#{page2.name}/
+      expect(content).to match /#{page3.name}/
     end
-
-
   end
 end

data/spec/models/spud_menu_item_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe SpudMenuItem do
+describe SpudMenuItem, :type => :model do
 
   it {should have_many(:spud_menu_items)}
   it {should belong_to(:spud_page)}
@@ -10,22 +10,22 @@ describe SpudMenuItem do
   describe :validations do
     it "should require a name" do
       p = FactoryGirl.build(:spud_menu_item,:name => nil)
-      p.should_not be_valid
+      expect(p).to_not be_valid
     end
 
     it "should require a menu_id" do
       p = FactoryGirl.build(:spud_menu_item,:spud_menu_id => nil)
-      p.should_not be_valid
+      expect(p).to_not be_valid
     end
 
     it "should require a parent_type" do
       p = FactoryGirl.build(:spud_menu_item,:parent_type => nil)
-      p.should_not be_valid
+      expect(p).to_not be_valid
     end
 
     it "should require a parent_id" do
       p = FactoryGirl.build(:spud_menu_item,:parent_id => nil)
-      p.should_not be_valid
+      expect(p).to_not be_valid
     end
   end
 end

data/spec/models/spud_page_partial_revision_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe SpudPagePartialRevision do
+describe SpudPagePartialRevision, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
 end

data/spec/models/spud_page_partial_spec.rb

@@ -1,28 +1,28 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe SpudPagePartial do
+describe SpudPagePartial, :type => :model do
   describe "validations" do
 
     it "should require a name" do
       p = FactoryGirl.build(:spud_page_partial,:name => nil)
-      p.should_not be_valid
+      expect(p).to_not be_valid
     end
 
     it "should respond with a symbol_name based on name" do
       p = FactoryGirl.build(:spud_page_partial,:name => "Test Page")
-      p.symbol_name.should == "test_page"
+      expect(p.symbol_name).to eq("test_page")
     end
   end
 
   describe "save hooks" do
     it "should save the symbol name" do
-      p = FactoryGirl.create(:spud_page_partial,:name => "Test Page")
-      p.attributes["symbol_name"].should == "test_page"
+      p = FactoryGirl.create(:spud_page_partial, :name => "Test Page")
+      expect(p.attributes["symbol_name"]).to eq("test_page")
     end
 
     it "should create a new revision if content is changed" do
-      p = FactoryGirl.create(:spud_page_partial,:name => "Test Page",:content =>"Home Sweet Home",:spud_page_id => 1)
-      SpudPagePartialRevision.where(:spud_page_id => 1,:name => "Test Page").count.should == 1
+      p = FactoryGirl.create(:spud_page_partial, :name => "Test Page", :content => 'Content')
+      expect(SpudPagePartialRevision.where(:spud_page_id => p.spud_page_id).count).to eq(1)
     end
 
     it "should delete old revisions beyond max_revision count" do
@@ -35,7 +35,7 @@ describe SpudPagePartial do
 
       p.content = "Another change"
       p.save
-      SpudPagePartialRevision.where(:spud_page_id => 1,:name => "Test Page").count.should == 2
+      expect(SpudPagePartialRevision.where(:spud_page_id => 1,:name => "Test Page").count).to eq(2)
     end
 
   end