card 1.16.15 → 1.17.0

data/spec/lib/card/content_spec.rb

@@ -3,105 +3,149 @@ require 'card/content'
 
 EXAMPLES = {
   nests: {
-    content:        [
-        "Some Literals: \\[{I'm not| a link]}, and ",
-        "\\{{This Card|Is not Included}}",
-        ", but ",
-        "{{this is}}",
-        ", and some tail"
-      ].join(''),
-    rendered:       [
-        "Some Literals: \\[{I'm not| a link]}, and ",
-        "<span>{</span>{This Card|Is not Included}}",
-        ", but ",
-        {options: {inc_name: "this is",inc_syntax: "this is"}},
-        ", and some tail"
-      ],
-    classes: [String, :EscapedLiteral, String, :Include, String ]
+    content: "Some Literals: \\[{I'm not| a link]}, and " \
+                '\\{{This Card|Is not Included}}' \
+                ', but ' \
+                '{{this is}}' \
+                ', and some tail',
+    rendered: ["Some Literals: \\[{I'm not| a link]}, and ",
+               '<span>{</span>{This Card|Is not Included}}',
+               ', but ',
+               { options: { inc_name: 'this is',
+                            inc_syntax: 'this is'
+                          }
+               },
+               ', and some tail'
+              ],
+    classes: [String, :EscapedLiteral, String, :Include, String]
   },
 
   links_and_nests: {
-    content: %(Some Links and includes: [[the card|the text]], and {{This Card|Is Included}}{{this too}}
-        and [[http://external.wagn.org/path|link text]]{{Included|open}}),
-    rendered:       [
-        "Some Links and includes: ",
-        "<a class=\"wanted-card\" href=\"/the_card?card%5Bname%5D=the+card\">the text</a>",
-        ", and ",
-        { options: { view: "Is Included", inc_name: "This Card", inc_syntax: "This Card|Is Included"}},
-        { options: { inc_name: "this too", inc_syntax: "this too"}},
-        "\n        and ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://external.wagn.org/path\">link text</a>",
-        { options: { view: "open", inc_name: "Included", inc_syntax: "Included|open" }}
-      ],
-    classes: [String, :Link, String, :Include, :Include, String, :Link, :Include ]
+    content: 'Some Links and includes: [[the card|the text]], ' \
+               'and {{This Card|Is Included}}{{this too}} ' \
+               'and [[http://external.wagn.org/path|link text]]' \
+               '{{Included|open}}',
+    rendered: ['Some Links and includes: ',
+               '<a class="wanted-card" ' \
+                 'href="/the_card?card%5Bname%5D=the+card">' \
+                 'the text</a>',
+               ', and ',
+               { options: { view: 'Is Included',
+                            inc_name: 'This Card',
+                            inc_syntax: 'This Card|Is Included'
+                          }
+               },
+               { options: { inc_name: 'this too',
+                            inc_syntax: 'this too'
+                          }
+               },
+               ' and ',
+               '<a target="_blank" class="external-link" ' \
+               'href="http://external.wagn.org/path">link text</a>',
+               { options: { view: 'open',
+                            inc_name: 'Included',
+                            inc_syntax: 'Included|open'
+                          }
+               }
+              ],
+    classes: [
+      String, :Link, String, :Include, :Include, String, :Link, :Include
+    ]
   },
 
   uris_and_links: {
-    content: %(Some URIs and Links: http://a.url.com/
-        More urls: wagn.com/a/path/to.html
-        http://localhost:2020/path?cgi=foo&bar=baz  [[http://brain.org/Home|extra]]
-        [ http://gerry.wagn.com/a/path ]
-        { https://brain.org/more?args }),
-    rendered:       [
-        "Some URIs and Links: ", '<a target="_blank" class="external-link" href="http://a.url.com/">http://a.url.com/</a>',
-        "\n        More urls: ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://wagn.com/a/path/to.html\">wagn.com/a/path/to.html</a>",
-        "\n        ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://localhost:2020/path?cgi=foo&amp;bar=baz\">http://localhost:2020/path?cgi=foo&bar=baz</a>",
-        "  ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://brain.org/Home\">extra</a>",
-        "\n        [ ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://gerry.wagn.com/a/path\">http://gerry.wagn.com/a/path</a>",
-        " ]\n        { ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"https://brain.org/more?args\">https://brain.org/more?args</a>",
-        " }"
-      ],
-    text_rendered:       [
-         "Some URIs and Links: ", 'http://a.url.com/',
-         "\n        More urls: ",
-         "wagn.com/a/path/to.html[http://wagn.com/a/path/to.html]",
-         "\n        ",
-         "http://localhost:2020/path?cgi=foo&bar=baz",
-         "  ",
-         "extra[http://brain.org/Home]",
-         "\n        [ ",
-         "http://gerry.wagn.com/a/path",
-         " ]\n        { ",
-         "https://brain.org/more?args",
-         " }"
-       ],
-    classes: [String, :URI, String, :HostURI, String, :URI, String, :Link, String, :URI, String, :URI, String ]
+    content: 'Some URIs and Links: http://a.url.com/ ' \
+               'More urls: wagn.com/a/path/to.html ' \
+               'http://localhost:2020/path?cgi=foo&bar=baz ' \
+               '[[http://brain.org/Home|extra]] ' \
+               '[ http://gerry.wagn.com/a/path ] ' \
+               '{ https://brain.org/more?args } ',
+    rendered: ['Some URIs and Links: ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://a.url.com/">http://a.url.com/</a>',
+               ' More urls: ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://wagn.com/a/path/to.html">' \
+                 'wagn.com/a/path/to.html</a>',
+               ' ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://localhost:2020/path?cgi=foo&amp;bar=baz">' \
+                 'http://localhost:2020/path?cgi=foo&bar=baz</a>',
+               ' ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://brain.org/Home">extra</a>',
+               ' [ ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://gerry.wagn.com/a/path">' \
+                 'http://gerry.wagn.com/a/path</a>',
+               ' ] { ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="https://brain.org/more?args">' \
+                 'https://brain.org/more?args</a>',
+               ' } '
+              ],
+    text_rendered: ['Some URIs and Links: ', 'http://a.url.com/',
+                    ' More urls: ',
+                    'wagn.com/a/path/to.html[http://wagn.com/a/path/to.html]',
+                    ' ',
+                    'http://localhost:2020/path?cgi=foo&bar=baz',
+                    ' ',
+                    'extra[http://brain.org/Home]',
+                    ' [ ',
+                    'http://gerry.wagn.com/a/path',
+                    ' ] { ',
+                    'https://brain.org/more?args',
+                    ' } '
+                   ],
+    classes: [
+      String, :URI, String, :HostURI, String, :URI, String, :Link,
+      String, :URI, String, :URI, String
+    ]
   },
 
   uris_and_links_2: {
-    content: %(Some URIs and Links: http://a.url.com
-        More urls: wagn.com/a/path/to.html
-        [ http://gerry.wagn.com/a/path ]
-        { https://brain.org/more?args }
-        http://localhost:2020/path?cgi=foo&bar=baz  [[http://brain.org/Home|extra]]),
-    rendered:       [
-        "Some URIs and Links: ","<a target=\"_blank\" class=\"external-link\" href=\"http://a.url.com\">http://a.url.com</a>",
-        "\n        More urls: ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://wagn.com/a/path/to.html\">wagn.com/a/path/to.html</a>",
-        "\n        [ ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://gerry.wagn.com/a/path\">http://gerry.wagn.com/a/path</a>",
-        " ]\n        { ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"https://brain.org/more?args\">https://brain.org/more?args</a>",
-        " }\n        ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://localhost:2020/path?cgi=foo&amp;bar=baz\">http://localhost:2020/path?cgi=foo&bar=baz</a>",
-        "  ",
-        "<a target=\"_blank\" class=\"external-link\" href=\"http://brain.org/Home\">extra</a>"
-      ],
-    classes:  [String, :URI, String, :HostURI, String, :URI, String, :URI, String, :URI, String, :Link ]
+    content: 'Some URIs and Links: http://a.url.com ' \
+               'More urls: wagn.com/a/path/to.html ' \
+               '[ http://gerry.wagn.com/a/path ] ' \
+               '{ https://brain.org/more?args } ' \
+               'http://localhost:2020/path?cgi=foo&bar=baz ' \
+               '[[http://brain.org/Home|extra]]',
+    rendered: ['Some URIs and Links: ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://a.url.com">http://a.url.com</a>',
+               ' More urls: ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://wagn.com/a/path/to.html">' \
+                 'wagn.com/a/path/to.html</a>',
+               ' [ ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://gerry.wagn.com/a/path">' \
+                 'http://gerry.wagn.com/a/path</a>',
+               ' ] { ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="https://brain.org/more?args">' \
+                 'https://brain.org/more?args</a>',
+               ' } ',
+               '<a target="_blank" class="external-link" ' \
+                 'href="http://localhost:2020/path?cgi=foo&amp;bar=baz">' \
+                 'http://localhost:2020/path?cgi=foo&bar=baz</a>',
+               ' ',
+               '<a target="_blank" class="external-link" ' \
+               'href="http://brain.org/Home">extra</a>'
+              ],
+    classes:  [
+      String, :URI, String, :HostURI, String, :URI, String, :URI, String, :URI,
+      String, :Link
+    ]
   },
 
   no_chunks: {
-    content: "No chunks",
-    rendered: "No chunks"
+    content: 'No chunks',
+    rendered: 'No chunks'
   },
 
   single_nest: {
-    content: "{{one inclusion|size;large}}",
+    content: '{{one inclusion|size;large}}',
     classes: [:Include]
   },
 
@@ -137,8 +181,7 @@ EXAMPLES = {
   }
 }
 
-
-EXAMPLES.each do |key, val|
+EXAMPLES.each_value do |val|
   if val[:classes]
     val[:classes] = val[:classes].map do |klass|
       Class === klass ? klass : Card::Chunk.const_get(klass)
@@ -146,26 +189,32 @@ EXAMPLES.each do |key, val|
   end
 end
 
-
 describe Card::Content do
-  context "instance" do
-
+  context 'instance' do
     before do
       @check_proc = Proc.new do |m, v|
-        if Array===m
+        if Array === m
           wrong_class = m[0] != v.class
-          is_last = m.size == 1
-          #warn "check M[#{is_last}]:#{wrong_class}, #{m[0]}, V#{v.inspect}" if wrong_class || is_last
           expect(wrong_class).to be_falsey
-          wrong_class ? false : ( is_last ? true : m[1..-1] )
-        else false end
+          is_last = m.size == 1
+          if !wrong_class
+            is_last ? true : m[1..-1]
+          end
+        end
       end
 
-      assert card = Card["One"]
+      assert card = Card['One']
       @card = card
 
       # non-nil valued opts only ...
-      @render_block =  Proc.new do |opts| {options: opts.inject({}) {|i,v| !v[1].nil? && i[v[0]]=v[1]; i } } end
+      @render_block = Proc.new do |opts|
+        options = opts.inject({}) do |i, v|
+          if !v[1].nil? && (i[v[0]] = v[1])
+            i
+          end
+        end
+        { options: options }
+      end
     end
 
     let(:example)       { EXAMPLES[@example] }
@@ -178,132 +227,165 @@ describe Card::Content do
     describe 'parse' do
       def check_chunk_classes
         expect(cobj.inject(classes, &@check_proc)).to eq(true)
-        clist = classes.find_all {|c| String != c }
+        clist = classes.select { |c| String != c }
         cobj.each_chunk do |chk|
           expect(chk).to be_instance_of clist.shift
         end
         expect(clist).to be_empty
       end
 
-      it "finds all the chunks and strings" do
+      it 'finds all the chunks and strings' do
         # note the mixed [} that are considered matching, needs some cleanup ...
         @example = :nests
         expect(cobj.inject(classes, &@check_proc)).to eq(true)
       end
 
-      it "gives just the chunks" do
+      it 'gives just the chunks' do
         @example = :nests
         check_chunk_classes
       end
 
-      it "finds all the chunks links and trasclusions" do
+      it 'finds all the chunks links and trasclusions' do
         @example = :links_and_nests
         expect(cobj.inject(classes, &@check_proc)).to eq(true)
       end
 
-      it "finds uri chunks " do
-        # tried some tougher cases that failed, don't know the spec, so hard to form better tests for URIs here
+      it 'finds uri chunks ' do
+        # tried some tougher cases that failed, don't know the spec, so
+        # hard to form better tests for URIs here
         @example = :uris_and_links
         check_chunk_classes
       end
 
-      it "finds uri chunks (b)" do
-        # tried some tougher cases that failed, don't know the spec, so hard to form better tests for URIs here
+      it 'finds uri chunks (b)' do
+        # tried some tougher cases that failed, don't know the spec, so
+        # hard to form better tests for URIs here
         @example = :uris_and_links_2
         check_chunk_classes
       end
 
-      it "parses just a string" do
+      it 'parses just a string' do
         @example = :no_chunks
         expect(cobj).to eq(rendered)
       end
 
-      it "parses a single chunk" do
+      it 'parses a single chunk' do
         @example = :single_nest
         check_chunk_classes
       end
 
-      it "leaves css alone" do
+      it 'leaves css alone' do
         @example = :css
         expect(cobj).to eq(content)
       end
     end
 
-    describe "render" do
-      it "renders all nests" do
+    describe 'render' do
+      it 'renders all nests' do
         @example = :nests
         expect(cobj.as_json.to_s).to match /not rendered/
-        cobj.process_content_object &@render_block
-        expect(rdr=cobj.as_json.to_json).not_to match /not rendered/
+        cobj.process_each_chunk &@render_block
+        rdr = cobj.as_json.to_json
+        expect(rdr).not_to match /not rendered/
         expect(rdr).to eq(rendered.to_json)
       end
 
-      it "renders links and nests" do
+      it 'renders links and nests' do
         @example = :links_and_nests
-        cobj.process_content_object &@render_block
-        expect(rdr=cobj.as_json.to_json).not_to match /not rendered/
+        cobj.process_each_chunk &@render_block
+        rdr = cobj.as_json.to_json
+        expect(rdr).not_to match /not rendered/
         expect(rdr).to eq(rendered.to_json)
       end
 
-      it "renders links correctly for text formatters" do
+      it 'renders links correctly for text formatters' do
         @example = :uris_and_links
         card2 = Card[@card.id]
         format = card2.format format: :text
         cobj = Card::Content.new content, format
-        cobj.process_content_object &@render_block
+        cobj.process_each_chunk &@render_block
         expect(cobj.as_json.to_json).to eq(text_rendered.to_json)
       end
 
-      it "does not need rendering if no nests" do
+      it 'does not need rendering if no nests' do
         @example = :uris_and_links
-        cobj.process_content_object &@render_block
+        cobj.process_each_chunk &@render_block
         expect(cobj.as_json.to_json).to eq(rendered.to_json)
       end
 
-      it "does not need rendering if no nests (b)" do
+      it 'does not need rendering if no nests (b)' do
         @example = :uris_and_links_2
-        expect(rdr=cobj.as_json.to_json).to match /not rendered/ # links are rendered too, but not with a block
-        cobj.process_content_object &@render_block
-        expect(rdr=cobj.as_json.to_json).not_to match /not rendered/
-        expect(rdr).to eq(rendered.to_json)
+        rdr1 = cobj.as_json.to_json
+        expect(rdr1).to match /not rendered/
+        # links are rendered too, but not with a block
+        cobj.process_each_chunk &@render_block
+        rdr2 = cobj.as_json.to_json
+        expect(rdr2).not_to match /not rendered/
+        expect(rdr2).to eq(rendered.to_json)
       end
     end
   end
 
-  UNTAGGED_CASES = [ ' [grrew][/wiki/grrew]ss ', ' {{this is a test}}, {{this|view|is:too}} and',
-    ' so is http://foo.bar.come//', ' and foo="my attr, not int a tag" <not a=tag ', ' p class"foobar"> and more' ]
+  UNTAGGED_CASES = [' [grrew][/wiki/grrew]ss ',
+                    ' {{this is a test}}, {{this|view|is:too}} and',
+                    ' so is http://foo.bar.come//',
+                    ' and foo="my attr, not int a tag" <not a=tag ',
+                    ' p class"foobar"> and more'
+                   ]
 
-  context "class" do
+  context 'class' do
     describe '#clean!' do
       it 'should not alter untagged content' do
         UNTAGGED_CASES.each do |test_case|
-          assert_equal test_case,Card::Content.clean!(test_case)
+          assert_equal test_case, Card::Content.clean!(test_case)
         end
       end
 
       it 'should strip disallowed html class attributes' do
-        assert_equal '<p>html<div>with</div> funky tags</p>', Card::Content.clean!('<p>html<div class="boo">with</div><monkey>funky</butts>tags</p>')
-        assert_equal '<span>foo</span>', Card::Content.clean!('<span class="banana">foo</span>')
+        assert_equal '<p>html<div>with</div> funky tags</p>',
+                     Card::Content.clean!(
+                       '<p>html<div class="boo">with</div>' \
+                       '<monkey>funky</butts>tags</p>'
+                     )
+        assert_equal '<span>foo</span>',
+                     Card::Content.clean!('<span class="banana">foo</span>')
       end
 
       it 'should not strip permitted_classes' do
-        assert_equal '<span class="w-spotlight">foo</span>', Card::Content.clean!('<span class="w-spotlight">foo</span>')
-        assert_equal '<p class="w-highlight w-ok">foo</p>', Card::Content.clean!('<p class="w-highlight w-ok">foo</p>')
+        has_stripped1 = '<span class="w-spotlight">foo</span>'
+        assert_equal has_stripped1,
+                     Card::Content.clean!(has_stripped1)
+        has_stripped2 = '<p class="w-highlight w-ok">foo</p>'
+        assert_equal has_stripped2,
+                     Card::Content.clean!(has_stripped2)
       end
 
-      it 'should strip permitted_classes but not permitted ones when both are present' do
-        assert_equal "<span class='w-spotlight w-ok'>foo</span>", Card::Content.clean!("<span class='w-spotlight banana w-ok'>foo</span>")
-        assert_equal '<p class="w-highlight">foo</p>', Card::Content.clean!('<p class="w-highlight bad-at end">foo</p>')
-        assert_equal '<p class="w-highlight">foo</p>', Card::Content.clean!('<p class="bad-class w-highlight">foo</p>')
+      it 'should strip permitted_classes ' \
+            'but not permitted ones when both are present' do
+        assert_equal '<span class="w-spotlight w-ok">foo</span>',
+                     Card::Content.clean!(
+                       '<span class="w-spotlight banana w-ok">foo</span>'
+                     )
+        assert_equal '<p class="w-highlight">foo</p>',
+                     Card::Content.clean!(
+                       '<p class="w-highlight bad-at end">foo</p>'
+                     )
+        assert_equal '<p class="w-highlight">foo</p>',
+                     Card::Content.clean!(
+                       '<p class="bad-class w-highlight">foo</p>'
+                     )
       end
 
       it 'should allow permitted attributes' do
-        assert_equal '<img src="foo">',   Card::Content.clean!('<img src="foo">')
-        assert_equal "<img alt='foo'>",   Card::Content.clean!("<img alt='foo'>")
-        assert_equal '<img title="foo">', Card::Content.clean!('<img title=foo>')
-        assert_equal '<a href="foo">',    Card::Content.clean!('<a href="foo">')
-        assert_equal '<code lang="foo">', Card::Content.clean!('<code lang="foo">')
-        assert_equal '<blockquote cite="foo">', Card::Content.clean!('<blockquote cite="foo">')
+        assert_equal '<img src="foo">', Card::Content.clean!('<img src="foo">')
+        assert_equal "<img alt='foo'>", Card::Content.clean!("<img alt='foo'>")
+        assert_equal '<img title="foo">',
+                     Card::Content.clean!('<img title=foo>')
+        assert_equal '<a href="foo">', Card::Content.clean!('<a href="foo">')
+        assert_equal '<code lang="foo">',
+                     Card::Content.clean!('<code lang="foo">')
+        assert_equal '<blockquote cite="foo">',
+                     Card::Content.clean!('<blockquote cite="foo">')
       end
 
       it 'should not allow nonpermitted attributes' do
@@ -313,23 +395,27 @@ describe Card::Content do
 
       it 'should remove comments' do
         assert_equal 'yo', Card::Content.clean!('<!-- not me -->yo')
-        assert_equal 'joe', Card::Content.clean!('<!-- not me -->joe<!-- not me -->')
+        assert_equal 'joe',
+                     Card::Content.clean!('<!-- not me -->joe<!-- not me -->')
       end
 
       it 'fixes regular nbsp order by default' do
         assert_equal 'space&nbsp; test&nbsp; two&nbsp;&nbsp; space',
-                      Card::Content.clean!('space&nbsp; test &nbsp;two &nbsp;&nbsp;space')
+                     Card::Content.clean!(
+                       'space&nbsp; test &nbsp;two &nbsp;&nbsp;space'
+                     )
       end
 
-      it 'doesn\'t fix regular nbsp order with setting' do
-        # manually configure this setting, then make this one live (test above will then fail)
-        pending "Can't set Card.config.space_last_in_multispace= false for one test"
+      it "doesn't fix regular nbsp order with setting" do
+        # manually configure this setting, then make this one live
+        # (test above will then fail)
+        pending "Can't set Card.config.space_last_in_multispace= false "\
+                'for one test'
         assert_equal 'space&nbsp; test &nbsp;two &nbsp;&nbsp;space',
-                      Card::Content.clean!('space&nbsp; test &nbsp;two &nbsp;&nbsp;space')
+                     Card::Content.clean!(
+                       'space&nbsp; test &nbsp;two &nbsp;&nbsp;space'
+                     )
       end
     end
   end
-
-
 end
-