comfortable_mexican_sofa 1.12.11 → 2.0.0

data/test/lib/content/tags/helper_test.rb

@@ -0,0 +1,52 @@
+require_relative '../../../test_helper'
+
+class ContentTagsHelperTest < ActiveSupport::TestCase
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "helper_method")
+    assert_equal "helper_method", tag.method_name
+    assert_equal [], tag.params
+  end
+
+  def test_init_with_params
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "helper_method, param, key: val")
+    assert_equal "helper_method", tag.method_name
+    assert_equal ["param", {"key" => "val"}], tag.params
+  end
+
+  def test_init_without_method_name
+    message = "Missing method name for helper tag"
+    assert_exception_raised ComfortableMexicanSofa::Content::Tag::Error, message do
+      ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "")
+    end
+  end
+
+  def test_content
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "method_name, param, key: val")
+    assert_equal "<%= method_name(\"param\",{\"key\"=>\"val\"}) %>", tag.content
+  end
+
+  def test_render
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "method_name, param, key: val")
+    assert_equal "<%= method_name(\"param\",{\"key\"=>\"val\"}) %>", tag.render
+  end
+
+  def test_render_with_whitelist
+    ComfortableMexicanSofa.config.allowed_helpers = [:tester, :eval]
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "tester")
+    assert_equal "<%= tester() %>", tag.render
+
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "eval")
+    assert_equal "<%= eval() %>", tag.render
+
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "not_whitelisted")
+    assert_nil tag.render
+  end
+
+  def test_render_with_blacklist
+    ComfortableMexicanSofa::Content::Tag::Helper::BLACKLIST.each do |method|
+      tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, method)
+      assert_nil tag.render
+    end
+  end
+end

data/test/lib/content/tags/markdown_test.rb

@@ -0,0 +1,33 @@
+require_relative '../../../test_helper'
+
+class ContentTagsMarkdownTest < ActiveSupport::TestCase
+
+  setup do
+    @page = comfy_cms_pages(:default)
+  end
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(@page, "test")
+    assert_equal "test", tag.identifier
+  end
+
+  def test_content
+    frag = comfy_cms_fragments(:default)
+    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(@page, frag.identifier)
+    assert_equal frag,          tag.fragment
+    assert_equal frag.content,  tag.content
+  end
+
+  def test_render
+    frag = comfy_cms_fragments(:default)
+    frag.update_column(:content, "**test**")
+    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(@page, frag.identifier)
+    assert_equal "<p><strong>test</strong></p>\n", tag.render
+  end
+
+  def test_render_unrenderable
+    frag = comfy_cms_fragments(:default)
+    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(@page, "#{frag.identifier}, render: false")
+    assert_equal "", tag.render
+  end
+end

data/test/lib/content/tags/number_test.rb

@@ -0,0 +1,13 @@
+require_relative '../../../test_helper'
+
+class ContentTagsNumberTest < ActiveSupport::TestCase
+
+  setup do
+    @page = comfy_cms_pages(:default)
+  end
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::Number.new(@page, "test")
+    assert_equal "test", tag.identifier
+  end
+end

data/test/lib/content/tags/partial_test.rb

@@ -0,0 +1,43 @@
+require_relative '../../../test_helper'
+
+class ContentTagsPartialTest < ActiveSupport::TestCase
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial")
+    assert_equal "path/to/partial", tag.path
+    assert_equal ({}), tag.locals
+  end
+
+  def test_init_with_locals
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial, key: val")
+    assert_equal "path/to/partial", tag.path
+    assert_equal ({"key" => "val"}), tag.locals
+  end
+
+  def test_init_without_path
+    message = "Missing path for partial tag"
+    assert_exception_raised ComfortableMexicanSofa::Content::Tag::Error, message do
+      ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "key: val")
+    end
+  end
+
+  def test_content
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial, key: val")
+    assert_equal "<%= render partial: '@path', locals: {\"key\"=>\"val\"} %>", tag.content
+  end
+
+  def test_render
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial, key: val")
+    assert_equal "<%= render partial: '@path', locals: {\"key\"=>\"val\"} %>", tag.render
+  end
+
+  def test_render_with_whitelist
+    ComfortableMexicanSofa.config.allowed_partials = ['safe/path']
+
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial")
+    assert_equal "", tag.render
+
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "safe/path")
+    assert_equal "<%= render partial: '@path', locals: {} %>", tag.render
+  end
+end

data/test/lib/content/tags/snippet_test.rb

@@ -0,0 +1,36 @@
+require_relative '../../../test_helper'
+
+class ContentTagsSnippetTest < ActiveSupport::TestCase
+
+  setup do
+    @page = comfy_cms_pages(:default)
+  end
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "default")
+    assert_equal "default", tag.identifier
+    assert_equal comfy_cms_snippets(:default), tag.snippet
+  end
+
+  def test_init_without_identifier
+    message = "Missing identifier for snippet tag"
+    assert_exception_raised ComfortableMexicanSofa::Content::Tag::Error, message do
+      ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "")
+    end
+  end
+
+  def test_snippet_new_record
+    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "new")
+    assert tag.snippet.new_record?
+  end
+
+  def test_content
+    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "default")
+    assert_equal "snippet content", tag.content
+  end
+
+  def test_content_new_record
+    tag = ComfortableMexicanSofa::Content::Tag::Snippet.new(@page, "new")
+    assert_nil tag.content
+  end
+end

data/test/lib/content/tags/template_test.rb

@@ -0,0 +1,35 @@
+require_relative '../../../test_helper'
+
+class ContentTagsTemplateTest < ActiveSupport::TestCase
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "path/to/template")
+    assert_equal "path/to/template", tag.path
+  end
+
+  def test_init_without_path
+    message = "Missing template path for template tag"
+    assert_exception_raised ComfortableMexicanSofa::Content::Tag::Error, message do
+      ComfortableMexicanSofa::Content::Tag::Template.new(@page, "")
+    end
+  end
+
+  def test_content
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "path/to/template")
+    assert_equal "<%= render template: \"path/to/template\" %>", tag.content
+  end
+
+  def test_render
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "path/to/template")
+    assert_equal "<%= render template: \"path/to/template\" %>", tag.render
+  end
+
+  def test_render_with_whitelist
+    ComfortableMexicanSofa.config.allowed_templates = ["allowed/path"]
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "allowed/path")
+    assert_equal "<%= render template: \"allowed/path\" %>", tag.render
+
+    tag = ComfortableMexicanSofa::Content::Tag::Template.new(@page, "not_allowed/path")
+    assert_equal "", tag.render
+  end
+end

data/test/lib/content/tags/text_test.rb

@@ -0,0 +1,13 @@
+require_relative '../../../test_helper'
+
+class ContentTagsTextTest < ActiveSupport::TestCase
+
+  setup do
+    @page = comfy_cms_pages(:default)
+  end
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::Text.new(@page, "test")
+    assert_equal "test", tag.identifier
+  end
+end

data/test/lib/content/tags/textarea_test.rb

@@ -0,0 +1,13 @@
+require_relative '../../../test_helper'
+
+class ContentTagsTextAreaTest < ActiveSupport::TestCase
+
+  setup do
+    @page = comfy_cms_pages(:default)
+  end
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::TextArea.new(@page, "test")
+    assert_equal "test", tag.identifier
+  end
+end

data/test/lib/content/tags/wysiwyg_test.rb

@@ -0,0 +1,13 @@
+require_relative '../../../test_helper'
+
+class ContentTagsWysiwygTest < ActiveSupport::TestCase
+
+  setup do
+    @page = comfy_cms_pages(:default)
+  end
+
+  def test_init
+    tag = ComfortableMexicanSofa::Content::Tag::Wysiwyg.new(@page, "test")
+    assert_equal "test", tag.identifier
+  end
+end

data/test/lib/revisions_test.rb

@@ -1,185 +1,220 @@
 require_relative '../test_helper'
 
 class RevisionsTest < ActiveSupport::TestCase
-  
+
+  setup do
+    @site     = comfy_cms_sites(:default)
+    @layout   = comfy_cms_layouts(:default)
+    @page     = comfy_cms_pages(:default)
+    @snippet  = comfy_cms_snippets(:default)
+  end
+
   def test_fixtures_validity
     assert_equal ({
-      'content' => 'revision {{cms:page:default_page_text}}', 
+      'content' => 'revision {{cms:fragment content}}',
       'css'     => 'revision css',
       'js'      => 'revision js' }), comfy_cms_revisions(:layout).data
