notroff 0.2.1 → 0.2.2

data/lib/notroff/code_typer.rb

@@ -6,16 +6,28 @@ class CodeTypeRefiner
 
     paragraphs.each_with_index do |paragraph, i|
       type = paragraph[:type]
-      previous_type = ( paragraphs.first == paragraph) ? nil : paragraphs[i-1][:type]
-      next_type = ( paragraphs.last == paragraph) ? nil : paragraphs[i+1][:type]
+      previous_type = previous_paragraph_type(paragraphs, i)
+      next_type = next_paragraph_type(paragraphs, i)
       new_type = code_type_for( previous_type, type, next_type )
-      paragraph[:type] = new_type
-      processed_paragraphs << paragraph
+      new_paragraph = paragraph.clone
+      new_paragraph[:type] = new_type
+      processed_paragraphs << new_paragraph
     end
     processed_paragraphs
   end
 
+  def previous_paragraph_type(paragraphs, i)
+    return nil if i <= 0
+    paragraphs[i-1][:type]
+  end
+
+  def next_paragraph_type(paragraphs, i)
+    return nil if (i + 1) >= paragraphs.size
+    paragraphs[i+1][:type]
+  end
+
   def code_type_for( previous_type, type, next_type )
+    Logger.log "code type for [#{previous_type}] [#{type}] [#{next_type}]"
     if type != :code
       new_type = type
 
@@ -32,6 +44,7 @@ class CodeTypeRefiner
       new_type = :single_code
     end
 
+    Logger.log("new type: #{new_type}")
     new_type
   end
 end

data/lib/notroff/paragraph_joiner.rb

@@ -7,8 +7,7 @@ class ParagraphJoiner
 
       if join?(paragraph)
         if new_p
-          new_p.string += " "
-          new_p.string += paragraph
+          new_p.string = join(new_p.string, paragraph)
         else
           new_p = paragraph
         end
@@ -24,6 +23,10 @@ class ParagraphJoiner
     processed_paragraphs
   end
 
+  def join(first, second)
+    first + " " + second
+  end
+
   def join?(paragraph)
     false
   end
@@ -46,6 +49,10 @@ class BodyParagraphJoiner < ParagraphJoiner
 end
 
 class CodeParagraphJoiner < ParagraphJoiner
+  def join(first, second)
+    first + "\n" + second
+  end
+
   def join?(paragraph)
     return false unless paragraph[:type] == :code
     true

data/spec/paragraph_joiner_spec.rb

@@ -24,3 +24,19 @@ describe BodyParagraphJoiner do
     new_paras[1].string.should == "para4 para5"
   end
 end
+
+describe CodeParagraphJoiner do
+  let(:pj) { CodeParagraphJoiner.new(:code) }
+
+  let(:paras) do
+    paras = %W{ para1 para2 para3 para4 para5}
+    paras.map {|p| Text.new(p, :type => :code) }
+  end
+
+  it 'should join paragraphs with the newlines intact' do
+    new_paras = pj.process(paras)
+    new_paras.size.should == 1
+    new_paras[0][:type].should == :code
+    new_paras[0].string.should == "para1\npara2\npara3\npara4\npara5"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notroff
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors: