dnote 1.6.1 → 1.7.0

data/lib/dnote/templates/md/file.erb

@@ -9,5 +9,6 @@ file://<%= file %>
 
 <% list.each do |note| %>
 * <%= note %> (<%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(4).rstrip + "\n\n" %><% end %>
 <% end; end %>
 

data/lib/dnote/templates/md/label.erb

@@ -14,5 +14,6 @@
 
 <% line_notes.each do |note| %>
 * <%= note %> (<%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(4).rstrip + "\n\n" %><% end %>
 <% end; end; end %>
 

data/lib/dnote/templates/md/list.erb

@@ -5,5 +5,6 @@
 
 <% notes.each_with_index do |note, index| %>
 <%= "%s" % [index+1] %>. <%= note.label %>: <%= h note.textline %> (<%= note.file %>: <%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(4).rstrip + "\n\n" %><% end %>
 <% end %>
 

data/lib/dnote/templates/rdoc.erb

@@ -7,5 +7,6 @@
 
 <% line_notes.each do |note| %>
 * <%= note %> (<%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(4).rstrip + "\n\n" %><% end %>
 <% end; end; end %>
 

data/lib/dnote/templates/rdoc/file.erb

@@ -5,5 +5,6 @@
 
 <% list.each do |note| %>
 * <%= note %> (<%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(4).rstrip + "\n\n" %><% end %>
 <% end; end %>
 

data/lib/dnote/templates/rdoc/label.erb

@@ -7,5 +7,6 @@
 
 <% line_notes.each do |note| %>
 * <%= note %> (<%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(4).rstrip + "\n\n" %><% end %>
 <% end; end; end %>
 

data/lib/dnote/templates/rdoc/list.erb

@@ -2,5 +2,6 @@
 
 <% notes.each_with_index do |note, index| %>
 * <%= note.label %>: <%= h note.textline %> (<%= note.file %>: <%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(4).rstrip + "\n\n" %><% end %>
 <% end %>
 

data/lib/dnote/templates/text.erb

@@ -7,5 +7,6 @@
 
 <% line_notes.each_with_index do |note, i| %>
 <%= note.text.indent(6).sub(' ' * 6,(" %3s. " % [i+1])) %> (<%= note.file %>:<%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(8) + "\n" %><% end %>
 <% end; end %>
 

data/lib/dnote/templates/text/file.erb

@@ -5,6 +5,7 @@
 <%= file %>:
 
 <% line_notes.sort!{ |a,b| a.line <=> b.line } %><% line_notes.each do |note| %>
-<%= note.to_s.indent(10).sub(' ' * 10,'        * ') %> (<%= note.line %>)
+<%= note.to_s.indent(4).sub(' ' * 4,'    * ') %> (<%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(10) + "\n" %><% end %>
 <% end; end %>
 

data/lib/dnote/templates/text/list.erb

@@ -3,5 +3,6 @@
 
 <% notes.each_with_index do |note, index| %>
 <%= "%4s %s %s" % [index+1, note.label, note.text.gsub("\n", ' ')] %> (<%= note.file %>:<%= note.line %>)
+<% if note.code? %><%= "\n" + note.code.tabset(8) + "\n" %><% end %>
 <% end %>
 

data/lib/dnote/templates/xml.erb

@@ -1,15 +1,23 @@
 <?xml version="1.0" ?>
 <notes>
 <% notes.by_label_file.each do |label, per_file| %>
-    <label name="<%= label %>">
+  <label name="<%= label %>">
 <% per_file.each do |file, line_notes| %>
-        <file src="<%= file %>">
+    <file src="<%= file %>">
 <% line_notes.sort!{ |a,b| a.line <=> b.line } %>
 <% line_notes.each do |note| %>
-            <note line="<%= note.line %>" type="<%= label %>"><%= h note.textline %></note>
+      <note line="<%= note.line %>" type="<%= label %>">
+        <%= h note.textline %>
+<% if note.code? %>
+
+<![CDATA[
+<%= note.code %>
+]]>
 <% end %>
-        </file>
+      </note>
 <% end %>
-    </label>
+    </file>
+<% end %>
+  </label>
 <% end %>
 </notes>

data/lib/dnote/templates/xml/file.erb

@@ -1,15 +1,23 @@
 <?xml version="1.0" ?>
 <notes>
 <% notes.by_file_label.each do |file, per_label| %>
-    <file src="<%= file %>">
+  <file src="<%= file %>">
 <% per_label.each do |label, lnotes| %>
-        <label name="<%= label %>">
+    <label name="<%= label %>">
 <% line_notes.sort!{ |a,b| a.line <=> b.line } %>
 <% line_notes.each do |note| %>
-            <note line="<%= note.line %>" type="<%= label %>"><%= h note.textline %></note>
+      <note line="<%= note.line %>" type="<%= label %>">
+        <%= h note.textline %>
+<% if note.code? %>
+
+<![CDATA[
+<%= note.code %>
+]]>
 <% end %>
-        </label>
+      </note>
 <% end %>
-    </file>
+    </label>
+<% end %>
+  </file>
 <% end %>
 </notes>

data/lib/dnote/templates/xml/label.erb

@@ -1,12 +1,20 @@
 <?xml version="1.0" ?>
 <notes>
 <% notes.by_label_file.each do |label, per_file| %>
-    <label name="<%= label %>">
+  <label name="<%= label %>">
 <% per_file.each do |file, line_notes| %>
-        <file src="<%= file %>">
+    <file src="<%= file %>">
 <% line_notes.sort!{ |a,b| a.line <=> b.line } %>
 <% line_notes.each do |note| %>
-            <note line="<%= note.line %>" type="<%= label %>"><%= h note.textline %></note>
+      <note line="<%= note.line %>" type="<%= label %>">
+        <%= h note.textline %>
+<% if note.code? %>
+
+<![CDATA[
+<%= note.code %>
+]]>
+<% end %>
+</note>
 <% end %>
         </file>
 <% end %>

data/lib/dnote/templates/xml/list.erb

@@ -1,6 +1,14 @@
 <?xml version="1.0" ?>
 <notes>
 <% notes.each do |note| %>
-  <note file="<%= note.file %>" line="<%= note.line %>" type="<%= label %>"><%= h note.textline %></note>
+  <note file="<%= note.file %>" line="<%= note.line %>" type="<%= label %>">
+    <%= h note.textline %>
+<% if note.code? %>
+
+<![CDATA[
+<%= note.code %>
+]]>
+<% end %>
+</note>
 <% end %>
 </notes>

data/lib/dnote/version.rb

@@ -1,3 +1,16 @@
 module DNote
-  VERSION = '1.5.0'
+
+  #
+  def self.metadata
+    @metadata ||= (
+      require 'yaml'
+      YAML.load_file(File.dirname(__FILE__) + '/../dnote.yml')
+    )
+  end
+
+  #
+  def self.const_missing(name)
+    metadata[name.to_s.downcase] || super(name)
+  end
+
 end

data/test/notes_case.rb

@@ -1,44 +1,64 @@
+require 'lemon'
+require 'ae'
 require 'dnote/notes'
 
 testcase DNote::Notes do
 
   concern "Coverage of DNote::Notes class."
 
-  unit :labels => 'returns the list of labels' do
-    notes = DNote::Notes.new([], :labels=>['TODO'])
-    notes.labels.assert == ['TODO'] #DNote::Notes::DEFAULT_LABELS
+  method :labels do
+    test 'returns the list of labels' do
+      notes = DNote::Notes.new([], :labels=>['TODO'])
+      notes.labels.assert == ['TODO'] #DNote::Notes::DEFAULT_LABELS
+    end
   end
 
-  unit :files => 'returns the files attribute' do
-    notes = DNote::Notes.new(["example1.rb"])
-    notes.assert.files == ["example1.rb"]
-    notes = DNote::Notes.new([], :paths => ["example2.rb"])
-    notes.assert.files == ["example2.rb"]
+  method :files do
+    test 'returns the files attribute' do
+      notes = DNote::Notes.new(["example1.rb"])
+      notes.assert.files == ["example1.rb"]
+      notes = DNote::Notes.new([], :paths => ["example2.rb"])
+      notes.assert.files == ["example2.rb"]
+    end
   end
 
-  unit :files= => 'changes the paths attribute' do
-    notes = DNote::Notes.new([])
-    notes.files = ["example1.rb"]
-    notes.assert.files == ["example1.rb"]
+  method :files do
+    test 'changes the paths attribute' do
+      notes = DNote::Notes.new([])
+      notes.files = ["example1.rb"]
+      notes.assert.files == ["example1.rb"]
+    end
   end
 
-  unit :match_general => '' do
-    notes = DNote::Notes.new([])
-    line, lineno, file = "# TODO: Do something or another!", 1, "foo.rb"
-    rec = notes.match_general(line, lineno, file)
-    rec.to_h.assert == {'label'=>"TODO",'file'=>file,'line'=>lineno,'text'=>"Do something or another!"}
+  method :match_general do
+    test 'works' do
+      notes = DNote::Notes.new([])
+      line, lineno, file = "# TODO: Do something or another!", 1, "foo.rb"
+      rec = notes.match_general(line, lineno, file)
+      rec.to_h.assert == {'label'=>"TODO",'file'=>file,'line'=>lineno,'text'=>"Do something or another!"}
+    end
   end
 
-  unit :match_special => '' do
-    notes = DNote::Notes.new([], :labels=>['TODO'])
-    line, lineno, file = "# TODO: Do something or another!", 1, "foo.rb"
-    rec = notes.match_special(line, lineno, file)
-    rec.to_h.assert == {'label'=>"TODO",'file'=>file,'line'=>lineno,'text'=>"Do something or another!"}
+  method :match_special do
+    test 'works' do
+      notes = DNote::Notes.new([], :labels=>['TODO'])
+      line, lineno, file = "# TODO: Do something or another!", 1, "foo.rb"
+      rec = notes.match_special(line, lineno, file)
+      rec.to_h.assert == {'label'=>"TODO",'file'=>file,'line'=>lineno,'text'=>"Do something or another!"}
+    end
   end
 
-  unit :counts
-  unit :notes
-  unit :parse
+  method :counts do
+    test{ raise NotImplementedError }
+  end
+
+  method :notes do
+    test{ raise NotImplementedError }
+  end
+
+  method :parse do
+    test{ raise NotImplementedError }
+  end
 
 end
 

metadata

@@ -1,82 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dnote
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 1
-  version: 1.6.1
+version: !ruby/object:Gem::Version
+  version: 1.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Thomas Sawyer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: lemon
+  requirement: &13030000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *13030000
+- !ruby/object:Gem::Dependency
+  name: ae
+  requirement: &13029220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: redline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *13029220
+- !ruby/object:Gem::Dependency
+  name: detroit
+  requirement: &13028580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: reap
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *13028580
+- !ruby/object:Gem::Dependency
+  name: reap
+  requirement: &13027940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: DNote makes it easy to extract developer's notes from source code, and supports almost any language.
-email: transfire@gmail.com
-executables: 
+  prerelease: false
+  version_requirements: *13027940
+description: ! 'DNote makes it easy to extract developer''s notes from source code,
+
+  and supports almost any language.'
+email:
+- transfire@gmail.com
+executables:
 - dnote
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- HISTORY.rdoc
 - README.rdoc
-files: 
+- COPYING.rdoc
+files:
 - .ruby
+- .yardopts
 - bin/dnote
 - lib/dnote/core_ext.rb
 - lib/dnote/format.rb
 - lib/dnote/note.rb
 - lib/dnote/notes.rb
+- lib/dnote/rake/dnotetask.rb
 - lib/dnote/session.rb
-- lib/dnote/string.rb
 - lib/dnote/templates/html/file.erb
 - lib/dnote/templates/html/label.erb
 - lib/dnote/templates/html/list.erb
@@ -115,51 +115,35 @@ files:
 - lib/dnote/templates/yaml.erb
 - lib/dnote/version.rb
 - lib/dnote.rb
-- lib/plugins/rake/task.rb
-- lib/plugins/redline/dnote.rb
 - test/notes_case.rb
 - try/sample.bas
 - try/sample.js
 - try/sample.rb
 - HISTORY.rdoc
-- APACHE2.txt
 - README.rdoc
-has_rdoc: true
+- COPYING.rdoc
 homepage: http://rubyworks.github.com/dnote
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --title
-- DNote API
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: dnote
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Extract developer's notes from source code
+summary: Extract developer's notes from source code.
 test_files: []
-