comfortable_mexican_sofa 2.0.8 → 2.0.9

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

@@ -7,13 +7,13 @@ class ContentTagsCheckboxTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Checkbox.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Checkbox.new(context: @page, params: ["test"])
     assert_equal "test", tag.identifier
   end
 
   def test_content
     frag = comfy_cms_fragments(:boolean)
-    tag = ComfortableMexicanSofa::Content::Tag::Checkbox.new(@page, frag.identifier)
+    tag = ComfortableMexicanSofa::Content::Tag::Checkbox.new(context: @page, params: [frag.identifier])
     assert_equal frag,          tag.fragment
     assert_equal frag.boolean,  tag.content
   end

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

@@ -7,13 +7,13 @@ class ContentTagsDateTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Date.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Date.new(context: @page, params: ["test"])
     assert_equal "test", tag.identifier
   end
 
   def test_content
     frag = comfy_cms_fragments(:datetime)
-    tag = ComfortableMexicanSofa::Content::Tag::Date.new(@page, frag.identifier)
+    tag = ComfortableMexicanSofa::Content::Tag::Date.new(context: @page, params: [frag.identifier])
     assert_equal frag,          tag.fragment
     assert_equal frag.datetime, tag.content
   end

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

@@ -7,13 +7,13 @@ class ContentTagsDatetimeTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Datetime.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Datetime.new(context: @page, params: ["test"])
     assert_equal "test", tag.identifier
   end
 
   def test_content
     frag = comfy_cms_fragments(:datetime)
-    tag = ComfortableMexicanSofa::Content::Tag::Datetime.new(@page, frag.identifier)
+    tag = ComfortableMexicanSofa::Content::Tag::Datetime.new(context: @page, params: [frag.identifier])
     assert_equal frag,          tag.fragment
     assert_equal frag.datetime, tag.content
   end

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

@@ -12,14 +12,23 @@ class ContentTagsFileLinkTest < ActiveSupport::TestCase
   # -- Tests -------------------------------------------------------------------
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, "123")
+    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(context: @page, params: ["123"])
     assert_equal "123", tag.identifier
     assert_equal "url", tag.as
   end
 
   def test_init_with_params
-    string = "123, as: image, resize: 100x100, gravity: center, crop: '100x100+0+0'"
-    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, string)
+    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(
+      context: @page,
+      params: [
+        "123", {
+          "as"      => "image",
+          "resize"  => "100x100",
+          "gravity" => "center",
+          "crop"    => "100x100+0+0"
+        }
+      ]
+    )
     assert_equal "123", tag.identifier
     assert_equal "image", tag.as
     assert_equal ({
@@ -32,27 +41,30 @@ class ContentTagsFileLinkTest < ActiveSupport::TestCase
   def test_init_without_identifier
     message = "Missing identifier for file link tag"
     assert_exception_raised ComfortableMexicanSofa::Content::Tag::Error, message do
-      ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, "")
+      ComfortableMexicanSofa::Content::Tag::FileLink.new(context: @page)
     end
   end
 
   def test_file
-    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, @file.id)
+    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(context: @page, params: [@file.id])
     assert tag.file.is_a?(Comfy::Cms::File)
 
-    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, "invalid")
+    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(context: @page, params: ["invalid"])
     assert_nil tag.file
   end
 
   def test_content
-    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, @file.id)
+    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(context: @page, params: [@file.id])
     out = rails_blob_path(tag.file.attachment, only_path: true)
     assert_equal out, tag.content
     assert_equal out, tag.render
   end
 
   def test_content_as_link
-    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, "#{@file.id}, as: link")
+    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(
+      context: @page,
+      params: [@file.id, { "as" => "link" }]
+    )
     url = rails_blob_path(tag.file.attachment, only_path: true)
     out = "<a href='#{url}' target='_blank'>default file</a>"
     assert_equal out, tag.content
@@ -60,7 +72,10 @@ class ContentTagsFileLinkTest < ActiveSupport::TestCase
   end
 
   def test_content_as_image
-    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, "#{@file.id}, as: image")
+    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(
+      context: @page,
+      params: [@file.id, { "as" => "image" }]
+    )
     url = rails_blob_path(tag.file.attachment, only_path: true)
     out = "<img src='#{url}' alt='default file'/>"
     assert_equal out, tag.content
@@ -68,7 +83,7 @@ class ContentTagsFileLinkTest < ActiveSupport::TestCase
   end
 
   def test_content_when_not_found
-    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(@page, "invalid")
+    tag = ComfortableMexicanSofa::Content::Tag::FileLink.new(context: @page, params: ["invalid"])
     assert_equal "", tag.content
     assert_equal "", tag.render
   end

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

@@ -11,14 +11,21 @@ class ContentTagsFileTest < ActiveSupport::TestCase
   # -- Tests -------------------------------------------------------------------
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::File.new(context: @page, params: ["test"])
     assert_equal "test",  tag.identifier
     assert_equal "url",   tag.as
   end
 
   def test_init_with_params
-    string = "test, as: image, resize: 100x100, gravity: center, crop: '100x100+0+0'"
-    tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, string)
+    tag = ComfortableMexicanSofa::Content::Tag::File.new(
+      context: @page,
+      params: ["test", {
+        "as"      => "image",
+        "resize"  => "100x100",
+        "gravity" => "center",
+        "crop"    => "100x100+0+0"
+      }]
+    )
     assert_equal "test",  tag.identifier
     assert_equal "image", tag.as
     assert_equal ({
@@ -30,26 +37,32 @@ class ContentTagsFileTest < ActiveSupport::TestCase
 
   def test_content
     frag = comfy_cms_fragments(:file)
-    tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, frag.identifier)
+    tag = ComfortableMexicanSofa::Content::Tag::File.new(context: @page, params: [frag.identifier])
     assert_equal rails_blob_path(frag.attachments.first, only_path: true), tag.content
   end
 
   def test_content_as_link
     frag = comfy_cms_fragments(:file)
-    tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, "#{frag.identifier}, as: link")
+    tag = ComfortableMexicanSofa::Content::Tag::File.new(
+      context: @page,
+      params: [frag.identifier, { "as" => "link" }]
+    )
     out = "<a href='#{rails_blob_path(frag.attachments.first, only_path: true)}' target='_blank'>fragment.jpg</a>"
     assert_equal out, tag.content
   end
 
   def test_content_as_image
     frag = comfy_cms_fragments(:file)
-    tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, "#{frag.identifier}, as: image")
+    tag = ComfortableMexicanSofa::Content::Tag::File.new(
+      context: @page,
+      params: [frag.identifier, { "as" => "image" }]
+    )
     out = "<img src='#{rails_blob_path(frag.attachments.first, only_path: true)}' alt='fragment.jpg'/>"
     assert_equal out, tag.content
   end
 
   def test_content_with_no_attachment
-    tag = ComfortableMexicanSofa::Content::Tag::File.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::File.new(context: @page, params: ["test"])
     assert_equal "", tag.content
   end
 

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

@@ -11,14 +11,21 @@ class ContentTagsFilesTest < ActiveSupport::TestCase
   # -- Tests -------------------------------------------------------------------
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Files.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Files.new(context: @page, params: ["test"])
     assert_equal "test",  tag.identifier
     assert_equal "url",   tag.as
   end
 
   def test_init_with_params
-    string = "test, as: image, resize: 100x100, gravity: center, crop: '100x100+0+0'"
-    tag = ComfortableMexicanSofa::Content::Tag::Files.new(@page, string)
+    tag = ComfortableMexicanSofa::Content::Tag::Files.new(
+      context: @page,
+      params: ["test", {
+        "as"      => "image",
+        "resize"  => "100x100",
+        "gravity" => "center",
+        "crop"    => "100x100+0+0"
+      }]
+    )
     assert_equal "test",  tag.identifier
     assert_equal "image", tag.as
     assert_equal ({
@@ -32,13 +39,13 @@ class ContentTagsFilesTest < ActiveSupport::TestCase
     frag = comfy_cms_fragments(:file)
     frag.update_attribute(:tag, "files")
     frag.update_attribute(:files, fixture_file_upload("files/image.jpg", "image/jpeg"))
-    tag = ComfortableMexicanSofa::Content::Tag::Files.new(@page, frag.identifier)
+    tag = ComfortableMexicanSofa::Content::Tag::Files.new(context: @page, params: [frag.identifier])
     out = frag.attachments.map { |a| rails_blob_path(a, only_path: true) }.join(" ")
     assert_equal out, tag.content
   end
 
   def test_content_no_attachments
-    tag = ComfortableMexicanSofa::Content::Tag::Files.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Files.new(context: @page, params: ["test"])
     assert_equal "", tag.content
   end
 

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

@@ -7,7 +7,7 @@ class ContentTagsFragmentTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(@page, "content")
+    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(context: @page, params: ["content"])
     assert_equal @page,     tag.context
     assert_equal "content", tag.identifier
     assert_equal true,      tag.renderable
@@ -16,48 +16,52 @@ class ContentTagsFragmentTest < ActiveSupport::TestCase
 
   def test_init_with_params
     tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(
-      @page, "content, render: false, namespace: test"
+      context: @page,
+      params: ["content", { "render" => "false", "namespace" => "test" }]
     )
     assert_equal false,  tag.renderable
     assert_equal "test", tag.namespace
   end
 
   def test_init_without_identifier
-    message = "Missing identifier for fragment tag"
+    message = "Missing identifier for fragment tag: {{cms:markdown}}"
     assert_exception_raised ComfortableMexicanSofa::Content::Tag::Error, message do
-      ComfortableMexicanSofa::Content::Tag::Fragment.new(@page, "")
+      ComfortableMexicanSofa::Content::Tag::Fragment.new(context: @page, source: "{{cms:markdown}}")
     end
   end
 
   def test_fragment
-    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(@page, "content")
+    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(context: @page, params: ["content"])
     assert_equal comfy_cms_fragments(:default), tag.fragment
   end
 
   def test_fragment_new_record
-    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(@page, "new")
+    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(context: @page, params: ["new"])
     fragment = tag.fragment
     assert fragment.is_a?(Comfy::Cms::Fragment)
     assert fragment.new_record?
   end
 
   def test_content
-    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(@page, "content")
+    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(context: @page, params: ["content"])
     assert_equal "content", tag.content
   end
 
   def test_content_new_record
-    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(@page, "new")
+    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(context: @page, params: ["new"])
     assert_nil tag.content
   end
 
   def test_render
-    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(@page, "content")
+    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(context: @page, params: ["content"])
     assert_equal "content", tag.render
   end
 
   def test_render_when_not_renderable
-    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(@page, "content, render: false")
+    tag = ComfortableMexicanSofa::Content::Tag::Fragment.new(
+      context: @page,
+      params: ["content", { "render" => "false" }]
+    )
     assert_equal "", tag.render
   end
 

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

@@ -3,13 +3,16 @@ require_relative "../../../test_helper"
 class ContentTagsHelperTest < ActiveSupport::TestCase
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "helper_method")
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(context: @page, params: ["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")
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(
+      context: @page,
+      params: ["helper_method", "param", { "key" => "val" }]
+    )
     assert_equal "helper_method", tag.method_name
     assert_equal ["param", { "key" => "val" }], tag.params
   end
@@ -17,35 +20,41 @@ class ContentTagsHelperTest < ActiveSupport::TestCase
   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, "")
+      ComfortableMexicanSofa::Content::Tag::Helper.new(context: @page)
     end
   end
 
   def test_content
-    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "method_name, param, key: val")
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(
+      context: @page,
+      params: ["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")
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(
+      context: @page,
+      params: ["method_name", "param", { "key" => "val" }]
+    )
     assert_equal "<%= method_name(\"param\",{\"key\"=>\"val\"}) %>", tag.render
   end
 
   def test_render_with_whitelist
     ComfortableMexicanSofa.config.allowed_helpers = %i[tester eval]
-    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "tester")
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(context: @page, params: ["tester"])
     assert_equal "<%= tester() %>", tag.render
 
-    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "eval")
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(context: @page, params: ["eval"])
     assert_equal "<%= eval() %>", tag.render
 
-    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(@page, "not_whitelisted")
+    tag = ComfortableMexicanSofa::Content::Tag::Helper.new(context: @page, params: ["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)
+      tag = ComfortableMexicanSofa::Content::Tag::Helper.new(context: @page, params: [method])
       assert_nil tag.render
     end
   end

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

@@ -7,13 +7,13 @@ class ContentTagsMarkdownTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(context: @page, params: ["test"])
     assert_equal "test", tag.identifier
   end
 
   def test_content
     frag = comfy_cms_fragments(:default)
-    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(@page, frag.identifier)
+    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(context: @page, params: [frag.identifier])
     assert_equal frag,          tag.fragment
     assert_equal frag.content,  tag.content
   end
@@ -21,13 +21,16 @@ class ContentTagsMarkdownTest < ActiveSupport::TestCase
   def test_render
     frag = comfy_cms_fragments(:default)
     frag.update_column(:content, "**test**")
-    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(@page, frag.identifier)
+    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(context: @page, params: [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")
+    tag = ComfortableMexicanSofa::Content::Tag::Markdown.new(
+      context: @page,
+      params: [frag.identifier, { "render" => "false" }]
+    )
     assert_equal "", tag.render
   end
 

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

@@ -7,7 +7,7 @@ class ContentTagsNumberTest < ActiveSupport::TestCase
   end
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Number.new(@page, "test")
+    tag = ComfortableMexicanSofa::Content::Tag::Number.new(context: @page, params: ["test"])
     assert_equal "test", tag.identifier
   end
 

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

@@ -3,13 +3,19 @@ require_relative "../../../test_helper"
 class ContentTagsPartialTest < ActiveSupport::TestCase
 
   def test_init
-    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial")
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(
+      context: @page,
+      params: ["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")
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(
+      context: @page,
+      params: ["path/to/partial", { "key" => "val" }]
+    )
     assert_equal "path/to/partial", tag.path
     assert_equal ({ "key" => "val" }), tag.locals
   end
@@ -17,27 +23,42 @@ class ContentTagsPartialTest < ActiveSupport::TestCase
   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")
+      ComfortableMexicanSofa::Content::Tag::Partial.new(
+        context: @page,
+        params: [{ "key" => "val" }]
+      )
     end
   end
 
   def test_content
-    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial, key: val")
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(
+      context: @page,
+      params: ["path/to/partial", { "key" => "val" }]
+    )
     assert_equal "<%= render partial: \"path/to/partial\", locals: {\"key\"=>\"val\"} %>", tag.content
   end
 
   def test_render
-    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "path/to/partial, key: val")
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(
+      context: @page,
+      params: ["path/to/partial", { "key" => "val" }]
+    )
     assert_equal "<%= render partial: \"path/to/partial\", 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")
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(
+      context: @page,
+      params: ["path/to/partial"]
+    )
     assert_equal "", tag.render
 
-    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(@page, "safe/path")
+    tag = ComfortableMexicanSofa::Content::Tag::Partial.new(
+      context: @page,
+      params: ["safe/path"]
+    )
     assert_equal "<%= render partial: \"safe/path\", locals: {} %>", tag.render
   end