karmi-markout 0.1.6 → 0.1.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 6
+:patch: 7
 :major: 0
 :minor: 1

data/lib/markout/formatters/html/html.rb

@@ -2,6 +2,7 @@ require 'rdiscount'
 require 'erb'
 require 'base64'
 require 'mime/types'
+require 'cgi'
 
 module Markout
 
@@ -58,6 +59,10 @@ module Markout
       @document.history
     end
 
+    def h(html)
+      CGI::escapeHTML(html.to_s)
+    end
+
     private
 
     # TODO : Make 'alt' attribute optional

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

@@ -20,7 +20,7 @@
   <% if history %>
   <div id="history_header">
     <p>Last revision: 
-      <strong><%= history.revisions.first.subject %></strong>
+      <strong><%= h(history.revisions.first.subject) %></strong>
       <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> -->
@@ -39,7 +39,7 @@
     <h2>History</h2>
     <% history.revisions.each do |revision| %>
     <div id="revision_<%= revision.sha %>" class="revision">
-      <h4><%= revision.date.strftime('%d/%m/%Y %H:%M') %> : <%= revision.subject %> (<%= revision.author %>)</h4>
+      <h4><%= revision.date.strftime('%d/%m/%Y %H:%M') %> : <%= h(revision.subject) %> (<%= revision.author %>)</h4>
       <div class="detail">
       <% if revision.message %><%= revision.message(:format => :html) %><% end %>
       <pre>

data/lib/markout/revision.rb

@@ -1,4 +1,5 @@
 require 'rdiscount'
+require 'cgi'
 
 module Markout
 
@@ -27,7 +28,7 @@ module Markout
     def message(options={})
       case options[:format]
       when :html
-        return RDiscount.new(@message).to_html
+        return RDiscount.new( CGI::escapeHTML(@message) ).to_html
       else
         return @message
       end
@@ -50,7 +51,7 @@ module Markout
 
     def inline_diff
       # FIXME: Cleanup
-      output  = %x[cd #{@repo.path} && git show --no-prefix --ignore-space-change --color-words #{@sha} 2>&1]
+      output  = %x[cd #{@repo.path} && git show --no-prefix --ignore-space-at-eol --color-words #{@sha} 2>&1]
       if $?.success?
         return convert_bash_color_codes( output.gsub(/(.*)@@(.*)/m, '\2') )
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: karmi-markout
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Karel Minarik
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-03 00:00:00 -07:00
+date: 2009-08-21 00:00:00 -07:00
 default_executable: markout
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,7 @@ files:
 - LICENSE
 has_rdoc: false
 homepage: http://github.com/karmi/markout
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Sexy Markdown output