comfortable_mexican_sofa 1.12.11 → 2.0.0

data/test/integration/view_hooks_test.rb

@@ -1,26 +1,26 @@
 require_relative '../test_helper'
 
 class ViewHooksIntegrationTest < ActionDispatch::IntegrationTest
-  
+
   def teardown
     ComfortableMexicanSofa::ViewHooks.remove(:navigation)
   end
-  
+
   def test_hooks_rendering
     Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
     ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook')
-    
-    http_auth :get, comfy_admin_cms_sites_path
+
+    r :get, comfy_admin_cms_sites_path
     assert_response :success
     assert_match /hook_content/, response.body
   end
-  
+
   def test_hooks_rendering_with_multiples
     Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
     ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook')
     ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook_2')
-    
-    http_auth :get, comfy_admin_cms_sites_path
+
+    r :get, comfy_admin_cms_sites_path
     assert_response :success
     assert_match /hook_content/, response.body
     assert_match /<hook_content_2>/, response.body
@@ -30,18 +30,17 @@ class ViewHooksIntegrationTest < ActionDispatch::IntegrationTest
     Comfy::Admin::Cms::SitesController.append_view_path(File.expand_path('../fixtures/views', File.dirname(__FILE__)))
     ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook_2', 0)
     ComfortableMexicanSofa::ViewHooks.add(:navigation, '/nav_hook', 1)
-    
-    http_auth :get, comfy_admin_cms_sites_path
+
+    r :get, comfy_admin_cms_sites_path
     assert_response :success
     assert_match /<hook_content_2>hook_content/, response.body
   end
-  
+
   def test_hooks_rendering_with_no_hook
     ComfortableMexicanSofa::ViewHooks.remove(:navigation)
-    
-    http_auth :get, comfy_admin_cms_sites_path
+
+    r :get, comfy_admin_cms_sites_path
     assert_response :success
     assert_no_match /hook_content/, response.body
   end
-
 end

data/test/lib/configuration_test.rb

@@ -12,17 +12,16 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'ComfortableMexicanSofa::AccessControl::AdminAuthorization',   config.admin_authorization
     assert_equal 'ComfortableMexicanSofa::AccessControl::PublicAuthentication', config.public_auth
     assert_equal '', config.admin_route_redirect
-    assert_equal false, config.enable_fixtures
-    assert_equal File.expand_path('db/cms_fixtures', Rails.root), config.fixtures_path
+    assert_equal false, config.enable_seeds
+    assert_equal File.expand_path('db/cms_seeds', Rails.root), config.seeds_path
     assert_equal 25, config.revisions_limit
     assert_equal ({
       'en'    => 'English',
       'es'    => 'Español'
     }), config.locales
     assert_nil config.admin_locale
-    assert_equal ({}), config.upload_file_options
     assert_nil config.admin_cache_sweeper
-    assert_equal false, config.allow_irb
+    assert_equal false, config.allow_erb
     assert_nil config.allowed_helpers
     assert_nil config.allowed_partials
     assert_nil config.allowed_templates

data/test/lib/content/block_test.rb

@@ -0,0 +1,26 @@
+require_relative '../../test_helper'
+
+class ContentBlockTest < ActiveSupport::TestCase
+
+  class TestBlockTag < ComfortableMexicanSofa::Content::Block
+    # ...
+  end
+
+  setup do
+    ComfortableMexicanSofa::Content::Renderer.register_tag(:test_block, TestBlockTag)
+  end
+
+  teardown do
+    ComfortableMexicanSofa::Content::Renderer.tags.delete("test_block")
+  end
+
+  # -- Tests -------------------------------------------------------------------
+
+  def test_block_tag_nodes
+    block = TestBlockTag.new(nil, "")
+    assert_equal [], block.nodes
+    block.nodes << "text"
+    assert_equal ["text"], block.nodes
+  end
+
+end

data/test/lib/content/params_parser_test.rb

