murdoc 0.1.7 → 0.1.8

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/murdoc/annotator.rb

@@ -84,11 +84,13 @@ module Murdoc
 
         # post-processing: stripping comments and removing empty strings from beginnings and ends
         starting_line += postprocess_source(source_lines)
-        postprocess_comments(comment_lines)
+        postprocess_comments(comment_lines)        
+        # clear comment lines if that's commented out code
+        comment_lines.clear if comment_lines[0] =~ /^:code:$/
         
-        # writing a new paragraph unless we have a case of commented out code
-        unless comment_lines[0] =~ /^:code:$/
-          @paragraphs << Paragraph.new(source_lines.join("\n"), comment_lines.join("\n"), starting_line, source_type, options)
+        # if we have comments or source
+        if comment_lines.size > 0 || source_lines.size > 0
+          @paragraphs << Paragraph.new(source_lines.join("\n"), comment_lines.join("\n"), starting_line, source_type, options)          
         end
       end
     end

data/markup/template.haml

@@ -12,4 +12,4 @@
           %ol
             - 1.upto(p.source.split("\n").size) do |i|
               %li= i + p.starting_line
-          %code<= p.formatted_source
+          %code<~ p.formatted_source

data/murdoc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murdoc}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]

data/spec/murdoc/annotator_spec.rb

@@ -83,7 +83,6 @@ describe Murdoc::Annotator do
         source = "=begin\n"
         lambda {
           subject = described_class.new(source, :ruby)
-          subject.source = source
         }.should_not raise_error
       end
     end
@@ -104,6 +103,14 @@ describe Murdoc::Annotator do
         subject.paragraphs[0].source.should == "def hi\nend"
         subject.paragraphs[0].annotation.should == "Comment"
       end
+      
+      it "should not swallow wrong code" do
+        source = "# :code:\n# def hi\n# end\n\ndef hallo\nend"
+        subject = described_class.new(source, :ruby)
+        subject.should have_exactly(1).paragraphs
+        subject.paragraphs[0].annotation.to_s.should == ""
+        subject.paragraphs[0].source.should == "def hallo\nend"
+      end
     end
 
     it "should not choke on edge cases" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Mark Abramov
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -231788783804928032
+      hash: 1151868179894521634
       segments: 
       - 0
       version: "0"