aweplug 1.0.0.a3 → 1.0.0.a4

data/lib/aweplug/extensions/kramdown_quickstart.rb

@@ -11,7 +11,7 @@ module Aweplug
 
         def initialize repository, layout, output_dir
           @repo = repository
-          @output_dir = output_dir
+          @output_dir = Pathname.new output_dir
           @layout = layout
         end
 
@@ -22,22 +22,33 @@ module Aweplug
             metadata = extract_metadata(file)
             metadata[:commits] = commit_info @repo, Pathname.new(file)
 
-            page.send 'metadata=', @metadata
+            page.send 'metadata=', metadata
             # TODO: Upload to DCP
           end
         end
 
         def extract_metadata(file)
-          (Kramdown::Document.new File.readlines(file).join, :input => 'QuickStartParser').root.options[:metadata]
+          document = (::Kramdown::Document.new File.readlines(file).join, :input => 'QuickStartParser')
+          toc = ::Kramdown::Converter::Toc.convert(document.root)
+          toc_items = toc[0].children.select { |el| el.value.options[:level] == 2 }.map do |t| 
+            {:id => t.attr[:id], :text => t.value.children.first.value}
+          end
+
+          metadata = document.root.options[:metadata]
+          metadata[:toc] = toc_items
+          metadata
         end
 
         def add_to_site(site, file)
+          page_path = Pathname.new file
           page = site.engine.load_site_page file
           page.layout = @layout
-          page.output_path = File.join @output_path, page.output_filename
+          page.output_path = File.join @output_dir, page_path.relative_path_from(Pathname.new @repo).dirname, 'index.html'
+          site.pages << page
           page
         end
       end
     end
   end
 end
+

data/lib/aweplug/helpers/kramdown_metadata.rb

@@ -12,47 +12,75 @@ module Kramdown
         @block_parsers.unshift :target_product_metadata
         @block_parsers.unshift :source_metadata
         @block_parsers.unshift :summary_metadata
+        @block_parsers.unshift :product_metadata
+        @block_parsers.unshift :title_hack_metadata
 
         @root.options[:metadata] = {:author => '', :level => '',
                                     :technologies => '', :target_product => '',
                                     :source => '', :summary => ''}
       end
 
+      HEADER_ID=/(?:[ \t]+\{#([A-Za-z][\w:-]*)\})?/
+      SETEXT_HEADER_START = /^(#{OPT_SPACE}[^ \t].*?)#{HEADER_ID}[ \t]*?\n(=)+\s*?\n/
+
+      def parse_title_hack_metadata 
+        return false if !after_block_boundary?
+
+        #start_line_number = @src.current_line_number
+        @src.pos += @src.matched_size
+        text, id, _ = @src[1], @src[2], @src[3]
+        text.strip!
+        el = new_block_el(:header, nil, nil, :level => 1, :raw_text => text, :location => 1)
+        add_text(text, el)
+        el.attr['id'] = id if id
+        
+        @root.options[:metadata][:title] = text
+        #@tree.children << el
+        true
+      end
+      define_parser(:title_hack_metadata, SETEXT_HEADER_START)
+
       def parse_author_metadata
         @src.pos += @src.matched_size
-        @root.options[:metadata][:author] = @src[3]
+        @root.options[:metadata][:author] = @src[2].rstrip
       end
-      define_parser(:author_metadata, /^(Author:)(\s+)(.*?)$/)
+      define_parser(:author_metadata, /^(Author:)#{OPT_SPACE}(.*?)\s*?\n/)
 
       def parse_level_metadata
         @src.pos += @src.matched_size
-        @root.options[:metadata][:level] = @src[3]
+        @root.options[:metadata][:level] = @src[2].rstrip
       end
-      define_parser(:level_metadata, /^(Level:)(\s+)(.*?)$/)
+      define_parser(:level_metadata, /^(Level:)#{OPT_SPACE}(.*?)\s*?\n/)
 
       def parse_technologies_metadata
         @src.pos += @src.matched_size
-        @root.options[:metadata][:technologies] = @src[3]
+        @root.options[:metadata][:technologies] = @src[2].rstrip
       end
-      define_parser(:technologies_metadata, /^(Technologies:)(\s+)(.*?)$/)
+      define_parser(:technologies_metadata, /^(Technologies:)#{OPT_SPACE}(.*?)\s*?\n/)
 
       def parse_target_product_metadata
         @src.pos += @src.matched_size
-        @root.options[:metadata][:target_product] = @src[3]
+        @root.options[:metadata][:target_product] = @src[2].rstrip
       end
-      define_parser(:target_product_metadata, /^(Target Product:)(\s+)(.*?)$/)
+      define_parser(:target_product_metadata, /^(Target Product:)#{OPT_SPACE}(.*?)\s*?\n/)
 
       def parse_source_metadata
         @src.pos += @src.matched_size
-        @root.options[:metadata][:source] = @src[3][1..-2]
+        @root.options[:metadata][:source] = @src[2][1..-2].rstrip
       end
-      define_parser(:source_metadata, /^(Source:)(\s+)(.*?)$/)
+      define_parser(:source_metadata, /^(Source:)#{OPT_SPACE}(.*?)\s*?\n/)
 
       def parse_summary_metadata
         @src.pos += @src.matched_size
-        @root.options[:metadata][:summary] = @src[3]
+        @root.options[:metadata][:summary] = @src[2].rstrip
+      end
+      define_parser(:summary_metadata, /^(Summary:)#{OPT_SPACE}(.*?)\s*?\n/)
+
+      def parse_product_metadata
+        @src.pos += @src.matched_size
+        @root.options[:metadata][:product] = @src[2].rstrip
       end
-      define_parser(:summary_metadata, /^(Summary:)(\s+)(.*?)$/)
+      define_parser(:product_metadata, /^(Product Versions:)#{OPT_SPACE}(.*?)\s*?\n/)
     end
   end
 end

data/lib/aweplug/version.rb

@@ -1,4 +1,4 @@
 module Aweplug
-  VERSION='1.0.0.a3'
+  VERSION='1.0.0.a4'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aweplug
 version: !ruby/object:Gem::Version
-  version: 1.0.0.a3
+  version: 1.0.0.a4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit