markdown-expander 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec4cfc4d81d3e1fb1bd1c9d819fb1787725184e
-  data.tar.gz: 9fb3a69fc05ccc7f5fe004c9d23382f1e33aaa50
+  metadata.gz: f5cc0aa3fd21ded1886f9c0cd66093d376f734de
+  data.tar.gz: 2202dadac71019f67a5739be0183fa3e0a019788
 SHA512:
-  metadata.gz: 286118a7ac49628c4c0915b34b6d8525e0f070d356934bd143c9dd491a84d866a86722cca97295b3a4ca371ccd9c8c52e6e0feeaf4844d849746699906e540ac
-  data.tar.gz: a3fb4536c86024b03051eb7c8c9c4a0f42d3be1628d572220849fe236c399a4e3a4402322da52f144d8f361eaffb1f18e2c8d90c04d40d10a11f63ac72e211a8
+  metadata.gz: d18c4084c7dd37e24e77935d32d0428f6a8f09988447119a9f848f9e271bbb8f7cd560d7325ff8568514b1696b0690fe0646eab30e9ef402015ba5e327518b0c
+  data.tar.gz: 8deb31e8fd6843b9d6ebf99c90a39e63dff7c7c0becba7a697bb1e7d132ccfec05b95919b09b1975bd9a14fb75ffdd639d645dbeb536a24a1a8108a83f5939aa

data/README.md

@@ -58,3 +58,22 @@ MarkdownExpander::Expander.new(template).render(
 )
 #=> "# First!\n# Second!\n"
 ```
+
+## Logic
+
+```ruby
+require "markdown-expander"
+
+template = <<-TEMPLATE
+{{animal in animals}}
+  {{if animal.name == "cats"}}
+# {{animal.name}} are the best!!!!!
+  {{end}}
+{{end}}
+TEMPLATE
+
+MarkdownExpander::Expander.new(template).render(
+  animals: [ {name: "dogs"}, {name: "cats"} ]
+)
+#=> "# cats are the best!!!!!\n"
+```

data/README.md.docu

@@ -32,6 +32,7 @@ Or install it yourself as:
 ## Expressions
 
 ```ruby
+:example:
 require "markdown-expander"
 
 MarkdownExpander::Expander.new(
@@ -40,6 +41,7 @@ MarkdownExpander::Expander.new(
   thing: {title: "Hello"}
 )
 #=> "# Title: Hello"
+:end:
 ```
 
 ## Loops
@@ -60,3 +62,24 @@ MarkdownExpander::Expander.new(template).render(
 #=> "# First!\n# Second!\n"
 :end:
 ```
+
+## Logic
+
+```ruby
+:example:
+require "markdown-expander"
+
+template = <<-TEMPLATE
+{{animal in animals}}
+  {{if animal.name == "cats"}}
+# {{animal.name}} are the best!!!!!
+  {{end}}
+{{end}}
+TEMPLATE
+
+MarkdownExpander::Expander.new(template).render(
+  animals: [ {name: "dogs"}, {name: "cats"} ]
+)
+#=> "# cats are the best!!!!!\n"
+:end:
+```

data/lib/markdown-expander.rb

@@ -11,7 +11,7 @@ module MarkdownExpander
       @template = template
     end
 
-    def render options
+    def render scope
       root = Node.new(nil, nil)
       node = root
 
@@ -20,12 +20,12 @@ module MarkdownExpander
           new_node = Node.new(node, LoopStart.new($1, $2))
           node.children << new_node
           node = new_node
-        elsif line =~ END_MATCH
-          node = node.parent
         elsif line =~ IF_START_MATCH
           new_node = Node.new(node, IfStart.new($1, $2, $3))
           node.children << new_node
           node = new_node
+        elsif line =~ END_MATCH
+          node = node.parent
         else
           loop do
             if line =~ EXPRESSION_MATCH
@@ -42,39 +42,38 @@ module MarkdownExpander
         end
       end
 
-      evaluate_nodes(root, options)
+      evaluate_nodes(root, scope)
+    end
+
+    def drill_down_to_value scope, expression
+      expression_parts = expression.split(".").map(&:to_sym)
+      expression_parts.each do |part|
+        scope = scope[part]
+      end
+      scope
     end
 
     def evaluate_nodes root, scope
       lines = []
       root.children.each_with_index do |child, index|
-        if child.value.class == Expression
-          lines << child.value.evaluate(scope)
-        elsif child.value.class == LoopStart
-          name = child.value.name.to_sym
-          parts = child.value.looper.split(".")
-          parts.each do |part|
-            scope = scope[part.to_sym]
-          end
+        if child.element.class == Expression
+          lines << drill_down_to_value(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.each do |item|
             lines << evaluate_nodes(child, {name => item})
           end
-        elsif child.value.class == IfStart
-          parts = child.value.expression.split(".")
-          value = scope
-          parts.each do |part|
-            value = value[part.to_sym]
-          end
+        elsif child.element.class == IfStart
+          value = drill_down_to_value(scope, child.element.expression)
           expression_satisfied =
-            (child.value.operator == "==" && value.to_s == child.value.value) ||
-            (child.value.operator == "!=" && value.to_s != child.value.value)
+            (child.element.operator == "==" && value.to_s == child.element.value) ||
+            (child.element.operator == "!=" && value.to_s != child.element.value)
           if expression_satisfied
-            scope.each do |item|
-              lines << evaluate_nodes(child, scope)
-            end
+            lines << evaluate_nodes(child, scope)
           end
         else
-          lines << child.value
+          lines << child.element
         end
       end
       lines.join("")
@@ -83,19 +82,19 @@ module MarkdownExpander
     class Node
       attr_accessor :parent
       attr_accessor :children
-      attr_accessor :value
-      def initialize parent, value
+      attr_accessor :element
+      def initialize parent, element
         @parent = parent
-        @value = value
+        @element = element
         @children = []
       end
     end
 
     class LoopStart
-      attr_accessor :name, :looper
-      def initialize name, looper
+      attr_accessor :name, :expression
+      def initialize name, expression
         @name = name
-        @looper = looper
+        @expression = expression
       end
     end
 
@@ -111,16 +110,9 @@ module MarkdownExpander
     end
 
     class Expression
-      def initialize value
-        @value = value
-      end
-      def evaluate scope
-        parts = @value.split(".")
-        current_scope = scope
-        parts.each do |part|
-          current_scope = current_scope[part.to_sym]
-        end
-        current_scope
+      attr_accessor :expression
+      def initialize expression
+        @expression = expression
       end
     end
   end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markdown-expander
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Vos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler