model_formatting 0.2.3.16 → 0.2.3.18

data/Rakefile

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

data/lib/model_formatting.rb

@@ -1,6 +1,5 @@
 require 'cgi'
 require 'active_support' # NilClass#blank?
-require 'redcarpet_custom'
 module ModelFormatting
   class Part < Array
     attr_reader :format
@@ -191,7 +190,8 @@ module ModelFormatting
   begin
     require 'redcarpet'
     def self.process_markdown(text)
-      markdown = Redcarpet::Markdown.new(Redcarpet::Render::Custom,
+      renderer = Redcarpet::Render::HTML.new(:with_toc_data => true)
+      markdown = Redcarpet::Markdown.new(renderer,
         :no_intra_emphasis => true,
         :tables => true,
         :fenced_code_blocks => true,

data/test/formatting_test.rb

@@ -62,6 +62,21 @@ module ModelFormatting
       end
     end
 
+    class SimpleWithToc < Base
+      formats :body do
+        white_list.allowed_attributes << 'id'
+      end
+    end
+
+    context "SimpleWithToc with formatting" do
+      it "creates anchors for titles" do
+        record = Simple.new
+        record.body = "# Title\n\nFoo."
+        record.save
+        record.formatted_body.should ==%(<div><h1 id="toc_0">Title</h1>\n<p>Foo.</p></div>)
+      end
+    end
+
     class BaseWithAfter < Base
       formats :body do
         after { |format, text, options| text }

data/test/model_formatting_test.rb

@@ -7,11 +7,6 @@ class ModelFormattingTest < Test::Unit::TestCase
     parts.first.class.should == ModelFormatting::FormattedPart
     parts.first.should == 'foo'
   end
-  
-  it "generates TOC titles" do
-   ModelFormatting.process(:html, "# title one\n\n# title two\n\n## title one").should == \
-    "<div><a name=\"title-one\" class=\"anchor\" href=\"#title-one\" id=\n\"title-one\"></a>\n<h1 id=\"title-one\">title one</h1>\n<a name=\"title-two\" class=\"anchor\" href=\"#title-two\" id=\n\"title-two\"></a>\n<h1 id=\"title-two\">title two</h1>\n<a name=\"title-one_1\" class=\"anchor\" href=\"#title-one_1\" id=\n\"title-one_1\"></a>\n<h2 id=\"title-one_1\">title one</h2></div>"
-  end
 
   it "parses empty code block into array of single CodeBlock" do
     parts = ModelFormatting.parse_text_parts(nil, nil, "@@@ foo\n@@@")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: model_formatting
 version: !ruby/object:Gem::Version 
-  hash: 115
+  hash: 119
   prerelease: 
   segments: 
   - 0
   - 2
   - 3
-  - 16
-  version: 0.2.3.16
+  - 18
+  version: 0.2.3.18
 platform: ruby
 authors: 
 - ENTP
@@ -16,10 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-24 00:00:00 Z
+date: 2013-04-22 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +31,12 @@ dependencies:
         - 1
         - 3
         version: 1.1.3
-  requirement: *id001
-  prerelease: false
+  version_requirements: *id001
   name: rack
+  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +46,12 @@ dependencies:
         - 2
         - 2
         version: "2.2"
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id002
   name: redcarpet
+  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +62,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id003
   name: actionpack
+  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +78,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  requirement: *id004
-  prerelease: false
+  version_requirements: *id004
   name: activerecord
+  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +94,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  requirement: *id005
-  prerelease: false
+  version_requirements: *id005
   name: activesupport
+  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +110,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  requirement: *id006
-  prerelease: false
+  version_requirements: *id006
   name: tidy_ffi
+  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,12 +126,12 @@ dependencies:
         - 5
         - 5
         version: 0.5.5
-  requirement: *id007
-  prerelease: false
+  version_requirements: *id007
   name: jeremymcanally-context
+  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,9 +142,9 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  requirement: *id008
-  prerelease: false
+  version_requirements: *id008
   name: jeremymcanally-matchy
+  prerelease: false
   type: :development
 description: 
 email: company@entp.com
@@ -163,12 +164,12 @@ files:
 - lib/model_formatting/init.rb
 - lib/model_formatting/instance_methods.rb
 - lib/model_formatting.rb
-- lib/redcarpet_custom.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: []
 
@@ -198,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Automatically format model attributes using redcarpet (markdown) and Tender/Lighthouse extensions.

data/lib/redcarpet_custom.rb

@@ -1,27 +0,0 @@
-require 'redcarpet'
-module Redcarpet::Render
-  class Custom < HTML
-    # include Redcarpet::Render::HTML
-    def header(title, level)
-      @headers ||= []
-      # you can use this permalink style: 1-foo-bar with the level in it
-      # permalink = "#{level}-#{title.gsub(/\W+/, "-")}"
-      
-      # .. or just use title. you might like a better regex here, too
-      permalink = title.gsub(/\W+/, "-")
-      
-      # for extra credit: implement this as its own method
-      if @headers.include?(permalink)
-        permalink += "_1"
-         # my brain hurts
-        loop do
-          break if !@headers.include?(permalink)
-          # generate titles like foo-bar_1, foo-bar_2
-          permalink.gsub!(/\_(\d+)$/, "_#{$1.to_i + 1}")
-        end
-      end
-      @headers << permalink
-      %(\n<a name="#{permalink}" class="anchor" href="##{permalink}"><span class="anchor-icon"></span></a><h#{level} id=\"#{permalink}\">#{title}</h#{level}>\n)
-    end
-  end
-end