dolt 0.5.0 → 0.5.1

data/lib/dolt/disk_repo_resolver.rb

@@ -28,9 +28,9 @@ module Dolt
     end
 
     def all
-      Dir.entries(root).select do |e|
-        File.exists?(File.join(root, e, ".git"))
-      end
+      (Dir.entries(root).select do |e|
+         File.exists?(File.join(root, e, ".git"))
+       end).sort
     end
 
     private

data/lib/dolt/version.rb

@@ -17,5 +17,5 @@
 #++
 
 module Dolt
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/dolt/view/markup.rb

@@ -21,6 +21,7 @@ module Dolt
   module View
     module Markup
       def render_markup(path, content)
+        content = highlight_code_blocks(path, content)
         markup = GitHub::Markup.render(path, content)
         "<div class=\"gts-markup\">#{markup}</div>"
       end
@@ -32,6 +33,75 @@ module Dolt
       def format_text_blob(path, code, repo = nil, ref = nil)
         render_markup(path, code)
       end
+
+      def highlight_code_blocks(path, markup)
+        return markup unless path =~ /\.(md|mkdn?|mdwn|mdown|markdown)$/
+        can_highlight = respond_to?(:highlight)
+        CodeBlockParser.parse(markup) do |lexer, code|
+          code = can_highlight ? highlight(path, code, { :lexer => lexer }) : code
+          l = can_highlight ? Pygments::Lexer.find(lexer) : nil
+          "<pre class=\"#{l && l.aliases.first} prettyprint\">#{code}</pre>"
+        end
+      end
+    end
+
+    class CodeBlockParser
+      attr_reader :lines
+
+      def self.parse(markup, &block)
+        new(markup).parse(&block)
+      end
+
+      def initialize(markup)
+        @lines = markup.split("\n")
+        @current_code_bock = nil
+      end
+
+      def parse(&block)
+        result = []
+
+        while line = @lines.shift
+          if closes_code_block?(line)
+            result << block.call(*close_active_code_block)
+          elsif active_code_block?
+            append_active_code_block(line)
+          elsif starts_code_block?(line)
+            start_code_block(line)
+          else
+            result << line
+          end
+        end
+
+        result.join("\n")
+      end
+
+      def active_code_block?
+        !@current_code_bock.nil?
+      end
+
+      def starts_code_block?(line)
+        line.match(/^```.*/)
+      end
+
+      def closes_code_block?(line)
+        active_code_block? && line == "```"
+      end
+
+      def start_code_block(line)
+        m = line.match(/```([^\s]+)/)
+        @current_code_bock = [m && m[1], []]
+      end
+
+      def append_active_code_block(line)
+        @current_code_bock[1] << line
+      end
+
+      def close_active_code_block
+        lexer = @current_code_bock[0]
+        code = @current_code_bock[1].join("\n")
+        @current_code_bock = nil
+        [lexer, code]
+      end
     end
   end
 end

data/test/dolt/view/markup_test.rb

@@ -17,14 +17,78 @@
 #++
 require "test_helper"
 require "dolt/view/markup"
+require "dolt/view/syntax_highlight"
+
+module StubHighlighter
+  def highlight(path, code, opt = {})
+    return "##[#{opt[:lexer]}]#{code}##"
+  end
+end
 
 describe Dolt::View::Markup do
   include Dolt::View::Markup
 
   describe "#render_markup" do
+    include Dolt::View::SyntaxHighlight
+
     it "wraps markup in .gts-markup" do
       html = render_markup("file.md", "# Hey")
       assert_match "<div class=\"gts-markup\">", html
     end
+
+    it "renders multi-line code blocks with syntax highlighting" do
+      html = render_markup("file.md", <<-MD)
+```cl
+(s-trim-left "trim ") ;; => "trim "
+(s-trim-left " this") ;; => "this"
+```
+      MD
+
+      assert_match "<pre class=\"common-lisp prettyprint\">", html
+    end
+
+    it "highlights multiple separate multi-line code blocks" do
+      html = render_markup("file.md", <<-MD)
+# # This stuff
+
+```cl
+(s-trim-left "trim ") ;; => "trim "
+(s-trim-left " this") ;; => "this"
+```
+
+# And this stuff
+
+```cl
+(s-trim-left "trim ") ;; => "trim "
+(s-trim-left " this") ;; => "this"
+```
+      MD
+
+      assert_equal 2, html.scan(/common-lisp/).length
+    end
+  end
+
+  describe "#highlight_code_blocks" do
+    include StubHighlighter
+
+    it "does not touch non-markdown files" do
+      content = "```cl\n(yup)\n```"
+      assert_equal content, highlight_code_blocks("file.rst", content)
+    end
+
+    it "highlights one-line code block" do
+      content = "```cl\n(yup)\n```"
+      assert_match "##[cl](yup)##", highlight_code_blocks("file.md", content)
+    end
+
+    it "highlights multi-line code block" do
+      content = "```cl\n(yup)\n(yessir-p t)\n```"
+      assert_match "##[cl](yup)\n(yessir-p t)##", highlight_code_blocks("file.md", content)
+    end
+
+    it "preserves code block white-space" do
+      content = "```cl\n(yup\n  (yessir-p t))\n```"
+      assert_match "##[cl](yup\n  (yessir-p t))##", highlight_code_blocks("file.md", content)
+    end
   end
 end

data/vendor/ui/css/gitorious.css

@@ -594,3 +594,10 @@ input[type=text].gts-ref-input {
        possible" */
     width: 1em;
 }
+
+.gts-markup code {
+    border: none;
+    color: inherit;
+    font-size: 0.9em;
+    padding: 2px;
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dolt
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Christian Johansen