markdown-expander 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08884e0ba6130f82bde17019674c76462d0c02fc
-  data.tar.gz: 5fe09c64e9f0962720abf743145a5f557fcb5e5b
+  metadata.gz: dec4cfc4d81d3e1fb1bd1c9d819fb1787725184e
+  data.tar.gz: 9fb3a69fc05ccc7f5fe004c9d23382f1e33aaa50
 SHA512:
-  metadata.gz: 9f3f14364a5409cc72d537ae03226a93f9fb3d5331fb2ad00c3a57e9e0512332d8259f4c2f323a75bb5e36023bc275bc30dc5584a5f28bcdfa9cd2699d530a64
-  data.tar.gz: 835a848e9853d38de2d80aa3d085dc4feee46b334fe35652b8c85bac537d3c8442cef73d46e81859ee2d4411c342a6ee3a83ded495cc2067c3797849c555ac95
+  metadata.gz: 286118a7ac49628c4c0915b34b6d8525e0f070d356934bd143c9dd491a84d866a86722cca97295b3a4ca371ccd9c8c52e6e0feeaf4844d849746699906e540ac
+  data.tar.gz: a3fb4536c86024b03051eb7c8c9c4a0f42d3be1628d572220849fe236c399a4e3a4402322da52f144d8f361eaffb1f18e2c8d90c04d40d10a11f63ac72e211a8

data/README.md

@@ -1,6 +1,17 @@
 # markdown-expander
 
-Adds some new syntax to markdown
+A preprocessor for markdown that adds simple logic.
+
+## Why would you do this?????
+
+This was written to be used on anmo.io, where users can create web pages with
+markdown, but also need to have some simple templating language.
+
+Because users are going to be inputting content, I can't use any templating
+language that allows them to execute ruby code.
+
+Liquid seemed far too complex and heavyweight for what I want and also didn't
+work well when mixed with markdown.
 
 ## Installation
 

data/README.md.docu

@@ -1,6 +1,17 @@
 # markdown-expander
 
-Adds some new syntax to markdown
+A preprocessor for markdown that adds simple logic.
+
+## Why would you do this?????
+
+This was written to be used on anmo.io, where users can create web pages with
+markdown, but also need to have some simple templating language.
+
+Because users are going to be inputting content, I can't use any templating
+language that allows them to execute ruby code.
+
+Liquid seemed far too complex and heavyweight for what I want and also didn't
+work well when mixed with markdown.
 
 ## Installation
 

data/lib/markdown-expander.rb

@@ -3,8 +3,9 @@ require "version"
 module MarkdownExpander
   class Expander
     LOOP_START_MATCH = /{{\s*([a-zA-Z_]*)\s+in\s+([a-zA-Z_.]*)\s*}}/
-    LOOP_END_MATCH = /{{\s*end\s*}}/
+    END_MATCH = /{{\s*end\s*}}/
     EXPRESSION_MATCH = /{{\s*([a-zA-Z_.]+)\s*}}/
+    IF_START_MATCH = /{{\s*if\s*([a-zA-Z_.]*)\s*(==|!=)\s*"(.*)"}}/
 
     def initialize template
       @template = template
@@ -19,8 +20,12 @@ module MarkdownExpander
           new_node = Node.new(node, LoopStart.new($1, $2))
           node.children << new_node
           node = new_node
-        elsif line =~ LOOP_END_MATCH
+        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
         else
           loop do
             if line =~ EXPRESSION_MATCH
@@ -54,6 +59,20 @@ module MarkdownExpander
           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
+          expression_satisfied =
+            (child.value.operator == "==" && value.to_s == child.value.value) ||
+            (child.value.operator == "!=" && value.to_s != child.value.value)
+          if expression_satisfied
+            scope.each do |item|
+              lines << evaluate_nodes(child, scope)
+            end
+          end
         else
           lines << child.value
         end
@@ -80,6 +99,17 @@ module MarkdownExpander
       end
     end
 
+    class IfStart
+      attr_accessor :expression
+      attr_accessor :operator
+      attr_accessor :value
+      def initialize expression, operator, value
+        @expression = expression
+        @operator = operator
+        @value = value
+      end
+    end
+
     class Expression
       def initialize value
         @value = value

data/lib/version.rb

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

metadata

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