comfortable_mexican_sofa 1.0.51 → 1.1.1

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -4,281 +4,21 @@ namespace :db do
 end
 
 namespace :comfortable_mexican_sofa do
-  
-  # Example use:
-  #   rake comfortable_mexican_sofa:import:all FROM=mysite.local TO=mysite.com SEED_PATH=/path/to/seed_data
-  namespace :import do
+  namespace :fixtures do
     
-    task :check_for_requirements => :environment do |task, args|
-      @from       = args[:from].present?? args[:from] : nil
-      @site       = args[:to].present?? args[:to] : nil
-      @seed_path  = 
-        ComfortableMexicanSofa.config.seed_data_path = 
-        (args[:seed_path].present?? args[:seed_path] : nil) || ComfortableMexicanSofa.config.seed_data_path
-      
-      if !@seed_path
-        abort 'SEED_PATH is not set. Please define where cms fixtures are located.'
-      end
-      unless File.exists?((@from && @seed_path = "#{@seed_path}/#{@from}").to_s)
-        abort "FROM is not properly set. Cannot find fixtures in '#{@seed_path}'"
-      end
-      if !(@site = CmsSite.find_by_hostname(args[:to]))
-        abort "TO is not properly set. Cannot find site with hostname '#{args[:to]}'"
+    desc 'Import Fixture data into database. (options: SITE=example.com)'
+    task :import => :environment do |task, args|
+      site = if ComfortableMexicanSofa.config.enable_multiple_sites
+        Cms::Site.find_by_hostname(args[:site])
+      else
+        Cms::Site.first
       end
+      abort 'SITE is not found. Aborting.' if !site
       
-      # a small hack to ensure that #load_from_file looks in the right directory
-      @site.hostname = args[:from]
+      puts "Syncing for #{site.hostname}"
+      ComfortableMexicanSofa::Fixtures.sync(site)
       
-      puts "Starting import into #{@site.label} (#{@site.hostname}) from '#{@seed_path}'"
-    end
-    
-    desc 'Import layouts into database'
-    task :layouts => [:environment, :check_for_requirements] do |task, args|
-      puts 'Importing Layouts'
-      puts '-----------------'
-      layouts = Dir.glob(File.expand_path('layouts/*.yml', @seed_path)).collect do |layout_file_path|
-        begin
-          attributes = YAML.load_file(layout_file_path).symbolize_keys!
-          @site.cms_layouts.load_from_file(@site, attributes[:slug])
-        rescue
-          nil
-        end
-      end.compact
-      CmsLayout.connection.transaction do
-        # Fixtures are not ordered in any particular way. Saving order matters,
-        # so we cycle them until there nothing left to save
-        while layouts.present?
-          layout = layouts.shift
-          if !layout.parent || layout.parent && parent = @site.cms_layouts.find_by_slug(layout.parent.slug)
-            layout.parent = (parent rescue nil)
-            should_write    = true
-            existing_layout = nil
-            
-            if existing_layout = @site.cms_layouts.find_by_slug(layout.slug)
-              print "Found layout in database with slug: #{layout.slug}. Overwrite? (y/N): "
-              should_write = ($stdin.gets.to_s.strip.downcase == 'y')
-            end
-            if should_write
-              if existing_layout
-                existing_layout.attributes = layout.attributes.slice('label', 'content', 'css', 'js')
-                layout = existing_layout
-              end
-              puts "Saving layout: #{layout.label} (#{layout.slug})"
-              layout.save!
-            else
-              puts "Skipping layout: #{layout.label} (#{layout.slug})"
-            end
-          else
-            layouts.push layout
-          end
-        end
-      end
-    end
-    
-    desc 'Import pages into database'
-    task :pages => [:environment, :check_for_requirements] do |task, args|
-      puts 'Importing Pages'
-      puts '---------------'
-      pages = Dir.glob(File.expand_path('pages/**/*.yml', @seed_path)).collect do |page_file_path|
-        begin
-          attributes = YAML.load_file(page_file_path).symbolize_keys!
-          @site.cms_pages.load_from_file(@site, attributes[:full_path])
-        rescue
-          nil
-        end
-      end.compact
-      CmsPage.connection.transaction do
-        # Fixtures are not ordered in any particular way. Saving order matters,
-        # so we cycle them until there nothing left to save
-        while pages.present?
-          page = pages.shift
-          if !page.parent || page.parent && parent = @site.cms_pages.find_by_full_path(page.parent.full_path)
-            page.parent = (parent rescue nil)
-            page.cms_layout = @site.cms_layouts.find_by_slug(page.cms_layout.slug)
-            should_write  = true
-            existing_page = nil
-            
-            if existing_page = @site.cms_pages.find_by_full_path(page.full_path)
-              print "Found page in database with full_path: #{page.full_path}. Overwrite? (y/N): "
-              should_write = ($stdin.gets.to_s.strip.downcase == 'y')
-            end
-            
-            if should_write
-              if existing_page
-                # merging cms_blocks_attributes with the existing page
-                attrs = page.cms_blocks_attributes.collect do |block_attrs|
-                  existing_block = existing_page.cms_blocks_attributes.find{|b| b[:label] == block_attrs[:label]}
-                  block_attrs[:id] = existing_block[:id] if existing_block
-                  block_attrs.stringify_keys
-                end
-                
-                existing_page.attributes = page.attributes.slice('label')
-                existing_page.cms_blocks_attributes = attrs
-                page = existing_page
-              end
-              puts "... Saving page: #{page.label} (#{page.full_path})"
-              page.save!
-            else
-              puts "... Skipping page: #{page.label} (#{page.full_path})"
-            end
-          else
-            pages.push page
-          end
-        end
-      end
+      puts 'Done!'
     end
-    
-    desc 'Import snippets into database'
-    task :snippets => [:environment, :check_for_requirements] do |task, args|
-      puts 'Importing Snippets'
-      puts '------------------'
-      snippets = Dir.glob(File.expand_path('snippets/*.yml', @seed_path)).collect do |snippet_file_path|
-        begin
-          attributes = YAML.load_file(snippet_file_path).symbolize_keys!
-          @site.cms_snippets.load_from_file(@site, attributes[:slug])
-        rescue
-          nil
-        end
-      end.compact
-      CmsSnippet.connection.transaction do
-        snippets.each do |snippet|
-          should_write      = true
-          existing_snippet  = nil
-          if existing_snippet = @site.cms_snippets.find_by_slug(snippet.slug)
-            print "Found snippet in database with slug: #{snippet.slug}. Overwrite? (y/N): "
-            should_write = ($stdin.gets.to_s.strip.downcase == 'y')
-          end
-          if should_write
-            if existing_snippet
-              existing_snippet.attributes = snippet.attributes.slice('label', 'content')
-              snippet = existing_snippet
-            end
-            puts "... Saving snippet: #{snippet.label} (#{snippet.slug})"
-            snippet.save!
-          else
-            puts "... Skipping snippet: #{snippet.label} (#{snippet.slug})"
-          end
-        end
-      end
-    end
-    
-    desc 'Import layouts, pages and snippets all in one go'
-    task :all => [:layouts, :pages, :snippets]
-    
   end
-  
-  # Example use:
-  #   rake comfortable_mexican_sofa:import:all FROM=mysite.com TO=mysite.local SEED_PATH=/path/to/seed_data
-  namespace :export do
-    
-    task :check_for_requirements => :environment do |task, args|
-      @site       = args[:from].present?? args[:from] : nil
-      @to         = args[:to].present?? args[:to] : nil
-      @seed_path  = 
-        ComfortableMexicanSofa.config.seed_data_path = 
-        (args[:seed_path].present?? args[:seed_path] : nil) || ComfortableMexicanSofa.config.seed_data_path
-      
-      if !@seed_path
-        abort 'SEED_PATH is not set. Please define where cms fixtures are located.'
-      end
-      if !(@site = CmsSite.find_by_hostname(args[:from]))
-        abort "FROM is not properly set. Cannot find site with hostname '#{args[:from]}'"
-      end
-      unless @to && @seed_path = "#{@seed_path}/#{@to}"
-        abort "TO is not properly set. What's the target hostname?"
-      end
-      
-      FileUtils.mkdir_p @seed_path
-      FileUtils.mkdir_p "#{@seed_path}/layouts"
-      FileUtils.mkdir_p "#{@seed_path}/pages"
-      FileUtils.mkdir_p "#{@seed_path}/snippets"
-      
-      puts "Starting export from #{@site.label} (#{@site.hostname}) to '#{@seed_path}'"
-    end
-    
-    desc 'Export layouts to yaml files'
-    task :layouts => [:environment, :check_for_requirements] do |task, args|
-      puts 'Exporting Layouts'
-      puts '-----------------'
-      CmsLayout.all.each do |layout|
-        should_write = true
-        file_path = File.join(@seed_path, 'layouts', "#{layout.slug}.yml")
-        if File.exists?(file_path)
-          print "Found layout fixture: #{file_path} Overwrite? (y/N): "
-          should_write = ($stdin.gets.to_s.strip.downcase == 'y')
-        end
-        if should_write
-          attributes = layout.attributes.slice('label', 'slug', 'content', 'css', 'js')
-          attributes['parent'] = layout.parent.slug if layout.parent
-          open(file_path, 'w') do |f|
-            f.write(attributes.to_yaml)
-          end
-          puts "... Saving layout: #{layout.label} (#{layout.slug})"
-        else
-          puts "... Skipping layout: #{layout.label} (#{layout.slug})"
-        end
-      end
-    end
-    
-    desc 'Export pages to yaml files'
-    task :pages => [:environment, :check_for_requirements] do |task, args|
-      puts 'Exporting Pages'
-      puts '---------------'
-      CmsPage.all.each do |page|
-        should_write = true
-        page_name = page.full_path.split('/').last || 'index'
-        page_path = (p = page.full_path.split('/')) && p.pop && p.join('/')
-        
-        FileUtils.mkdir_p "#{@seed_path}/pages/#{page_path}"
-        file_path = File.join(@seed_path, 'pages', "#{page_path}/#{page_name}.yml")
-        
-        if File.exists?(file_path)
-          print "Found page fixture: #{file_path} Overwrite? (y/N): "
-          should_write = ($stdin.gets.to_s.strip.downcase == 'y')
-        end
-        if should_write
-          
-          attributes = page.attributes.slice('label', 'slug', 'full_path', 'is_published')
-          attributes['targe_page']            = page.target_page.full_path if page.target_page
-          attributes['parent']                = page.parent.full_path if page.parent
-          attributes['cms_layout']            = page.cms_layout.slug
-          attributes['cms_blocks_attributes'] = page.cms_blocks_attributes.collect{|b| b.delete(:id) && b.stringify_keys}
-          
-          open(file_path, 'w') do |f|
-            f.write(attributes.to_yaml)
-          end
-          puts "... Saving page: #{page.label} (#{page.full_path})"
-        else
-          puts "... Skipping page: #{page.label} (#{page.full_path})"
-        end
-      end
-    end
-    
-    desc 'Export snippets to yaml files'
-    task :snippets => [:environment, :check_for_requirements] do |task, args|
-      puts 'Exporting Snippets'
-      puts '------------------'
-      CmsSnippet.all.each do |snippet|
-        should_write = true
-        file_path = File.join(@seed_path, 'snippets', "#{snippet.slug}.yml")
-        if File.exists?(file_path)
-          print "Found snippet fixture: #{file_path} Overwrite? (y/N): "
-          should_write = ($stdin.gets.to_s.strip.downcase == 'y')
-        end
-        if should_write
-          attributes = snippet.attributes.slice('label', 'slug', 'content')
-          open(file_path, 'w') do |f|
-            f.write(attributes.to_yaml)
-          end
-          puts "... Saving snippet: #{snippet.label} (#{snippet.slug})"
-        else
-          puts "... Skipping snippet: #{snippet.label} (#{snippet.slug})"
-        end
-      end
-    end
-    
-    desc 'Export layouts, pages and snippets all in one go'
-    task :all => [:layouts, :pages, :snippets]
-    
-  end
-end
+end

data/public/javascripts/comfortable_mexican_sofa/cms.js

@@ -54,7 +54,7 @@ $.CMS = function(){
     
     // Load Page Blocks on layout change
     load_page_blocks: function(){
-      $('select#cms_page_cms_layout_id').bind('change.cms', function() {
+      $('select#cms_page_layout_id').bind('change.cms', function() {
         $.ajax({
           url: ['/' + admin_path_prefix, 'pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'),
           data: ({

data/test/fixtures/{cms_blocks.yml → cms/blocks.yml}

@@ -1,10 +1,10 @@
 default_field_text:
-  cms_page: default
+  page: default
   label: default_field_text
   content: default_field_text_content
 
 default_page_text:
-  cms_page: default
+  page: default
   label: default_page_text
   content: |-
     default_page_text_content_a

data/test/fixtures/{cms_layouts.yml → cms/layouts.yml}

@@ -1,5 +1,5 @@
 default:
-  cms_site: default
+  site: default
   label: Default Layout
   slug: default
   parent:
@@ -14,7 +14,7 @@ default:
   js: default_js
     
 nested:
-  cms_site: default
+  site: default
   label: Nested Layout
   slug: nested
   parent:
@@ -25,7 +25,7 @@ nested:
   js: nested_js
     
 child:
-  cms_site: default
+  site: default
   label: Child Layout
   slug: child
   parent: nested

data/test/fixtures/{cms_pages.yml → cms/pages.yml}

@@ -1,8 +1,8 @@
 default:
-  cms_site: default
+  site: default
   parent:
   target_page:
-  cms_layout: default
+  layout: default
   label: Default Page
   slug:
   full_path: '/'
@@ -20,10 +20,10 @@ default:
     layout_content_c
   
 child:
-  cms_site: default
+  site: default
   parent: default
   target_page:
-  cms_layout: default
+  layout: default
   label: Child Page
   slug: 'child-page'
   full_path: '/child-page'

data/test/fixtures/{cms_snippets.yml → cms/snippets.yml}

@@ -1,5 +1,5 @@
 default:
-  cms_site: default
+  site: default
   label: Default Snippet
   slug: default
   content: default_snippet_content

data/test/fixtures/{cms_uploads.yml → cms/uploads.yml}

@@ -1,5 +1,5 @@
 default:
-  cms_site: default
+  site: default
   file_file_name: sample.jpg
   file_content_type: image/jpeg
   file_file_size: 20099

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -10,7 +10,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_no_layouts
-    CmsLayout.delete_all
+    Cms::Layout.delete_all
     get :index
     assert_response :redirect
     assert_redirected_to :action => :new
@@ -42,22 +42,22 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   end
   
   def test_creation
-    assert_difference 'CmsLayout.count' do
+    assert_difference 'Cms::Layout.count' do
       post :create, :cms_layout => {
         :label    => 'Test Layout',
         :slug     => 'test',
         :content  => 'Test {{cms:page:content}}'
       }
       assert_response :redirect
-      layout = CmsLayout.last
-      assert_equal cms_sites(:default), layout.cms_site
+      layout = Cms::Layout.last
+      assert_equal cms_sites(:default), layout.site
       assert_redirected_to :action => :edit, :id => layout
       assert_equal 'Layout created', flash[:notice]
     end
   end
   
   def test_creation_failure
-    assert_no_difference 'CmsLayout.count' do
+    assert_no_difference 'Cms::Layout.count' do
       post :create, :cms_layout => { }
       assert_response :success
       assert_template :new
@@ -92,7 +92,7 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   end
   
   def test_destroy
-    assert_difference 'CmsLayout.count', -1 do
+    assert_difference 'Cms::Layout.count', -1 do
       delete :destroy, :id => cms_layouts(:default)
       assert_response :redirect
       assert_redirected_to :action => :index

data/test/functional/cms_admin/pages_controller_test.rb

@@ -10,7 +10,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_no_pages
-    CmsPage.delete_all
+    Cms::Page.delete_all
     get :index
     assert_response :redirect
     assert_redirected_to :action => :new
@@ -20,7 +20,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new
     assert_response :success
     assert assigns(:cms_page)
-    assert_equal cms_layouts(:default), assigns(:cms_page).cms_layout
+    assert_equal cms_layouts(:default), assigns(:cms_page).layout
     
     assert_template :new
     assert_select 'form[action=/cms-admin/pages]'
@@ -29,64 +29,64 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   def test_get_new_with_field_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:datetime}}')
     get :new
-    assert_select "input[type='datetime'][name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='datetime'][name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_with_field_integer
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:integer}}')
     get :new
-    assert_select "input[type='number'][name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='number'][name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_with_field_string
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label}}')
     get :new
-    assert_select "input[type='text'][name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='text'][name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_with_field_text
     cms_layouts(:default).update_attribute(:content, '{{cms:field:test_label:text}}')
     get :new
-    assert_select "textarea[name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "textarea[name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_with_page_datetime
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:datetime}}')
     get :new
-    assert_select "input[type='datetime'][name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='datetime'][name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_with_page_integer
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:integer}}')
     get :new
-    assert_select "input[type='number'][name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='number'][name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_with_page_string
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:string}}')
     get :new
-    assert_select "input[type='text'][name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='text'][name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_with_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label}}')
     get :new
-    assert_select "textarea[name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "textarea[name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_with_rich_page_text
     cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:rich_text}}')
     get :new
-    assert_select "textarea[name='cms_page[cms_blocks_attributes][][content]']"
-    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "textarea[name='cms_page[blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
   end
   
   def test_get_new_as_child_page
@@ -104,8 +104,8 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert assigns(:cms_page)
     assert_template :edit
     assert_select "form[action=/cms-admin/pages/#{page.id}]"
-    assert_select "input[name='cms_page[cms_blocks_attributes][][id]'][value='#{cms_blocks(:default_field_text).id}']"
-    assert_select "input[name='cms_page[cms_blocks_attributes][][id]'][value='#{cms_blocks(:default_field_text).id}']"
+    assert_select "input[name='cms_page[blocks_attributes][][id]'][value='#{cms_blocks(:default_field_text).id}']"
+    assert_select "input[name='cms_page[blocks_attributes][][id]'][value='#{cms_blocks(:default_field_text).id}']"
   end
   
   def test_get_edit_failure
@@ -117,22 +117,22 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_get_edit_with_blank_layout
     page = cms_pages(:default)
-    page.update_attribute(:cms_layout_id, nil)
+    page.update_attribute(:layout_id, nil)
     get :edit, :id => page
     assert_response :success
     assert assigns(:cms_page)
-    assert assigns(:cms_page).cms_layout
+    assert assigns(:cms_page).layout
   end
   
   def test_creation
-    assert_difference 'CmsPage.count' do
-      assert_difference 'CmsBlock.count', 2 do
+    assert_difference 'Cms::Page.count' do
+      assert_difference 'Cms::Block.count', 2 do
         post :create, :cms_page => {
-          :label          => 'Test Page',
-          :slug           => 'test-page',
-          :parent_id      => cms_pages(:default).id,
-          :cms_layout_id  => cms_layouts(:default).id,
-          :cms_blocks_attributes => [
+          :label      => 'Test Page',
+          :slug       => 'test-page',
+          :parent_id  => cms_pages(:default).id,
+          :layout_id  => cms_layouts(:default).id,
+          :blocks_attributes => [
             { :label    => 'default_page_text',
               :content  => 'content content' },
             { :label    => 'default_field_text',
@@ -140,8 +140,8 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
           ]
         }
         assert_response :redirect
-        page = CmsPage.last
-        assert_equal cms_sites(:default), page.cms_site
+        page = Cms::Page.last
+        assert_equal cms_sites(:default), page.site
         assert_redirected_to :action => :edit, :id => page
         assert_equal 'Page saved', flash[:notice]
       end
@@ -149,10 +149,10 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_creation_failure
-    assert_no_difference ['CmsPage.count', 'CmsBlock.count'] do
+    assert_no_difference ['Cms::Page.count', 'Cms::Block.count'] do
       post :create, :cms_page => {
-        :cms_layout_id  => cms_layouts(:default).id,
-        :cms_blocks_attributes => [
+        :layout_id => cms_layouts(:default).id,
+        :blocks_attributes => [
           { :label    => 'default_page_text',
             :content  => 'content content' },
           { :label    => 'default_field_text',
@@ -161,8 +161,8 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       }
       assert_response :success
       page = assigns(:cms_page)
-      assert_equal 2, page.cms_blocks.size
-      assert_equal ['content content', 'title content'], page.cms_blocks.collect{|b| b.content}
+      assert_equal 2, page.blocks.size
+      assert_equal ['content content', 'title content'], page.blocks.collect{|b| b.content}
       assert_template :new
       assert_equal 'Failed to create page', flash[:error]
     end
@@ -170,7 +170,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_update
     page = cms_pages(:default)
-    assert_no_difference 'CmsBlock.count' do
+    assert_no_difference 'Cms::Block.count' do
       put :update, :id => page, :cms_page => {
         :label => 'Updated Label'
       }
@@ -184,11 +184,11 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_update_with_layout_change
     page = cms_pages(:default)
-    assert_difference 'CmsBlock.count', 1 do
+    assert_difference 'Cms::Block.count', 1 do
       put :update, :id => page, :cms_page => {
-        :label => 'Updated Label',
-        :cms_layout_id => cms_layouts(:nested).id,
-        :cms_blocks_attributes => [
+        :label      => 'Updated Label',
+        :layout_id  => cms_layouts(:nested).id,
+        :blocks_attributes => [
           { :label    => 'content',
             :content  => 'new_page_text_content',
             :id       => cms_blocks(:default_page_text).id },
@@ -201,7 +201,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       assert_redirected_to :action => :edit, :id => page
       assert_equal 'Page updated', flash[:notice]
       assert_equal 'Updated Label', page.label
-      assert_equal ['new_page_text_content', 'default_field_text_content', 'new_page_string_content'], page.cms_blocks.collect{|b| b.content}
+      assert_equal ['new_page_text_content', 'default_field_text_content', 'new_page_string_content'], page.blocks.collect{|b| b.content}
     end
   end
   
@@ -216,8 +216,8 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_destroy
-    assert_difference 'CmsPage.count', -2 do
-      assert_difference 'CmsBlock.count', -2 do
+    assert_difference 'Cms::Page.count', -2 do
+      assert_difference 'Cms::Block.count', -2 do
         delete :destroy, :id => cms_pages(:default)
         assert_response :redirect
         assert_redirected_to :action => :index
@@ -230,13 +230,13 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     xhr :get, :form_blocks, :id => cms_pages(:default), :layout_id => cms_layouts(:nested).id
     assert_response :success
     assert assigns(:cms_page)
-    assert_equal 2, assigns(:cms_page).cms_tags.size
+    assert_equal 2, assigns(:cms_page).tags.size
     assert_template :form_blocks
     
     xhr :get, :form_blocks, :id => cms_pages(:default), :layout_id => cms_layouts(:default).id
     assert_response :success
     assert assigns(:cms_page)
-    assert_equal 4, assigns(:cms_page).cms_tags.size
+    assert_equal 4, assigns(:cms_page).tags.size
     assert_template :form_blocks
   end
   
@@ -244,18 +244,18 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     xhr :get, :form_blocks, :id => 0, :layout_id => cms_layouts(:default).id
     assert_response :success
     assert assigns(:cms_page)
-    assert_equal 3, assigns(:cms_page).cms_tags.size
+    assert_equal 3, assigns(:cms_page).tags.size
     assert_template :form_blocks
   end
   
   def test_creation_preview
-    assert_no_difference 'CmsPage.count' do
+    assert_no_difference 'Cms::Page.count' do
       post :create, :preview => 'Preview', :cms_page => {
-        :label          => 'Test Page',
-        :slug           => 'test-page',
-        :parent_id      => cms_pages(:default).id,
-        :cms_layout_id  => cms_layouts(:default).id,
-        :cms_blocks_attributes => [
+        :label      => 'Test Page',
+        :slug       => 'test-page',
+        :parent_id  => cms_pages(:default).id,
+        :layout_id  => cms_layouts(:default).id,
+        :blocks_attributes => [
           { :label    => 'default_page_text',
             :content  => 'preview content' }
         ]
@@ -267,10 +267,10 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_update_preview
     page = cms_pages(:default)
-    assert_no_difference 'CmsPage.count' do
+    assert_no_difference 'Cms::Page.count' do
       put :update, :preview => 'Preview', :id => page, :cms_page => {
         :label => 'Updated Label',
-        :cms_blocks_attributes => [
+        :blocks_attributes => [
           { :label    => 'default_page_text',
             :content  => 'preview content',
             :id       => cms_blocks(:default_page_text).id}
@@ -284,7 +284,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_new_with_no_layout
-    CmsLayout.destroy_all
+    Cms::Layout.destroy_all
     get :new
     assert_response :redirect
     assert_redirected_to new_cms_admin_layout_path
@@ -292,7 +292,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_edit_with_no_layout
-    CmsLayout.destroy_all
+    Cms::Layout.destroy_all
     page = cms_pages(:default)
     get :edit, :id => page
     assert_response :redirect
@@ -313,11 +313,11 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
   def test_reorder
     page_one = cms_pages(:child)
-    page_two = cms_sites(:default).cms_pages.create!(
-      :parent     => cms_pages(:default),
-      :cms_layout => cms_layouts(:default),
-      :label      => 'test',
-      :slug       => 'test'
+    page_two = cms_sites(:default).pages.create!(
+      :parent => cms_pages(:default),
+      :layout => cms_layouts(:default),
+      :label  => 'test',
+      :slug   => 'test'
     )
     assert_equal 0, page_one.position
     assert_equal 1, page_two.position