bookie 0.0.12 → 0.0.13

data/CHANGELOG.md

@@ -62,3 +62,7 @@ examples from <= 0.0.10. Move towards a book manifest type API. Much work needs
 
 Added rudimentary chapter support for EPUB, MOBI, and PDF. Render once per
 emitter rather than once per chapter per emitter (bugfix).
+
+## 0.0.13 (2011.05.23)
+
+Basic inline code formatting. Horrible parser needs to go away...

data/examples/basic-features.rb

@@ -8,7 +8,9 @@ book.chapter "Multiple paragraphs", "#{fixture_dir}/multi_paragraph_document.md"
 book.chapter "Preformatted text blocks", "#{fixture_dir}/preformatted_blocks.md"
 book.chapter "Section headings", "#{fixture_dir}/document_with_headings.md"
 book.chapter "Unordered lists", "#{fixture_dir}/lists.md"
+book.chapter "Inline Formatting", "#{fixture_dir}/inline_formatting.md"
 
 book.render("bookie-basic-feature", [Bookie::Emitters::PDF.new,
                                      Bookie::Emitters::EPUB.new,
-                                     Bookie::Emitters::MOBI.new])
+                                     Bookie::Emitters::MOBI.new,
+                                     Bookie::Emitters::HTML.new])

data/lib/bookie.rb

@@ -2,6 +2,7 @@ require "date"
 require "fileutils"
 require "tempfile"
 require "erb"
+require "strscan"
 
 require "prawn"
 require "eeepub"

data/lib/bookie/emitters/html.rb

@@ -16,7 +16,18 @@ module Bookie
       end
 
       def build_paragraph(paragraph)
-        @body << "<p>#{paragraph.contents}</p>"
+        @body << "<p>#{convert_inlines(paragraph.contents)}</p>"
+      end
+
+      def convert_inlines(contents)
+        contents.map do |c|
+          case c
+          when Bookie::NormalText
+            c.contents
+          when Bookie::CodeText
+            "<tt>#{c.contents}</tt>"
+          end
+        end.join.strip
       end
 
       def build_raw_text(raw_text)

data/lib/bookie/emitters/pdf.rb

@@ -67,14 +67,27 @@ module Bookie
       end
 
       def build_paragraph(paragraph)
+        para_text = convert_inlines(paragraph.contents)
+
         draw do
           font("serif", size: 9) do
-            text(paragraph.contents.strip, align: :justify, leading: 2)
+            text(para_text, align: :justify, leading: 2, inline_format: true)
           end
           move_down in2pt(0.1)
         end
       end
 
+      def convert_inlines(contents)
+        contents.map do |c|
+          case c
+          when Bookie::NormalText
+            c.contents
+          when Bookie::CodeText
+            "<color rgb='660000'><font name='mono' size='9'>#{c.contents}</font></color>"
+          end
+        end.join.strip
+      end
+
       def build_raw_text(raw_text)
         sanitized_text = raw_text.contents.gsub(" ", Prawn::Text::NBSP).strip
 

data/lib/bookie/parser.rb

@@ -3,6 +3,8 @@ module Bookie
   RawText          = Struct.new(:contents)
   SectionHeading   = Struct.new(:contents)
   List             = Struct.new(:contents)
+  NormalText       = Struct.new(:contents)
+  CodeText         = Struct.new(:contents)
   
   class Parser
     def self.parse(raw_data, emitter=Bookie::Emitters::Null.new)
@@ -19,8 +21,25 @@ module Bookie
       parse_contents(raw_data)
     end
 
+    def extract_inlines(paragraph_text)
+      scanner = StringScanner.new(paragraph_text)
+      modes   = [NormalText, CodeText].cycle
+      output  = []
+
+      current_mode = modes.next
+      current_mode = modes.next if scanner.scan(/`/)
+
+      until scanner.eos?
+        output << current_mode.new(scanner.scan(/[^`]+/m))
+        current_mode = modes.next if scanner.scan(/`/)
+      end
+
+      output
+    end
+
     def extract_paragraph(paragraph_text)
-      paragraph = Paragraph.new(paragraph_text.gsub(/\s+/," "))
+      text_segments = extract_inlines(paragraph_text.gsub(/\s+/," "))
+      paragraph = Paragraph.new(text_segments)
       @emitter.build_paragraph(paragraph)
       parsed_content << paragraph
     end

data/lib/bookie/version.rb

@@ -1,3 +1,3 @@
 module Bookie
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/test/fixtures/inline_formatting.md

@@ -0,0 +1,17 @@
+As you can see in the code above, I decided that my `Piece#paint` method was
+probably better off as `Canvas#paint_shape`, just to collect the presentation
+logic in one place. Here’s what the updated code ended up looking like.
+
+    class Canvas
+     # ...
+
+     def paint_shape(shape, position)
+       shape.translated_points(position).each do |point|
+         paint(point, Piece::SYMBOL)
+       end
+     end
+    end
+
+This new code does not rely directly on the `Piece#points` method anymore, but
+instead, passes a position to the newly created `Piece#translated_points` to get a
+set of coordinates anchored by the specified position.

data/test/units/parser_test.rb

@@ -12,7 +12,7 @@ context "A Parser" do
     assert_equal 8, parsed_content.length
 
     actual_paragraph      = parsed_content[4]
-    actual_paragraph_text = actual_paragraph.first
+    actual_paragraph_text = actual_paragraph.first[0].contents
 
     assert_equal sample_paragraph_text, actual_paragraph_text 
   end

metadata

@@ -2,7 +2,7 @@
 name: bookie
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - Gregory Brown
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -04:00
+date: 2011-05-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - lib/bookie/version.rb
 - lib/bookie.rb
 - test/fixtures/document_with_headings.md
+- test/fixtures/inline_formatting.md
 - test/fixtures/lists.md
 - test/fixtures/multi_paragraph_document.md
 - test/fixtures/preformatted_blocks.md