comfortable_mexican_sofa 1.0.51 → 1.1.1

data/test/unit/{cms_tag_test.rb → tag_test.rb}

@@ -1,9 +1,9 @@
 require File.expand_path('../test_helper', File.dirname(__FILE__))
 
-class CmsTagTest < ActiveSupport::TestCase
+class TagTest < ActiveSupport::TestCase
   
   def test_tokenizer_regex
-    regex = CmsTag::TOKENIZER_REGEX
+    regex = ComfortableMexicanSofa::Tag::TOKENIZER_REGEX
     
     tokens = 'text { text } text'.scan(regex)
     assert_equal nil,                   tokens[0][0]
@@ -60,7 +60,7 @@ class CmsTagTest < ActiveSupport::TestCase
   
   def test_tokenizer_regex_limit
     string = '<p>text</p>' * 400
-    tokens = string.scan(CmsTag::TOKENIZER_REGEX)
+    tokens = string.scan(ComfortableMexicanSofa::Tag::TOKENIZER_REGEX)
     assert_equal 1, tokens.count
     assert_equal nil, tokens[0][0]
     assert_equal string, tokens[0][1]
@@ -68,7 +68,7 @@ class CmsTagTest < ActiveSupport::TestCase
   
   def test_content_for_existing_page
     page = cms_pages(:default)
-    assert page.cms_tags.blank?
+    assert page.tags.blank?
     assert_equal rendered_content_formatter(
       '
       layout_content_a
@@ -80,26 +80,26 @@ class CmsTagTest < ActiveSupport::TestCase
       layout_content_c'
     ), page.content(true)
     
-    assert_equal 4, page.cms_tags.size
-    assert_equal 'cms_tag/field_text_default_field_text', page.cms_tags[0].identifier
-    assert_equal 'cms_tag/page_text_default_page_text', page.cms_tags[1].identifier
-    assert_equal 'cms_tag/snippet_default', page.cms_tags[2].identifier
-    assert_equal page.cms_tags[1], page.cms_tags[2].parent
-    assert_equal 'cms_tag/snippet_default', page.cms_tags[3].identifier
+    assert_equal 4, page.tags.size
+    assert_equal 'field_text_default_field_text', page.tags[0].identifier
+    assert_equal 'page_text_default_page_text', page.tags[1].identifier
+    assert_equal 'snippet_default', page.tags[2].identifier
+    assert_equal page.tags[1], page.tags[2].parent
+    assert_equal 'snippet_default', page.tags[3].identifier
   end
   
   def test_content_for_new_page
-    page = CmsPage.new
-    assert page.cms_blocks.blank?
-    assert page.cms_tags.blank?
+    page = Cms::Page.new
+    assert page.blocks.blank?
+    assert page.tags.blank?
     assert_equal '', page.content
-    assert page.cms_tags.blank?
+    assert page.tags.blank?
   end
   
   def test_content_for_new_page_with_layout
-    page = CmsPage.new(:cms_layout => cms_layouts(:default))
-    assert page.cms_blocks.blank?
-    assert page.cms_tags.blank?
+    page = cms_sites(:default).pages.new(:layout => cms_layouts(:default))
+    assert page.blocks.blank?
+    assert page.tags.blank?
     assert_equal rendered_content_formatter(
       '
       layout_content_a
@@ -109,17 +109,17 @@ class CmsTagTest < ActiveSupport::TestCase
       layout_content_c'
     ), page.content
     
-    assert_equal 3, page.cms_tags.size
-    assert_equal 'cms_tag/field_text_default_field_text', page.cms_tags[0].identifier
-    assert_equal 'cms_tag/page_text_default_page_text', page.cms_tags[1].identifier
-    assert_equal 'cms_tag/snippet_default', page.cms_tags[2].identifier
+    assert_equal 3, page.tags.size
+    assert_equal 'field_text_default_field_text', page.tags[0].identifier
+    assert_equal 'page_text_default_page_text', page.tags[1].identifier
+    assert_equal 'snippet_default', page.tags[2].identifier
   end
   
   def test_content_for_new_page_with_initilized_cms_blocks
