markdown-expander 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5cc0aa3fd21ded1886f9c0cd66093d376f734de
-  data.tar.gz: 2202dadac71019f67a5739be0183fa3e0a019788
+  metadata.gz: 94078f341de6bb0794aa103efc520773d9766abd
+  data.tar.gz: 9073385427a5aa7911b7406f83f79615041a6043
 SHA512:
-  metadata.gz: d18c4084c7dd37e24e77935d32d0428f6a8f09988447119a9f848f9e271bbb8f7cd560d7325ff8568514b1696b0690fe0646eab30e9ef402015ba5e327518b0c
-  data.tar.gz: 8deb31e8fd6843b9d6ebf99c90a39e63dff7c7c0becba7a697bb1e7d132ccfec05b95919b09b1975bd9a14fb75ffdd639d645dbeb536a24a1a8108a83f5939aa
+  metadata.gz: f1b219b2dce87acce2fa2c117ec632ea84d13de1171b46bb65fc80741aa018b045b22f319b66dda193340c63079fbabc66f2fe2738e8585e3a45b0056d089033
+  data.tar.gz: f665687f5506bf48af177b4e78910dd7cc56fa005551accdd0cc1e9d9696222c1c2a11ec845aa326f9e089fcfee37c7d5e3914e6e884a6d2a3fe5669daa42d01

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.4

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

@@ -12,16 +12,17 @@ module MarkdownExpander
     end
 
     def render scope
-      root = Node.new(nil, nil)
+      root = Node.new(nil, nil, 1)
       node = root
+      current_line = 1
 
       @template.each_line do |line|
         if line =~ LOOP_START_MATCH
-          new_node = Node.new(node, LoopStart.new($1, $2))
+          new_node = Node.new(node, LoopStart.new($1, $2), current_line)
           node.children << new_node
           node = new_node
         elsif line =~ IF_START_MATCH
-          new_node = Node.new(node, IfStart.new($1, $2, $3))
+          new_node = Node.new(node, IfStart.new($1, $2, $3), current_line)
           node.children << new_node
           node = new_node
         elsif line =~ END_MATCH
@@ -31,24 +32,54 @@ module MarkdownExpander
             if line =~ EXPRESSION_MATCH
               before_match = $`
               after_match = $'
-              node.children << Node.new(node, before_match)
-              node.children << Node.new(node, Expression.new($1))
+              node.children << Node.new(node, before_match, current_line)
+              node.children << Node.new(node, Expression.new($1), current_line)
               line = after_match
             else
-              node.children << Node.new(node, line)
+              node.children << Node.new(node, line, current_line)
               break
             end
           end
         end
       end
 
-      evaluate_nodes(root, scope)
+      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
+      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
+      end
     end
 
-    def drill_down_to_value scope, expression
+    class ExpressionDrillDownError < StandardError
+      attr_reader :node
+      attr_reader :expression
+      def initialize node, expression
+        @node = node
+        @expression = expression
+      end
+    end
+
+    def drill_down_to_value node, scope, expression
       expression_parts = expression.split(".").map(&:to_sym)
       expression_parts.each do |part|
-        scope = scope[part]
+        begin
+          scope = scope[part]
+        rescue NoMethodError
+          raise ExpressionDrillDownError.new(node, expression)
+        end
       end
       scope
     end
@@ -57,15 +88,15 @@ module MarkdownExpander
       lines = []
       root.children.each_with_index do |child, index|
         if child.element.class == Expression
-          lines << drill_down_to_value(scope, child.element.expression)
+          lines << drill_down_to_value(child, scope, child.element.expression)
         elsif child.element.class == LoopStart
           name = child.element.name.to_sym
-          scope = drill_down_to_value(scope, child.element.expression)
+          scope = drill_down_to_value(child, scope, child.element.expression)
           scope.each do |item|
             lines << evaluate_nodes(child, {name => item})
           end
         elsif child.element.class == IfStart
-          value = drill_down_to_value(scope, child.element.expression)
+          value = drill_down_to_value(child, scope, child.element.expression)
           expression_satisfied =
             (child.element.operator == "==" && value.to_s == child.element.value) ||
             (child.element.operator == "!=" && value.to_s != child.element.value)
@@ -79,13 +110,24 @@ 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
       attr_accessor :element
-      def initialize parent, element
+      attr_accessor :line_number
+      def initialize parent, element, line_number
         @parent = parent
         @element = element
+        @line_number = line_number
         @children = []
       end
     end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown-expander
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrew Vos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - README.md