model_formatting 0.2.3.7 → 0.2.3.8

data/Rakefile

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

data/lib/model_formatting.rb

@@ -179,15 +179,8 @@ module ModelFormatting
   def self.gfm(text)
     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.join[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")
+      text.gsub!(/(^(?! {4}|\t)\w+_\w+_\w[\w_]*)/) do |x|
+        x.gsub('_', '\_') if x.split('').sort.to_s[0..1] == '__'
       end
     end
   end

data/test/formatting_test.rb

@@ -42,9 +42,9 @@ module ModelFormatting
       
       it "bolds the string 'Name'" do
         record = Simple.new
-        record.body = "My name is\n__Name__"
+        record.body = "My name is __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 <strong>Name</strong></p></div>)
       end
 
       it "preserves leading spaces in code blocks" do

data/test/model_formatting_test.rb

@@ -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<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
 
   describe "GFM" do
@@ -108,15 +108,6 @@ class ModelFormattingTest < Test::Unit::TestCase
       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")

data/test/test_helper.rb

@@ -1,16 +1,5 @@
 $:.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'

metadata

@@ -1,100 +1,145 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: model_formatting
-version: !ruby/object:Gem::Version
-  version: 0.2.3.7
+version: !ruby/object:Gem::Version 
+  hash: 67
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 3
+  - 8
+  version: 0.2.3.8
 platform: ruby
-authors:
+authors: 
 - ENTP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-21 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdiscount
-  requirement: &70183067153420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 6
+        - 5
         version: 1.6.5
   type: :runtime
-  prerelease: false
-  version_requirements: *70183067153420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: actionpack
-  requirement: &70183067152840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 3
+        - 9
         version: 2.3.9
   type: :runtime
-  prerelease: false
-  version_requirements: *70183067152840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &70183067152280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 3
+        - 9
         version: 2.3.9
   type: :runtime
-  prerelease: false
-  version_requirements: *70183067152280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70183067151760 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 3
+        - 9
         version: 2.3.9
   type: :runtime
-  prerelease: false
-  version_requirements: *70183067151760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: tidy_ffi
-  requirement: &70183067151240 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 0
+        - 1
+        - 2
         version: 0.1.2
   type: :runtime
-  prerelease: false
-  version_requirements: *70183067151240
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: jeremymcanally-context
-  requirement: &70183067150660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        - 5
         version: 0.5.5
   type: :development
-  prerelease: false
-  version_requirements: *70183067150660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: jeremymcanally-matchy
-  requirement: &70183067150080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
         version: 0.1.0
   type: :development
-  prerelease: false
-  version_requirements: *70183067150080
+  version_requirements: *id007
 description: 
 email: company@entp.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README
-files:
+files: 
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -109,29 +154,39 @@ files:
 - test/formatting_test.rb
 - test/model_formatting_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://github.com/entp
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Automatically format model attributes using rdiscount and Tender/Lighthouse
-  extensions.
+summary: Automatically format model attributes using rdiscount and Tender/Lighthouse extensions.
 test_files: []
+