guides 0.6.8 → 0.6.8.1

data/lib/guides/generator.rb

@@ -201,7 +201,7 @@ module Guides
         <ol class="chapters">
       INDEX
 
-      i = Indexer.new(body, warnings)
+      i = Indexer.new(body, warnings, @production)
       i.index
 
       # Set index for 2 levels

data/lib/guides/indexer.rb

@@ -6,10 +6,11 @@ module Guides
   class Indexer
     attr_reader :body, :result, :warnings, :level_hash
 
-    def initialize(body, warnings)
+    def initialize(body, warnings, production = false)
       @body     = body
       @result   = @body.dup
       @warnings = warnings
+      @production = production
     end
 
     def index
@@ -19,41 +20,40 @@ module Guides
     private
 
     def process(string, current_level=3, counters=[1])
+      if @production
+        # Ignore anything in construction tags
+        string = string.gsub(%r{<construction>.*?</construction>}m, '')
+      end
+
       s = StringScanner.new(string)
 
       level_hash = ActiveSupport::OrderedHash.new
 
-      while !s.eos?
-        re = %r{^h(\d)(?:\((#.*?)\))?\s*\.\s*(.*)$}
-        s.match?(re)
-        if matched = s.matched
-          matched =~ re
-          level, idx, title = $1.to_i, $2, $3.strip
+      while s.scan_until(%r{^h(\d)(?:\((#.*?)\))?\s*\.\s*(.*)$})
+        level, idx, title = s[1].to_i, s[2], s[3].strip
 
-          if level < current_level
-            # This is needed. Go figure.
-            return level_hash
-          elsif level == current_level
-            index = counters.join(".")
-            idx ||= '#' + title_to_idx(title)
+        if level < current_level
+          # This is needed. Go figure.
+          return level_hash
+        elsif level == current_level
+          index = counters.join(".")
+          idx ||= '#' + title_to_idx(title)
 
-            raise "Parsing Fail" unless @result.sub!(matched, "h#{level}(#{idx}). #{index} #{title}")
+          raise "Parsing Fail" unless @result.sub!(s.matched, "h#{level}(#{idx}). #{index} #{title}")
 
-            key = {
-              :title => title,
-              :id => idx
-            }
-            # Recurse
-            counters << 1
-            level_hash[key] = process(s.post_match, current_level + 1, counters)
-            counters.pop
+          key = {
+            :title => title,
+            :id => idx
+          }
+          # Recurse
+          counters << 1
+          level_hash[key] = process(s.post_match, current_level + 1, counters)
+          counters.pop
 
-            # Increment the current level
-            last = counters.pop
-            counters << last + 1
-          end
+          # Increment the current level
+          last = counters.pop
+          counters << last + 1
         end
-        s.getch
       end
       level_hash
     end

data/lib/guides/textile_transformer.rb

@@ -2,6 +2,14 @@ require "strscan"
 require "cgi"
 
 module Guides
+  module HTMLFormatter
+    include RedCloth::Formatters::HTML
+
+    def br(opts)
+      " "
+    end
+  end
+
   class TextileTransformer
     LANGUAGES = { "ruby" => "ruby", "sql" => "sql", "javascript" => "javascript",
                   "css" => "css", "plain" => "plain", "erb" => "ruby; html-script: true",
@@ -61,23 +69,21 @@ module Guides
     end
 
     def consume_note(css_class)
-      match = scan_until /(\r?\n){2}/
+      match = scan_until /(\r?\n){2,}/ # We need at least 2 line breaks but we want to match as many as exist
       note = match.pre_match.gsub(/\n\s*/, " ")
       note = RedCloth.new(note, [:lite_mode]).to_html
       @output << %{<div class="#{css_class}"><p>#{note}</p></div>\n}
     end
 
     def consume_construction
-      if @production
-        @string.sub!(%r{^.*</construction>}, '')
-      else
-        @string.sub!(%r{</construction>}, '')
+      match = scan_until(%r{</construction>})
+      unless @production
+        @string = match.pre_match + @string
       end
     end
 
     def flush_textile
-      @pending_textile.gsub!(/(?<!\n)\n(?!\n)/, ' ') # Don't convert single \n to line-breaks
-      @output << RedCloth.new(@pending_textile).to_html << "\n"
+      @output << RedCloth.new(@pending_textile).to(HTMLFormatter) << "\n"
       @pending_textile = ""
     end
   end

data/lib/guides/version.rb

@@ -1,3 +1,3 @@
 module Guides
-  VERSION = "0.6.8"
+  VERSION = "0.6.8.1"
 end

data/spec/textile_transformer_spec.rb

@@ -64,8 +64,20 @@ describe "Transformer" do
     @transformer.transform("This\nhas\nbreaks.\n\nAnd\nparagraphs.").should == "<p>This has breaks.</p>\n<p>And paragraphs.</p>\n"
   end
 
+  it "properly handles more than two line breaks" do
+    result = @transformer.transform("TIP: With \"link\":file.html.\n\n\nh4. Heading")
+    result.should == %{\n<div class="info"><p>With <a href="file.html">link</a>.</p></div>\n<h4>Heading</h4>\n}
+
+    result = @transformer.transform("Test\n\n\nh4. Heading")
+    result.should =="<p>Test</p>\n<h4>Heading</h4>\n"
+  end
+
+  it "handles single line returns outside of paragraphs" do
+    @transformer.transform("* One\n* Two\n* Three").should == "<ul>\n\t<li>One</li>\n\t<li>Two</li>\n\t<li>Three</li>\n</ul>\n"
+  end
+
   it "handles <construction>" do
-    str = "Testing this out. <construction>Write more here later.</construction> This is awesome.\n"
+    str = "Testing this out. <construction>Write more\nhere later.</construction> This is awesome.\n"
     @transformer.transform(str).should == "<p>Testing this out.  This is awesome.</p>\n"
     @dev_transformer.transform(str).should == "<p>Testing this out. Write more here later. This is awesome.</p>\n"
 

metadata

@@ -2,7 +2,7 @@
 name: guides
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.8
+  version: 0.6.8.1
 platform: ruby
 authors: 
 - Yehuda Katz