markdown-expander 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94078f341de6bb0794aa103efc520773d9766abd
-  data.tar.gz: 9073385427a5aa7911b7406f83f79615041a6043
+  metadata.gz: 61595a9cdbd9373019eccd421e379de6cda1edfb
+  data.tar.gz: 858f94a729be5106f0a260a6688503c9ea6fdf34
 SHA512:
-  metadata.gz: f1b219b2dce87acce2fa2c117ec632ea84d13de1171b46bb65fc80741aa018b045b22f319b66dda193340c63079fbabc66f2fe2738e8585e3a45b0056d089033
-  data.tar.gz: f665687f5506bf48af177b4e78910dd7cc56fa005551accdd0cc1e9d9696222c1c2a11ec845aa326f9e089fcfee37c7d5e3914e6e884a6d2a3fe5669daa42d01
+  metadata.gz: c5b7813853e5fdf883c7d8c390b804500075f2c75e15a65811682f2a25c85725f76ef29708d1a04fff54c33a4157c93c41cb44622fbed838db5522302b7abf16
+  data.tar.gz: 0ac90bf8d84e868cc8821ecaf61c56d3d16ce9ba2a5f6279c2b0b0b94788a02188c5b0207988605bd9f0a0bfede7a5e806c1d7960516380a6529b83257915746

data/README.md

@@ -38,7 +38,7 @@ MarkdownExpander::Expander.new(
   "# Title: {{thing.title}}"
 ).render(
   thing: {title: "Hello"}
-).body
+)
 #=> "# Title: Hello"
 ```
 
@@ -55,7 +55,7 @@ TEMPLATE
 
 MarkdownExpander::Expander.new(template).render(
   stuff: [ {title: "First!"}, {title: "Second!"} ]
-).body
+)
 #=> "# First!\n# Second!\n"
 ```
 
@@ -74,6 +74,6 @@ TEMPLATE
 
 MarkdownExpander::Expander.new(template).render(
   animals: [ {name: "dogs"}, {name: "cats"} ]
-).body
+)
 #=> "# cats are the best!!!!!\n"
 ```

data/README.md.docu

@@ -39,7 +39,7 @@ MarkdownExpander::Expander.new(
   "# Title: {{thing.title}}"
 ).render(
   thing: {title: "Hello"}
-).body
+)
 #=> "# Title: Hello"
 :end:
 ```
@@ -58,7 +58,7 @@ TEMPLATE
 
 MarkdownExpander::Expander.new(template).render(
   stuff: [ {title: "First!"}, {title: "Second!"} ]
-).body
+)
 #=> "# First!\n# Second!\n"
 :end:
 ```
@@ -79,7 +79,7 @@ TEMPLATE
 
 MarkdownExpander::Expander.new(template).render(
   animals: [ {name: "dogs"}, {name: "cats"} ]
-).body
+)
 #=> "# cats are the best!!!!!\n"
 :end:
 ```

data/lib/markdown-expander.rb

@@ -41,25 +41,38 @@ module MarkdownExpander
             end
           end
         end
+        current_line += 1
       end
 
-      errors = []
-      if node != root
-        if node.element.class == IfStart
-          errors << "LINE #{node.line_number}: if statement has no end"
-        elsif node.element.class == LoopStart
-          errors << "LINE #{node.line_number}: loop has no end"
-        end
+      parse_error = if node != root
+                      if node.element.class == IfStart
+                        MarkdownExpandError.new(node.line_number, "if statement has no end")
+                      elsif node.element.class == LoopStart
+                        MarkdownExpandError.new(node.line_number, "loop has no end")
+                      end
+                    end
+
+      if parse_error.nil? == false
+        raise parse_error
       end
 
-      if errors.any?
-        RenderResult.new(nil, errors)
-      else
-        begin
-          RenderResult.new(evaluate_nodes(root, scope), [])
-        rescue ExpressionDrillDownError => e
-          RenderResult.new(nil, ["LINE #{e.node.line_number}: expression '#{e.expression}' could not be evaluated"])
-        end
+      begin
+        evaluate_nodes(root, scope)
+      rescue ExpressionDrillDownError => e
+        raise MarkdownExpandError.new(
+          e.node.line_number,
+          "expression '#{e.expression}' could not be evaluated",
+        )
+      end
+    end
+
+    class MarkdownExpandError < StandardError
+      attr_reader :line_number
+      attr_reader :message
+
+      def initialize line_number, message
+        @line_number = line_number
+        @message = message
       end
     end
 
@@ -110,15 +123,6 @@ module MarkdownExpander
       lines.join("")
     end
 
-    class RenderResult
-      attr_reader :body
-      attr_reader :errors
-      def initialize body, errors
-        @body = body
-        @errors = errors
-      end
-    end
-
     class Node
       attr_accessor :parent
       attr_accessor :children

data/lib/version.rb

@@ -1,3 +1,3 @@
 module MarkdownExpander
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdown-expander
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Andrew Vos