model_formatting 0.2.3.2 → 0.2.3.4

data/Gemfile

@@ -0,0 +1,14 @@
+source :gemcutter
+source "http://gem.entp.com"
+
+gem 'rake'
+gem 'rdiscount', '~> 1.6.5'
+gem 'actionpack', '~> 2.3.9'
+gem 'activerecord', '~> 2.3.9'
+gem 'activesupport', '~> 2.3.9'
+gem 'tidy_ffi', '~> 0.1.2'
+
+group :development, :test do
+  gem 'context', '0.5.5'
+  gem 'matchy', '~>0.4.0'
+end

data/Gemfile.lock

@@ -0,0 +1,31 @@
+GEM
+  remote: http://rubygems.org/
+  remote: http://gem.entp.com/
+  specs:
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
+      rack (~> 1.1.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    context (0.5.5)
+    ffi (1.0.10)
+    matchy (0.4.0)
+    rack (1.1.2)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    tidy_ffi (0.1.3)
+      ffi (>= 0.3.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 2.3.9)
+  activerecord (~> 2.3.9)
+  activesupport (~> 2.3.9)
+  context (= 0.5.5)
+  matchy (~> 0.4.0)
+  rake
+  rdiscount (~> 1.6.5)
+  tidy_ffi (~> 0.1.2)

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = "model_formatting"
-  s.version = "0.2.3.2"
+  s.version = "0.2.3.4"
   s.author = "ENTP"
   s.email = "company@entp.com"
   s.homepage = "http://github.com/entp"
@@ -16,8 +16,8 @@ spec = Gem::Specification.new do |s|
   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_dependency("tidy_ffi", "~>0.1.2")
+  s.add_development_dependency("jeremymcanally-context", "0.5.5")
   s.add_development_dependency("jeremymcanally-matchy", "~>0.1.0")
 end
 

data/lib/model_formatting.rb

@@ -170,7 +170,7 @@ module ModelFormatting
     extract_tag(text, :pre) do |txt| 
       # prevent foo_bar_baz from ending up with an italic word in the middle
       text.gsub!(/(^(?! {4}|\t)[A-Za-z0-9]+_[A-Za-z0-9]+_[A-Za-z0-9]\w*)/) do |x|
-        x.gsub('_', '\_') if x.split('').sort.to_s[0..1] == '__'
+        x.gsub('_', '\_') if x.split('').sort.join[0..1] == '__'
       end
  
       # in very clear cases, let newlines become <br /> tags
@@ -195,17 +195,16 @@ module ModelFormatting
   end
 
   begin
-    require 'tidy'
-    Tidy.path = ENV['TIDY_PATH'] unless ENV['TIDY_PATH'].blank?
+    require 'tidy_ffi'
     def self.process_tidy(text)
-      return text unless Tidy.path
-      Tidy.open(:show_body_only => true, :input_encoding => :utf8) do |tidy|
-        tidy.options.new_inline_tags = "video"
-        tidy.clean(text)
-      end
+      tidy = TidyFFI::Tidy.new(text)
+      tidy.options.input_encoding = 'utf8'
+      tidy.options.show_body_only = true
+      tidy.options.new_inline_tags = "video"
+      tidy.clean.strip
     end
   rescue LoadError
-    puts "No Tidy gem found.  `gem install tidy`.  Don't forget to set Tidy.path."
+    puts "No TidyFFI gem found.  `gem install tidy_ffi`."
     def self.process_tidy(text)
       text
     end

data/test/formatting_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/test_helper'
+# encoding: utf-8
+require File.expand_path('../test_helper', __FILE__)
 
 module ModelFormatting
   class Test < Test::Unit::TestCase
@@ -43,14 +44,21 @@ module ModelFormatting
         record = Simple.new
         record.body = "My name is\n__Name__"
         record.save
-        record.formatted_body.should == %(<div><p>My name is<br />\n<strong>Name</strong></p></div>)
+        record.formatted_body.should == %(<div><p>My name is<br>\n<strong>Name</strong></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>)
+        record.formatted_body.should == %(<div><pre>\n<code>code\nmore code</code>\n</pre>\n<p>not code</p></div>)
+      end
+
+      it "converts unicode characters to html entities" do
+        record = Simple.new
+        record.body = "Encöded ɐ \\Upload \\upload"
+        record.save
+        record.formatted_body.should ==%(<div><p>Enc&ouml;ded &#592; \\Upload \\upload</p></div>)
       end
     end
 
@@ -108,7 +116,7 @@ module ModelFormatting
       end
 
       describe "being saved" do
-        before :all do
+        before do
           @record = Post.new
           @record.body  = 'booya'
           @record.title = 'wtf'
@@ -116,11 +124,11 @@ module ModelFormatting
         end
 
         it "formats #body" do
-          @record.formatted_body.should == %(<div>(<p>ayoob</p>)</div>)
+          @record.formatted_body.should == %(<div>(\n<p>ayoob</p>\n)</div>)
         end
 
         it "formats #title" do
-          @record.title_html.should == %(<div>(<p>ftw</p>)</div>)
+          @record.title_html.should == %(<div>(\n<p>ftw</p>\n)</div>)
         end
 
         it "formats #bio" do
@@ -162,7 +170,7 @@ module ModelFormatting
       end
 
       describe "being saved" do
-        before :all do
+        before do
           @record = ChildPost.new
           @record.body = 'booya'
           @record.bio  = 'wtf'

data/test/model_formatting_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class ModelFormattingTest < Test::Unit::TestCase
   it "parses simple string into array of single FormattedBlock" do
@@ -55,27 +55,27 @@ class ModelFormattingTest < Test::Unit::TestCase
   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>)
+    ModelFormatting.process(:html, "Yo.\n\nhere is a | pipe\n\nfoobaz").should == %(<div><p>Yo.</p>\n<p>here is a | pipe</p>\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>)
+    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!</p>\n<pre>\ntacos\n</pre>\nare great.\n<p>I love to eat</p>\n<pre>\ntacos\n</pre>\ntopped with\n<pre>\ntacos\n</pre>\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>)
+    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
   
   it "converts @@@ to code blocks" do
-    ModelFormatting.process(:html, "<a>foo</a>\n\n@@@\n<a>bar</a>\n@@@\n\n@@@\nbaz\n@@@\n\n@@@ wah wah \n \n").should == %(<div><p><a>foo</a></p>\n\n<pre><code>&lt;a&gt;bar&lt;/a&gt;</code>\n</pre>\n\n\n\n\n<pre><code>baz</code>\n</pre>\n\n\n<p>@@@ wah wah</p></div>)
+    ModelFormatting.process(:html, "<a>foo</a>\n\n@@@\n<a>bar</a>\n@@@\n\n@@@\nbaz\n@@@\n\n@@@ wah wah \n \n").should == %(<div><p><a>foo</a></p>\n<pre>\n<code>&lt;a&gt;bar&lt;/a&gt;</code>\n</pre>\n<pre>\n<code>baz</code>\n</pre>\n<p>@@@ wah wah</p></div>)
   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</p>\n<pre>\n<code class=\"ninja\">bar</code>\n</pre>\n<pre>\n<code>baz</code>\n</pre>\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</p>\n<pre>\n<code>bar</code>\n</pre>\n<pre>\n<code>baz</code>\n</pre>\n<p>@@@ wah wah</p>\n<pre>\n\n</pre></div>"
   end
   
   it "converts @@@ with params to code blocks with text format" do
@@ -88,7 +88,7 @@ class ModelFormattingTest < Test::Unit::TestCase
   
   it "treats linebreaks correctly" do
     ModelFormatting.process(:html, "Line breaks should not be treated as\nnew paragraphs.  They are not paragraphs.\n\nHowever, when a line is skipped, that is a paragraph.\nGMail, and basically every comment or submission form on the \nweb work this way.").should == \
-      "<div><p>Line breaks should not be treated as<br/>\nnew paragraphs.  They are not paragraphs.</p>\n\n<p>However, when a line is skipped, that is a paragraph.<br/>\nGMail, and basically every comment or submission form on the<br/>\nweb work this way.</p></div>"
+      "<div><p>Line breaks should not be treated as<br>\nnew paragraphs. They are not paragraphs.</p>\n<p>However, when a line is skipped, that is a paragraph.<br>\nGMail, and basically every comment or submission form on the<br>\nweb work this way.</p></div>"
   end
 
   describe "GFM" do

data/test/test_helper.rb

@@ -1,8 +1,20 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
+require 'test/unit'
+module Test
+  module Unit
+    class TestCase
+      def method_name
+          /`(.*)'/.match(caller.first).captures[0].to_sym rescue nil
+      end
+    end
+  end
+end
+
 require 'rubygems'
 require 'action_controller'
 require 'action_view'
+require 'active_support/core_ext'
 require 'model_formatting'
 require 'model_formatting/init'
 require 'model_formatting/config'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 91
   prerelease: 
   segments: 
   - 0
   - 2
   - 3
-  - 2
-  version: 0.2.3.2
+  - 4
+  version: 0.2.3.4
 platform: ruby
 authors: 
 - ENTP
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 -07:00
+date: 2011-11-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,19 +84,19 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: tidy
+  name: tidy_ffi
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
-        - 1
+        - 0
         - 1
         - 2
-        version: 1.1.2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -105,7 +105,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         hash: 1
         segments: 
@@ -140,6 +140,8 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- Gemfile
+- Gemfile.lock
 - Rakefile
 - README
 - bin/model_formatting