-      
-    assert_equal ({'blocks_attributes' => [
-      { 'identifier' => 'default_page_text',   'content' => 'revision page content'  },
-      { 'identifier' => 'default_field_text',  'content' => 'revision field content' }
+
+    assert_equal ({'fragments_attributes' => [
+      {'identifier' => 'content', 'content' => 'old content'},
+      {'identifier' => 'title',   'content' => 'old title'}
     ]}), comfy_cms_revisions(:page).data
-    
+
     assert_equal ({
       'content' => 'revision content'
     }), comfy_cms_revisions(:snippet).data
   end
-  
+
   def test_init_for_layouts
-    assert_equal ['content', 'css', 'js'], comfy_cms_layouts(:default).revision_fields
+    assert_equal ['content', 'css', 'js'], @layout.revision_fields
   end
-  
+
   def test_init_for_pages
-    assert_equal ['blocks_attributes'], comfy_cms_pages(:default).revision_fields
+    assert_equal ['fragments_attributes'], @page.revision_fields
   end
-  
+
   def test_init_for_snippets
-    assert_equal ['content'], comfy_cms_snippets(:default).revision_fields
+    assert_equal ['content'], @snippet.revision_fields
   end
-  
+
   def test_creation_for_layout
-    layout = comfy_cms_layouts(:default)
-    old_attributes = layout.attributes.slice('content', 'css', 'js')
-    
-    assert_difference 'layout.revisions.count' do
-      layout.update_attributes!(
-        :content  => 'new {{cms:page:content}}',
-        :js       => 'new js'
+    old_attributes = @layout.attributes.slice('content', 'css', 'js')
+
+    assert_difference -> {@layout.revisions.count} do
+      @layout.update_attributes!(
+        content:  'new {{cms:fragment content}}',
+        js:       'new js'
       )
-      layout.reload
-      assert_equal 2, layout.revisions.count
-      revision = layout.revisions.first
+      @layout.reload
+      assert_equal 2, @layout.revisions.count
+      revision = @layout.revisions.last
       assert_equal old_attributes, revision.data
     end
   end
-  
+
   def test_creation_for_layout_ignore
-    layout = comfy_cms_layouts(:default)
-    assert_no_difference 'layout.revisions.count' do
-      layout.update_attributes(:label => 'new label')
+    assert_no_difference -> {@layout.revisions.count} do
+      @layout.update_attributes(label: "new label")
     end
   end
-  
+
   def test_creation_for_page
-    page = comfy_cms_pages(:default)
-    
-    assert_difference 'page.revisions.count' do
-      page.update_attributes!(
-        :blocks_attributes => [
-          { :identifier => 'default_page_text',
-            :content    => 'new content' }
+    assert_difference -> {@page.revisions.count} do
+      @page.update_attributes!(
+        fragments_attributes:  [
+          { identifier: 'content',
+            content:    'new content' }
         ]
       )
-      page.reload
-      assert_equal 2, page.revisions.count
-      revision = page.revisions.first
+      @page.reload
+      assert_equal 2, @page.revisions.count
+      revision = @page.revisions.last
+
       assert_equal ({
-        'blocks_attributes' => [
-          { :identifier => 'default_field_text',
-            :content    => 'default_field_text_content' },
-          { :identifier => 'default_page_text',
-            :content    => "default_page_text_content_a\n{{cms:snippet:default}}\ndefault_page_text_content_b" }]
+        "fragments_attributes" => [
+          { identifier: "boolean",
+            tag:        "checkbox",
+            content:    nil,
+            datetime:   nil,
+            boolean:    true },
+          { identifier: "file",
+            tag:        "file",
+            content:    nil,
+            datetime:   nil,
+            boolean:    false },
+          { identifier: "datetime",
+            tag:        "datetime",
+            content:    nil,
+            datetime:   comfy_cms_fragments(:datetime).datetime,
+            boolean:    false },
+          { identifier: "content",
+            tag:        "text",
+            content:    "content",
+            datetime:   nil,
+            boolean:    false }]
       }), revision.data
     end
   end
-  
+
   def test_creation_for_page_ignore
-    page = comfy_cms_pages(:default)
-    assert_no_difference 'page.revisions.count' do
-      page.update_attributes(:label => 'new label')
+    assert_no_difference -> {@page.revisions.count} do
+      @page.update_attributes(label: "new label")
     end
   end
-  
+
   def test_creation_for_snippet
-    snippet = comfy_cms_snippets(:default)
-    old_attributes  = snippet.attributes.slice('content')
-    
-    assert_difference 'snippet.revisions.count' do
-      snippet.update_attributes(:content => 'new content')
-      snippet.reload
-      assert_equal 2, snippet.revisions.count
-      revision = snippet.revisions.first
+    old_attributes  = @snippet.attributes.slice('content')
+
+    assert_difference -> {@snippet.revisions.count} do
+      @snippet.update_attributes(content: "new content")
+      @snippet.reload
+      assert_equal 2, @snippet.revisions.count
+      revision = @snippet.revisions.last
       assert_equal old_attributes, revision.data
     end
   end
-  
+
   def test_creation_for_snippet_ignore
-    snippet = comfy_cms_snippets(:default)
-    assert_no_difference 'snippet.revisions.count' do
-      snippet.update_attributes(:label => 'new label')
+    assert_no_difference -> {@snippet.revisions.count} do
+      @snippet.update_attributes(label: "new label")
     end
   end
-  
+
   def test_creation_for_new_record
     assert_difference 'Comfy::Cms::Snippet.count' do
       assert_no_difference 'Comfy::Cms::Revision.count' do
-        snippet = comfy_cms_sites(:default).snippets.create!(
-          :label      => 'test snippet',
-          :identifier => 'test_snippet',
-          :content    => 'test content'
+        snippet = @site.snippets.create!(
+          label:      'test snippet',
+          identifier: 'test_snippet',
+          content:    'test content'
         )
         assert_equal 0, snippet.revisions.count
       end
     end
   end
-  
+
   def test_restore_from_revision_for_layout
-    layout = comfy_cms_layouts(:default)
     revision = comfy_cms_revisions(:layout)
-    
-    assert_difference 'layout.revisions.count' do
-      layout.restore_from_revision(revision)
-      layout.reload
-      assert_equal 'revision {{cms:page:default_page_text}}', layout.content
-      assert_equal 'revision css', layout.css
-      assert_equal 'revision js', layout.js
+
+    assert_difference -> {@layout.revisions.count} do
+      @layout.restore_from_revision(revision)
+      @layout.reload
+      assert_equal 'revision {{cms:fragment content}}', @layout.content
+      assert_equal 'revision css', @layout.css
+      assert_equal 'revision js', @layout.js
     end
   end
-  
+
   def test_restore_from_revision_for_page
-    page = comfy_cms_pages(:default)
     revision = comfy_cms_revisions(:page)
-    
-    assert_difference 'page.revisions.count' do
-      page.restore_from_revision(revision)
-      page.reload
+
+    assert_difference -> {@page.revisions.count} do
+      @page.restore_from_revision(revision)
+      @page.reload
+
       assert_equal [
-        { :identifier => 'default_field_text', :content => 'revision field content'  },
-        { :identifier => 'default_page_text',  :content => 'revision page content'   }
-      ], page.blocks_attributes
+        { identifier: "boolean",
+          tag:        "checkbox",
+          content:    nil,
+          datetime:   nil,
+          boolean:true },
+        { identifier: "file",
+          tag:        "file",
+          content:    nil,
+          datetime:   nil,
+          boolean:    false },
+        { identifier: "datetime",
+          tag:        "datetime",
+          content:    nil,
+          datetime:   comfy_cms_fragments(:datetime).datetime,
+          boolean:    false },
+        { identifier: "content",
+          tag:        "text",
+          content:    "old content",
+          datetime:   nil,
+          boolean:    false },
+        { identifier: "title",
+          tag:        "text",
+          content:    "old title",
+          datetime:   nil,
+          boolean:    false }
+      ], @page.fragments_attributes
     end
   end
-  
+
   def test_restore_from_revision_for_snippet
-    snippet = comfy_cms_snippets(:default)
     revision = comfy_cms_revisions(:snippet)
-    
-    assert_difference 'snippet.revisions.count' do
-      snippet.restore_from_revision(revision)
-      snippet.reload
-      assert_equal 'revision content', snippet.content
+
+    assert_difference -> {@snippet.revisions.count} do
+      @snippet.restore_from_revision(revision)
+      @snippet.reload
+      assert_equal 'revision content', @snippet.content
     end
   end
-  
+
   def test_restore_from_revision_with_wrong_revision_type
-    snippet = comfy_cms_snippets(:default)
     revision = comfy_cms_revisions(:layout)
-    
-    assert_no_difference 'snippet.revisions.count' do
-      snippet.restore_from_revision(revision)
-      snippet.reload
-      assert_equal 'default_snippet_content', snippet.content
+
+    assert_no_difference -> {@snippet.revisions.count} do
+      @snippet.restore_from_revision(revision)
+      @snippet.reload
+      assert_equal "snippet content", @snippet.content
     end
   end
-  
+
   def test_creation_with_limit
     ComfortableMexicanSofa.config.revisions_limit = 1
-    snippet = comfy_cms_snippets(:default)
     revision = comfy_cms_revisions(:snippet)
-    
-    assert_equal 1, snippet.revisions.count
-    
-    assert_no_difference 'snippet.revisions.count' do
-      snippet.update_attributes(:content => 'new content')
+
+    assert_equal 1, @snippet.revisions.count
+
+    assert_no_difference -> {@snippet.revisions.count} do
+      @snippet.update_attributes(content: 'new content')
       assert_nil Comfy::Cms::Revision.find_by_id(revision.id)
-      
-      snippet.reload
-      revision = snippet.revisions.first
-      assert_equal ({ 'content' => 'default_snippet_content' }), revision.data
+
+      @snippet.reload
+      revision = @snippet.revisions.last
+      assert_equal ({"content" => "snippet content"}), revision.data
     end
   end
-  
-end
+end