-    page = CmsPage.new(:cms_layout => cms_layouts(:default))
-    assert page.cms_blocks.blank?
-    assert page.cms_tags.blank?
-    page.cms_blocks_attributes = [
+    page = cms_sites(:default).pages.new(:layout => cms_layouts(:default))
+    assert page.blocks.blank?
+    assert page.tags.blank?
+    page.blocks_attributes = [
       {
         :label    => 'default_field_text',
         :content  => 'new_default_field_content',
@@ -136,7 +136,7 @@ class CmsTagTest < ActiveSupport::TestCase
         :type     => 'CmsTag::PageText'
       }
     ]
-    assert_equal 3, page.cms_blocks.size
+    assert_equal 3, page.blocks.size
     
     assert_equal rendered_content_formatter(
       '
@@ -148,18 +148,18 @@ class CmsTagTest < ActiveSupport::TestCase
       layout_content_c'
     ), page.content
     
-    assert_equal 4, page.cms_tags.size
-    assert_equal 'cms_tag/field_text_default_field_text', page.cms_tags[0].identifier
-    assert_equal 'cms_tag/page_text_default_page_text', page.cms_tags[1].identifier
-    assert_equal 'cms_tag/snippet_default', page.cms_tags[2].identifier
-    assert_equal page.cms_tags[1], page.cms_tags[2].parent
-    assert_equal 'cms_tag/snippet_default', page.cms_tags[3].identifier
+    assert_equal 4, page.tags.size
+    assert_equal 'field_text_default_field_text', page.tags[0].identifier
+    assert_equal 'page_text_default_page_text', page.tags[1].identifier
+    assert_equal 'snippet_default', page.tags[2].identifier
+    assert_equal page.tags[1], page.tags[2].parent
+    assert_equal 'snippet_default', page.tags[3].identifier
   end
   
   def test_content_with_repeated_tags
     page = cms_pages(:default)
-    page.cms_layout.content << "\n{{cms:page:default_page_text:text}}"
-    page.cms_layout.save!
+    page.layout.content << "\n{{cms:page:default_page_text:text}}"
+    page.layout.save!
     
     assert_equal rendered_content_formatter(
       '
@@ -175,15 +175,15 @@ class CmsTagTest < ActiveSupport::TestCase
       default_page_text_content_b'
     ), page.content(true)
     
-    assert_equal 6, page.cms_tags.size
-    assert_equal 'cms_tag/field_text_default_field_text', page.cms_tags[0].identifier
-    assert_equal 'cms_tag/page_text_default_page_text', page.cms_tags[1].identifier
-    assert_equal 'cms_tag/snippet_default', page.cms_tags[2].identifier
-    assert_equal page.cms_tags[1], page.cms_tags[2].parent
-    assert_equal 'cms_tag/snippet_default', page.cms_tags[3].identifier
-    assert_equal 'cms_tag/page_text_default_page_text', page.cms_tags[4].identifier
-    assert_equal 'cms_tag/snippet_default', page.cms_tags[5].identifier
-    assert_equal page.cms_tags[4], page.cms_tags[5].parent
+    assert_equal 6, page.tags.size
+    assert_equal 'field_text_default_field_text', page.tags[0].identifier
+    assert_equal 'page_text_default_page_text', page.tags[1].identifier
+    assert_equal 'snippet_default', page.tags[2].identifier
+    assert_equal page.tags[1], page.tags[2].parent
+    assert_equal 'snippet_default', page.tags[3].identifier
+    assert_equal 'page_text_default_page_text', page.tags[4].identifier
+    assert_equal 'snippet_default', page.tags[5].identifier
+    assert_equal page.tags[4], page.tags[5].parent
   end
   
   def test_content_with_cyclical_tags
@@ -200,7 +200,24 @@ class CmsTagTest < ActiveSupport::TestCase
       infinite  loop
       layout_content_c'
     ), page.content(true)
-    assert_equal 6, page.cms_tags.size
+    assert_equal 6, page.tags.size
+  end
+  
+  def test_is_cms_block?
+    tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
+      cms_pages(:default), '{{ cms:page:content:text }}'
+    )
+    assert tag.is_cms_block?
+    
+    tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+      cms_pages(:default), '{{ cms:field:content:text }}'
+    )
+    assert tag.is_cms_block?
+    
+    tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
+      cms_pages(:default), '{{ cms:snippet:label }}'
+    )
+    assert !tag.is_cms_block?
   end
   
 end

data/test/unit/tags/field_datetime_test.rb

@@ -0,0 +1,44 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class FieldDateTimeTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+      cms_pages(:default), '{{ cms:field:content:datetime }}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:datetime}}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+      cms_pages(:default), '{{cms:field:dash-content:datetime}}'
+    )
+    assert_equal 'dash-content', tag.label
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:field:content:not_datetime}}',
+      '{{cms:field:content}}',
+      '{{cms:not_field:content}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:datetime}}'
+    )
+    assert tag.content.blank?
+    time = 2.days.ago
+    tag.content = time
+    assert_equal time, tag.content
+    assert_equal '', tag.render
+  end
+  
+end

data/test/unit/tags/field_integer_test.rb

