smartdown 0.11.4 → 0.12.0

data/spec/engine_spec.rb

@@ -12,7 +12,7 @@ describe Smartdown::Engine do
     build_flow("check-uk-visa") do
       node("check-uk-visa") do
         heading("Check uk visa")
-        paragraph("This is the paragraph")
+        line("This is the paragraph")
         start_button("passport_question")
       end
 
@@ -39,16 +39,16 @@ describe Smartdown::Engine do
         conditional do
           named_predicate "pred?"
           true_case do
-            paragraph("True case")
+            line("True case")
           end
           false_case do
-            paragraph("False case")
+            line("False case")
           end
         end
       end
 
       node("outcome_with_interpolation") do
-        paragraph("The answer is %{interpolated_variable}")
+        line("The answer is %{interpolated_variable}")
       end
     end
   }
@@ -56,7 +56,7 @@ describe Smartdown::Engine do
     build_flow("check-uk-visa") do
       node("check-uk-visa") do
         heading("Check uk visa")
-        paragraph("This is the paragraph")
+        line("This is the paragraph")
         start_button("passport_question")
       end
 
@@ -115,24 +115,24 @@ describe Smartdown::Engine do
         conditional do
           named_predicate "pred?"
           true_case do
-            paragraph("True case")
+            line("True case")
           end
           false_case do
-            paragraph("False case")
+            line("False case")
           end
         end
       end
 
       node("outcome_imaginary_country") do
-        paragraph("Imaginary country")
+        line("Imaginary country")
       end
 
       node("outcome_with_interpolation") do
-        paragraph("The answer is %{interpolated_variable}")
+        line("The answer is %{interpolated_variable}")
       end
 
       node("outcome_passport_colour_specified") do
-        paragraph("What a pretty passport")
+        line("What a pretty passport")
       end
     end
   }
@@ -297,7 +297,7 @@ describe Smartdown::Engine do
 
       let(:expected_node_after_conditional_resolution) {
         model_builder.node("outcome_no_visa_needed") do
-          paragraph("True case")
+          line("True case")
         end
       }
 
@@ -315,7 +315,7 @@ describe Smartdown::Engine do
 
       let(:expected_node_after_conditional_resolution) {
         model_builder.node("outcome_with_interpolation") do
-          paragraph("The answer is 42")
+          line("The answer is 42")
         end
       }
 

data/spec/fixtures/acceptance/animal-example-multiple/animal-example-multiple.txt

@@ -1,6 +1,8 @@
+---
 meta_description: Animals eh?
 satisfies_need: 100982
 status: draft
+---
 
 # A simple example of smartdown
 

data/spec/fixtures/acceptance/animal-example-simple/animal-example-simple.txt

@@ -1,6 +1,8 @@
+---
 meta_description: Animals eh?
 satisfies_need: 100982
 status: draft
+---
 
 # A simple example of smartdown
 

data/spec/fixtures/acceptance/cover-sheet/cover-sheet.txt

@@ -1,5 +1,7 @@
+---
 satisfies_need: 1234
 meta_description: Blah blah
+---
 
 # My coversheet
 
@@ -12,3 +14,6 @@ of text.
 * can
 * have
 * lists
+
+
+And handles multiple new lines

data/spec/fixtures/acceptance/snippet/snippet.txt

@@ -1,6 +1,8 @@
+---
 meta_description: Snippets
 satisfies_need: 999999
 status: draft
+---
 
 # A snippet in use
 

data/spec/model/node_spec.rb

@@ -36,7 +36,7 @@ describe Smartdown::Model::Node do
         Smartdown::Model::Element::MarkdownHeading.new("A Heading"),
         Smartdown::Model::Element::Question::Date.new("a_date_question"),
         Smartdown::Model::Element::Question::MultipleChoice.new("a_multiple_choice_question"),
-        Smartdown::Model::Element::MarkdownParagraph.new("Some text"),
+        Smartdown::Model::Element::MarkdownLine.new("Some text"),
       ] }
       specify { expect(node.questions).to eq elements[1..2] }
     end

data/spec/parser/base_spec.rb

@@ -23,11 +23,11 @@ describe Smartdown::Parser::Base do
 
     # Only one newline
     it { should parse("\r") }
-    it { should parse("\r\n") }
-    it { should parse("\n\r") }
     it { should parse("\n") }
 
     # Not multiple
+    it { should_not parse("\r\n") }
+    it { should_not parse("\n\r") }
     it { should_not parse("\n\n") }
   end
 

data/spec/parser/element/conditional_spec.rb

@@ -23,7 +23,11 @@ SOURCE
         should parse(source).as(
           conditional: {
             predicate: {named_predicate: "pred1?"},
-            true_case: [{p: "#{true_body}\n"}]
+            true_case: [
+              {line: "#{true_body}"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ]
           }
         )
       }
@@ -37,7 +41,11 @@ SOURCE
           should eq(
             Smartdown::Model::Element::Conditional.new(
               Smartdown::Model::Predicate::Named.new("pred1?"),
-              [Smartdown::Model::Element::MarkdownParagraph.new(true_body + "\n")]
+              [
+                Smartdown::Model::Element::MarkdownLine.new(true_body),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+              ]
             )
           )
         }
@@ -53,7 +61,14 @@ SOURCE
         should parse(source).as(
           conditional: {
             predicate: {named_predicate: "pred1?"},
-            true_case: [{p: "#{one_line}\n"}, {p: "#{one_line}\n"}]
+            true_case: [
+              {line: "#{one_line}"},
+              {blank: "\n"},
+              {blank: "\n"},
+              {line: "#{one_line}"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ]
           }
         )
       }
@@ -68,8 +83,12 @@ SOURCE
             Smartdown::Model::Element::Conditional.new(
               Smartdown::Model::Predicate::Named.new("pred1?"),
               [
-                Smartdown::Model::Element::MarkdownParagraph.new(one_line + "\n"),
-                Smartdown::Model::Element::MarkdownParagraph.new(one_line + "\n")
+                Smartdown::Model::Element::MarkdownLine.new(one_line),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+                Smartdown::Model::Element::MarkdownLine.new(one_line),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
               ]
             )
           )
@@ -125,8 +144,16 @@ SOURCE
         should parse(source).as(
           conditional: {
             predicate: {named_predicate: "pred1?"},
-            true_case: [{p: "#{true_body}\n"}],
-            false_case: [{p: "#{false_body}\n"}]
+            true_case: [
+              {line: "#{true_body}"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ],
+            false_case: [
+              {line: "#{false_body}"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ]
           }
         )
       }
@@ -140,8 +167,16 @@ SOURCE
           should eq(
             Smartdown::Model::Element::Conditional.new(
               Smartdown::Model::Predicate::Named.new("pred1?"),
-              [Smartdown::Model::Element::MarkdownParagraph.new(true_body + "\n")],
-              [Smartdown::Model::Element::MarkdownParagraph.new(false_body + "\n")]
+              [
+                Smartdown::Model::Element::MarkdownLine.new(true_body),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+              ],
+              [
+                Smartdown::Model::Element::MarkdownLine.new(false_body),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+              ]
             )
           )
         }
@@ -172,10 +207,18 @@ SOURCE
         should parse(source).as(
           conditional: {
             predicate: {named_predicate: "pred1?"},
-            true_case: [{p: "#{true1_body}\n"}],
+            true_case: [
+              {line: "#{true1_body}"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ],
             false_case: [{conditional: {
               predicate: {named_predicate: "pred2?"},
-              true_case: [{p: "#{true2_body}\n"}],
+              true_case: [
+                {line: "#{true2_body}"},
+                {blank: "\n"},
+                {blank: "\n"},
+              ],
             }}]
           }
         )
@@ -190,10 +233,18 @@ SOURCE
             should eq(
               Smartdown::Model::Element::Conditional.new(
                 Smartdown::Model::Predicate::Named.new("pred1?"),
-                [Smartdown::Model::Element::MarkdownParagraph.new(true1_body + "\n")],
+                [
+                  Smartdown::Model::Element::MarkdownLine.new(true1_body),
+                  Smartdown::Model::Element::MarkdownLine.new("\n"),
+                  Smartdown::Model::Element::MarkdownLine.new("\n"),
+                ],
                 [Smartdown::Model::Element::Conditional.new(
                   Smartdown::Model::Predicate::Named.new("pred2?"),
-                  [Smartdown::Model::Element::MarkdownParagraph.new(true2_body + "\n")]
+                  [
+                    Smartdown::Model::Element::MarkdownLine.new(true2_body),
+                    Smartdown::Model::Element::MarkdownLine.new("\n"),
+                    Smartdown::Model::Element::MarkdownLine.new("\n"),
+                  ]
                 )]
               )
             )
@@ -230,13 +281,25 @@ SOURCE
         should parse(source).as(
           conditional: {
             predicate: {named_predicate: "pred1?"},
-            true_case: [{p: "#{true1_body}\n"}],
+            true_case: [
+              {line: "#{true1_body}"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ],
             false_case: [{conditional: {
               predicate: {named_predicate: "pred2?"},
-              true_case: [{p: "#{true2_body}\n"}],
+              true_case: [
+                {line: "#{true2_body}"},
+                {blank: "\n"},
+                {blank: "\n"},
+              ],
               false_case: [{conditional: {
                 predicate: {named_predicate: "pred3?"},
-                true_case: [{p: "#{true3_body}\n"}],
+                true_case: [
+                  {line: "#{true3_body}"},
+                  {blank: "\n"},
+                  {blank: "\n"},
+                ],
               }}]
             }}]
           }
@@ -252,13 +315,25 @@ SOURCE
           should eq(
             Smartdown::Model::Element::Conditional.new(
               Smartdown::Model::Predicate::Named.new("pred1?"),
-              [Smartdown::Model::Element::MarkdownParagraph.new(true1_body + "\n")],
+              [
+                Smartdown::Model::Element::MarkdownLine.new(true1_body),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+              ],
               [Smartdown::Model::Element::Conditional.new(
                 Smartdown::Model::Predicate::Named.new("pred2?"),
-                [Smartdown::Model::Element::MarkdownParagraph.new(true2_body + "\n")],
+                [
+                  Smartdown::Model::Element::MarkdownLine.new(true2_body),
+                  Smartdown::Model::Element::MarkdownLine.new("\n"),
+                  Smartdown::Model::Element::MarkdownLine.new("\n"),
+                ],
                   [Smartdown::Model::Element::Conditional.new(
                     Smartdown::Model::Predicate::Named.new("pred3?"),
-                    [Smartdown::Model::Element::MarkdownParagraph.new(true3_body + "\n")]
+                    [
+                      Smartdown::Model::Element::MarkdownLine.new(true3_body),
+                      Smartdown::Model::Element::MarkdownLine.new("\n"),
+                      Smartdown::Model::Element::MarkdownLine.new("\n"),
+                    ]
                   )]
               )]
             )
@@ -296,11 +371,23 @@ SOURCE
         should parse(source).as(
           conditional: {
             predicate: {named_predicate: "pred1?"},
-            true_case: [{p: "#{true1_body}\n"}],
+            true_case: [
+              {line: "#{true1_body}"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ],
             false_case: [{conditional: {
               predicate: {named_predicate: "pred2?"},
-              true_case: [{p: "#{true2_body}\n"}],
-              false_case: [{p: "#{false_body}\n"}]
+              true_case: [
+                {line: "#{true2_body}"},
+                {blank: "\n"},
+                {blank: "\n"},
+              ],
+              false_case: [
+                {line: "#{false_body}"},
+                {blank: "\n"},
+                {blank: "\n"},
+              ]
             }}]
           }
         )
@@ -316,11 +403,23 @@ SOURCE
           should eq(
             Smartdown::Model::Element::Conditional.new(
               Smartdown::Model::Predicate::Named.new("pred1?"),
-              [Smartdown::Model::Element::MarkdownParagraph.new(true1_body + "\n")],
+              [
+                Smartdown::Model::Element::MarkdownLine.new(true1_body),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+                Smartdown::Model::Element::MarkdownLine.new("\n"),
+              ],
               [Smartdown::Model::Element::Conditional.new(
                 Smartdown::Model::Predicate::Named.new("pred2?"),
-                [Smartdown::Model::Element::MarkdownParagraph.new(true2_body + "\n")],
-                [Smartdown::Model::Element::MarkdownParagraph.new(false_body + "\n")]
+                [
+                  Smartdown::Model::Element::MarkdownLine.new(true2_body),
+                  Smartdown::Model::Element::MarkdownLine.new("\n"),
+                  Smartdown::Model::Element::MarkdownLine.new("\n"),
+                ],
+                [
+                  Smartdown::Model::Element::MarkdownLine.new(false_body),
+                  Smartdown::Model::Element::MarkdownLine.new("\n"),
+                  Smartdown::Model::Element::MarkdownLine.new("\n"),
+                ]
               )]
             )
           )
@@ -354,12 +453,21 @@ SOURCE
            conditional: {
              predicate: {named_predicate: "pred1?"},
              true_case: [
-               {p: "#{first_true_body}\n"},
+               {line: "#{first_true_body}"},
+               {blank: "\n"},
+               {blank: "\n"},
                {conditional: {
-                 predicate: {named_predicate: "pred2?"},
-                 true_case: [{p: "#{both_true_body}\n"}],
+                predicate: {named_predicate: "pred2?"},
+                true_case: [
+                  {line: "#{both_true_body}"},
+                  {blank: "\n"},
+                  {blank: "\n"},
+                ],
                }},
-               {p: "#{first_true_body}\n"}
+               {blank: "\n"},
+               {line: "#{first_true_body}"},
+               {blank: "\n"},
+               {blank: "\n"},
              ]
            }
         )
@@ -388,7 +496,13 @@ TAG
          conditional: {
            predicate: {named_predicate: "pred?"},
             true_case: [
-              {p: "#{true_body}"}
+              {line: "$E"},
+              {blank: "\n"},
+              {line: "Bit of content in lovely custom tag"},
+              {blank: "\n"},
+              {line: "$E"},
+              {blank: "\n"},
+              {blank: "\n"},
            ]},
         )
       }

data/spec/parser/element/front_matter_spec.rb

@@ -5,12 +5,12 @@ describe Smartdown::Parser::Element::FrontMatter do
 
   subject(:parser) { described_class.new }
 
-  it { should parse("a: 1\n").as(front_matter: [{name: "a", value: "1"}]) }
-  it { should parse("a: 1\nb: 2\n").as(front_matter: [{name: "a", value: "1"}, {name: "b", value: "2"}]) }
+  it { should parse("---\na: 1\n---\n").as(front_matter: [{name: "a", value: "1"}]) }
+  it { should parse("---\na: 1\nb: 2\n---\n").as(front_matter: [{name: "a", value: "1"}, {name: "b", value: "2"}]) }
 
   describe "transformed" do
     let(:node_name) { "my_node" }
-    let(:source) { "a: 1\n" }
+    let(:source) { "---\na: 1\n---\n" }
     subject(:transformed) {
       Smartdown::Parser::NodeInterpreter.new(node_name, source, parser: parser).interpret
     }

data/spec/parser/element/markdown_line_spec.rb

@@ -0,0 +1,28 @@
+require 'smartdown/parser/element/markdown_line'
+require 'smartdown/parser/node_interpreter'
+
+describe Smartdown::Parser::Element::MarkdownLine do
+
+  subject(:parser) { described_class.new }
+  let(:node_name) { "my_node" }
+
+  it { should parse("My para").as(line: "My para") }
+  it { should_not parse("My para\n").as(line: "My para\n") }
+  it { should parse(" My para").as(line: " My para") }
+  it { should_not parse(" My para\nsecond line") }
+  it { should_not parse(" My para\nsecond line\n") }
+  it { should_not parse(" My para\nsecond line   \n") }
+  it { should_not parse("Para1\n\nPara2") }
+
+  it { should parse("a   b") }
+
+  describe "transformed" do
+    let(:content) { "My para" }
+    subject(:transformed) {
+      Smartdown::Parser::NodeInterpreter.new(node_name, content, parser: parser).interpret
+    }
+
+    it { should eq(Smartdown::Model::Element::MarkdownLine.new(content)) }
+  end
+end
+

data/spec/parser/integration/cover_sheet_spec.rb

@@ -3,7 +3,9 @@ require 'smartdown/model/element/start_button'
 
 describe "interpreting a cover sheet containing a start button" do
   let(:source) { <<-SOURCE
+---
 meta_description: My coversheet
+---
 
 # Cover sheet
 

data/spec/parser/node_parser_spec.rb

@@ -20,8 +20,10 @@ SOURCE
       should parse(source).as({
         body: [
           {h1: "This is my title"},
-          {p: "This is a paragraph of text with stuff\nthat flows along\n"},
-          {p: "Another paragraph of text\n"}
+          {blank_line: "\n", element: {line: "This is a paragraph of text with stuff"}},
+          {blank_line: "\n", element: {line: "that flows along"}},
+          {blank_line: "\n\n", element: {line: "Another paragraph of text"}},
+          {blank_line: "\n", element: {blank: nil}},
         ]
       })
     }
@@ -34,7 +36,9 @@ SOURCE
   describe "front matter and body" do
     let(:source) {
 <<SOURCE
+---
 name: My node
+---
 
 # This is my title
 
@@ -49,7 +53,8 @@ SOURCE
         ],
         body: [
           {h1: "This is my title"},
-          {p: "A paragraph\n"}
+          {blank_line: "\n", element: {line: "A paragraph"}},
+          {blank_line: "\n", element: {blank: nil}},
         ]
       })
     end
@@ -70,13 +75,16 @@ SOURCE
       should parse(source).as({
         body: [
           {h1: "This is my title"},
-          {multiple_choice: {
-            identifier: "my_question",
-            options: [
-              {value: "yes", label: "Yes"},
-              {value: "no", label: "No"}
-            ],
-            option_pairs: []}
+          {blank_line: "\n",
+           element: {
+             multiple_choice: {
+              identifier: "my_question",
+              options: [
+                {value: "yes", label: "Yes"},
+                {value: "no", label: "No"}
+              ],
+              option_pairs: []}
+            }
           }
         ]
       })
@@ -102,16 +110,22 @@ SOURCE
       should parse(source).as({
         body: [
           {h1: "This is my title"},
-          {multiple_choice: {
-            identifier: "my_question",
-            options: [
-              {value: "yes", label: "Yes"},
-              {value: "no", label: "No"}
-            ],
-            option_pairs: []}
+          {blank_line: "\n",
+           element: {
+             multiple_choice: {
+              identifier: "my_question",
+              options: [
+                {value: "yes", label: "Yes"},
+                {value: "no", label: "No"}
+              ],
+              option_pairs: []
+              }
+            }
           },
-          {h1: "Next node rules"},
-          {next_node_rules: [{rule: {predicate: {named_predicate: "pred1?"}, outcome: "outcome"}}]}
+          {blank_line: "\n", element: {h1: "Next node rules"}},
+          {blank_line: "\n", element: 
+            {next_node_rules: [{rule: {predicate: {named_predicate: "pred1?"}, outcome: "outcome"}}]}
+          }
         ]
       })
     }
@@ -125,8 +139,11 @@ SOURCE
       let(:expected_elements) {
         [
           Smartdown::Model::Element::MarkdownHeading.new("This is my title"),
+          Smartdown::Model::Element::MarkdownLine.new("\n"),
           Smartdown::Model::Element::Question::MultipleChoice.new("my_question", "yes"=>"Yes", "no"=>"No"),
+          Smartdown::Model::Element::MarkdownLine.new("\n"),
           Smartdown::Model::Element::MarkdownHeading.new("Next node rules"),
+          Smartdown::Model::Element::MarkdownLine.new("\n"),
           Smartdown::Model::NextNodeRules.new([
             Smartdown::Model::Rule.new(Smartdown::Model::Predicate::Named.new("pred1?"), "outcome")
           ])
@@ -159,10 +176,18 @@ SOURCE
     it {
       should parse(source).as({
         body: [
-          {conditional: {
+          { conditional: {
             predicate: {named_predicate: "pred1?"},
-            true_case: [{p: "Text when true\n"}],
-            false_case: [{p: "Text when false\n"}]
+            true_case: [
+              {line: "Text when true"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ],
+            false_case: [
+              {line: "Text when false"},
+              {blank: "\n"},
+              {blank: "\n"},
+            ]
           }}
         ]
       })
@@ -187,8 +212,10 @@ SOURCE
       should parse(source).as({
         body: [
           {h1: "This is my title"},
-          {p: "This is a paragraph of text with stuff\nthat flows along\n"},
-          {p: "Another paragraph of text\n"}
+          {blank_line: "\n", element: {line: "This is a paragraph of text with stuff"}},
+          {blank_line: "\n", element: {line: "that flows along"}},
+          {blank_line: "\n\n", element: {line: "Another paragraph of text"}},
+          {blank_line: "\n\n\n", element: {blank: nil}},
         ]
       })
     }
@@ -199,7 +226,7 @@ SOURCE
     let(:source) {
 <<SOURCE
 # Lovely title
-	 
+
 line of content
 SOURCE
 }
@@ -207,8 +234,9 @@ SOURCE
     it "doesn't blow up" do
       should parse(source).as({
         body: [
-          { h1: "Lovely title" },
-          { p: "line of content\n" },
+          {h1: "Lovely title" },
+          {blank_line: "\n", element: {line: "line of content" }},
+          {blank_line: "\n", element: {blank: nil }},
         ]
       })
     end

data/spec/support/model_builder.rb

@@ -1,7 +1,7 @@
 require 'smartdown/model/flow'
 require 'smartdown/model/node'
 require 'smartdown/model/element/markdown_heading'
-require 'smartdown/model/element/markdown_paragraph'
+require 'smartdown/model/element/markdown_line'
 require 'smartdown/model/element/start_button'
 require 'smartdown/model/element/question/multiple_choice'
 require 'smartdown/model/element/question/date'
@@ -41,9 +41,9 @@ class ModelBuilder
     @elements.last
   end
 
-  def paragraph(content)
+  def line(content)
     @elements ||= []
-    @elements << Smartdown::Model::Element::MarkdownParagraph.new(content)
+    @elements << Smartdown::Model::Element::MarkdownLine.new(content)
     @elements.last
   end