comfortable_mexican_sofa 1.6.23 → 1.6.24

data/test/unit/tag_test.rb

@@ -183,7 +183,7 @@ class TagTest < ActiveSupport::TestCase
   def test_content_with_cyclical_tags
     page = cms_pages(:default)
     snippet = cms_snippets(:default)
-    snippet.update_attribute(:content, "infinite {{cms:page:default}} loop")
+    snippet.update_attributes(:content => "infinite {{cms:page:default}} loop")
     assert_equal rendered_content_formatter(
       '
       layout_content_a
@@ -274,4 +274,30 @@ class TagTest < ActiveSupport::TestCase
     assert_equal %{<%= h('\\'+User.first.inspect+\\'') %>}, tag.render
   end
   
+  def test_tag_initialization_with_namespace
+    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+      cms_pages(:default), '{{ cms:page:content:string }}'
+    )
+    assert_equal 'content', tag.identifier
+    assert_equal nil, tag.namespace
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+      cms_pages(:default), '{{ cms:page:home.content:string }}'
+    )
+    assert_equal 'home.content', tag.identifier
+    assert_equal 'home', tag.namespace
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+      cms_pages(:default), '{{ cms:page:home.main.content:string }}'
+    )
+    assert_equal 'home.main.content', tag.identifier
+    assert_equal 'home.main', tag.namespace
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+      cms_pages(:default), '{{ cms:page:ho-me.ma-in.con-tent:string }}'
+    )
+    assert_equal 'ho-me.ma-in.con-tent', tag.identifier
+    assert_equal 'ho-me.ma-in', tag.namespace
+  end
+  
 end

data/test/unit/tags/collection_test.rb

@@ -14,11 +14,18 @@ class CollectionTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:collection:snippet:cms/snippet }}'
     )
     assert_equal 'snippet',               tag.identifier
+    assert_nil                            tag.namespace
     assert_equal 'Cms::Snippet',          tag.collection_class
     assert_equal 'partials/cms/snippets', tag.collection_partial
     assert_equal 'label',                 tag.collection_title
     assert_equal 'id',                    tag.collection_identifier
     assert_equal [],                      tag.collection_params
+    
+    assert tag = ComfortableMexicanSofa::Tag::Collection.initialize_tag(
+      cms_pages(:default), '{{ cms:collection:namespace.snippet:cms/snippet }}'
+    )
+    assert_equal 'namespace.snippet', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_detailed

data/test/unit/tags/field_datetime_test.rb

@@ -7,6 +7,7 @@ class FieldDateTimeTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:field:content:datetime }}'
     )
     assert_equal 'content', tag.identifier
+    assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
       cms_pages(:default), '{{cms:field:content:datetime}}'
     )
@@ -15,6 +16,11 @@ class FieldDateTimeTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{cms:field:dash-content:datetime}}'
     )
     assert_equal 'dash-content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldDateTime.initialize_tag(
+      cms_pages(:default), '{{cms:field:namespace.content:datetime}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/field_integer_test.rb

@@ -7,6 +7,7 @@ class FieldIntegerTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:field:content:integer }}'
     )
     assert_equal 'content', tag.identifier
+    assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
       cms_pages(:default), '{{cms:field:content:integer}}'
     )
@@ -15,6 +16,11 @@ class FieldIntegerTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{cms:field:dash-content:integer}}'
     )
     assert_equal 'dash-content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldInteger.initialize_tag(
+      cms_pages(:default), '{{cms:field:namespace.content:integer}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/field_rich_text_test.rb

@@ -7,6 +7,7 @@ class FieldRichTextTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:field:content:rich_text }}'
     )
     assert_equal 'content', tag.identifier
+    assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
       cms_pages(:default), '{{cms:field:content:rich_text}}'
     )
@@ -15,6 +16,11 @@ class FieldRichTextTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{cms:field:dash-content:rich_text}}'
     )
     assert_equal 'dash-content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldRichText.initialize_tag(
+      cms_pages(:default), '{{cms:field:namespace.content:rich_text}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/field_string_test.rb

@@ -7,6 +7,7 @@ class FieldStringTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:field:content:string }}'
     )
     assert_equal 'content', tag.identifier
+    assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
       cms_pages(:default), '{{cms:field:content:string}}'
     )
@@ -19,6 +20,11 @@ class FieldStringTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{cms:field:dash-content}}'
     )
     assert_equal 'dash-content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldString.initialize_tag(
+      cms_pages(:default), '{{cms:field:namespace.content}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/field_text_test.rb

@@ -7,6 +7,7 @@ class FieldTextTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:field:content:text }}'
     )
     assert_equal 'content', tag.identifier
+    assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
       cms_pages(:default), '{{cms:field:content:text}}'
     )
@@ -15,6 +16,11 @@ class FieldTextTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{cms:field:dash-content:text}}'
     )
     assert_equal 'dash-content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
+      cms_pages(:default), '{{cms:field:namespace.content:text}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/page_datetime_test.rb

@@ -7,6 +7,7 @@ class PageDateTimeTagTest < ActiveSupport::TestCase
       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}}'
     )
@@ -15,6 +16,11 @@ class PageDateTimeTagTest < ActiveSupport::TestCase
       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}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/page_file_test.rb

@@ -6,13 +6,21 @@ class PageFileTagTest < ActiveSupport::TestCase
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
       cms_pages(:default), '{{ cms:page_file:label }}'
     )
+    assert_equal 'label', tag.identifier
+    assert_nil tag.namespace
     assert 'url', tag.type
     assert_equal nil, tag.dimensions
     
     assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
       cms_pages(:default), '{{ cms:page_file:label:partial }}'
     )
-    assert 'partial', tag.type
+    assert_equal 'partial', tag.type
+    
+    assert tag = ComfortableMexicanSofa::Tag::PageFile.initialize_tag(
+      cms_pages(:default), '{{ cms:page_file:namespace.label:partial }}'
+    )
+    assert_equal 'namespace.label', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_with_dimentions
@@ -90,7 +98,7 @@ class PageFileTagTest < ActiveSupport::TestCase
   
   def test_content_and_render_with_dimentions
     layout = cms_layouts(:default)
-    layout.update_attribute(:content, '{{ cms:page_file:file:image[10x10#] }}')
+    layout.update_attributes(:content => '{{ cms:page_file:file:image[10x10#] }}')
     page = cms_pages(:default)
     upload = fixture_file_upload('files/image.jpg', 'image/jpeg')
     

data/test/unit/tags/page_files_test.rb

@@ -7,12 +7,20 @@ class PageFilesTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:page_files:label }}'
     )
     assert 'url', tag.type
+    assert_equal 'label', tag.identifier
+    assert_equal nil, tag.namespace
     assert_equal nil, tag.dimensions
     
     assert tag = ComfortableMexicanSofa::Tag::PageFiles.initialize_tag(
       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 }}'
+    )
+    assert_equal 'namespace.label', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_with_dimentions
@@ -83,7 +91,7 @@ class PageFilesTagTest < ActiveSupport::TestCase
   
   def test_content_and_render_with_dimentions
     layout = cms_layouts(:default)
-    layout.update_attribute(:content, '{{ cms:page_files:file:image[10x10#] }}')
+    layout.update_attributes(:content => '{{ cms:page_files:file:image[10x10#] }}')
     page = cms_pages(:default)
     upload = fixture_file_upload('files/image.jpg', 'image/jpeg')
     

data/test/unit/tags/page_integer_test.rb

@@ -7,6 +7,7 @@ class PageIntegerTagTest < ActiveSupport::TestCase
       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}}'
     )
@@ -15,6 +16,11 @@ class PageIntegerTagTest < ActiveSupport::TestCase
       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}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/page_rich_text_test.rb

@@ -7,6 +7,7 @@ class PageRichTextTagTest < ActiveSupport::TestCase
       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}}'
     )
@@ -15,6 +16,11 @@ class PageRichTextTagTest < ActiveSupport::TestCase
       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}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/page_string_test.rb

@@ -7,6 +7,7 @@ class PageStringTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:page:content:string }}'
     )
     assert_equal 'content', tag.identifier
+    assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
       cms_pages(:default), '{{cms:page:content:string}}'
     )
@@ -15,6 +16,11 @@ class PageStringTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{cms:page:dash-content:string}}'
     )
     assert_equal 'dash-content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
+      cms_pages(:default), '{{cms:page:namespace.content:string}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/tags/page_text_test.rb

@@ -7,6 +7,7 @@ class PageTextTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{ cms:page:content:text }}'
     )
     assert_equal 'content', tag.identifier
+    assert_nil tag.namespace
     assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
       cms_pages(:default), '{{cms:page:content}}'
     )
@@ -19,6 +20,11 @@ class PageTextTagTest < ActiveSupport::TestCase
       cms_pages(:default), '{{cms:page:dash-content}}'
     )
     assert_equal 'dash-content', tag.identifier
+    assert tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
+      cms_pages(:default), '{{cms:page:namespace.content}}'
+    )
+    assert_equal 'namespace.content', tag.identifier
+    assert_equal 'namespace', tag.namespace
   end
   
   def test_initialize_tag_failure

data/test/unit/view_methods_test.rb

@@ -2,6 +2,8 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 
 class ViewMethodsTest < ActionView::TestCase
   
+  include ComfortableMexicanSofa::ViewMethods
+  
   class ::HelpersTestController < ActionController::Base
     helper { def hello; 'hello' end }
     def test_cms_snippet_content
@@ -23,12 +25,12 @@ class ViewMethodsTest < ActionView::TestCase
   end
   
   def test_cms_snippet_content_with_tags
-    cms_snippets(:default).update_attribute(:content, '{{cms:helper:hello}}')
+    cms_snippets(:default).update_column(:content, '{{cms:helper:hello}}')
     assert_equal 'hello', action_result('test_cms_snippet_content')
   end
   
   def test_cms_snippet_content_with_file_tag
-    cms_snippets(:default).update_attribute(:content, '{{cms:file:sample.jpg}}')
+    cms_snippets(:default).update_column(:content, '{{cms:file:sample.jpg}}')
     assert_equal cms_files(:default).file.url, action_result('test_cms_snippet_content')
   end
   
@@ -37,8 +39,24 @@ class ViewMethodsTest < ActionView::TestCase
   end
   
   def test_cms_page_content_with_tags
-    cms_blocks(:default_field_text).update_attribute(:content, '{{cms:helper:hello}}')
+    cms_blocks(:default_field_text).update_column(:content, '{{cms:helper:hello}}')
     assert_equal 'hello', action_result('test_cms_page_content')
   end
   
+  def test_cms_page_content_with_files
+    page = cms_pages(:default)
+    page.layout.update_column(:content, '{{cms:page_file:file}} {{cms:page_files:files}}')
+    page.update_attributes!(
+      :blocks_attributes => [
+        { :identifier => 'file',
+          :content    => fixture_file_upload('files/image.jpg', "image/jpeg") },
+        { :identifier => 'files',
+          :content    => [fixture_file_upload('files/image.jpg', "image/jpeg"),
+                          fixture_file_upload('files/image.gif', "image/gif")] }
+      ]
+    )
+    assert_equal page.blocks.find_by_identifier('file').files.first, cms_page_content(:file, page)
+    assert_equal page.blocks.find_by_identifier('files').files, cms_page_content(:files, page)
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.23
+  version: 1.6.24
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -229,6 +229,7 @@ files:
 - config/locales/es.yml
 - config/locales/ja.yml
 - config/locales/pt-BR.yml
+- config/locales/ru.yml
 - config/locales/sv.yml
 - config/locales/zh-CN.yml
 - config/routes.rb
@@ -385,7 +386,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1828103925495804435
+      hash: 2960063838234964061
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -394,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ComfortableMexicanSofa is a powerful CMS Engine for Ruby on Rails 3 applications