model_formatting 0.2.3.18.4 → 0.2.3.18.5

data/Rakefile

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

data/lib/model_formatting.rb

@@ -98,7 +98,7 @@ module ModelFormatting
     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 +123,7 @@ module ModelFormatting
           current_part = nil
         else
           if current_part then parts << current_part end
-          current_part = CodePart.new(format, $2)
+          current_part = CodePart.new(format, $3)
         end
         in_code_block = !in_code_block
       else
@@ -192,7 +192,6 @@ module ModelFormatting
     require 'redcarpet'
     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

data/test/model_formatting_test.rb

@@ -9,8 +9,8 @@ class ModelFormattingTest < Test::Unit::TestCase
   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>"
+   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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 199
+  hash: 197
   prerelease: 
   segments: 
   - 0
   - 2
   - 3
   - 18
-  - 4
-  version: 0.2.3.18.4
+  - 5
+  version: 0.2.3.18.5
 platform: ruby
 authors: 
 - ENTP
@@ -17,11 +17,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-29 00:00:00 -07:00
-default_executable: 
+date: 2013-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rack
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,12 +32,12 @@ dependencies:
         - 1
         - 3
         version: 1.1.3
-  version_requirements: *id001
-  name: rack
-  prerelease: false
   type: :runtime
+  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: redcarpet
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +47,12 @@ dependencies:
         - 2
         - 2
         version: "2.2"
-  version_requirements: *id002
-  name: redcarpet
-  prerelease: false
   type: :runtime
+  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: actionpack
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +63,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  version_requirements: *id003
-  name: actionpack
-  prerelease: false
   type: :runtime
+  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +79,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  version_requirements: *id004
-  name: activerecord
-  prerelease: false
   type: :runtime
+  prerelease: false
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: activesupport
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +95,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  version_requirements: *id005
-  name: activesupport
-  prerelease: false
   type: :runtime
+  prerelease: false
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: tidy_ffi
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,12 +111,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  version_requirements: *id006
-  name: tidy_ffi
-  prerelease: false
   type: :runtime
+  prerelease: false
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: jeremymcanally-context
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -127,12 +127,12 @@ dependencies:
         - 5
         - 5
         version: 0.5.5
-  version_requirements: *id007
-  name: jeremymcanally-context
-  prerelease: false
   type: :development
+  prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: jeremymcanally-matchy
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,10 +143,9 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  version_requirements: *id008
-  name: jeremymcanally-matchy
-  prerelease: false
   type: :development
+  prerelease: false
+  requirement: *id008
 description: 
 email: company@entp.com
 executables: []
@@ -171,7 +170,6 @@ files:
 - test/formatting_test.rb
 - test/model_formatting_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/entp
 licenses: []
 
@@ -201,7 +199,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 redcarpet (markdown) and Tender/Lighthouse extensions.