@@ -0,0 +1,43 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class FieldIntegerTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+      cms_pages(:default), '{{ cms:field:content:integer }}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:integer}}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+      cms_pages(:default), '{{cms:field:dash-content:integer}}'
+    )
+    assert_equal 'dash-content', tag.label
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:field:content:not_integer}}',
+      '{{cms:field:content}}',
+      '{{cms:not_field:content}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:integer}}'
+    )
+    assert tag.content.blank?
+    tag.content = '5'
+    assert_equal '5', tag.content
+    assert_equal '', tag.render
+  end
+  
+end

data/test/unit/tags/field_string_test.rb

@@ -0,0 +1,46 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class FieldStringTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+      cms_pages(:default), '{{ cms:field:content:string }}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:string}}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+      cms_pages(:default), '{{cms:field:content}}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+      cms_pages(:default), '{{cms:field:dash-content}}'
+    )
+    assert_equal 'dash-content', tag.label
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:field:content:not_string}}',
+      '{{cms:not_field:content}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+      cms_pages(:default), '{{cms:field:content}}'
+    )
+    assert tag.content.blank?
+    tag.content = 'test_content'
+    assert_equal 'test_content', tag.content
+    assert_equal '', tag.render
+  end
+  
+end

data/test/unit/tags/field_text_test.rb

@@ -0,0 +1,42 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class FieldTextTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+      cms_pages(:default), '{{ cms:field:content:text }}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:text}}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+      cms_pages(:default), '{{cms:field:dash-content:text}}'
+    )
+    assert_equal 'dash-content', tag.label
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:field:content:not_text}}',
+      '{{cms:not_field:content:text}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+      cms_pages(:default), '{{cms:field:content:text}}'
+    )
+    assert tag.content.blank?
+    tag.content = 'test_content'
+    assert_equal 'test_content', tag.content
+    assert_equal '', tag.render
+  end
+  
+end

data/test/unit/{cms_tags → tags}/helper_test.rb

@@ -3,14 +3,20 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 class HelperTest < ActiveSupport::TestCase
   
   def test_initialize_tag
-    assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{ cms:helper:method_name }}')
+    assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+      cms_pages(:default), '{{ cms:helper:method_name }}'
+    )
     assert_equal 'method_name', tag.label
-    assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{ cms:helper:method-name }}')
+    assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+      cms_pages(:default), '{{ cms:helper:method-name }}'
+    )
     assert_equal 'method-name', tag.label
   end
   
   def test_initialize_tag_with_parameters
-    assert tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{ cms:helper:method_name:param1:param2 }}')
+    assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+      cms_pages(:default), '{{ cms:helper:method_name:param1:param2 }}'
+    )
     assert tag.label = 'method_name'
     assert tag.params = 'param1:param2'
   end
@@ -21,16 +27,22 @@ class HelperTest < ActiveSupport::TestCase
       '{{cms:not_helper:method_name}}',
       '{not_a_tag}'
     ].each do |tag_signature|
-      assert_nil CmsTag::Helper.initialize_tag(cms_pages(:default), tag_signature)
+      assert_nil ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
     end
   end
   
   def test_content_and_render
-    tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{cms:helper:method_name}}')
+    tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+      cms_pages(:default), '{{cms:helper:method_name}}'
+    )
     assert_equal "<%= method_name() %>", tag.content
     assert_equal "<%= method_name() %>", tag.render
     
-    tag = CmsTag::Helper.initialize_tag(cms_pages(:default), '{{cms:helper:method_name:param1:param2}}')
+    tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
+      cms_pages(:default), '{{cms:helper:method_name:param1:param2}}'
+    )
     assert_equal "<%= method_name('param1', 'param2') %>", tag.content
     assert_equal "<%= method_name('param1', 'param2') %>", tag.render
   end

data/test/unit/tags/page_datetime_test.rb

@@ -0,0 +1,44 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class PageDateTimeTest < ActiveSupport::TestCase
+  
+  def test_initialize_tag
+    assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+      cms_pages(:default), '{{ cms:page:content:datetime }}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+      cms_pages(:default), '{{cms:page:content:datetime}}'
+    )
+    assert_equal 'content', tag.label
+    assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+      cms_pages(:default), '{{cms:page:dash-content:datetime}}'
+    )
+    assert_equal 'dash-content', tag.label
+  end
+  
+  def test_initialize_tag_failure
+    [
+      '{{cms:page:content:not_datetime}}',
+      '{{cms:page:content}}',
+      '{{cms:not_page:content}}',
+      '{not_a_tag}'
+    ].each do |tag_signature|
+      assert_nil ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+        cms_pages(:default), tag_signature
+      )
+    end
+  end
+  
+  def test_content_and_render
+    tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
+      cms_pages(:default), '{{cms:page:content:datetime}}'
+    )
+    assert tag.content.blank?
+    time = 2.days.ago
+    tag.content = time
+    assert_equal time, tag.content
+    assert_equal time.to_s, tag.render
+  end
+  
+end