smartdown 0.11.4 → 0.12.0

data/spec/support_specs/model_builder_spec.rb

@@ -7,7 +7,7 @@ describe ModelBuilder do
     let(:node1) {
       Smartdown::Model::Node.new("check-uk-visa", [
         Smartdown::Model::Element::MarkdownHeading.new("Check uk visa"),
-        Smartdown::Model::Element::MarkdownParagraph.new("This is the paragraph"),
+        Smartdown::Model::Element::MarkdownLine.new("This is the paragraph"),
         Smartdown::Model::Element::StartButton.new("what_passport_do_you_have?")
       ])
     }
@@ -33,7 +33,7 @@ describe ModelBuilder do
       model = builder.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("what_passport_do_you_have?")
         end
 
@@ -70,8 +70,8 @@ describe ModelBuilder do
     let(:expected) {
       Smartdown::Model::Element::Conditional.new(
         Smartdown::Model::Predicate::Named.new("pred?"),
-        [Smartdown::Model::Element::MarkdownParagraph.new("True case")],
-        [Smartdown::Model::Element::MarkdownParagraph.new("False case")]
+        [Smartdown::Model::Element::MarkdownLine.new("True case")],
+        [Smartdown::Model::Element::MarkdownLine.new("False case")]
       )
     }
 
@@ -79,10 +79,10 @@ describe ModelBuilder do
       builder.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
     }
@@ -95,11 +95,11 @@ describe ModelBuilder do
       let(:expected) {
         Smartdown::Model::Element::Conditional.new(
           Smartdown::Model::Predicate::Named.new("pred1?"),
-          [Smartdown::Model::Element::MarkdownParagraph.new("True case")],
+          [Smartdown::Model::Element::MarkdownLine.new("True case")],
           [Smartdown::Model::Element::Conditional.new(
             Smartdown::Model::Predicate::Named.new("pred2?"),
-            [Smartdown::Model::Element::MarkdownParagraph.new("False True case")],
-            [Smartdown::Model::Element::MarkdownParagraph.new("False False case")]
+            [Smartdown::Model::Element::MarkdownLine.new("False True case")],
+            [Smartdown::Model::Element::MarkdownLine.new("False False case")]
           )]
         )
       }
@@ -108,16 +108,16 @@ describe ModelBuilder do
         builder.conditional do
           named_predicate "pred1?"
           true_case do
-            paragraph("True case")
+            line("True case")
           end
           false_case do
             conditional do
               named_predicate "pred2?"
               true_case do
-                paragraph("False True case")
+                line("False True case")
               end
               false_case do
-                paragraph("False False case")
+                line("False False case")
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartdown
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &13913560 !ruby/object:Gem::Requirement
+  requirement: &8259380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *13913560
+  version_requirements: *8259380
 - !ruby/object:Gem::Dependency
   name: uk_postcode
-  requirement: &13912820 !ruby/object:Gem::Requirement
+  requirement: &8258580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *13912820
+  version_requirements: *8258580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13912040 !ruby/object:Gem::Requirement
+  requirement: &8257860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *13912040
+  version_requirements: *8257860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13911540 !ruby/object:Gem::Requirement
+  requirement: &8257340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13911540
+  version_requirements: *8257340
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &13910780 !ruby/object:Gem::Requirement
+  requirement: &8256560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13910780
+  version_requirements: *8256560
 - !ruby/object:Gem::Dependency
   name: gem_publisher
-  requirement: &13910100 !ruby/object:Gem::Requirement
+  requirement: &8255920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13910100
+  version_requirements: *8255920
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &14198380 !ruby/object:Gem::Requirement
+  requirement: &8206260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14198380
+  version_requirements: *8206260
 description: 
 email: david.heath@digital.cabinet-office.gov.uk
 executables:
@@ -109,13 +109,14 @@ files:
 - lib/smartdown/parser/node_parser.rb
 - lib/smartdown/parser/scenario_sets_interpreter.rb
 - lib/smartdown/parser/element/date_question.rb
+- lib/smartdown/parser/element/markdown_blank_line.rb
 - lib/smartdown/parser/element/salary_question.rb
 - lib/smartdown/parser/element/postcode_question.rb
 - lib/smartdown/parser/element/conditional.rb
-- lib/smartdown/parser/element/markdown_paragraph.rb
 - lib/smartdown/parser/element/start_button.rb
 - lib/smartdown/parser/element/front_matter.rb
 - lib/smartdown/parser/element/country_question.rb
+- lib/smartdown/parser/element/markdown_line.rb
 - lib/smartdown/parser/element/multiple_choice_question.rb
 - lib/smartdown/parser/element/next_steps.rb
 - lib/smartdown/parser/element/markdown_heading.rb
@@ -148,6 +149,7 @@ files:
 - lib/smartdown/model/scenarios/question.rb
 - lib/smartdown/model/scenarios/scenario_set.rb
 - lib/smartdown/model/scenarios/scenario.rb
+- lib/smartdown/model/elements.rb
 - lib/smartdown/model/flow.rb
 - lib/smartdown/model/predicate/named.rb
 - lib/smartdown/model/predicate/set_membership.rb
@@ -173,8 +175,8 @@ files:
 - lib/smartdown/model/answer/multiple_choice.rb
 - lib/smartdown/model/answer/text.rb
 - lib/smartdown/model/element/conditional.rb
-- lib/smartdown/model/element/markdown_paragraph.rb
 - lib/smartdown/model/element/start_button.rb
+- lib/smartdown/model/element/markdown_line.rb
 - lib/smartdown/model/element/next_steps.rb
 - lib/smartdown/model/element/markdown_heading.rb
 - lib/smartdown/model/element/question/date.rb
@@ -205,10 +207,10 @@ files:
 - spec/parser/element/conditional_spec.rb
 - spec/parser/element/start_button_parser_spec.rb
 - spec/parser/element/date_question_spec.rb
-- spec/parser/element/markdown_paragraph_spec.rb
 - spec/parser/element/markdown_heading_spec.rb
 - spec/parser/element/front_matter_spec.rb
 - spec/parser/element/salary_question_spec.rb
+- spec/parser/element/markdown_line_spec.rb
 - spec/parser/element/text_question_spec.rb
 - spec/parser/option_pairs_transform_spec.rb
 - spec/parser/node_parser_spec.rb
@@ -301,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4059470595308680197
+      hash: -3641220914455318318
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -310,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4059470595308680197
+      hash: -3641220914455318318
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -334,10 +336,10 @@ test_files:
 - spec/parser/element/conditional_spec.rb
 - spec/parser/element/start_button_parser_spec.rb
 - spec/parser/element/date_question_spec.rb
-- spec/parser/element/markdown_paragraph_spec.rb
 - spec/parser/element/markdown_heading_spec.rb
 - spec/parser/element/front_matter_spec.rb
 - spec/parser/element/salary_question_spec.rb
+- spec/parser/element/markdown_line_spec.rb
 - spec/parser/element/text_question_spec.rb
 - spec/parser/option_pairs_transform_spec.rb
 - spec/parser/node_parser_spec.rb

data/lib/smartdown/parser/element/markdown_paragraph.rb

@@ -1,19 +0,0 @@
-require 'smartdown/parser/base'
-
-module Smartdown
-  module Parser
-    module Element
-      class MarkdownParagraph < Base
-        rule(:markdown_line) {
-          optional_space >> whitespace_terminated_string >> optional_space
-        }
-
-        rule(:markdown_paragraph) {
-          (markdown_line >> line_ending).repeat(1).as(:p)
-        }
-
-        root(:markdown_paragraph)
-      end
-    end
-  end
-end

data/spec/parser/element/markdown_paragraph_spec.rb

@@ -1,28 +0,0 @@
-require 'smartdown/parser/element/markdown_paragraph'
-require 'smartdown/parser/node_interpreter'
-
-describe Smartdown::Parser::Element::MarkdownParagraph do
-
-  subject(:parser) { described_class.new }
-  let(:node_name) { "my_node" }
-
-  it { should parse("My para").as(p: "My para") }
-  it { should parse("My para\n").as(p: "My para\n") }
-  it { should parse(" My para").as(p: " My para") }
-  it { should parse(" My para\nsecond line").as(p: " My para\nsecond line") }
-  it { should parse(" My para\nsecond line\n").as(p: " My para\nsecond line\n") }
-  it { should parse(" My para\nsecond line   \n").as(p: " 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::MarkdownParagraph.new(content)) }
-  end
-end
-