model_formatting 0.2.3.19 → 0.3.2

data/Gemfile

@@ -2,15 +2,13 @@ source :gemcutter
 source "http://gem.entp.com"
 
 gem 'rake'
-gem 'rack', '~> 1.1.3'
-gem 'actionpack', '~> 2.3.18'
-gem 'activerecord', '~> 2.3.18'
-gem 'activesupport', '~> 2.3.18'
-gem 'redcarpet', '~> 2.2'
-gem 'tidy_ffi', '~> 0.1'
+gem 'rdiscount', '~> 1.6.5'
+gem 'actionpack', '~> 3.0.0'
+gem 'activerecord', '~> 3.0.0'
+gem 'activesupport', '~> 3.0.0'
+gem 'tidy_ffi', '~> 0.1.2'
 
 group :development, :test do
   gem 'context', '0.5.5'
   gem 'matchy', '~>0.4.0'
-  gem 'ruby-debug'
 end

data/Gemfile.lock

@@ -2,41 +2,55 @@ GEM
   remote: http://rubygems.org/
   remote: http://gem.entp.com/
   specs:
-    actionpack (2.3.18)
-      activesupport (= 2.3.18)
-      rack (~> 1.1.0)
-    activerecord (2.3.18)
-      activesupport (= 2.3.18)
-    activesupport (2.3.18)
-    columnize (0.3.6)
+    abstract (1.0.0)
+    actionpack (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.5)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.12)
+      activesupport (= 3.0.12)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.12)
+      activemodel (= 3.0.12)
+      activesupport (= 3.0.12)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.12)
+    arel (2.0.10)
+    builder (2.1.2)
     context (0.5.5)
-    ffi (1.2.1)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    ffi (1.0.10)
+    i18n (0.5.0)
     matchy (0.4.0)
-    rack (1.1.5)
+    rack (1.2.5)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
     rake (0.9.2)
-    rbx-require-relative (0.0.9)
-    redcarpet (2.2.2)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    tidy_ffi (0.1.5)
-      ffi (~> 1.2.0)
+    rdiscount (1.6.8)
+    tidy_ffi (0.1.3)
+      ffi (>= 0.3.5)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 2.3.18)
-  activerecord (~> 2.3.18)
-  activesupport (~> 2.3.18)
+  actionpack (~> 3.0.0)
+  activerecord (~> 3.0.0)
+  activesupport (~> 3.0.0)
   context (= 0.5.5)
   matchy (~> 0.4.0)
-  rack (~> 1.1.3)
   rake
-  redcarpet (~> 2.2)
-  ruby-debug
-  tidy_ffi (~> 0.1)
+  rdiscount (~> 1.6.5)
+  tidy_ffi (~> 0.1.2)

data/README

@@ -1,9 +1,3 @@
-This is a plugin for Rails that performs automatic text-to-html formatting. 
-
-For rails 2.3, please use the 'rails23' branch (you can specify ~> 0.2 in your gemfile)
-
-It uses the 'redcarpet' markdown library with a few other pre-processing steps.
-Note: tests do not run on 1.9.x series due to a bug in the test frameworks we use,
-but the code works fine.
+This is a plugin for Rails 2.2.x that performs automatic text-to-html formatting.
 
 It is extracted from and used by [Tender](http://tenderapp.com/) and [Lighthouse](http://lighthouseapp.com/).

data/Rakefile

@@ -1,22 +1,21 @@
-require 'rubygems/package_task'
+require 'rake/gempackagetask'
 require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = "model_formatting"
-  s.version = "0.2.3.19"
+  s.version = "0.3.2"
   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 redcarpet (markdown) and Tender/Lighthouse extensions."
+  s.summary = "Automatically format model attributes using rdiscount and Tender/Lighthouse extensions."
   s.files = FileList['[a-zA-Z]*', 'bin/*', 'lib/**/*', 'rails/**/*', 'test/**/*']
   s.has_rdoc = false
   s.extra_rdoc_files = ["README"]
-  s.add_dependency("rack", "~>1.1.3")
-  s.add_dependency("redcarpet", "~>2.2")
-  s.add_dependency("actionpack", "~>2.3.15")
-  s.add_dependency("activerecord", "~>2.3.15")
-  s.add_dependency("activesupport", "~>2.3.15")
+  s.add_dependency("rdiscount", "~>1.6.5")
+  s.add_dependency("actionpack", "~>3.0.0")
+  s.add_dependency("activerecord", "~>3.0.0")
+  s.add_dependency("activesupport", "~>3.0.0")
   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")
@@ -24,7 +23,7 @@ end
 
 
 desc 'Build the gem.'
-Gem::PackageTask.new(spec) do |pkg|
+Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 

data/lib/model_formatting.rb

@@ -1,6 +1,5 @@
 require 'cgi'
 require 'active_support' # NilClass#blank?
-require 'redcarpet_custom'
 module ModelFormatting
   class Part < Array
     attr_reader :format
@@ -89,16 +88,16 @@ module ModelFormatting
       end
     end
     if format == :html
-      string = process_tidy(string)
       if options[:white_list]
         string = options[:white_list].sanitize(string)
       end
+      string = process_tidy(string)
     end
     string.strip!
     format == :html ? "<div>#{string}</div>" : string
   end
 
-  CODEBLOCK_RE = /^(@@@|```)( ([a-z]+)\s*)?$/
+  CODEBLOCK_RE = /^@@@( ([a-z]+)\s*)?$/
 
   # Parse a string into a given array of [CodeBlcok, FormattedBlock, CodeBlock, FormattedBlock]
   #
@@ -123,7 +122,7 @@ module ModelFormatting
           current_part = nil
         else
           if current_part then parts << current_part end
-          current_part = CodePart.new(format, $3)
+          current_part = CodePart.new(format, $2)
         end
         in_code_block = !in_code_block
       else
@@ -179,27 +178,20 @@ module ModelFormatting
 
   def self.gfm(text)
     extract_tag(text, :pre) do |txt| 
-      # in very clear cases, let newlines become <br /> tags
-      #text.gsub!(/(\A|^$\n)(^\w[^\n]*\n)(^\w[^\n]*$)+/m) do |x|
-      #  x.gsub(/^(.+)$/, "\\1  ")
-      text.gsub!(/^[\w\<][^\n]*\n+/) do |x|
-        x =~ /\n{2}/ ? x : (x.strip!; x << "  \n")
+      # prevent foo_bar_baz from ending up with an italic word in the middle
+      text.gsub!(/(^(?! {4}|\t)\w+_\w+_\w[\w_]*)/) do |x|
+        x.gsub('_', '\_') if x.split('').sort.to_s[0..1] == '__'
       end
     end
   end
 
   begin
-    require 'redcarpet'
+    require 'rdiscount'
     def self.process_markdown(text)
-      markdown = Redcarpet::Markdown.new(Redcarpet::Render::Custom,
-        :no_intra_emphasis => true,
-        :tables => true,
-        :fenced_code_blocks => true,
-        :space_after_headers => true
-      ).render(text)
+      RDiscount.new(text).to_html
     end
   rescue LoadError
-    puts "No Redcarpet gem found.  `gem install redcarpet`."
+    puts "No RDiscount gem found.  `gem install rdiscount`."
     def self.process_markdown(text)
       text
     end
@@ -208,20 +200,12 @@ module ModelFormatting
   begin
     require 'tidy_ffi'
     def self.process_tidy(text)
-      begin
-        tidy = TidyFFI::Tidy.new(text)
-        tidy.options.input_encoding = 'utf8'
-        tidy.options.show_body_only = true
-        tidy.options.new_inline_tags = "video source"
-        tidy.options.force_output = true
-        tidy.clean.strip
-      rescue ArgumentError => e
-        if e.to_s == "string contains null byte"
-          text
-        else
-          raise e
-        end
-      end
+      tidy = TidyFFI::Tidy.new(text)
+      tidy.options.input_encoding = 'utf8'
+      tidy.options.show_body_only = true
+      tidy.options.new_inline_tags = "video"
+      tidy.options.force_output = true
+      tidy.clean.strip
     end
   rescue LoadError
     puts "No TidyFFI gem found.  `gem install tidy_ffi`."

data/test/formatting_test.rb

@@ -24,7 +24,7 @@ module ModelFormatting
       formats :body
     end
   
-    context "Simple with formatting" do
+    describe "Simple with formatting" do
       it "has attribute from #formats arguments" do
         Simple.model_formatting_attributes[:body].should == "formatted_body"
       end
@@ -60,13 +60,6 @@ module ModelFormatting
         record.save
         record.formatted_body.should ==%(<div><p>Enc&ouml;ded &#592; \\Upload \\upload</p></div>)
       end
-
-      it "formats incorrect html" do
-        record = Simple.new
-        record.body = "<a href=http://google.com>google</a>"
-        record.save
-        record.formatted_body.should ==%(<div><p><a href="http://google.com">google</a></p></div>)
-      end
     end
 
     class BaseWithAfter < Base
@@ -75,7 +68,7 @@ module ModelFormatting
       end
     end
 
-    context "base with after callback" do
+    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')
@@ -101,7 +94,7 @@ module ModelFormatting
       end
     end
   
-    context "Post with formatting" do
+    describe "Post with formatting" do
       it "has attribute from #formats arguments" do
         Post.model_formatting_attributes[:body].should == "formatted_body"
       end
@@ -122,7 +115,7 @@ module ModelFormatting
         Post.before_save.should == :format_content_with_model_formatting
       end
 
-      context "being saved" do
+      describe "being saved" do
         before do
           @record = Post.new
           @record.body  = 'booya'
@@ -159,7 +152,7 @@ module ModelFormatting
       end
     end
   
-    context "ChildPost with formatting" do
+    describe "ChildPost with formatting" do
       it "has attribute from #formats arguments" do
         ChildPost.model_formatting_attributes[:body].should == "formatted_body"
       end
@@ -176,7 +169,7 @@ module ModelFormatting
         ChildPost.before_save.should == :format_content_with_model_formatting
       end
 
-      context "being saved" do
+      describe "being saved" do
         before do
           @record = ChildPost.new
           @record.body = 'booya'

data/test/model_formatting_test.rb

@@ -7,11 +7,6 @@ class ModelFormattingTest < Test::Unit::TestCase
     parts.first.class.should == ModelFormatting::FormattedPart
     parts.first.should == 'foo'
   end
-  
-  it "generates TOC titles" do
-   ModelFormatting.process(:html, "# title one\n\n# title two\n\n## title one").should == \
-     "<div><h1 id=\"title-one\"><a name=\"title-one\" class=\"anchor\" href=\n\"#title-one\" id=\"title-one\"></a>title one</h1>\n<h1 id=\"title-two\"><a name=\"title-two\" class=\"anchor\" href=\n\"#title-two\" id=\"title-two\"></a>title two</h1>\n<h2 id=\"title-one_1\"><a name=\"title-one_1\" class=\"anchor\" href=\n\"#title-one_1\" id=\"title-one_1\"></a>title one</h2></div>"
-  end
 
   it "parses empty code block into array of single CodeBlock" do
     parts = ModelFormatting.parse_text_parts(nil, nil, "@@@ foo\n@@@")
@@ -76,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<br></p>\n<pre>\n<code class=\"ninja\">bar</code>\n</pre>\n<pre>\n<code>baz</code>\n</pre>\n@@@ wah wah</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<br></p>\n<pre>\n<code>bar</code>\n</pre>\n<pre>\n<code>baz</code>\n</pre>\n@@@ wah wah\n<pre>\n\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
@@ -93,11 +88,10 @@ 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<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 new paragraphs. They are\nnot paragraphs.</p>\n<p>However, when a line is skipped, that is a paragraph. GMail, and\nbasically every comment or submission form on the web work this\nway.</p></div>"
   end
 
-  context "GFM" do
+  describe "GFM" do
     it "does not touch single underscores inside words" do
       assert_equal "foo_bar", ModelFormatting.gfm("foo_bar")
     end
@@ -110,19 +104,10 @@ class ModelFormattingTest < Test::Unit::TestCase
       assert_equal "<pre>\nfoo_bar_baz\n</pre>", ModelFormatting.gfm("<pre>\nfoo_bar_baz\n</pre>")
     end
   
-    it "does not touch underscores inside words" do
-      assert_equal "foo_bar_baz", ModelFormatting.gfm("foo_bar_baz")
-    end
-
-    it "turns newlines into br tags in simple cases" do
-      assert_equal "foo  \nbar", ModelFormatting.gfm("foo\nbar")
+    it "escapes two or more underscores inside words" do
+      assert_equal "foo\\_bar\\_baz", ModelFormatting.gfm("foo_bar_baz")
     end
-
-    it "converts newlines in all groups" do
-      assert_equal "apple  \npear  \norange  \nbanana\n\nruby  \npython  \nerlang  \njavascript",
-        ModelFormatting.gfm("apple\npear\norange\nbanana\n\nruby\npython\nerlang\njavascript")
-    end
-
+  
     it "does not not convert newlines in lists" do
       assert_equal "# foo\n# bar", ModelFormatting.gfm("# foo\n# bar")
       assert_equal "* foo\n* bar", ModelFormatting.gfm("* foo\n* bar")

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 117
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  - 19
-  version: 0.2.3.19
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - ENTP
@@ -16,89 +15,77 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-15 00:00:00 Z
+date: 2012-03-21 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rdiscount
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 5
         segments: 
         - 1
-        - 1
-        - 3
-        version: 1.1.3
+        - 6
+        - 5
+        version: 1.6.5
   type: :runtime
-  requirement: *id001
-  prerelease: false
-  name: rack
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
-  type: :runtime
-  requirement: *id002
+  name: actionpack
   prerelease: false
-  name: redcarpet
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 15
-        version: 2.3.15
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  requirement: *id003
-  prerelease: false
-  name: actionpack
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: activerecord
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 15
-        version: 2.3.15
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  requirement: *id004
-  prerelease: false
-  name: activerecord
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 7
         segments: 
-        - 2
         - 3
-        - 15
-        version: 2.3.15
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
-  requirement: *id005
-  prerelease: false
-  name: activesupport
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: tidy_ffi
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,11 +97,11 @@ dependencies:
         - 2
         version: 0.1.2
   type: :runtime
-  requirement: *id006
-  prerelease: false
-  name: tidy_ffi
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: jeremymcanally-context
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,11 +113,11 @@ dependencies:
         - 5
         version: 0.5.5
   type: :development
-  requirement: *id007
-  prerelease: false
-  name: jeremymcanally-context
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: jeremymcanally-matchy
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,9 +129,7 @@ dependencies:
         - 0
         version: 0.1.0
   type: :development
-  requirement: *id008
-  prerelease: false
-  name: jeremymcanally-matchy
+  version_requirements: *id007
 description: 
 email: company@entp.com
 executables: []
@@ -163,12 +148,12 @@ files:
 - lib/model_formatting/init.rb
 - lib/model_formatting/instance_methods.rb
 - lib/model_formatting.rb
-- lib/redcarpet_custom.rb
 - rails/init.rb
 - test/fixtures/mkd-extraction.txt
 - test/formatting_test.rb
 - test/model_formatting_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://github.com/entp
 licenses: []
 
@@ -198,9 +183,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Automatically format model attributes using redcarpet (markdown) and Tender/Lighthouse extensions.
+summary: Automatically format model attributes using rdiscount and Tender/Lighthouse extensions.
 test_files: []
 

data/lib/redcarpet_custom.rb

@@ -1,27 +0,0 @@
-require 'redcarpet'
-module Redcarpet::Render
-  class Custom < HTML
-    # include Redcarpet::Render::HTML
-    def header(title, level)
-      @headers ||= []
-      # you can use this permalink style: 1-foo-bar with the level in it
-      # permalink = "#{level}-#{title.gsub(/\W+/, "-")}"
-      
-      # .. or just use title. you might like a better regex here, too
-      permalink = title.gsub(/\W+/, "-").downcase
-      
-      # for extra credit: implement this as its own method
-      if @headers.include?(permalink)
-        permalink += "_1"
-         # my brain hurts
-        loop do
-          break if !@headers.include?(permalink)
-          # generate titles like foo-bar_1, foo-bar_2
-          permalink.gsub!(/\_(\d+)$/, "_#{$1.to_i + 1}")
-        end
-      end
-      @headers << permalink
-      %(\n<h#{level} id=\"#{permalink}\"><a name="#{permalink}" class="anchor" href="##{permalink}"></a>#{title}</h#{level}>\n)
-    end
-  end
-end