notroff 0.3.2 → 0.3.5

data/bin/notroff

@@ -12,6 +12,9 @@ while true
   elsif ARGV.first == '-h'
     formatter_class = HtmlFormatter
     ARGV.shift
+  elsif ARGV.first == '-s'
+    formatter_class = SpecFormatter
+    ARGV.shift
   elsif ARGV.first == '-d'
     formatter_class = DocbookFormatter
     ARGV.shift

data/lib/notroff.rb

@@ -17,6 +17,7 @@ require "notroff/html_renderer"
 require "notroff/docbook_renderer"
 require "notroff/odt_renderer"
 require "notroff/odt_replacer"
+require "notroff/spec_renderer"
 require "notroff/template_expander"
 require "notroff/type_refiner"
 require "notroff/filter"

data/lib/notroff/embedded.rb

@@ -81,7 +81,6 @@ class EmbeddedRubyProcessor
       if p[:type] == :x
         Logger.log p
         results = process_command(p.string)
-        puts "**** results: #{results}"
         new_paragraphs << results if results
       else
         new_paragraphs << p
@@ -103,6 +102,7 @@ class EmbeddedRubyProcessor
       result[:included] = inc_all
       result
     end
+    Logger.warn("Zero lines included!!") if lines.empty?
     lines
   end
 
@@ -121,7 +121,6 @@ class EmbeddedRubyProcessor
   end
 
   def ex(ruby_command, type=:code)
-    puts "ruby_command: #{ruby_command}"
     embed(type, eval(ruby_command).to_s.split("\n"))
   end
 
@@ -136,10 +135,15 @@ class EmbeddedRubyProcessor
         state = :after_first
         break if para =~ re2
       elsif state == :after_first
-        break if para =~ re2
+        if para =~ re2
+          state = :after_second
+          break
+        end
         para[:included] = true
       end
     end
+    raise "Couldnt find first pattern" if state == :before_first
+    raise "Couldnt find second pattern" unless state == :after_second
     paras
   end
 

data/lib/notroff/formatter.rb

@@ -29,6 +29,8 @@ class DocbookFormatter < Formatter
     add_processor Grouper.new(:bullet)
     add_processor Grouper.new(:list)
     add_processor DocbookRenderer.new
+    add_processor OdtReplacer.new(output)
+    add_processor OdtReplacer.new(output)
     add_processor FileWriter.new(output)
   end
 end
@@ -49,7 +51,25 @@ class OdtFormatter < Formatter
     add_processor OdtRenderer.new
     add_processor TemplateExpander.new
     add_processor OdtReplacer.new(output)
+   end
+ end
+
+ class SpecFormatter < Formatter
+   def initialize(input, output)
+    super()
+    prepend_processor RegularExpressionExcludeFilter.new(/^--.*$/)
+    prepend_processor FileReader.new(input)
+    add_processor BodyTypeRefiner.new
+    add_processor CodeTypeRefiner.new
+    add_processor CodeTypeRefiner.new(:listing, :first_listing, :middle_listing, :end_listing)
+    add_processor Grouper.new(:bullet)
+    add_processor Grouper.new(:list)
+    add_processor Grouper.new(:quote)
+    add_processor Grouper.new(:attribution)
+    add_processor SpecRenderer.new
+    add_processor FileWriter.new(output)
   end
+
 end
 
 

data/lib/notroff/logger.rb

@@ -10,4 +10,9 @@ module Logger
     return unless @verbose
     puts args.join(' ')
   end
+
+  def self.warn(*args)
+    STDERR.puts "WARNING: #{args.join(' ')} ******"
+    log(args)
+  end
 end

data/lib/notroff/odt_renderer.rb

@@ -31,7 +31,8 @@ class OdtRenderer < Processor
     :pt => 'PT',
     :cn => 'HA',
     :chapter => 'HA',
-    :ct => 'HB' }
+    :ct => 'HB',
+    :fc => 'FC'}
 
   @@footnote_number = 1
 
@@ -112,7 +113,6 @@ class OdtRenderer < Processor
       add_body_text(item.string, el)
       p.add(el)
     end
-    puts p.to_s
     p
   end
 
@@ -120,7 +120,6 @@ class OdtRenderer < Processor
     list = Element.new('text:list')
     list.attributes['text:style-name'] = 'L2'
     items.each_with_index do |item, i|
-      puts "*** adding item: #{item}"
       list_item_element = Element.new('text:list-item')
       text_element = Element.new('text:p')
       text_element.attributes['text:style-name'] = numbered_item_style_for(items, i)
@@ -128,7 +127,6 @@ class OdtRenderer < Processor
       list_item_element.add(text_element)
       list.add(list_item_element)
     end
-    puts list.to_s
     list
   end
 
@@ -142,7 +140,6 @@ class OdtRenderer < Processor
     list = Element.new('text:list')
     list.attributes['text:style-name'] = 'L1'
     items.each_with_index do |item, i|
-      puts "*** adding item: #{item}"
       list_item_element = Element.new('text:list-item')
       text_element = Element.new('text:p')
       text_element.attributes['text:style-name'] = bullet_item_style_for(items, i)
@@ -150,7 +147,6 @@ class OdtRenderer < Processor
       list_item_element.add(text_element)
       list.add(list_item_element)
     end
-    puts list.to_s
     list
   end
 

data/lib/notroff/spec_renderer.rb

@@ -0,0 +1,53 @@
+require 'rexml/document'
+require 'pp'
+
+
+class SpecRenderer < Processor
+  include Tokenize
+  include REXML
+
+  @@footnote_number = 1
+
+  def initialize
+    @last_code = false
+  end
+
+  def process( paragraphs )
+    elements = []
+    paragraphs.each do |paragraph|
+      new_element = format( paragraph )
+      elements << new_element if new_element
+    end
+    "require 'utils/utils'\n\ndescribe 'foo' do\n\n#{elements.join}\nend\n"
+  end
+
+  def format( para )
+    Logger.log "Format: #{para.inspect}"
+    type = para[:type]
+    text = para
+
+    this_code = code_type?(type)
+
+
+    if @last_code and this_code
+      ret =  "#{para}\n"
+
+    elsif @last_code
+      ret =  "##FOO_B\n  end\n"
+
+    elsif this_code
+      ret = "\n  it 'should foo' do\n##FOO_A\n#{para}\n"
+
+    else
+      ret = nil
+    end
+
+    @last_code = this_code
+    ret
+  end
+
+  def code_type?( type )
+    [ :first_code, :middle_code, :end_code, :single_code,
+      :listing, :first_listing, :middle_listing, :end_listing ].include?(type)
+  end
+end

data/lib/notroff/template_expander.rb

@@ -14,18 +14,12 @@ class TemplateExpander < Processor
     insert_body(doc, content_map[:body])
     doc.to_s
   end
-   
-  def insert_body(doc, body_elements)
-    puts "reading file: #{TEMPLATE}"
 
+  def insert_body(doc, body_elements)
     text_element = REXML::XPath.first(doc, PATH)
     n = text_element.elements.size
-    puts "deleting #{n} elements"
     n.times {|i| text_element.delete_element(1)}
-    puts "ELs: #{body_elements.size}"
-    puts "ELs: #{body_elements}"
     body_elements.each {|el| text_element.add_element(el)}
-
     doc
   end
 end

data/lib/yesroff/nr_writer.rb

@@ -2,7 +2,9 @@ class NRWriter
   attr_reader :para_style
 
   def initialize
-    @para_style = :body
+    @bold_depth = 0
+    @italic_depth = 0
+    @code_depth = 0
     @text_style = :normal
     @single_line = false
   end
@@ -21,7 +23,7 @@ class NRWriter
   end
 
   def switch_text_style(new_style)
-    debug " <<switching to new style #{new_style}>>  "
+    log " <<switching to new style #{new_style}>>  "
     return if @text_style == new_style
     if @text_style != :normal
       toggle_text_style(@text_style)
@@ -32,12 +34,6 @@ class NRWriter
     @text_style = new_style
   end
 
-  def toggle_text_style(style)
-    toggle_bold if style == :bold
-    toggle_italic if style == :italic
-    toggle_code if style == :code    
-  end
-
   def end_paragraph
     puts
     if @single_line
@@ -49,22 +45,68 @@ class NRWriter
   end
 
   def indent(n)
-    print (' ' * n)
-    
+    log "indent #{n}"
+    print (' ' * n)    
+  end
+
+  def start_bold
+    print "!!" if @bold_depth == 0
+    @bold_depth += 1
   end
-  def toggle_bold
-    print "!!"
+
+  def end_bold
+    print "!!" if @bold_depth == 1
+    @bold_depth -= 1
+  end
+
+  def start_italic
+    print "~~" if @italic_depth == 0
+    @italic_depth += 1
   end
 
-  def toggle_italic
-    print "~~"
+  def end_italic
+    print "~~ " if @italic_depth == 1
+    @italic_depth -= 1
   end
 
-  def toggle_code
-    print '@@'
+  def start_code
+    print "@@" if @code_depth == 0
+    @code_depth += 1
+  end
+
+  def end_code
+    print "@@ " if @code_depth == 1
+    @code_depth -= 1
+  end
+
+  def special_style?
+    return true unless @para_style ==  :body
+    @code_depth > 0 or @italic_depth > 0 or @bold_depth > 0
+  end
+
+  def split_text(t)
+    return t if t.length < 80
+    words = t.split(' ')
   end
 
   def text(t)
-    print t
+    log "==>Text #{t}"
+    if special_style?
+      print t
+    else
+      array = t.split(' ')
+      line_len = 0
+      array.each do |word|
+        print word
+        line_len += word.length
+        if line_len > 70
+          print "\n"
+          line_len = 0
+        else
+          print " "
+          line_len += 1
+        end
+      end
+    end
   end
 end

data/lib/yesroff/odt_parser.rb

@@ -13,9 +13,21 @@ def debug(*args)
   puts args.join(' ')
 end
  
-class OdtParser
+def additional_styles(styles)
+  log "noop additional paragraph styles function"
+end
+
+def additional_text_styles(styles)
+  log "noop additional text styles function"
+end
 
+class OdtParser
   def initialize(odt_path)
+    if File.exist?("yesroff.rc")
+      log "loading notroff.rb"
+      load 'yesroff.rc'
+    end
+
     log "Reading #{odt_path}..."
     Zip::ZipFile.open(odt_path ) do |zipfile|
       zipfile.file.open("content.xml") do |content|
@@ -34,68 +46,64 @@ class OdtParser
     cd1 = TextStyle.new("CD1")
     cd1.code = true
 
-    styles = [
-      cd1,
-      TextStyle.new("Default"),
-      TextStyle.new("C1"),
-      TextStyle.new("C1_20_HD"),
-      TextStyle.new("FN"),
-      TextStyle.new("Base_20_Font"),
-      TextStyle.new("Chapter_20_Word")
-    ]
-    hash = {}
-    styles.each {|s| hash[s.name] = s}
+    hash = StyleHash.new
+    hash.add_style cd1
+    hash.add_style TextStyle.new("Default")
+    hash.add_style TextStyle.new("C1")
+    hash.add_style TextStyle.new("C1_20_HD")
+    hash.add_style TextStyle.new("FN")
+    hash.add_style TextStyle.new("Base_20_Font")
+    hash.add_style TextStyle.new("Chapter_20_Word")
+    additional_text_styles(hash)
     hash
   end
 
+
   def default_para_styles
-    styles = [
-    ParagraphStyle.new('FT', nil, :body, false),
-    ParagraphStyle.new('IT', nil, :body, false),
-    ParagraphStyle.new('Quotation', nil, :quote, true),
-
-    ParagraphStyle.new('CDT1', nil, :code, false),
-    ParagraphStyle.new('CDT', nil, :code, false),
-    ParagraphStyle.new('CDTX', nil, :code, false),
-    ParagraphStyle.new('C1', nil, :c1, true),
-    ParagraphStyle.new('C2', nil, :c1, true),
-    ParagraphStyle.new('TB', nil, :c1, true),
-    ParagraphStyle.new('Free_20_Form', nil, :c1, true),
-
-
-    ParagraphStyle.new('NLC1', nil, :code, false),
-    ParagraphStyle.new('NLC', nil, :code, false),
-    ParagraphStyle.new('NLCX', nil, :code, false),
-    ParagraphStyle.new('NLPara', nil, :code, false),
-
-    ParagraphStyle.new('TX', nil, :code, false),
-
-    ParagraphStyle.new('HA', nil, :title, true),
-    ParagraphStyle.new('HB', nil, :subtitle, true),
-    ParagraphStyle.new('HC', nil, :sec, true),
-    ParagraphStyle.new('HD', nil, :subsec, true),
-    ParagraphStyle.new('TH', nil, :theading, true),
-    ParagraphStyle.new('LH', nil, :ltitle, true),
-    ParagraphStyle.new('LC', nil, :listing, false),
-    ParagraphStyle.new('LC2', nil, :listing, false),
-    ParagraphStyle.new('LX', nil, :listing, false),
-
-    ParagraphStyle.new('BL1', nil, :bullet, true),
-    ParagraphStyle.new('BL', nil, :bullet, true),
-    ParagraphStyle.new('BX', nil, :bullet, true),
-
-    ParagraphStyle.new('NL1', nil, :list, true),
-    ParagraphStyle.new('NL', nil, :list, true),
-    ParagraphStyle.new('NX', nil, :list, true),
-
-    ParagraphStyle.new('BLPara', nil, :bullet, true),
-    ParagraphStyle.new('Quotation_20_Attribution', nil, :attribution, true)
-
-    ]
-
-    hash = {}
-    styles.each {|s| hash[s.name] = s}
-    hash
+    styles = StyleHash.new
+    styles.add_style ParagraphStyle.new('FT', nil, :body, false)
+    styles.add_style ParagraphStyle.new('IT', nil, :body, false)
+    styles.add_style ParagraphStyle.new('Quotation', nil, :quote, true)
+
+    styles.add_style ParagraphStyle.new('CDT1', nil, :code, false)
+    styles.add_style ParagraphStyle.new('CDT', nil, :code, false)
+    styles.add_style ParagraphStyle.new('CDTX', nil, :code, false)
+    styles.add_style ParagraphStyle.new('C1', nil, :c1, true)
+    styles.add_style ParagraphStyle.new('C2', nil, :c1, true)
+    styles.add_style ParagraphStyle.new('TB', nil, :c1, true)
+    styles.add_style ParagraphStyle.new('Free_20_Form', nil, :c1, true)
+
+
+    styles.add_style ParagraphStyle.new('NLC1', nil, :code, false)
+    styles.add_style ParagraphStyle.new('NLC', nil, :code, false)
+    styles.add_style ParagraphStyle.new('NLCX', nil, :code, false)
+    styles.add_style ParagraphStyle.new('NLPara', nil, :code, false)
+
+    styles.add_style ParagraphStyle.new('TX', nil, :code, false)
+
+    styles.add_style ParagraphStyle.new('HA', nil, :title, true)
+    styles.add_style ParagraphStyle.new('HB', nil, :subtitle, true)
+    styles.add_style ParagraphStyle.new('HC', nil, :sec, true)
+    styles.add_style ParagraphStyle.new('HD', nil, :subsec, true)
+    styles.add_style ParagraphStyle.new('TH', nil, :theading, true)
+    styles.add_style ParagraphStyle.new('LH', nil, :ltitle, true)
+    styles.add_style ParagraphStyle.new('LC', nil, :listing, false)
+    styles.add_style ParagraphStyle.new('LC2', nil, :listing, false)
+    styles.add_style ParagraphStyle.new('LX', nil, :listing, false)
+
+    styles.add_style ParagraphStyle.new('BL1', nil, :bullet, true)
+    styles.add_style ParagraphStyle.new('BL', nil, :bullet, true)
+    styles.add_style ParagraphStyle.new('BX', nil, :bullet, true)
+
+    styles.add_style ParagraphStyle.new('NL1', nil, :list, true)
+    styles.add_style ParagraphStyle.new('NL', nil, :list, true)
+    styles.add_style ParagraphStyle.new('NX', nil, :list, true)
+
+    styles.add_style ParagraphStyle.new('BL Para', nil, :bullet, true)
+    styles.add_style ParagraphStyle.new('Quotation_20_Attribution', nil, :attribution, true)
+
+    additional_paragraph_styles(styles)
+    styles
   end
 
   def parse
@@ -148,7 +156,7 @@ class OdtParser
   def lookup_para_style(name)
     s = @para_styles[name]
     log "No such para style #{name}" unless s
-    #raise "No such para style #{name}" unless s
+    raise "No such para style #{name}" unless s
     s
   end
 
@@ -191,13 +199,17 @@ class OdtParser
     para
   end
 
+  def parse_indent(el)
+  end
+
   def parse_span(el)
     attrs = el.attributes
-    style = find_or_create_text_style(attrs['text:style-name'])
     indent = attrs['text:c'] ? attrs['text:c'].to_i : 0
+    style = find_or_create_text_style(attrs['text:style-name'])
     span = Span.new(style)
     span.indent = indent
     span.contents = parse_contents(span, el)
+    log("new span: #{span}")
     span
   end
 

data/lib/yesroff/text.rb

@@ -31,19 +31,25 @@ class TextStyle < Style
     result += ']'
   end
 
-  def render(w)
-    puts "Rendering style #{self}"
-
+  def start(w)
     if @bold
-      w.switch_text_style(:bold)
+      w.start_bold
     elsif @italic
-      w.switch_text_style(:italic)
+      w.start_italic
     elsif @code
-      w.switch_text_style(:code)
-    else
-      w.switch_text_style(:normal)
+      w.start_code
     end
   end
+
+  def stop(w)
+    if @bold
+      w.end_bold
+    elsif @italic
+      w.end_italic
+    elsif @code
+      w.end_code
+    end    
+  end
 end
 
 
@@ -62,12 +68,19 @@ class ParagraphStyle < Style
   end
 end
 
+class StyleHash < Hash
+  def add_style(s)
+    self[s.name] = s
+  end
+end
+
 class Container
   attr_accessor :style, :parent, :contents
 
   def initialize(style, parent=nil, contents=[])
     @style = style
     @contents = contents
+    @parent = parent
   end
 
   def <<(content)
@@ -81,23 +94,36 @@ class Container
   end
 
   def render(w)
-    #puts "========= rendering #{self.class} size: #{contents.size}"
+    #log "========= rendering #{self.class} size: #{contents.size}"
     #pp contents
     #puts "Rendering:"
     contents.each {|c|  c.render(w)}
   end
+
+  def to_s
+    result = "Container #{style}"
+    if @contents
+      result += @contents.join(' ')      
+    end
+    result
+  end
 end
 
 class Span < Container
   attr_accessor :indent
 
   def render(w)
-    debug "\nrendering span #{self} length #{self.length}"
-    return if self.length == 0
-    style.render(w)
-    w.indent(@indent) if @indent
-    super(w)
-    style.render(w)
+    l = self.length
+    #return if l == 0 and indent == 0
+    style.start(w)
+    log "Indenting #{indent}"
+    w.indent(indent) if indent
+    super(w) unless l == 0
+    style.stop(w)
+  end
+
+  def to_s
+    result = " Span: indent #{@indent} #{super} "
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notroff
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70333341691900 !ruby/object:Gem::Requirement
+  requirement: &70295630346980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70333341691900
+  version_requirements: *70295630346980
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70295630346220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70295630346220
 description: NotRoff A simple text to openoffice filter
 email: russ@russolsen.com
 executables:
@@ -62,6 +73,7 @@ files:
 - lib/notroff/paragraph_joiner.rb
 - lib/notroff/processor.rb
 - lib/notroff/skel.odt
+- lib/notroff/spec_renderer.rb
 - lib/notroff/string_extensions.rb
 - lib/notroff/template_expander.rb
 - lib/notroff/text.rb