model_formatting 0.2.1.1 → 0.2.3

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = "model_formatting"
-  s.version = "0.2.1.1"
+  s.version = "0.2.3"
   s.author = "ENTP"
   s.email = "company@entp.com"
   s.homepage = "http://github.com/entp"
@@ -12,10 +12,10 @@ spec = Gem::Specification.new do |s|
   s.files = FileList['[a-zA-Z]*', 'bin/*', 'lib/**/*', 'rails/**/*', 'test/**/*']
   s.has_rdoc = false
   s.extra_rdoc_files = ["README"]
-  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")
+  s.add_dependency("rdiscount", "~>1.5.8.1")
+  s.add_dependency("actionpack", "~>2.3.9")
+  s.add_dependency("activerecord", "~>2.3.9")
+  s.add_dependency("activesupport", "~>2.3.9")
   s.add_dependency("tidy", "~>1.1.2")
   s.add_development_dependency("jeremymcanally-context", "~>0.5.5")
   s.add_development_dependency("jeremymcanally-matchy", "~>0.1.0")

data/lib/model_formatting.rb

@@ -145,7 +145,8 @@ module ModelFormatting
     tag_names.each do |tag_name|
       text.gsub!(%r{<#{tag_name}[^>]*>.*?</#{tag_name}>}m) do |match|
         md5 = Digest::MD5.hexdigest(match)
-        extractions[md5] = match
+        extractions[md5] ||= []
+        extractions[md5] << match
         "{mkd-extraction-#{md5}}"
       end
     end
@@ -157,7 +158,9 @@ module ModelFormatting
     while !extractions.keys.empty?
       # Insert block extractions
       text.gsub!(/\{mkd-extraction-([0-9a-f]{32})\}/) do
-        extractions.delete($1)
+        value = extractions[$1].pop
+        extractions.delete($1) if extractions[$1].empty?
+        value
       end
     end
     text

data/test/model_formatting_test.rb

@@ -58,6 +58,10 @@ class ModelFormattingTest < Test::Unit::TestCase
     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 "doesn't remove duplicate pre blocks" do
+    ModelFormatting.process(:html, "Yes! <pre>tacos</pre> are great.\n\nI love to eat <pre>tacos</pre> topped with <pre>tacos</pre>.\n\nYes.").should == %(<div><p>Yes! <pre>tacos</pre> are great.</p>\n\n<p>I love to eat <pre>tacos</pre> topped with <pre>tacos</pre>.</p>\n\n<p>Yes.</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
@@ -67,11 +71,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</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<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>)
   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</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<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>)
   end
   
   it "converts @@@ with params to code blocks with text format" do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 89
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  - 1
-  version: 0.2.1.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - ENTP
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 01:00:00 -07:00
+date: 2011-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +26,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 85
         segments: 
         - 1
-        - 6
         - 5
-        version: 1.6.5
+        - 8
+        - 1
+        version: 1.5.8.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,12 +43,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 17
         segments: 
         - 2
-        - 2
         - 3
-        version: 2.2.3
+        - 9
+        version: 2.3.9
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -59,12 +59,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 17
         segments: 
         - 2
-        - 2
         - 3
-        version: 2.2.3
+        - 9
+        version: 2.3.9
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -75,12 +75,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 17
         segments: 
         - 2
-        - 2
         - 3
-        version: 2.2.3
+        - 9
+        version: 2.3.9
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Automatically format model attributes using rdiscount and Tender/Lighthouse extensions.