literate_md 1.0.3 → 1.0.4

data/bin/literate_md

@@ -4,8 +4,8 @@ require 'coderay'
 require 'redcarpet'
 require 'trollop'
 require 'fileutils'
- 
-opts = Trollop::options do
+
+opts = $opts || Trollop::options do
   opt :weave, "Produce documentation", :short => 'w'
   opt :tangle, "Produce code", :short => 't'
   opt :outputdir, "Directory to write files to", :default => Dir.pwd, :short => 'o'
@@ -76,8 +76,9 @@ class Tangle < Redcarpet::Render::Base
     (1..chunks.length-1).each{|index|
       last, this = chunks[index-1], chunks[index]
       new_snippet = code[
-      	last[:start] + last[:anchor_len], 
-      	[this[:start] - this[:anchor_len], 0 ].max ]
+        last[:start] + last[:anchor_len], # start index
+        this[:start] - (last[:start] + last[:anchor_len]) # length of substr
+      ]
       @links[normalise(last[:anchor],lang)] << new_snippet if not new_snippet.strip.empty?
     }
     nil

data/test/expected_test.rb

@@ -0,0 +1,15 @@
+
+int main() { 
+  
+int* me = &1;
+*me++;
+
+  
+/* MORE! MORE! */
+ 
+int* me = &1;
+*me++;
+
+
+  return 0; 
+}

data/test/test.md

@@ -0,0 +1,27 @@
+### my file ###
+add some *text*:
+
+~~~~~
+@*@ +=
+int main() { 
+  @Do Stuff@
+  @Do More Stuff@
+  return 0; 
+}
+~~~~~
+
+and some more text. we should probably say what dostuff is; it's:
+
+~~~~~
+@Do Stuff@ +=
+int* me = &1;
+*me++;
+@Do More Stuff@ +=
+/* MORE! MORE! */
+~~~~~
+
+was that clearer? More stuff is the same as the first:
+
+~~~~
+@Do More Stuff@ += @Do Stuff@
+~~~~

data/test/test_literate_md.rb

@@ -0,0 +1,35 @@
+require 'test/unit'
+require 'ostruct'
+ 
+class TestLiterateMD < Test::Unit::TestCase
+  def test_tangle
+    tidy_up(actual_file = 'test/test.rb')
+    $opts = OpenStruct.new(
+      :tangle => true, 
+      :weave => false, 
+      :outputdir => '.',
+      :files => 'test/test.md',
+      :lang => 'ruby')
+    run_it
+    expected = File.open('test/expected_test.rb', 'r'){|f|f.read}
+    actual = File.open(actual_file, 'r'){|f|f.read}
+    assert_equal expected, actual
+    tidy_up actual_file
+  end
+ 
+  def test_weave
+    # TODO!
+  end
+  
+  def tidy_up file
+    File.delete file if File.exists? file
+  end
+  
+  def run_it 
+    begin
+  	  load 'bin/literate_md'
+	rescue SystemExit => e
+      assert_equal e.status, 0
+	end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: literate_md
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - remis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-08 00:00:00 Z
+date: 2012-03-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: redcarpet
@@ -78,6 +78,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- test/expected_test.rb
+- test/test.md
+- test/test_literate_md.rb
 - bin/literate_md
 homepage: http://remis-thoughts.blogspot.com
 licenses: []
@@ -112,5 +115,7 @@ rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Convert markdown documents into code or html
-test_files: []
-
+test_files: 
+- test/expected_test.rb
+- test/test.md
+- test/test_literate_md.rb