@@ -0,0 +1,125 @@
+require_relative '../../test_helper'
+
+class ContentParamsParserTest < ActiveSupport::TestCase
+
+  def test_tokenizer
+    tokens = ComfortableMexicanSofa::Content::ParamsParser.tokenize("param")
+    assert_equal [[:string, "param"]], tokens
+  end
+
+  def test_tokenizer_with_integer
+    tokens = ComfortableMexicanSofa::Content::ParamsParser.tokenize("123")
+    assert_equal [[:string, "123"]], tokens
+  end
+
+  def test_tokenizer_with_commas
+    tokens = ComfortableMexicanSofa::Content::ParamsParser.tokenize("param_a, param_b, param_c")
+    assert_equal [
+      [:string, "param_a"], [:comma, ","], [:string, "param_b"], [:comma, ","], [:string, "param_c"]
+    ], tokens
+  end
+
+  def test_tokenizer_with_columns
+    tokens = ComfortableMexicanSofa::Content::ParamsParser.tokenize("key: value")
+    assert_equal [[:string, "key"], [:column, ":"], [:string, "value"]], tokens
+  end
+
+  def test_tokenizer_with_quoted_value
+    tokens = ComfortableMexicanSofa::Content::ParamsParser.tokenize("key: ''")
+    assert_equal [[:string, "key"], [:column, ":"], [:string, ""]], tokens
+
+    tokens = ComfortableMexicanSofa::Content::ParamsParser.tokenize("key: 'test'")
+    assert_equal [[:string, "key"], [:column, ":"], [:string, "test"]], tokens
+
+    tokens = ComfortableMexicanSofa::Content::ParamsParser.tokenize("key: 'v1, v2: v3'")
+    assert_equal [[:string, "key"], [:column, ":"], [:string, "v1, v2: v3"]], tokens
+
+    tokens = ComfortableMexicanSofa::Content::ParamsParser.tokenize('key: "v1, v2: v3"')
+    assert_equal [[:string, "key"], [:column, ":"], [:string, 'v1, v2: v3']], tokens
+  end
+
+  def test_tokenizer_with_bad_input
+    message = "Unexpected char: %"
+    assert_exception_raised ComfortableMexicanSofa::Content::ParamsParser::Error, message do
+      ComfortableMexicanSofa::Content::ParamsParser.tokenize("%")
+    end
+  end
+
+  def test_slice
+    tokens = [[:string, "a"], [:comma, ","], [:string, "b"]]
+    token_groups = ComfortableMexicanSofa::Content::ParamsParser.slice(tokens)
+    assert_equal [[[:string, "a"]], [[:string, "b"]]], token_groups
+  end
+
+  def test_parameterize
+    token_groups = [[[:string, "a"]]]
+    params = ComfortableMexicanSofa::Content::ParamsParser.parameterize(token_groups)
+    assert_equal ["a"], params
+
+    token_groups = [[[:string, "a"], [:column, ":"], [:string, "b"]]]
+    params = ComfortableMexicanSofa::Content::ParamsParser.parameterize(token_groups)
+    assert_equal [{"a" => "b"}], params
+  end
+
+  def test_parameterize_with_bad_input
+    message = "Unexpected tokens found: [[:string, \"a\"], [:string, \"b\"]]"
+    token_groups = [[[:string, "a"], [:string, "b"]]]
+    assert_exception_raised ComfortableMexicanSofa::Content::ParamsParser::Error, message do
+      ComfortableMexicanSofa::Content::ParamsParser.parameterize(token_groups)
+    end
+  end
+
+  def test_collect_param_for_string!
+    params = []
+    ComfortableMexicanSofa::Content::ParamsParser.collect_param_for_string!(params, [:string, "a"])
+    assert_equal ["a"], params
+  end
+
+  def test_collect_param_for_string_with_bad_input
+    message = "Unexpected token: [:invalid, \"a\"]"
+    assert_exception_raised ComfortableMexicanSofa::Content::ParamsParser::Error, message do
+      ComfortableMexicanSofa::Content::ParamsParser.collect_param_for_string!([], [:invalid, "a"])
+    end
+  end
+
+  def test_collect_param_for_hash!
+    params = []
+    tokens = [[:string, "a"], [:column, ":"], [:string, "b"]]
+    ComfortableMexicanSofa::Content::ParamsParser.collect_param_for_hash!(params, tokens)
+    assert_equal [{"a" => "b"}], params
+  end
+
+  def test_collect_param_for_hash_with_trailing_hash
+    params = ["x", {"y" => "z"}]
+    tokens = [[:string, "a"], [:column, ":"], [:string, "b"]]
+    ComfortableMexicanSofa::Content::ParamsParser.collect_param_for_hash!(params, tokens)
+    assert_equal ["x", {"y" => "z", "a" => "b"}], params
+  end
+
+  def test_collect_param_for_hash_with_trailing_param
+    params = ["x", {"y" => "z"}, "k"]
+    tokens = [[:string, "a"], [:column, ":"], [:string, "b"]]
+    ComfortableMexicanSofa::Content::ParamsParser.collect_param_for_hash!(params, tokens)
+    assert_equal ["x", {"y" => "z"}, "k", {"a" => "b"}], params
+  end
+
+  def test_collect_param_for_hash_with_bad_input
+    message = "Unexpected tokens: [[:string, \"a\"], [:invalid, \":\"], [:string, \"b\"]]"
+    assert_exception_raised ComfortableMexicanSofa::Content::ParamsParser::Error, message do
+      tokens = [[:string, "a"], [:invalid, ":"], [:string, "b"]]
+      ComfortableMexicanSofa::Content::ParamsParser.collect_param_for_hash!([], tokens)
+    end
+  end
+
+  def test_parse
+    text = "param_a, param_b, key_a: val_a, key_b: val_b, param_c, key_c: val_c"
+    params = ComfortableMexicanSofa::Content::ParamsParser.parse(text)
+    assert_equal [
+      "param_a",
+      "param_b",
+      {"key_a" => "val_a", "key_b" => "val_b"},
+      "param_c",
+      {"key_c" => "val_c"}
+    ], params
+  end
+end

data/test/lib/content/renderer_test.rb

@@ -0,0 +1,240 @@
+require_relative '../../test_helper'
+
+class ContentRendererTest < ActiveSupport::TestCase
+
+  class TestTag < ComfortableMexicanSofa::Content::Tag
+    def content
+      "test tag content"
+    end
+  end
+
+  class TestNestedTag < ComfortableMexicanSofa::Content::Tag
+    def content
+      "test {{cms:test}} content"
+    end
+  end
+
+  class TestBlockTag < ComfortableMexicanSofa::Content::Block
+    # ...
+  end
+
+  DEFAULT_REGISTERED_TAGS = {
+    "wysiwyg"   => ComfortableMexicanSofa::Content::Tag::Wysiwyg,
+    "text"      => ComfortableMexicanSofa::Content::Tag::Text,
+    "textarea"  => ComfortableMexicanSofa::Content::Tag::TextArea,
+    "markdown"  => ComfortableMexicanSofa::Content::Tag::Markdown,
+    "datetime"  => ComfortableMexicanSofa::Content::Tag::Datetime,
+    "date"      => ComfortableMexicanSofa::Content::Tag::Date,
+    "number"    => ComfortableMexicanSofa::Content::Tag::Number,
+    "checkbox"  => ComfortableMexicanSofa::Content::Tag::Checkbox,
+    "file"      => ComfortableMexicanSofa::Content::Tag::File,
+    "files"     => ComfortableMexicanSofa::Content::Tag::Files,
+    "snippet"   => ComfortableMexicanSofa::Content::Tag::Snippet,
+    "asset"     => ComfortableMexicanSofa::Content::Tag::Asset,
+    "file_link" => ComfortableMexicanSofa::Content::Tag::FileLink,
+    "helper"    => ComfortableMexicanSofa::Content::Tag::Helper,
+    "partial"   => ComfortableMexicanSofa::Content::Tag::Partial,
+    "template"  => ComfortableMexicanSofa::Content::Tag::Template
+  }.freeze
+
+  setup do
+    @template = ComfortableMexicanSofa::Content::Renderer.new(comfy_cms_pages(:default))
+
+    ComfortableMexicanSofa::Content::Renderer.register_tag(:test, TestTag)
+    ComfortableMexicanSofa::Content::Renderer.register_tag(:test_nested, TestNestedTag)
+    ComfortableMexicanSofa::Content::Renderer.register_tag(:test_block, TestBlockTag)
+  end
+
+  teardown do
+    ComfortableMexicanSofa::Content::Renderer.tags.delete("test")
+    ComfortableMexicanSofa::Content::Renderer.tags.delete("test_nested")
+    ComfortableMexicanSofa::Content::Renderer.tags.delete("test_block")
+  end
+
+  # Test helper so we don't have to do this each time
+  def render_string(string, template = @template)
+    tokens = @template.tokenize(string)
+    nodes  = @template.nodes(tokens)
+    @template.render(nodes)
+  end
+
+  # -- Tests -------------------------------------------------------------------
+
+  def test_tags
+    assert_equal (DEFAULT_REGISTERED_TAGS.merge(
+      "test"        => ContentRendererTest::TestTag,
+      "test_nested" => ContentRendererTest::TestNestedTag,
+      "test_block"  => ContentRendererTest::TestBlockTag
+    )), ComfortableMexicanSofa::Content::Renderer.tags
+  end
+
+  def test_register_tags
+    ComfortableMexicanSofa::Content::Renderer.register_tag(:other, TestTag)
+    assert_equal (DEFAULT_REGISTERED_TAGS.merge(
+      "test"        => ContentRendererTest::TestTag,
+      "test_nested" => ContentRendererTest::TestNestedTag,
+      "test_block"  => ContentRendererTest::TestBlockTag,
+      "other"       => ContentRendererTest::TestTag
+    )), ComfortableMexicanSofa::Content::Renderer.tags
+  ensure
+    ComfortableMexicanSofa::Content::Renderer.tags.delete("other")
+  end
+
+  def test_tokenize
+    assert_equal ["test text"], @template.tokenize("test text")
+  end
+
+  def test_tokenize_with_tag
+    assert_equal ["test ", {tag_class: "tag", tag_params: ""}, " text"],
+      @template.tokenize("test {{cms:tag}} text")
+  end
+
+  def test_tokenize_with_tag_and_params
+    assert_equal ["test ", {tag_class: "tag", tag_params: "name, key:val"}, " text"],
+      @template.tokenize("test {{cms:tag name, key:val}} text")
+  end
+
+  def test_tokenize_with_invalid_tag
+    assert_equal ["test {{abc:tag}} text"],
+      @template.tokenize("test {{abc:tag}} text")
+  end
+
+  def test_tokenize_with_newlines
+    assert_equal [{tag_class: "test", tag_params: ""}, "\n", {tag_class: "test", tag_params: ""}],
+      @template.tokenize("{{cms:test}}\n{{cms:test}}")
+  end
+
+  def test_nodes
+    tokens = @template.tokenize("test")
+    nodes = @template.nodes(tokens)
+    assert_equal ["test"], nodes
+  end
+
+  def test_nodes_with_tags
+    tokens = @template.tokenize("test {{cms:test}} content {{cms:test}}")
+    nodes = @template.nodes(tokens)
+    assert_equal 4, nodes.count
+    assert_equal "test ", nodes[0]
+    assert nodes[1].is_a?(ContentRendererTest::TestTag)
+    assert_equal " content ", nodes[2]
+    assert nodes[3].is_a?(ContentRendererTest::TestTag)
+  end
+
+  def test_nodes_with_block_tag
+    string = "a {{cms:test_block}} b {{cms:end}} c"
+    tokens = @template.tokenize(string)
+    nodes = @template.nodes(tokens)
+    assert_equal 3, nodes.count
+
+    assert_equal "a ", nodes[0]
+    assert_equal " c", nodes[2]
+
+    block = nodes[1]
+    assert block.is_a?(ContentRendererTest::TestBlockTag)
+    assert_equal [" b "], block.nodes
+  end
+
+  def test_nodes_with_block_tag_and_tag
+    string = "a {{cms:test_block}} b {{cms:test}} c {{cms:end}} d"
+    tokens = @template.tokenize(string)
+    nodes = @template.nodes(tokens)
+    assert_equal 3, nodes.count
+    assert_equal "a ", nodes[0]
+    assert_equal " d", nodes[2]
+
+    block = nodes[1]
+    assert block.is_a?(ContentRendererTest::TestBlockTag)
+    assert_equal 3, block.nodes.count
+    assert_equal " b ", block.nodes[0]
+    assert_equal " c ", block.nodes[2]
+
+    tag = block.nodes[1]
+    assert tag.is_a?(ContentRendererTest::TestTag)
+    assert_equal ["test tag content"], tag.nodes
+  end
+
+  def test_nodes_with_nested_block_tag
+    string = "a {{cms:test_block}} b {{cms:test_block}} c {{cms:end}} d {{cms:end}} e"
+    tokens = @template.tokenize(string)
+    nodes = @template.nodes(tokens)
+    assert_equal 3, nodes.count
+    assert_equal "a ", nodes[0]
+    assert_equal " e", nodes[2]
+
+    block = nodes[1]
+    assert block.is_a?(ContentRendererTest::TestBlockTag)
+    assert_equal 3, block.nodes.count
+    assert_equal " b ", block.nodes[0]
+    assert_equal " d ", block.nodes[2]
+
+    block = block.nodes[1]
+    assert_equal [" c "], block.nodes
+  end
+
+  def test_nodes_with_unclosed_block_tag
+    string = "a {{cms:test_block}} b"
+    tokens = @template.tokenize(string)
+    assert_exception_raised ComfortableMexicanSofa::Content::Renderer::SyntaxError, "unclosed block detected" do
+      @template.nodes(tokens)
+    end
+  end
+
+  def test_nodes_with_closed_tag
+    string = "a {{cms:end}} b"
+    tokens = @template.tokenize(string)
+    assert_exception_raised ComfortableMexicanSofa::Content::Renderer::SyntaxError, "closing unopened block" do
+      @template.nodes(tokens)
+    end
+  end
+
+  def test_sanitize_erb
+    out = @template.sanitize_erb("<% test %>", false)
+    assert_equal "&lt;% test %&gt;", out
+
+    out = @template.sanitize_erb("<% test %>", true)
+    assert_equal "<% test %>", out
+  end
+
+  def test_render
+    out = render_string("test")
+    assert_equal "test", out
+  end
+
+  def test_render_with_tag
+    out = render_string("a {{cms:text content}} z")
+    assert_equal "a content z", out
+  end
+
+  def test_render_with_erb
+    out = render_string("<%= 1 + 1 %>")
+    assert_equal "&lt;%= 1 + 1 %&gt;", out
+  end
+
+  def test_render_with_erb_allowed
+    ComfortableMexicanSofa.config.allow_erb = true
+    out = render_string("<%= 1 + 1 %>")
+    assert_equal "<%= 1 + 1 %>", out
+  end
+
+  def test_render_with_erb_allowed_via_tag
+    out = render_string("{{cms:partial path}}")
+    assert_equal "<%= render partial: '@path', locals: {} %>", out
+  end
+
+  def test_render_with_nested_tag
+    string = "a {{cms:text content}} b"
+    comfy_cms_fragments(:default).update_column(:content, "c {{cms:snippet default}} d")
+    comfy_cms_snippets(:default).update_column(:content, "e {{cms:helper test}} f")
+    out = render_string(string)
+    assert_equal "a c e <%= test() %> f d b", out
+  end
+
+  def test_render_stack_overflow
+    # making self-referencing content loop here
+    comfy_cms_snippets(:default).update_column(:content, "a {{cms:snippet default}} b")
+    message = "Deep tag nesting or recursive nesting detected"
+    assert_exception_raised ComfortableMexicanSofa::Content::Renderer::Error, message do
+      render_string("{{cms:snippet default}}")
+    end
+  end
+end