comfortable_mexican_sofa 1.11.2 → 1.12.0

data/test/lib/tags/file_test.rb

@@ -4,9 +4,9 @@ class FileTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
-      cms_pages(:default), '{{ cms:file:sample.jpg:image:alt text }}'
+      comfy_cms_pages(:default), '{{ cms:file:sample.jpg:image:alt text }}'
     )
-    assert_equal cms_files(:default), tag.file
+    assert_equal comfy_cms_files(:default), tag.file
     assert_equal 'sample.jpg', tag.identifier
     assert_equal ['image', 'alt text'], tag.params
   end
@@ -18,49 +18,49 @@ class FileTagTest < ActiveSupport::TestCase
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::File.initialize_tag(
-        cms_pages(:default), tag_signature
+        comfy_cms_pages(:default), tag_signature
       )
     end
   end
   
   def test_render_for_invalid
     tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
-      cms_pages(:default), '{{cms:file:invalid.jpg}}'
+      comfy_cms_pages(:default), '{{cms:file:invalid.jpg}}'
     )
     assert_nil tag.file
     assert_equal '', tag.render
   end
   
   def test_render
-    file = cms_files(:default)
+    file = comfy_cms_files(:default)
     assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
-      cms_pages(:default), '{{ cms:file:sample.jpg }}'
+      comfy_cms_pages(:default), '{{ cms:file:sample.jpg }}'
     )
     assert_equal file.file.url, tag.render
   end
   
   def test_render_for_link
-    file = cms_files(:default)
+    file = comfy_cms_files(:default)
     assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
-      cms_pages(:default), '{{ cms:file:sample.jpg:link }}'
+      comfy_cms_pages(:default), '{{ cms:file:sample.jpg:link }}'
     )
     assert_equal "<a href='#{file.file.url}' target='_blank'>sample.jpg</a>", tag.render
     
     assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
-      cms_pages(:default), '{{ cms:file:sample.jpg:link:link text }}'
+      comfy_cms_pages(:default), '{{ cms:file:sample.jpg:link:link text }}'
     )
     assert_equal "<a href='#{file.file.url}' target='_blank'>link text</a>", tag.render
   end
   
   def test_render_for_image
-    file = cms_files(:default)
+    file = comfy_cms_files(:default)
     assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
-      cms_pages(:default), '{{ cms:file:sample.jpg:image }}'
+      comfy_cms_pages(:default), '{{ cms:file:sample.jpg:image }}'
     )
     assert_equal "<img src='#{file.file.url}' alt='sample.jpg' />", tag.render
     
     assert tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
-      cms_pages(:default), '{{ cms:file:sample.jpg:image:alt text }}'
+      comfy_cms_pages(:default), '{{ cms:file:sample.jpg:image:alt text }}'
     )
     assert_equal "<img src='#{file.file.url}' alt='alt text' />", tag.render
   end

data/test/lib/tags/helper_test.rb

@@ -4,18 +4,18 @@ class HelperTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-      cms_pages(:default), '{{ cms:helper:method_name }}'
+      comfy_cms_pages(:default), '{{ cms:helper:method_name }}'
     )
     assert_equal 'method_name', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-      cms_pages(:default), '{{ cms:helper:method-name }}'
+      comfy_cms_pages(:default), '{{ cms:helper:method-name }}'
     )
     assert_equal 'method-name', tag.identifier
   end
   
   def test_initialize_tag_with_parameters
     assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-      cms_pages(:default), '{{ cms:helper:method_name:param1:param2 }}'
+      comfy_cms_pages(:default), '{{ cms:helper:method_name:param1:param2 }}'
     )
     assert_equal 'method_name', tag.identifier
     assert_equal ['param1', 'param2'], tag.params
@@ -23,7 +23,7 @@ class HelperTagTest < ActiveSupport::TestCase
 
   def test_initialize_tag_with_complex_parameters
     assert tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-      cms_pages(:default), '{{ cms:helper:method_name:param1:"param:2" }}'
+      comfy_cms_pages(:default), '{{ cms:helper:method_name:param1:"param:2" }}'
     )
     assert_equal 'method_name', tag.identifier
     assert_equal ['param1', 'param:2'], tag.params
@@ -37,20 +37,20 @@ class HelperTagTest < ActiveSupport::TestCase
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-        cms_pages(:default), tag_signature
+        comfy_cms_pages(:default), tag_signature
       )
     end
   end
   
   def test_content_and_render
     tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-      cms_pages(:default), '{{cms:helper:method_name}}'
+      comfy_cms_pages(:default), '{{cms:helper:method_name}}'
     )
     assert_equal "<%= method_name() %>", tag.content
     assert_equal "<%= method_name() %>", tag.render
     
     tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-      cms_pages(:default), '{{cms:helper:method_name:param1:param2}}'
+      comfy_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
@@ -59,7 +59,7 @@ class HelperTagTest < ActiveSupport::TestCase
   def test_blacklisted_methods
     ComfortableMexicanSofa::Tag::Helper::BLACKLIST.each do |method|
       tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-        cms_pages(:default), "{{ cms:helper:#{method}:Rails.env }}"
+        comfy_cms_pages(:default), "{{ cms:helper:#{method}:Rails.env }}"
       )
       assert_equal "<%= #{method}('Rails.env') %>", tag.content
       assert_equal nil, tag.render
@@ -70,14 +70,14 @@ class HelperTagTest < ActiveSupport::TestCase
     ComfortableMexicanSofa.config.allowed_helpers = [:tester, :eval]
     ComfortableMexicanSofa.config.allowed_helpers.each do |method|
       tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-        cms_pages(:default), "{{ cms:helper:#{method}:Rails.env }}"
+        comfy_cms_pages(:default), "{{ cms:helper:#{method}:Rails.env }}"
       )
       assert_equal "<%= #{method}('Rails.env') %>", tag.content
       assert_equal "<%= #{method}('Rails.env') %>", tag.render
     end
     
     tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-      cms_pages(:default), "{{ cms:helper:invalid:Rails.env }}"
+      comfy_cms_pages(:default), "{{ cms:helper:invalid:Rails.env }}"
     )
     assert_equal "<%= invalid('Rails.env') %>", tag.content
     assert_equal nil, tag.render

data/test/lib/tags/page_datetime_test.rb

@@ -4,20 +4,20 @@ class PageDateTimeTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
-      cms_pages(:default), '{{ cms:page:content:datetime }}'
+      comfy_cms_pages(:default), '{{ cms:page:content:datetime }}'
     )
     assert_equal 'content', tag.identifier
     assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
-      cms_pages(:default), '{{cms:page:content:datetime}}'
+      comfy_cms_pages(:default), '{{cms:page:content:datetime}}'
     )
     assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
-      cms_pages(:default), '{{cms:page:dash-content:datetime}}'
+      comfy_cms_pages(:default), '{{cms:page:dash-content:datetime}}'
     )
     assert_equal 'dash-content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
-      cms_pages(:default), '{{cms:page:namespace.content:datetime}}'
+      comfy_cms_pages(:default), '{{cms:page:namespace.content:datetime}}'
     )
     assert_equal 'namespace.content', tag.identifier
     assert_equal 'namespace', tag.namespace
@@ -31,14 +31,14 @@ class PageDateTimeTagTest < ActiveSupport::TestCase
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::PageDateTime.initialize_tag(
-        cms_pages(:default), tag_signature
+        comfy_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}}'
+      comfy_cms_pages(:default), '{{cms:page:content:datetime}}'
     )
     assert tag.block.content.blank?
     time = 2.days.ago

data/test/lib/tags/page_file_test.rb

@@ -4,7 +4,7 @@ class PageFileTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
-      cms_pages(:default), '{{ cms:page_file:label }}'
+      comfy_cms_pages(:default), '{{ cms:page_file:label }}'
     )
     assert_equal 'label', tag.identifier
     assert_nil tag.namespace
@@ -12,12 +12,12 @@ class PageFileTagTest < ActiveSupport::TestCase
     assert_equal nil, tag.dimensions
     
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
-      cms_pages(:default), '{{ cms:page_file:label:partial }}'
+      comfy_cms_pages(:default), '{{ cms:page_file:label:partial }}'
     )
     assert_equal 'partial', tag.type
     
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
-      cms_pages(:default), '{{ cms:page_file:namespace.label:partial }}'
+      comfy_cms_pages(:default), '{{ cms:page_file:namespace.label:partial }}'
     )
     assert_equal 'namespace.label', tag.identifier
     assert_equal 'namespace', tag.namespace
@@ -25,7 +25,7 @@ class PageFileTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag_with_dimentions
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
-      cms_pages(:default), '{{ cms:page_file:label:image[100x100#] }}'
+      comfy_cms_pages(:default), '{{ cms:page_file:label:image[100x100#] }}'
     )
     assert_equal 'image', tag.type
     assert_equal '100x100#', tag.dimensions
@@ -38,13 +38,13 @@ class PageFileTagTest < ActiveSupport::TestCase
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
-        cms_pages(:default), tag_signature
+        comfy_cms_pages(:default), tag_signature
       )
     end
   end
   
   def test_content_and_render
-    page = cms_pages(:default)
+    page = comfy_cms_pages(:default)
     
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:partial }}')
     assert_equal "<%= render :partial => 'partials/page_file', :locals => {:identifier => nil} %>", tag.render
@@ -74,7 +74,7 @@ class PageFileTagTest < ActiveSupport::TestCase
       tag.render
       
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:image }}')
-    assert_equal "<img src='#{file_url}' alt='file' />", 
+    assert_equal "<img src='#{file_url}' alt='Image' />", 
       tag.render
       
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(page, '{{ cms:page_file:file:image:image alt }}')
@@ -98,19 +98,19 @@ class PageFileTagTest < ActiveSupport::TestCase
   end
   
   def test_content_and_render_with_dimentions
-    layout = cms_layouts(:default)
+    layout = comfy_cms_layouts(:default)
     layout.update_attributes(:content => '{{ cms:page_file:file:image[10x10#] }}')
-    page = cms_pages(:default)
+    page = comfy_cms_pages(:default)
     upload = fixture_file_upload('files/image.jpg', 'image/jpeg')
     
-    assert_difference 'Cms::File.count' do
+    assert_difference 'Comfy::Cms::File.count' do
       page.update_attributes!(
         :blocks_attributes => [
           { :identifier => 'file',
             :content    => upload }
         ]
       )
-      file = Cms::File.last
+      file = Comfy::Cms::File.last
       assert_equal 'image.jpg', file.file_file_name
       # assert file.file_file_size < upload.size
     end

data/test/lib/tags/page_files_test.rb

@@ -4,7 +4,7 @@ class PageFilesTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
-      cms_pages(:default), '{{ cms:page_files:label }}'
+      comfy_cms_pages(:default), '{{ cms:page_files:label }}'
     )
     assert 'url', tag.type
     assert_equal 'label', tag.identifier
@@ -12,12 +12,12 @@ class PageFilesTagTest < ActiveSupport::TestCase
     assert_equal nil, tag.dimensions
     
     assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
-      cms_pages(:default), '{{ cms:page_files:label:partial }}'
+      comfy_cms_pages(:default), '{{ cms:page_files:label:partial }}'
     )
     assert 'partial', tag.type
     
     assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
-      cms_pages(:default), '{{ cms:page_files:namespace.label:partial }}'
+      comfy_cms_pages(:default), '{{ cms:page_files:namespace.label:partial }}'
     )
     assert_equal 'namespace.label', tag.identifier
     assert_equal 'namespace', tag.namespace
@@ -25,7 +25,7 @@ class PageFilesTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag_with_dimentions
     assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
-      cms_pages(:default), '{{ cms:page_files:label:image[100x100#] }}'
+      comfy_cms_pages(:default), '{{ cms:page_files:label:image[100x100#] }}'
     )
     assert_equal 'image', tag.type
     assert_equal '100x100#', tag.dimensions
@@ -38,13 +38,13 @@ class PageFilesTagTest < ActiveSupport::TestCase
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
-        cms_pages(:default), tag_signature
+        comfy_cms_pages(:default), tag_signature
       )
     end
   end
   
   def test_content_and_render
-    page = cms_pages(:default)
+    page = comfy_cms_pages(:default)
     
     assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(page, '{{ cms:page_files:files:partial }}')
     assert_equal "<%= render :partial => 'partials/page_files', :locals => {:identifier => []} %>", tag.render
@@ -56,7 +56,8 @@ class PageFilesTagTest < ActiveSupport::TestCase
     page.update_attributes!(
       :blocks_attributes => [
         { :identifier => 'files',
-          :content    => [fixture_file_upload('files/image.jpg', "image/jpeg"), fixture_file_upload('files/image.gif', "image/gif")] }
+          :content    => [fixture_file_upload('files/image.jpg', "image/jpeg"),
+                          fixture_file_upload('files/image.gif', "image/gif")]}
       ]
     )
     files = tag.block.files
@@ -92,19 +93,19 @@ class PageFilesTagTest < ActiveSupport::TestCase
   end
   
   def test_content_and_render_with_dimentions
-    layout = cms_layouts(:default)
+    layout = comfy_cms_layouts(:default)
     layout.update_attributes(:content => '{{ cms:page_files:file:image[10x10#] }}')
-    page = cms_pages(:default)
+    page = comfy_cms_pages(:default)
     upload = fixture_file_upload('files/image.jpg', 'image/jpeg')
     
-    assert_difference 'Cms::File.count' do
+    assert_difference 'Comfy::Cms::File.count' do
       page.update_attributes!(
         :blocks_attributes => [
           { :identifier => 'file',
             :content    => upload }
         ]
       )
-      file = Cms::File.last
+      file = Comfy::Cms::File.last
       assert_equal 'image.jpg', file.file_file_name
       # assert file.file_file_size < upload.size
     end

data/test/lib/tags/page_integer_test.rb

@@ -4,20 +4,20 @@ class PageIntegerTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
-      cms_pages(:default), '{{ cms:page:content:integer }}'
+      comfy_cms_pages(:default), '{{ cms:page:content:integer }}'
     )
     assert_equal 'content', tag.identifier
     assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
-      cms_pages(:default), '{{cms:page:content:integer}}'
+      comfy_cms_pages(:default), '{{cms:page:content:integer}}'
     )
     assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
-      cms_pages(:default), '{{cms:page:dash-content:integer}}'
+      comfy_cms_pages(:default), '{{cms:page:dash-content:integer}}'
     )
     assert_equal 'dash-content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
-      cms_pages(:default), '{{cms:page:namespace.content:integer}}'
+      comfy_cms_pages(:default), '{{cms:page:namespace.content:integer}}'
     )
     assert_equal 'namespace.content', tag.identifier
     assert_equal 'namespace', tag.namespace
@@ -31,14 +31,14 @@ class PageIntegerTagTest < ActiveSupport::TestCase
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
-        cms_pages(:default), tag_signature
+        comfy_cms_pages(:default), tag_signature
       )
     end
   end
   
   def test_content_and_render
     tag = ComfortableMexicanSofa::Tag::PageInteger.initialize_tag(
-      cms_pages(:default), '{{cms:page:content:integer}}'
+      comfy_cms_pages(:default), '{{cms:page:content:integer}}'
     )
     assert tag.block.content.blank?
     tag.block.content = '5'

data/test/lib/tags/page_markdown_test.rb

@@ -4,20 +4,20 @@ class PageMarkdownTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageMarkdown.initialize_tag(
-      cms_pages(:default), '{{ cms:page:content:markdown }}'
+      comfy_cms_pages(:default), '{{ cms:page:content:markdown }}'
     )
     assert_equal 'content', tag.identifier
     assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::PageMarkdown.initialize_tag(
-      cms_pages(:default), '{{cms:page:content:markdown}}'
+      comfy_cms_pages(:default), '{{cms:page:content:markdown}}'
     )
     assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageMarkdown.initialize_tag(
-      cms_pages(:default), '{{cms:page:dash-content:markdown}}'
+      comfy_cms_pages(:default), '{{cms:page:dash-content:markdown}}'
     )
     assert_equal 'dash-content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageMarkdown.initialize_tag(
-      cms_pages(:default), '{{cms:page:namespace.content:markdown}}'
+      comfy_cms_pages(:default), '{{cms:page:namespace.content:markdown}}'
     )
     assert_equal 'namespace.content', tag.identifier
     assert_equal 'namespace', tag.namespace
@@ -31,14 +31,14 @@ class PageMarkdownTagTest < ActiveSupport::TestCase
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::PageMarkdown.initialize_tag(
-        cms_pages(:default), tag_signature
+        comfy_cms_pages(:default), tag_signature
       )
     end
   end
   
   def test_content_and_render
     tag = ComfortableMexicanSofa::Tag::PageMarkdown.initialize_tag(
-      cms_pages(:default), '{{cms:page:content:markdown}}'
+      comfy_cms_pages(:default), '{{cms:page:content:markdown}}'
     )
     assert tag.block.content.blank?
     tag.block.content = '_test_content_'

data/test/lib/tags/page_rich_text_test.rb

@@ -4,20 +4,20 @@ class PageRichTextTagTest < ActiveSupport::TestCase
   
   def test_initialize_tag
     assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
-      cms_pages(:default), '{{ cms:page:content:rich_text }}'
+      comfy_cms_pages(:default), '{{ cms:page:content:rich_text }}'
     )
     assert_equal 'content', tag.identifier
     assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
-      cms_pages(:default), '{{cms:page:content:rich_text}}'
+      comfy_cms_pages(:default), '{{cms:page:content:rich_text}}'
     )
     assert_equal 'content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
-      cms_pages(:default), '{{cms:page:dash-content:rich_text}}'
+      comfy_cms_pages(:default), '{{cms:page:dash-content:rich_text}}'
     )
     assert_equal 'dash-content', tag.identifier
     assert tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
-      cms_pages(:default), '{{cms:page:namespace.content:rich_text}}'
+      comfy_cms_pages(:default), '{{cms:page:namespace.content:rich_text}}'
     )
     assert_equal 'namespace.content', tag.identifier
     assert_equal 'namespace', tag.namespace
@@ -31,14 +31,14 @@ class PageRichTextTagTest < ActiveSupport::TestCase
       '{not_a_tag}'
     ].each do |tag_signature|
       assert_nil ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
-        cms_pages(:default), tag_signature
+        comfy_cms_pages(:default), tag_signature
       )
     end
   end
   
   def test_content_and_render
     tag = ComfortableMexicanSofa::Tag::PageRichText.initialize_tag(
-      cms_pages(:default), '{{cms:page:content:rich_text}}'
+      comfy_cms_pages(:default), '{{cms:page:content:rich_text}}'
     )
     assert tag.block.content.blank?
     tag.block.content = 'test_content'