karmi-markout 0.1.2 → 0.1.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 1
-:patch: 2
+:patch: 3
 :major: 0

data/lib/markout/formatters/html/templates/common/code.css

@@ -1,11 +1,11 @@
+.diff ins,
 .diff .ins {
   color: green;
-/*  background-color: rgba(0, 0, 0, 0.03);*/
-  background-color: #f0f5f1;
+  text-decoration: none;
 }
 
+.diff del,
 .diff .del {
   color: red;
-/*  background-color: rgba(0, 0, 0, 0.03);*/
-  background-color: #f0f5f1;
+  text-decoration: none;
 }

data/lib/markout/formatters/html/templates/common/syntax_diff.js

@@ -1,8 +1,8 @@
 CodeHighlighter.addStyle("diff",{
 	ins : {
-		exp  : /\+[^\n]+/
+		exp  : /\+[^\n]*/
 	},
 	del : {
-		exp  : /\-[^\n]+/
+		exp  : /\-[^\n]*/
 	}
 });

data/lib/markout/formatters/html/templates/default/content.rhtml

@@ -10,7 +10,6 @@
   <style type="text/css" media="screen"><%= screen_style %></style>
   <style type="text/css" media="print"><%= print_style %></style>
 
-  <%= syntax_highlighter %>
   <script type="text/javascript"><%= jquery %></script>
   <script type="text/javascript"><%= application_js %></script>
 
@@ -22,7 +21,7 @@
   <div id="history_header">
     <p>Last revision: 
       <strong><%= history.revisions.first.subject %></strong>
-      <em>(<%= history.revisions.first.author %>, <%= history.revisions.first.date.strftime('%m/%d/%Y %H:%M') %>)</em> | 
+      <em>(<%= history.revisions.first.author %>, <%= history.revisions.first.date.strftime('%d/%m/%Y %H:%M') %>)</em> | 
       <a href="#history">History</a>
       <!-- <strong class="new_revisions">(3 new)</strong> -->
     </p>
@@ -40,11 +39,11 @@
     <h2>History</h2>
     <% history.revisions.each do |revision| %>
     <div id="revision_<%= revision.sha %>" class="revision">
-      <h4><%= revision.date.strftime('%m/%d/%Y %H:%M') %> : <%= revision.subject %> (<%= revision.author %>)</h4>
+      <h4><%= revision.date.strftime('%d/%m/%Y %H:%M') %> : <%= revision.subject %> (<%= revision.author %>)</h4>
       <div class="detail">
       <pre>
 <code class="diff">
-<%= revision.diff %>
+<%= revision.diff(:format => 'inline') %>
 </code>
       </pre>
       </div><!-- /detail -->

data/lib/markout/formatters/html/templates/default/screen.css

@@ -163,12 +163,26 @@ hr { display: none; }
 }
 
 #history .revision pre {
+  background: none;
+  line-height: 120%;
   border: none;
   margin: 0;
-  padding: 0;
+  padding: 0 1em 0 1em;
 }
 
 #history .revision code {
   margin: 0;
   padding: 0;
 }
+
+#history .diff ins,
+#history .diff .ins {
+  color: green;
+  text-decoration: none;
+}
+
+#history .diff del,
+#history .diff .del {
+  color: red;
+  text-decoration: none;
+}

data/lib/markout/history.rb

@@ -23,7 +23,7 @@ module Markout
     def load_revisions
       @repo ||= load_repository
       commits = @repo.log 'master', @document.filename
-      @revisions = commits.collect { |c| Markout::Revision.new(c) }
+      @revisions = commits.collect { |c| Markout::Revision.new(@repo, c) }
       # puts @revisions
     end
   end

data/lib/markout/revision.rb

@@ -1,20 +1,60 @@
 module Markout
 
   class Revision
-    attr_reader :sha, :date, :author, :subject, :message, :diff
-    def initialize(commit)
+
+    attr_reader :sha, :date, :author, :subject, :message
+
+    def initialize(repo, commit)
+      @repo   = repo
       @sha    = commit.sha
       @date   = commit.date
       @author = commit.author.to_s
       @subject, @message = parse_commit_message(commit)
-      @diff   = commit.show.first.diff
+      @diff   = commit.show.first.diff || ''
+    end
+
+    def diff(options={})
+      case options[:format]
+        when 'raw'    then @diff
+        when 'short'  then short_diff
+        when 'inline' then inline_diff
+        else @diff
+      end
     end
 
     private
+
     def parse_commit_message(commit)
       lines = commit.message.split("/n")
       [ lines.first, lines[1..commit.message.size].join("\n") ]
     end
+
+    def short_diff
+      @diff.gsub(/^\-\-\- a\/\S+\n+/, '').
+            gsub(/^\+\+\+ b\/\S+\n+/, '').
+            gsub(/^\-\-\- \/dev\/null\n+/, '').
+            gsub(/^\+\+\+ \/dev\/null\n+/, '').
+            gsub(/^@@ .+\n+/,   '')
+    end
+
+    def inline_diff
+      # FIXME: Cleanup
+      output  = %x[cd #{@repo.path} && git show --no-prefix --ignore-space-change --color-words #{@sha} 2>&1]
+      if $?.success?
+        return convert_bash_color_codes( output.gsub(/(.*)@@(.*)/m, '\2') )
+      else
+        return short_diff
+      end
+    end
+
+    # Lifted from Integrity (www.integrityapp.com), (c) foca & sr
+    def convert_bash_color_codes(string)
+      string.
+        gsub(/\e\[31m([^\e]*)\e\[m/, '<del>\1</del>').
+        gsub(/\e\[32m([^\e]*)\e\[m/, '<ins>\1</ins>').
+        gsub("\e[m", '')
+    end
+
   end
 
 end

data/test/fixtures/markdown.html

@@ -172,9 +172,11 @@ hr { display: none; }
 }
 
 #history .revision pre {
+  background: none;
+  line-height: 120%;
   border: none;
   margin: 0;
-  padding: 0;
+  padding: 0 1em 0 1em;
 }
 
 #history .revision code {
@@ -407,21 +409,19 @@ CodeHighlighter.init = function() {
 	}
 }</script><script type="text/javascript">CodeHighlighter.addStyle("diff",{
 	ins : {
-		exp  : /\+[^\n]+/
+		exp  : /\+[^\n]*/
 	},
 	del : {
-		exp  : /\-[^\n]+/
+		exp  : /\-[^\n]*/
 	}
-});</script><style type="text/css" media="screen">.diff .ins {
+});</script><style type="text/css" media="screen">.diff ins,
+.diff .ins {
   color: green;
-/*  background-color: rgba(0, 0, 0, 0.03);*/
-  background-color: #f0f5f1;
 }
 
+.diff del,
 .diff .del {
   color: red;
-/*  background-color: rgba(0, 0, 0, 0.03);*/
-  background-color: #f0f5f1;
 }</style>
   <script type="text/javascript">/*
  * jQuery JavaScript Library v1.3.2

data/test/markout_revision_test.rb

@@ -5,9 +5,11 @@ require 'ostruct'
 module Markout
   class RevisionTest < Test::Unit::TestCase
 
-    def test_should_initialize_with_commit
+    def test_should_initialize_with_repo_and_commit
       assert_nothing_raised do
-        @revision = Markout::Revision.new( fake_grit_commit )
+        @revision = Markout::Revision.new( 
+          Grit::Repo.new(fixtures_path.join('empty_repository__dot__git'), :is_bare => true), 
+          fake_grit_commit )
       end
       assert_not_nil @revision.sha
       assert_not_nil @revision.date

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: karmi-markout
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Karel Minarik