daimon-markdown 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aff20c01e34584946a115276b997d78505820a88
-  data.tar.gz: c7d557edcc62ec6ebde33bfa669be2033e0c9053
+  metadata.gz: b8d9ae79f89262e2e5b173fd510137589bc6356a
+  data.tar.gz: b8e4072e934cac8da673c2efd259abc3435fba79
 SHA512:
-  metadata.gz: 2f1e21e1cd6ebadef92dcfdfb11b1baefb92da4c8e20208ae74f90e801722dbf771a4ee6332063e24559adfc083284595ccc6a139c3298d7319e5b2f33c8e381
-  data.tar.gz: 8fbe830c68dfd476b6f8e9d1479a7c3eef613e9743fc82f117553e63dc83795f9fa2c518835f4dcb6432b55da1a20531b01f209c5f577c3b8d2a8a003bc029db
+  metadata.gz: f56abca8ff5b504bcdf82e984a3b86efc7df6fd065eaa63e49b7b7e894670c3bf7f456321d64f8bdbc2cd6838fd59c10ec0973e82970a9eeabca4a4ef463acbd
+  data.tar.gz: b09300574c8c6475eda6c85ef1c8d2a9620743fa0be147e21fb08a2eaef5c527bf0577b9def206ec0d832e280a8bf27ed2b28b89fd368263fc6dbf3f9079ddcb

data/lib/daimon/markdown/filter/plugin.rb

@@ -9,11 +9,18 @@ module Daimon
             next if node.parent.name == "code" # skip code block
             result[:plugins] = []
             node.to_s.scan(/{{(.+?)}}/m) do |str|
-              parser = Daimon::Markdown::Parser.new(str[0])
-              parser.parse
-              plugin_class = Daimon::Markdown::Plugin.lookup(parser.name)
-              plugin = plugin_class.new(doc, node, result, context)
-              plugin.call(*parser.args)
+              begin
+                parser = Daimon::Markdown::Parser.new(str[0])
+                parser.parse
+                plugin_class = Daimon::Markdown::Plugin.lookup(parser.name)
+                plugin = plugin_class.new(doc, node, result, context)
+                plugin.call(*parser.args)
+              rescue Daimon::Markdown::Parser::Error => ex
+                message = "#{node} (#{ex.class}: #{ex.message})"
+                node.replace(message)
+              rescue Daimon::Markdown::Plugin::UnknownPluginError => ex
+                node.replace(ex.message)
+              end
             end
             unless result[:plugins].empty?
               scanner = StringScanner.new(node.to_s)

data/lib/daimon/markdown/parser.rb

@@ -4,6 +4,9 @@ module Daimon
   module Markdown
     class Parser < Ripper
 
+      class Error < StandardError
+      end
+
       KEYWORDS = {
         "nil" => nil,
         "true" => true,
@@ -83,6 +86,16 @@ module Daimon
         @arrays[@level - 1] << @arrays[@level]
         @level -= 1
       end
+
+      def on_parse_error(message)
+        compile_error(message)
+      end
+
+      private
+
+      def compile_error(message)
+        raise Error, message
+      end
     end
   end
 end

data/lib/daimon/markdown/plugin.rb

@@ -4,9 +4,14 @@ module Daimon
 
       PLUGIN_REGISTRY = {}
 
+      class UnknownPluginError < StandardError
+      end
+
       class << self
         def lookup(name)
           PLUGIN_REGISTRY.fetch(name)
+        rescue KeyError
+          raise UnknownPluginError, "Unknown plugin: #{name}"
         end
 
         def register(name, klass)

data/lib/daimon/markdown/version.rb

@@ -1,5 +1,5 @@
 module Daimon
   module Markdown
-    VERSION = "0.2.4"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daimon-markdown
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - daimon developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline