snaptoken 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cdda0b4122ad8de3618fbe31a5bb47444c4c028
-  data.tar.gz: 847bf9a36e8a2985abead05a23d61ea946fbb2ff
+  metadata.gz: 545140027c981fe0ffe37f26e2624c217d2f24b1
+  data.tar.gz: 1cd114bc8a2d9da435a0d5e0bdcd4d1fec731ad1
 SHA512:
-  metadata.gz: 80c11378a11b53fdb0d81bcd74abe044b71e608095e39328bc9b31eea958d0fef049c0ee4f02813d1366c0d376d3d4d7e69dfea1fe498f3fdd4de97e5c6b66a0
-  data.tar.gz: d5e76857782a44258e6dcde59d774cd480f3f237cd7201154c68a170a48c3947c9eee21ccc626441fd04a23eccb041f59a91f58e554358cdbd6fd294ceea0c08
+  metadata.gz: 565f94f26a32f86b785943a7df713e3f9a3cfa20cb0d110f4d5c71ea5fbb3ad5b1d86c201235e7448b0ad5aa028b56626bf846a7e0e968c05177d1cdc596e6dc
+  data.tar.gz: a901bc63c54d19227134d9ce2e267ce88207f89e23c0df5201237fa9f9ddf035a0c0baf47ae4a5deabb65f4f80d62ebbb4a698c2401bb4cb41c15c9b7560dd09

data/lib/snaptoken/commands/doc.rb

@@ -11,10 +11,8 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
     needs! :config, :config_name, :config_title, :steps_folder, :steps, :doc
 
     FileUtils.cd(File.join(@config[:path], "doc")) do
-      unless @args.include? "-c"
-        FileUtils.rm_rf("html_out")
-        FileUtils.mkdir("html_out")
-      end
+      FileUtils.rm_rf("html_out")
+      FileUtils.mkdir("html_out")
 
       copy_static_files
       write_css
@@ -22,21 +20,6 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
     end
   end
 
-  class HTMLLineByLine < Rouge::Formatter
-    def initialize(formatter)
-      @formatter = formatter
-    end
-
-    def stream(tokens, &b)
-      token_lines(tokens) do |line|
-        line.each do |tok, val|
-          yield @formatter.span(tok, val)
-        end
-        yield "\n"
-      end
-    end
-  end
-
   private
 
   def copy_static_files
@@ -109,7 +92,7 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
     end
 
     index = ""
-    markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+    markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(with_toc_data: true))
     pages = Dir["*.md"].sort.map { |f| f.sub(/\.md$/, '') }
     pages.delete "00.index"
     pages.each.with_index do |page, idx|
@@ -131,6 +114,8 @@ class Snaptoken::Commands::Doc < Snaptoken::Commands::BaseCommand
 
       content = markdown.render(md)
       content = Redcarpet::Render::SmartyPants.render(content)
+      content.gsub!(/<\/code>&lsquo;/) { "</code>&rsquo;" }
+      content.gsub!(/^\s*<h([23456]) id="([^"]+)">(.+)<\/h\d>$/) { "<h#{$1} id=\"#{$2}\"><a href=\"##{$2}\">#{$3}</a></h#{$1}>" }
       content.gsub!(/<p>{{([\w-]+)}}<\/p>/) { diffs[$1] }
 
       html = html_template.dup

data/lib/snaptoken/diff.rb

@@ -170,11 +170,12 @@ class Snaptoken::Diff
     @files = {}
 
     git_diff.lines.each do |line|
-      if !in_diff && line =~ /^diff --git (\S+) (\S+)$/
-        diff_file = DiffFile.new(File.basename($2))
+      if line =~ /^diff --git (\S+) (\S+)$/
+        diff_file = DiffFile.new($2.split("/")[2..-1].join("/"))
         @files[diff_file.filename] = diff_file
         section_stack = [diff_file]
         line_idx = -1
+        in_diff = false
       elsif !in_diff && line.start_with?('new file')
         diff_file.new_file!
       elsif line.start_with? '@@'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snaptoken
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged