comfortable_mexican_sofa 1.5.11 → 1.6.0

data/lib/comfortable_mexican_sofa/tags/file.rb

@@ -1,21 +1,21 @@
 class ComfortableMexicanSofa::Tag::File
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-\.]+/
-    /\{\{\s*cms:file:(#{label}):?(.*?)\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-\.]+/
+    /\{\{\s*cms:file:(#{identifier}):?(.*?)\s*\}\}/
   end
   
   # Initializing Cms::File object
   def file
-    page.site.files.detect{|f| f.file_file_name == self.label.to_s}
+    page.site.files.detect{|f| f.file_file_name == self.identifier.to_s}
   end
   
   def content
     return unless file
     
     format  = params[0]
-    text    = params[1] || label
+    text    = params[1] || identifier
     
     case format
     when 'link'

data/lib/comfortable_mexican_sofa/tags/helper.rb

@@ -1,13 +1,13 @@
 class ComfortableMexicanSofa::Tag::Helper
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:helper:(#{label}):?(.*?)\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:helper:(#{identifier}):?(.*?)\s*\}\}/
   end
   
   def content
-    "<%= #{label}(#{params.collect{|p| "'#{p}'"}.join(', ')}) %>"
+    "<%= #{identifier}(#{params.collect{|p| "'#{p}'"}.join(', ')}) %>"
   end
   
 end

data/lib/comfortable_mexican_sofa/tags/page_datetime.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::PageDateTime
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:page:(#{label}):datetime\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:page:(#{identifier}):datetime\s*\}\}/
   end
   
   def content

data/lib/comfortable_mexican_sofa/tags/page_file.rb

@@ -5,15 +5,15 @@ class ComfortableMexicanSofa::Tag::PageFile
   #   {{ cms:page_file:some_label:type:params }}
   # Simple tag can be:
   #   {{ cms:page_file:some_label }}
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:page_file:(#{label}):?(.*?)\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:page_file:(#{identifier}):?(.*?)\s*\}\}/
   end
   
   # Type of the tag controls how file is rendered
   def type
     s = params[0].to_s.gsub(/\[.*?\]/, '')
-    %w(partial url image link).member?(s) ? s : 'url'
+    %w(partial url image link field).member?(s) ? s : 'url'
   end
   
   def dimensions
@@ -32,17 +32,19 @@ class ComfortableMexicanSofa::Tag::PageFile
       file.file.url
     when 'link'
       return '' unless file
-      text = params[1] || label
+      text = params[1] || identifier
       "<a href='#{file.file.url}' target='_blank'>#{text}</a>"
     when 'image'
       return '' unless file
-      text = params[1] || label
+      text = params[1] || identifier
       "<img src='#{file.file.url}' alt='#{text}' />"
     when 'partial'
       path = params[1] || 'partials/page_file'
       ps = (self.params[2..-1] || []).collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
       ps = ps.present?? ", #{ps}" : ''
       "<%= render :partial => '#{path}', :locals => {:identifier => #{file.try(:id) || 'nil'}#{ps}} %>"
+    when 'field'
+      ''
     end
   end
   

data/lib/comfortable_mexican_sofa/tags/page_files.rb

@@ -1,15 +1,15 @@
 class ComfortableMexicanSofa::Tag::PageFiles
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:page_files:(#{label}):?(.*?)\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:page_files:(#{identifier}):?(.*?)\s*\}\}/
   end
   
   # Type of the tag controls how file is rendered
   def type
     s = params[0].to_s.gsub(/\[.*?\]/, '')
-    %w(partial url image link).member?(s) ? s : 'url'
+    %w(partial url image link field).member?(s) ? s : 'url'
   end
   
   def dimensions
@@ -44,6 +44,8 @@ class ComfortableMexicanSofa::Tag::PageFiles
       ps = ps.present?? ", #{ps}" : ''
       ids = files.present?? files.collect(&:id).join(',') : ''
       "<%= render :partial => '#{path}', :locals => {:identifier => [#{ids}]#{ps}} %>"
+    when 'field'
+      ''
     end
   end
   

data/lib/comfortable_mexican_sofa/tags/page_integer.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::PageInteger
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:page:(#{label}):integer\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:page:(#{identifier}):integer\s*\}\}/
   end
   
   def content

data/lib/comfortable_mexican_sofa/tags/page_rich_text.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::PageRichText
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:page:(#{label}):rich_text\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:page:(#{identifier}):rich_text\s*\}\}/
   end
   
   def content

data/lib/comfortable_mexican_sofa/tags/page_string.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::PageString
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:page:(#{label}):string\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:page:(#{identifier}):string\s*\}\}/
   end
   
   def content

data/lib/comfortable_mexican_sofa/tags/page_text.rb

@@ -1,9 +1,9 @@
 class ComfortableMexicanSofa::Tag::PageText
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:page:(#{label}):?(?:text)?\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:page:(#{identifier}):?(?:text)?\s*\}\}/
   end
   
   def content

data/lib/comfortable_mexican_sofa/tags/partial.rb

@@ -1,14 +1,14 @@
 class ComfortableMexicanSofa::Tag::Partial
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\/\-]+/
-    /\{\{\s*cms:partial:(#{label}):?(.*?)\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\/\-]+/
+    /\{\{\s*cms:partial:(#{identifier}):?(.*?)\s*\}\}/
   end
   
   def content
     ps = params.collect_with_index{|p, i| ":param_#{i+1} => '#{p}'"}.join(', ')
-    "<%= render :partial => '#{label}'#{ps.blank?? nil : ", :locals => {#{ps}}"} %>"
+    "<%= render :partial => '#{identifier}'#{ps.blank?? nil : ", :locals => {#{ps}}"} %>"
   end
   
 end

data/lib/comfortable_mexican_sofa/tags/snippet.rb

@@ -1,14 +1,15 @@
 class ComfortableMexicanSofa::Tag::Snippet
   include ComfortableMexicanSofa::Tag
   
-  def self.regex_tag_signature(label = nil)
-    label ||= /[\w\-]+/
-    /\{\{\s*cms:snippet:(#{label})\s*\}\}/
+  def self.regex_tag_signature(identifier = nil)
+    identifier ||= /[\w\-]+/
+    /\{\{\s*cms:snippet:(#{identifier})\s*\}\}/
   end
   
   # Find or initialize Cms::Snippet object
   def snippet
-    page.site.snippets.detect{|s| s.slug == self.label.to_s} || page.site.snippets.build(:slug => self.label.to_s)
+    page.site.snippets.detect{|s| s.identifier == self.identifier.to_s} ||
+      page.site.snippets.build(:identifier => self.identifier.to_s)
   end
   
   def content

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -17,13 +17,13 @@ module ComfortableMexicanSofa::ViewMethods
   
   # Content of a snippet. Example:
   #   cms_snippet_content(:my_snippet)
-  def cms_snippet_content(snippet_slug, cms_site = nil)
+  def cms_snippet_content(identifier, cms_site = nil)
     return '' unless cms_site ||= (@cms_site || Cms::Site.find_site(request.host.downcase, request.fullpath))
-    case snippet_slug
+    case identifier
     when Cms::Snippet
-      snippet = snippet_slug
+      snippet = identifier
     else
-      return '' unless snippet = cms_site.snippets.find_by_slug(snippet_slug)
+      return '' unless snippet = cms_site.snippets.find_by_identifier(identifier)
     end
     render :inline => ComfortableMexicanSofa::Tag.process_content(cms_site.pages.build, snippet.content)
   end
@@ -32,9 +32,9 @@ module ComfortableMexicanSofa::ViewMethods
   # Example:
   #   cms_page_content(:left_column, CmsPage.first)
   #   cms_page_content(:left_column) # if @cms_page is present
-  def cms_page_content(block_label, page = nil)
+  def cms_page_content(identifier, page = nil)
     return '' unless page ||= @cms_page
-    return '' unless block = page.blocks.find_by_label(block_label)
+    return '' unless block = page.blocks.find_by_identifier(identifier)
     render :inline => ComfortableMexicanSofa::Tag.process_content(page, block.content)
   end
 end

data/test/fixtures/cms/blocks.yml

@@ -1,11 +1,11 @@
 default_field_text:
   page: default
-  label: default_field_text
+  identifier: default_field_text
   content: default_field_text_content
 
 default_page_text:
   page: default
-  label: default_page_text
+  identifier: default_page_text
   content: |-
     default_page_text_content_a
     {{cms:snippet:default}}

data/test/fixtures/cms/categories.yml

@@ -1,3 +1,4 @@
 default:
+  site: default
   label: Default
   categorized_type: Cms::File

data/test/fixtures/cms/layouts.yml

@@ -1,7 +1,7 @@
 default:
   site: default
   label: Default Layout
-  slug: default
+  identifier: default
   parent:
   content: |-
     {{cms:field:default_field_text:text}}
@@ -17,7 +17,7 @@ default:
 nested:
   site: default
   label: Nested Layout
-  slug: nested
+  identifier: nested
   parent:
   content: |-
     {{cms:page:header}}
@@ -29,7 +29,7 @@ nested:
 child:
   site: default
   label: Child Layout
-  slug: child
+  identifier: child
   parent: nested
   content: |-
     {{cms:page:left_column}}

data/test/fixtures/cms/revisions.yml

@@ -9,10 +9,10 @@ page:
   record: default (Cms::Page)
   data: <%= {
     'blocks_attributes' => [
-      { 'label'   => 'default_page_text',
-        'content' => 'revision page content' },
-      { 'label'   => 'default_field_text',
-        'content' => 'revision field content'}
+      { 'identifier'  => 'default_page_text',
+        'content'     => 'revision page content' },
+      { 'identifier'  => 'default_field_text',
+        'content'     => 'revision field content'}
     ]}.to_yaml.inspect %>
       
 snippet:

data/test/fixtures/cms/sites.yml

@@ -1,5 +1,6 @@
 default:
   label: Default Site
+  identifier: default-site
   hostname: test.host
   path:
   is_mirrored: false

data/test/fixtures/cms/snippets.yml

@@ -1,6 +1,6 @@
 default:
   site: default
   label: Default Snippet
-  slug: default
+  identifier: default
   content: default_snippet_content
   position: 0

data/test/functional/cms_admin/dialogs_controller_test.rb

@@ -0,0 +1,24 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsAdmin::DialogsControllerTest < ActionController::TestCase
+
+  def test_get_image_dialog
+    get :show, :site_id => cms_sites(:default), :type => 'image'
+    assert_response :success
+    assert_template 'image'
+    assert_select "input[name=image_url]"
+  end
+  
+  def test_get_link_dialog
+    get :show, :site_id => cms_sites(:default), :type => 'link'
+    assert_response :success
+    assert_template 'link'
+  end
+  
+  def test_get_invalid
+    get :show, :site_id => cms_sites(:default), :type => 'invalid'
+    assert_response :success
+    assert_blank response.body
+  end
+
+end

data/test/functional/cms_admin/files_controller_test.rb

@@ -113,7 +113,7 @@ class CmsAdmin::FilesControllerTest < ActionController::TestCase
   def test_create_as_xhr
     request.env['HTTP_X_FILE_NAME'] = 'image.jpg'
     request.env['CONTENT_TYPE'] = 'image/jpeg'
-    request.env['RAW_POST_DATA'] = File.open(File.expand_path('../../fixtures/files/image.jpg', File.dirname(__FILE__))).read
+    request.env['RAW_POST_DATA'] = File.open(File.expand_path('../../fixtures/files/image.jpg', File.dirname(__FILE__)))
     
     assert_difference 'Cms::File.count' do
       xhr :post, :create, :site_id => cms_sites(:default)

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -46,9 +46,9 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   def test_creation
     assert_difference 'Cms::Layout.count' do
       post :create, :site_id => cms_sites(:default), :layout => {
-        :label    => 'Test Layout',
-        :slug     => 'test',
-        :content  => 'Test {{cms:page:content}}'
+        :label      => 'Test Layout',
+        :identifier => 'test',
+        :content    => 'Test {{cms:page:content}}'
       }
       assert_response :redirect
       layout = Cms::Layout.last
@@ -84,12 +84,12 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   def test_update_failure
     layout = cms_layouts(:default)
     put :update, :site_id => cms_sites(:default), :id => layout, :layout => {
-      :slug    => ''
+      :identifier => ''
     }
     assert_response :success
     assert_template :edit
     layout.reload
-    assert_not_equal '', layout.slug
+    assert_not_equal '', layout.identifier
     assert_equal 'Failed to update layout', flash[:error]
   end
   
@@ -105,8 +105,8 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   def test_reorder
     layout_one = cms_layouts(:default)
     layout_two = cms_sites(:default).layouts.create!(
-      :label  => 'test',
-      :slug   => 'test'
+      :label      => 'test',
+      :identifier => 'test'
     )
     assert_equal 0, layout_one.position
     assert_equal 1, layout_two.position

data/test/functional/cms_admin/pages_controller_test.rb

@@ -17,7 +17,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
   end
   
   def test_get_index_with_category
-    category = Cms::Category.create!(:label => 'Test Category', :categorized_type => 'Cms::Page')
+    category = cms_sites(:default).categories.create!(:label => 'Test Category', :categorized_type => 'Cms::Page')
     category.categorizations.create!(:categorized => cms_pages(:child))
     
     get :index, :site_id => cms_sites(:default), :category => category.label
@@ -51,7 +51,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
   def test_get_new_with_field_integer
@@ -59,7 +59,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
   def test_get_new_with_field_string
@@ -67,7 +67,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
   def test_get_new_with_field_text
@@ -75,7 +75,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
   def test_get_new_with_page_datetime
@@ -83,7 +83,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][class='datetime']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
   def test_get_new_with_page_integer
@@ -91,7 +91,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
   def test_get_new_with_page_string
@@ -99,7 +99,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
 
   def test_get_new_with_page_text
@@ -107,7 +107,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
   def test_get_new_with_page_file
@@ -115,7 +115,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='file'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
   def test_get_new_with_page_files
@@ -123,7 +123,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "input[type='file'][name='page[blocks_attributes][0][content][]'][multiple=multiple]"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
   def test_get_new_with_collection
@@ -135,7 +135,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       assert_select "option[value='']", :html => '---- Select Cms/Snippet ----'
       assert_select "option[value='#{snippet.id}']", :html => snippet.label
     end
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='snippet']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='snippet']"
   end
 
   def test_get_new_with_rich_page_text
@@ -143,7 +143,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='rich_text']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
   end
   
   def test_get_new_with_several_tag_fields
@@ -151,9 +151,9 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='label_a']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='label_a']"
     assert_select "textarea[name='page[blocks_attributes][1][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][1][label]'][value='label_b']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][1][identifier]'][value='label_b']"
   end
   
   def test_get_new_with_crashy_tag
@@ -167,9 +167,9 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :new, :site_id => cms_sites(:default)
     assert_response :success
     assert_select "textarea[name='page[blocks_attributes][0][content]'][class='code']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
     assert_select "textarea[name='page[blocks_attributes][1][content]'][class='code']", 0
-    assert_select "input[type='hidden'][name='page[blocks_attributes][1][label]'][value='test_label']", 0
+    assert_select "input[type='hidden'][name='page[blocks_attributes][1][identifier]'][value='test_label']", 0
   end
   
   def test_get_new_as_child_page
@@ -215,10 +215,10 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
           :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',
-              :content  => 'title content' }
+            { :identifier => 'default_page_text',
+              :content    => 'content content' },
+            { :identifier => 'default_field_text',
+              :content    => 'title content' }
           ]
         }, :commit => 'Create Page'
         assert_response :redirect
@@ -235,10 +235,10 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       post :create, :site_id => cms_sites(:default), :page => {
         :layout_id => cms_layouts(:default).id,
         :blocks_attributes => [
-          { :label    => 'default_page_text',
-            :content  => 'content content' },
-          { :label    => 'default_field_text',
-            :content  => 'title content' }
+          { :identifier => 'default_page_text',
+            :content    => 'content content' },
+          { :identifier => 'default_field_text',
+            :content    => 'title content' }
         ]
       }
       assert_response :success
@@ -271,10 +271,10 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
         :label      => 'Updated Label',
         :layout_id  => cms_layouts(:nested).id,
         :blocks_attributes => [
-          { :label    => 'content',
-            :content  => 'new_page_text_content' },
-          { :label    => 'header',
-            :content  => 'new_page_string_content' }
+          { :identifier => 'content',
+            :content    => 'new_page_text_content' },
+          { :identifier => 'header',
+            :content    => 'new_page_string_content' }
         ]
       }
       page.reload
@@ -282,7 +282,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 ['content', 'default_field_text', 'default_page_text', 'header'], page.blocks.collect{|b| b.label}
+      assert_equal ['content', 'default_field_text', 'default_page_text', 'header'], page.blocks.collect{|b| b.identifier}
     end
   end
 
@@ -341,8 +341,8 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
         :parent_id  => cms_pages(:default).id,
         :layout_id  => layout.id,
         :blocks_attributes => [
-          { :label    => 'default_page_text',
-            :content  => 'preview content' }
+          { :identifier => 'default_page_text',
+            :content    => 'preview content' }
         ]
       }
       assert_response :success
@@ -361,9 +361,8 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
       put :update, :site_id => page.site, :preview => 'Preview', :id => page, :page => {
         :label => 'Updated Label',
         :blocks_attributes => [
-          { :label    => 'default_page_text',
-            :content  => 'preview content',
-            :id       => cms_blocks(:default_page_text).id}
+          { :identifier => 'default_page_text',
+            :content    => 'preview content' }
         ]
       }
       assert_response :success