model_formatting 0.2.3.10 → 0.2.3.11

data/Gemfile

@@ -2,10 +2,10 @@ source :gemcutter
 source "http://gem.entp.com"
 
 gem 'rake'
-gem 'rdiscount', '~> 1.6.5'
-gem 'actionpack', '~> 2.3.9'
-gem 'activerecord', '~> 2.3.9'
-gem 'activesupport', '~> 2.3.9'
+gem 'actionpack', '~> 2.3.15'
+gem 'activerecord', '~> 2.3.15'
+gem 'activesupport', '~> 2.3.15'
+gem 'redcarpet', '~> 2.2'
 gem 'tidy_ffi', '~> 0.1.2'
 
 group :development, :test do

data/Gemfile.lock

@@ -2,18 +2,18 @@ GEM
   remote: http://rubygems.org/
   remote: http://gem.entp.com/
   specs:
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
+    actionpack (2.3.15)
+      activesupport (= 2.3.15)
       rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    activerecord (2.3.15)
+      activesupport (= 2.3.15)
+    activesupport (2.3.15)
     context (0.5.5)
     ffi (1.0.10)
     matchy (0.4.0)
     rack (1.1.2)
     rake (0.9.2)
-    rdiscount (1.6.8)
+    redcarpet (2.2.2)
     tidy_ffi (0.1.3)
       ffi (>= 0.3.5)
 
@@ -21,11 +21,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 2.3.9)
-  activerecord (~> 2.3.9)
-  activesupport (~> 2.3.9)
+  actionpack (~> 2.3.15)
+  activerecord (~> 2.3.15)
+  activesupport (~> 2.3.15)
   context (= 0.5.5)
   matchy (~> 0.4.0)
   rake
-  rdiscount (~> 1.6.5)
+  redcarpet (~> 2.2)
   tidy_ffi (~> 0.1.2)

data/Rakefile

@@ -1,21 +1,21 @@
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
 
 spec = Gem::Specification.new do |s|
   s.name = "model_formatting"
-  s.version = "0.2.3.10"
+  s.version = "0.2.3.11"
   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("actionpack", "~>2.3.9")
-  s.add_dependency("activerecord", "~>2.3.9")
-  s.add_dependency("activesupport", "~>2.3.9")
+  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("tidy_ffi", "~>0.1.2")
   s.add_development_dependency("jeremymcanally-context", "~>0.5.5")
   s.add_development_dependency("jeremymcanally-matchy", "~>0.1.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

@@ -193,12 +193,19 @@ module ModelFormatting
   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
@@ -39,7 +39,7 @@ module ModelFormatting
         record.save
         record.formatted_body.should == %(<div><p>booya</p></div>)
       end
-      
+
       it "bolds the string 'Name'" do
         record = Simple.new
         record.body = "My name is __Name__"
@@ -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
@@ -92,7 +92,7 @@ class ModelFormattingTest < Test::Unit::TestCase
 
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 71
+  hash: 69
   prerelease: 
   segments: 
   - 0
   - 2
   - 3
-  - 10
-  version: 0.2.3.10
+  - 11
+  version: 0.2.3.11
 platform: ruby
 authors: 
 - ENTP
@@ -16,73 +16,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-23 00:00:00 Z
+date: 2013-01-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  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
-  version_requirements: *id001
+        - 2
+        - 2
+        version: "2.2"
   type: :runtime
-  name: rdiscount
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 29
         segments: 
         - 2
         - 3
-        - 9
-        version: 2.3.9
-  version_requirements: *id002
+        - 15
+        version: 2.3.15
   type: :runtime
-  name: actionpack
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 29
         segments: 
         - 2
         - 3
-        - 9
-        version: 2.3.9
-  version_requirements: *id003
+        - 15
+        version: 2.3.15
   type: :runtime
-  name: activerecord
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 29
         segments: 
         - 2
         - 3
-        - 9
-        version: 2.3.9
-  version_requirements: *id004
+        - 15
+        version: 2.3.15
   type: :runtime
-  name: activesupport
-  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  name: tidy_ffi
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +95,11 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  version_requirements: *id005
   type: :runtime
-  name: tidy_ffi
-  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  name: jeremymcanally-context
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,11 +111,11 @@ dependencies:
         - 5
         - 5
         version: 0.5.5
-  version_requirements: *id006
   type: :development
-  name: jeremymcanally-context
-  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  name: jeremymcanally-matchy
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,10 +127,8 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  version_requirements: *id007
   type: :development
-  name: jeremymcanally-matchy
-  prerelease: false
+  version_requirements: *id007
 description: 
 email: company@entp.com
 executables: []
@@ -141,13 +140,13 @@ 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
@@ -182,9 +181,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+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: []