dnote 1.1.1 → 1.1.2

data/MANIFEST

@@ -9,6 +9,7 @@ lib/dnote/command.rb
 lib/dnote/format.rb
 lib/dnote/notes.rb
 lib/dnote/site.rb
+lib/dnote/string.rb
 lib/dnote/templates
 lib/dnote/templates/gnu.erb
 lib/dnote/templates/html.erb

data/lib/dnote.rb

@@ -1,5 +1,5 @@
 module DNote
-  VERSION = "1.1.1"  #:till: VERSION = "<%= version %>"
+  VERSION = "1.1.2"  #:till: VERSION = "<%= version %>"
 
   require 'dnote/notes'
 

data/lib/dnote/format.rb

@@ -12,6 +12,7 @@ module DNote
     require 'fileutils'
     require 'erb'
     require 'rexml/text'
+    require 'dnote/string'
 
     #DEFAULT_OUTPUT_DIR = "log/dnote"
 

data/lib/dnote/notes.rb

@@ -94,7 +94,11 @@ module DNote
                   text.strip!
                   text = nil
                 else
-                  text << ' ' << line.gsub(/^\s*#\s*/,'')
+                  if text[-1,1] == "\n"
+                    text << line.gsub(/^\s*#\s*/,'')
+                  else
+                    text << "\n" << line.gsub(/^\s*#\s*/,'')
+                  end
                 end
               end
             end

data/lib/dnote/string.rb

@@ -0,0 +1,68 @@
+class Xacto
+
+  # Extensions for String class.
+  # These methods are taken directly from Ruby Facets.
+  #
+  module String
+
+    # Provides a margin controlled string.
+    #
+    #   x = %Q{
+    #         | This
+    #         |   is
+    #         |     margin controlled!
+    #         }.margin
+    #
+    #
+    #   NOTE: This may still need a bit of tweaking.
+    #
+    #  CREDIT: Trans
+
+    def margin(n=0)
+      #d = /\A.*\n\s*(.)/.match( self )[1]
+      #d = /\A\s*(.)/.match( self)[1] unless d
+      d = ((/\A.*\n\s*(.)/.match(self)) ||
+          (/\A\s*(.)/.match(self)))[1]
+      return '' unless d
+      if n == 0
+        gsub(/\n\s*\Z/,'').gsub(/^\s*[#{d}]/, '')
+      else
+        gsub(/\n\s*\Z/,'').gsub(/^\s*[#{d}]/, ' ' * n)
+      end
+    end
+
+    # Preserves relative tabbing.
+    # The first non-empty line ends up with n spaces before nonspace.
+    #
+    #  CREDIT: Gavin Sinclair
+
+    def tabto(n)
+      if self =~ /^( *)\S/
+        indent(n - $1.length)
+      else
+        self
+      end
+    end
+
+    # Indent left or right by n spaces.
+    # (This used to be called #tab and aliased as #indent.)
+    #
+    #  CREDIT: Gavin Sinclair
+    #  CREDIT: Trans
+
+    def indent(n)
+      if n >= 0
+        gsub(/^/, ' ' * n)
+      else
+        gsub(/^ {0,#{-n}}/, "")
+      end
+    end
+
+  end
+
+  class ::String #:nodoc:
+    include Xacto::String
+  end
+
+end
+

data/lib/dnote/templates/gnu.erb

@@ -4,5 +4,5 @@
     <%= label %>:
 <%   per_file.each do |file, line_notes| %>
 <% line_notes.sort!{ |a,b| a[0] <=> b[0] } %><% line_notes.each do |line, note| %>
-        * <%= note %> (<%= file %>:<%= line %>)
+<%= note.indent(10).sub(' ' * 10,'        * ') %> (<%= file %>:<%= line %>)
 <% end; end; end %>

data/lib/dnote/templates/markdown.erb

@@ -1,11 +1,17 @@
-# <%= title %><% notes.each do |label, per_file| %>
+<%= title %>
+
+<%= '=' * title.size %>
+
+<% notes.each do |label, per_file| %>
+
+<%= label %> 
+<%= '-' * (label.size) %>
 
-## <%= label %>
 <%   per_file.each do |file, line_notes| %>
 
 ### file://<%= file %>
 
 <% line_notes.sort!{ |a,b| a[0] <=> b[0] } %><% line_notes.each do |line, note| %>
-* <%= note.gsub("\n", ' ') %> (<%= line %>)
+* <%= note %> (<%= line %>)
 <% end; end; end %>
 

data/lib/dnote/templates/rdoc.erb

@@ -6,6 +6,6 @@
 === file://<%= file %>
 
 <% line_notes.sort!{ |a,b| a[0] <=> b[0] } %><% line_notes.each do |line, note| %>
-* <%= note.gsub("\n", ' ') %> (<%= line %>)
+* <%= note %> (<%= line %>)
 <% end; end; end %>
 

data/meta/version

@@ -1 +1 @@
-1.1.1
+1.1.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnote
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Thomas Sawyer
@@ -32,6 +32,7 @@ files:
 - lib/dnote/format.rb
 - lib/dnote/notes.rb
 - lib/dnote/site.rb
+- lib/dnote/string.rb
 - lib/dnote/templates/gnu.erb
 - lib/dnote/templates/html.erb
 - lib/dnote/templates/markdown.erb