faqml 0.2.0 → 0.2.1

data/lib/faqml.rb

@@ -6,8 +6,9 @@ require 'fml/version'
 require 'fml/parser'
 require 'fml/wrap_filter'
 require 'fml/details_filter'
+require 'fml/markdown_filter'
 require 'fml/engine'
 require 'fml/template'
 
-# module FAQML;end; require 'pp'; require 'temple'; %w{parser details_filter wrap_filter engine template}.each {|x| require "./lib/fml/#{x}"}
+# module FAQML;end; require 'pp'; require 'temple'; %w{parser details_filter wrap_filter markdown_filter engine template}.each {|x| require "./lib/fml/#{x}"}
 # puts Tilt.new('test/test0.fml').render

data/lib/fml/details_filter.rb

@@ -8,8 +8,8 @@ class FAQML::DetailsFilter < Temple::Filter
   end
 
   def on_fml_qna(question, answer=nil)
-    answer_sexp = !answer.nil? && answer.length >= 4 ? build_fml_details('answer', answer[2], answer[3]) : nil
-    question_sexp = build_fml_details('question', question[2], question[3])
+    answer_sexp = !answer.nil? && answer.length >= 4 ? build_fml_details('answer', true, answer[2], answer[3]) : nil
+    question_sexp = build_fml_details('question', false, question[2], question[3])
     question_sexp.last << answer_sexp unless answer_sexp.nil?
     [:html, :tag, 'section', [:html, :attrs, [:html, :attr, 'class', [:static, 'qna']]],
       question_sexp
@@ -18,17 +18,18 @@ class FAQML::DetailsFilter < Temple::Filter
 
   private
 
-  def build_fml_details(class_name, summary, details)
-    sexp = [:html, :tag, 'details',
-      [:html, :attrs,
-        [:html, :attr, 'class', [:static, class_name]]],
-      [:multi]]
-    if !summary.last.first.nil? && summary.last.first != ''
-      sexp.last << [:html, :tag, 'summary', [:multi], [:static, summary.last.first]]
-    end
-    if details.length > 0
-      sexp.last << [:html, :tag, 'div', [:multi], [:multi, *details.last]]
-    end
+  def build_fml_details(class_name, open, summary, details)
+    attrs = [:html, :attrs, [:html, :attr, 'class', [:static, class_name]] ]
+    # open if marked as open, or has no summary
+    attrs << [:html, :attr, 'open', [:static, 'open']] if open || !has_summary_text?(summary)
+
+    sexp = [:html, :tag, 'details', attrs, [:multi]]
+    sexp.last << [:html, :tag, 'summary', [:multi], [:static, summary.last.first]]
+    sexp.last << [:html, :tag, 'div', [:multi], [:multi, *details.last]] if details.length > 0
     sexp
   end
+
+  def has_summary_text?(summary)
+    !summary.last.first.nil? && summary.last.first != ''
+  end
 end

data/lib/fml/engine.rb

@@ -11,7 +11,7 @@ class FAQML::Engine < Temple::Engine
   use FAQML::Parser, :strict
 
   # TODO: replace inline generation with a markdown filter
-  # use FAQML::MarkdownFilter
+  use FAQML::MarkdownFilter
   use FAQML::WrapFilter
   use FAQML::DetailsFilter
 

data/lib/fml/markdown_filter.rb

@@ -1,5 +1,47 @@
-# require 'redcarpet'
+require 'redcarpet'
 
-# renderer = Redcarpet::Render::HTML.new
-# extensions = {fenced_code_blocks: true}
-# @markdown = Redcarpet::Markdown.new(renderer, extensions)
+class FAQML::MarkdownFilter < Temple::Filter
+  def initialize(options = {})
+    @options = options
+    
+    renderer = Redcarpet::Render::HTML.new
+    extensions = {fenced_code_blocks: true}
+    @markdown = Redcarpet::Markdown.new(renderer, extensions)
+  end
+
+  def call(exp)
+    compile(exp)
+  end
+
+  def on_fml_answer(summary, details)
+    build_fml_type(:answer, summary, details)
+  end
+
+  def on_fml_question(summary, details)
+    build_fml_type(:question, summary, details)
+  end
+
+  def build_fml_type(type, summary, details)
+    [:fml, type,
+      [:fml, :summary, [build_markdown(summary.last)]],
+      [:fml, :details, [[:static, build_markdown(details.last)]]]
+    ]
+  end
+
+  def build_markdown(lines)
+    markdown_data = ""
+    lines.each do |line|
+      if line.is_a? String
+        markdown_data += line
+        next
+      end
+      case line.first
+      when :static
+      	markdown_data += line.last
+      when :newline
+      	markdown_data += "\n"
+      end
+    end
+    markdown_data = @markdown.render(markdown_data)
+  end
+end

data/lib/fml/version.rb

@@ -1,4 +1,4 @@
 module FAQML
   # @api public
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/fml/wrap_filter.rb

@@ -23,6 +23,8 @@ class FAQML::WrapFilter < Temple::Filter
       if exp.length > 2 && exp[0] == :fml
         case exp[1]
         when :question
+          # compile the details
+          # exp[3] = compile(exp[3])
           current_block = [:fml, :qna, exp]
           result << current_block
         when :answer

data/test/test0.fml

@@ -1,4 +1,2 @@
-question: What kind of bear is best?
-  Well?
-answer: False
-  Blackbear
+question: What kind of bear is *best?*
+answer: False. *Blackbear*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faqml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors: