model_formatting 0.2.3.8 → 0.2.3.10

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = "model_formatting"
-  s.version = "0.2.3.8"
+  s.version = "0.2.3.10"
   s.author = "ENTP"
   s.email = "company@entp.com"
   s.homepage = "http://github.com/entp"

data/lib/model_formatting.rb

@@ -182,6 +182,13 @@ 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
 
@@ -203,7 +210,7 @@ module ModelFormatting
       tidy = TidyFFI::Tidy.new(text)
       tidy.options.input_encoding = 'utf8'
       tidy.options.show_body_only = true
-      tidy.options.new_inline_tags = "video"
+      tidy.options.new_inline_tags = "video source"
       tidy.options.force_output = true
       tidy.clean.strip
     end

data/test/model_formatting_test.rb

@@ -88,7 +88,8 @@ 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
@@ -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,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 71
   prerelease: 
   segments: 
   - 0
   - 2
   - 3
-  - 8
-  version: 0.2.3.8
+  - 10
+  version: 0.2.3.10
 platform: ruby
 authors: 
 - ENTP
@@ -16,12 +16,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 -07:00
-default_executable: 
+date: 2012-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,11 +30,11 @@ dependencies:
         - 6
         - 5
         version: 1.6.5
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
+  type: :runtime
+  name: rdiscount
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +46,11 @@ dependencies:
         - 3
         - 9
         version: 2.3.9
-  type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
+  type: :runtime
+  name: actionpack
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,11 +62,11 @@ dependencies:
         - 3
         - 9
         version: 2.3.9
-  type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+  type: :runtime
+  name: activerecord
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,11 +78,11 @@ dependencies:
         - 3
         - 9
         version: 2.3.9
-  type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: tidy_ffi
+  type: :runtime
+  name: activesupport
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,11 +94,11 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeremymcanally-context
+  type: :runtime
+  name: tidy_ffi
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -113,11 +110,11 @@ dependencies:
         - 5
         - 5
         version: 0.5.5
-  type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: jeremymcanally-matchy
+  type: :development
+  name: jeremymcanally-context
   prerelease: false
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,8 +126,10 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  type: :development
   version_requirements: *id007
+  type: :development
+  name: jeremymcanally-matchy
+  prerelease: false
 description: 
 email: company@entp.com
 executables: []
@@ -154,7 +153,6 @@ files:
 - test/formatting_test.rb
 - test/model_formatting_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/entp
 licenses: []
 
@@ -184,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Automatically format model attributes using rdiscount and Tender/Lighthouse extensions.