model_formatting 0.2.0 → 0.2.1.1

data/Rakefile

@@ -3,17 +3,16 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = "model_formatting"
-  s.version = "0.2.0"
+  s.version = "0.2.1.1"
   s.author = "ENTP"
   s.email = "company@entp.com"
   s.homepage = "http://github.com/entp"
   s.platform = Gem::Platform::RUBY
   s.summary = "Automatically format model attributes using rdiscount and Tender/Lighthouse extensions."
-  s.files = FileList['[a-zA-Z]*', 'lib/**/*', 'rails/**/*', 'test/**/*']
-  s.require_path = "lib"
+  s.files = FileList['[a-zA-Z]*', 'bin/*', 'lib/**/*', 'rails/**/*', 'test/**/*']
   s.has_rdoc = false
   s.extra_rdoc_files = ["README"]
-  s.add_dependency("rdiscount", "~>1.5.5")
+  s.add_dependency("rdiscount", "~>1.6.5")
   s.add_dependency("actionpack", "~>2.2.3")
   s.add_dependency("activerecord", "~>2.2.3")
   s.add_dependency("activesupport", "~>2.2.3")

data/bin/model_formatting

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby -rubygems
+require 'model_formatting'
+puts ModelFormatting.process(:html, STDIN.read)
+

data/lib/model_formatting.rb

@@ -1,4 +1,5 @@
 require 'cgi'
+require 'active_support' # NilClass#blank?
 module ModelFormatting
   class Part < Array
     attr_reader :format
@@ -149,9 +150,15 @@ module ModelFormatting
       end
     end
     yield text
-    # Insert pre block extractions
-    text.gsub!(/\{mkd-extraction-([0-9a-f]{32})\}/) do
-      extractions[$1]
+    # In cases where multiple tag names are provided AND the tags mismatch or
+    # overlap in non-conforming ways, it's possible for extracted sections to
+    # have extractions in them. To keep content from being eaten by the markdown
+    # extractor, loop until all of the extractions have been replaced.
+    while !extractions.keys.empty?
+      # Insert block extractions
+      text.gsub!(/\{mkd-extraction-([0-9a-f]{32})\}/) do
+        extractions.delete($1)
+      end
     end
     text
   end
@@ -173,12 +180,11 @@ module ModelFormatting
   end
 
   begin
-    gem 'rdiscount', '>= 1.2.7.1'
     require 'rdiscount'
     def self.process_markdown(text)
       RDiscount.new(text).to_html
     end
-  rescue Gem::LoadError
+  rescue LoadError
     puts "No RDiscount gem found.  `gem install rdiscount`."
     def self.process_markdown(text)
       text
@@ -186,7 +192,6 @@ module ModelFormatting
   end
 
   begin
-    gem 'tidy'
     require 'tidy'
     Tidy.path = ENV['TIDY_PATH'] unless ENV['TIDY_PATH'].blank?
     def self.process_tidy(text)
@@ -196,10 +201,10 @@ module ModelFormatting
         tidy.clean(text)
       end
     end
-  rescue Gem::LoadError
+  rescue LoadError
     puts "No Tidy gem found.  `gem install tidy`.  Don't forget to set Tidy.path."
     def self.process_tidy(text)
       text
     end
   end
-end
+end

data/test/fixtures/mkd-extraction.txt

@@ -0,0 +1,15 @@
+# Busted markdown!
+
+<p><code>The missing code tag...</p>
+
+@@@
+will eat this code block!
+@@@
+
+Hard to fix but at least we can provide a warning!
+
+EDIT: omg fixed!
+
+<p><code>Additional code blocks below appear to trigger the bug.</code></p>
+
+

data/test/formatting_test.rb

@@ -47,6 +47,21 @@ module ModelFormatting
       end
     end
 
+    class BaseWithAfter < Base
+      formats :body do
+        after { |format, text, options| text }
+      end
+    end
+
+    describe "base with after callback" do
+      it "does not leave mkd-extraction artifacts" do
+        record = BaseWithAfter.new
+        record.body = File.read(File.dirname(__FILE__) + '/fixtures/mkd-extraction.txt')
+        record.save
+        assert_no_match /mkd-extraction/, record.formatted_body
+      end
+    end
+
     class Post < Base
       formats :body, :title => :title_html do
         attributes[:bio] = :full_bio
@@ -158,4 +173,4 @@ module ModelFormatting
     end
   end
 end
-      
+      

data/test/model_formatting_test.rb

@@ -54,6 +54,10 @@ class ModelFormattingTest < Test::Unit::TestCase
     ModelFormatting::Config.new(nil, nil, nil).replace_vars("a:abc/:d_e_f/:foo!", :abc => 'bc', :d_e_f => '-').should == "abc/-/!"
   end
 
+  it "doesn't remove lines with pipes" do
+    ModelFormatting.process(:html, "Yo.\n\nhere is a | pipe\n\nfoobaz").should == %(<div><p>Yo.</p>\n\n<p>here is a | pipe</p>\n\n<p>foobaz</p></div>)
+  end
+  
   it "links and encodes urls correctly" do
     ModelFormatting.process(:html, "a *b*  \n[Whoo](http://entp.com?a=1&b=2)").should == %(<div><p>a <em>b</em><br/>\n<a href="http://entp.com?a=1&amp;b=2">Whoo</a></p></div>)
   end
@@ -63,11 +67,11 @@ class ModelFormattingTest < Test::Unit::TestCase
   end
   
   it "converts @@@ with params to code blocks" do
-    ModelFormatting.process(:html, "foo\n@@@ ninja\nbar\n@@@\n@@@\nbaz\n@@@\n@@@ wah wah \n \n").should == %(<div><p>foo<br/>\n</p>\n\n<pre><code class=\"ninja\">bar</code>\n</pre>\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p></div>)
+    ModelFormatting.process(:html, "foo\n@@@ ninja\nbar\n@@@\n@@@\nbaz\n@@@\n@@@ wah wah \n \n").should == %(<div><p>foo</p>\n\n<pre><code class=\"ninja\">bar</code>\n</pre>\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p></div>)
   end
   
   it "fixes irregular number of @@@'s" do
-    ModelFormatting.process(:html, "foo\n@@@\nbar\n@@@\n@@@\nbaz\n@@@\n@@@ wah wah \n \n@@@").should == %(<div><p>foo<br/>\n</p>\n\n<pre><code>bar</code>\n</pre>\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p>\n\n<pre><code></code>\n</pre></div>)
+    ModelFormatting.process(:html, "foo\n@@@\nbar\n@@@\n@@@\nbaz\n@@@\n@@@ wah wah \n \n@@@").should == %(<div><p>foo</p>\n\n<pre><code>bar</code>\n</pre>\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p>\n\n<pre><code></code>\n</pre></div>)
   end
   
   it "converts @@@ with params to code blocks with text format" do

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 89
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  - 1
+  version: 0.2.1.1
 platform: ruby
 authors: 
 - ENTP
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 -07:00
+date: 2010-11-07 01:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 5
         segments: 
         - 1
+        - 6
         - 5
-        - 5
-        version: 1.5.5
+        version: 1.6.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -141,12 +142,13 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - README
-- tender.patch
+- bin/model_formatting
 - lib/model_formatting/config.rb
 - lib/model_formatting/init.rb
 - lib/model_formatting/instance_methods.rb
 - lib/model_formatting.rb
 - rails/init.rb
+- test/fixtures/mkd-extraction.txt
 - test/formatting_test.rb
 - test/model_formatting_test.rb
 - test/test_helper.rb

data/tender.patch

@@ -1,95 +0,0 @@
-Only in .: .git
-diff -ur ./lib/model_formatting/instance_methods.rb ../tender/vendor/plugins/model_formatting/lib/model_formatting/instance_methods.rb
---- ./lib/model_formatting/instance_methods.rb	2010-07-09 10:29:14.000000000 -0700
-+++ ../tender/vendor/plugins/model_formatting/lib/model_formatting/instance_methods.rb	2010-06-14 13:45:10.000000000 -0700
-@@ -2,13 +2,12 @@
-   module InstanceMethods
-   protected
-     def format_content_with_model_formatting
--      model_formatting_attributes.each do |original, formatted|
-+      self.class.model_formatting_attributes.each do |original, formatted|
-         text = send(original)
-         data = \
-           if text.blank?
-             ''
-           else
--            text.strip!
-             options = {:white_list => model_formatting_white_list,
-                        :before => model_formatting_before_callback,
-                        :after => model_formatting_after_callback}
-diff -ur ./lib/model_formatting.rb ../tender/vendor/plugins/model_formatting/lib/model_formatting.rb
---- ./lib/model_formatting.rb	2010-07-09 11:29:32.000000000 -0700
-+++ ../tender/vendor/plugins/model_formatting/lib/model_formatting.rb	2010-02-19 14:49:00.000000000 -0800
-@@ -138,11 +138,11 @@
-     parts.each { |p| p.compact! }
-   end
- 
--  def self.extract_regex(text, *regexes)
-+  def self.extract_tag(text, *tag_names)
-     # Extract pre blocks
-     extractions = {}
--    regexes.each do |regex|
--      text.gsub!(regex) do |match|
-+    tag_names.each do |tag_name|
-+      text.gsub!(%r{<#{tag_name}[^>]*>.*?</#{tag_name}>}m) do |match|
-         md5 = Digest::MD5.hexdigest(match)
-         extractions[md5] = match
-         "{mkd-extraction-#{md5}}"
-@@ -156,16 +156,6 @@
-     text
-   end
- 
--  def self.tag_name_to_regex(name)
--    %r{<#{name}[^>]*>.*?</#{name}>}m
--  end
--
--  def self.extract_tag(text, *tag_names)
--    extract_regex text, *tag_names.map { |n| tag_name_to_regex(n) } do |text|
--      yield text
--    end
--  end
--
-   def self.gfm(text)
-     extract_tag(text, :pre) do |txt| 
-       # prevent foo_bar_baz from ending up with an italic word in the middle
-@@ -183,13 +173,13 @@
-   end
- 
-   begin
--    gem 'rdiscount', '~> 1.2.7.1'
-+    gem 'rdiscount', '>= 1.2.7.1'
-     require 'rdiscount'
-     def self.process_markdown(text)
-       RDiscount.new(text).to_html
-     end
-   rescue Gem::LoadError
--    puts "No RDiscount gem found.  `gem install rdiscount -v '~>1.2.7.1'`."
-+    puts "No RDiscount gem found.  `gem install rdiscount`."
-     def self.process_markdown(text)
-       text
-     end
-@@ -212,4 +202,4 @@
-       text
-     end
-   end
--end
-+end
-
-Only in .: tender.patch
-diff -ur ./test/formatting_test.rb ../tender/vendor/plugins/model_formatting/test/formatting_test.rb
---- ./test/formatting_test.rb	2010-07-09 10:29:14.000000000 -0700
-+++ ../tender/vendor/plugins/model_formatting/test/formatting_test.rb	2010-02-19 14:49:00.000000000 -0800
-@@ -38,6 +38,13 @@
-         record.save
-         record.formatted_body.should == %(<div><p>booya</p></div>)
-       end
-+      
-+      it "preserves leading spaces in code blocks" do
-+        record = Simple.new
-+        record.body = "    code\n    more code\n\nnot code\n\n"
-+        record.save
-+        record.formatted_body.should == %(<div><pre><code>code\nmore code</code></pre>\n\n<p>not code</p></div>)
-+      end
-     end
- 
-     class Post < Base