model_formatting 0.3.2 → 0.5

data/Gemfile

@@ -2,7 +2,7 @@ source :gemcutter
 source "http://gem.entp.com"
 
 gem 'rake'
-gem 'rdiscount', '~> 1.6.5'
+gem 'redcarpet', '~> 2.2'
 gem 'actionpack', '~> 3.0.0'
 gem 'activerecord', '~> 3.0.0'
 gem 'activesupport', '~> 3.0.0'

data/Gemfile.lock

@@ -37,7 +37,7 @@ GEM
     rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.9.2)
-    rdiscount (1.6.8)
+    redcarpet (2.2.2)
     tidy_ffi (0.1.3)
       ffi (>= 0.3.5)
     tzinfo (0.3.32)
@@ -52,5 +52,5 @@ DEPENDENCIES
   context (= 0.5.5)
   matchy (~> 0.4.0)
   rake
-  rdiscount (~> 1.6.5)
+  redcarpet
   tidy_ffi (~> 0.1.2)

data/Rakefile

@@ -1,18 +1,18 @@
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = "model_formatting"
-  s.version = "0.3.2"
+  s.version = "0.5"
   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.summary = "Automatically format model attributes using redcarpet (markdown) 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("rdiscount", "~>1.6.5")
+  s.add_dependency("redcarpet", "~>2.2")
   s.add_dependency("actionpack", "~>3.0.0")
   s.add_dependency("activerecord", "~>3.0.0")
   s.add_dependency("activesupport", "~>3.0.0")
@@ -23,7 +23,7 @@ end
 
 
 desc 'Build the gem.'
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 

data/lib/model_formatting.rb

@@ -182,16 +182,30 @@ module ModelFormatting
       text.gsub!(/(^(?! {4}|\t)\w+_\w+_\w[\w_]*)/) do |x|
         x.gsub('_', '\_') if x.split('').sort.to_s[0..1] == '__'
       end
+
+      # 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")
+      end
     end
   end
 
   begin
-    require 'rdiscount'
+    require 'redcarpet'
     def self.process_markdown(text)
-      RDiscount.new(text).to_html
+      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
+        :no_intra_emphasis => true,
+        :tables => true,
+        :fenced_code_blocks => true,
+        :space_after_headers => true,
+#        :hard_wrap => true, 
+#        :with_toc_data => true, 
+        :autolink => true).render(text)
     end
   rescue LoadError
-    puts "No RDiscount gem found.  `gem install rdiscount`."
+    puts "No Redcarpet gem found.  `gem install redcarpet`."
     def self.process_markdown(text)
       text
     end

data/test/formatting_test.rb

@@ -24,7 +24,7 @@ module ModelFormatting
       formats :body
     end
   
-    describe "Simple with formatting" do
+    context "Simple with formatting" do
       it "has attribute from #formats arguments" do
         Simple.model_formatting_attributes[:body].should == "formatted_body"
       end
@@ -68,7 +68,7 @@ module ModelFormatting
       end
     end
 
-    describe "base with after callback" do
+    context "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')
@@ -94,7 +94,7 @@ module ModelFormatting
       end
     end
   
-    describe "Post with formatting" do
+    context "Post with formatting" do
       it "has attribute from #formats arguments" do
         Post.model_formatting_attributes[:body].should == "formatted_body"
       end
@@ -115,7 +115,7 @@ module ModelFormatting
         Post.before_save.should == :format_content_with_model_formatting
       end
 
-      describe "being saved" do
+      context "being saved" do
         before do
           @record = Post.new
           @record.body  = 'booya'
@@ -152,7 +152,7 @@ module ModelFormatting
       end
     end
   
-    describe "ChildPost with formatting" do
+    context "ChildPost with formatting" do
       it "has attribute from #formats arguments" do
         ChildPost.model_formatting_attributes[:body].should == "formatted_body"
       end
@@ -169,7 +169,7 @@ module ModelFormatting
         ChildPost.before_save.should == :format_content_with_model_formatting
       end
 
-      describe "being saved" do
+      context "being saved" do
         before do
           @record = ChildPost.new
           @record.body = 'booya'

data/test/model_formatting_test.rb

@@ -71,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<pre>\n<code class=\"ninja\">bar</code>\n</pre>\n<pre>\n<code>baz</code>\n</pre>\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></p>\n<pre>\n<code class=\"ninja\">bar</code>\n</pre>\n<pre>\n<code>baz</code>\n</pre>\n@@@ wah wah</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<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>"
+    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>"
   end
   
   it "converts @@@ with params to code blocks with text format" do
@@ -88,10 +88,11 @@ 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 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>"
+      "<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
+  context "GFM" do
     it "does not touch single underscores inside words" do
       assert_equal "foo_bar", ModelFormatting.gfm("foo_bar")
     end
@@ -107,7 +108,16 @@ class ModelFormattingTest < Test::Unit::TestCase
     it "escapes two or more 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")
+    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,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 1
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - ENTP
@@ -15,23 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 -07:00
-default_executable: 
+date: 2013-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: redcarpet
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 7
         segments: 
-        - 1
-        - 6
-        - 5
-        version: 1.6.5
+        - 2
+        - 2
+        version: "2.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -141,19 +138,18 @@ extra_rdoc_files:
 files: 
 - Gemfile
 - Gemfile.lock
-- Rakefile
 - README
+- Rakefile
 - bin/model_formatting
+- lib/model_formatting.rb
 - 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
-has_rdoc: true
 homepage: http://github.com/entp
 licenses: []
 
@@ -183,9 +179,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Automatically format model attributes using rdiscount and Tender/Lighthouse extensions.
+summary: Automatically format model attributes using redcarpet (markdown) and Tender/Lighthouse extensions.
 test_files: []