model_formatting 0.2.3.15 → 0.2.3.16

data/Gemfile

@@ -3,13 +3,14 @@ source "http://gem.entp.com"
 
 gem 'rake'
 gem 'rack', '~> 1.1.3'
-gem 'actionpack', '~> 2.3.15'
-gem 'activerecord', '~> 2.3.15'
-gem 'activesupport', '~> 2.3.15'
+gem 'actionpack', '~> 2.3.18'
+gem 'activerecord', '~> 2.3.18'
+gem 'activesupport', '~> 2.3.18'
 gem 'redcarpet', '~> 2.2'
 gem 'tidy_ffi', '~> 0.1'
 
 group :development, :test do
   gem 'context', '0.5.5'
   gem 'matchy', '~>0.4.0'
+  gem 'ruby-debug'
 end

data/Gemfile.lock

@@ -2,18 +2,27 @@ GEM
   remote: http://rubygems.org/
   remote: http://gem.entp.com/
   specs:
-    actionpack (2.3.15)
-      activesupport (= 2.3.15)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
       rack (~> 1.1.0)
-    activerecord (2.3.15)
-      activesupport (= 2.3.15)
-    activesupport (2.3.15)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    columnize (0.3.6)
     context (0.5.5)
     ffi (1.2.1)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     matchy (0.4.0)
     rack (1.1.5)
     rake (0.9.2)
+    rbx-require-relative (0.0.9)
     redcarpet (2.2.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     tidy_ffi (0.1.5)
       ffi (~> 1.2.0)
 
@@ -21,12 +30,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 2.3.15)
-  activerecord (~> 2.3.15)
-  activesupport (~> 2.3.15)
+  actionpack (~> 2.3.18)
+  activerecord (~> 2.3.18)
+  activesupport (~> 2.3.18)
   context (= 0.5.5)
   matchy (~> 0.4.0)
   rack (~> 1.1.3)
   rake
   redcarpet (~> 2.2)
+  ruby-debug
   tidy_ffi (~> 0.1)

data/Rakefile

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

data/lib/model_formatting.rb

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

data/lib/redcarpet_custom.rb

@@ -0,0 +1,27 @@
+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

data/test/model_formatting_test.rb

@@ -7,6 +7,11 @@ 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: 77
+  hash: 115
   prerelease: 
   segments: 
   - 0
   - 2
   - 3
-  - 15
-  version: 0.2.3.15
+  - 16
+  version: 0.2.3.16
 platform: ruby
 authors: 
 - ENTP
@@ -16,10 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-29 00:00:00 Z
+date: 2013-04-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +30,12 @@ dependencies:
         - 1
         - 3
         version: 1.1.3
-  version_requirements: *id001
-  type: :runtime
-  name: rack
+  requirement: *id001
   prerelease: false
+  name: rack
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +45,12 @@ dependencies:
         - 2
         - 2
         version: "2.2"
-  version_requirements: *id002
-  type: :runtime
-  name: redcarpet
+  requirement: *id002
   prerelease: false
+  name: redcarpet
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +61,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  version_requirements: *id003
-  type: :runtime
-  name: actionpack
+  requirement: *id003
   prerelease: false
+  name: actionpack
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +77,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  version_requirements: *id004
-  type: :runtime
-  name: activerecord
+  requirement: *id004
   prerelease: false
+  name: activerecord
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,12 +93,12 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  version_requirements: *id005
-  type: :runtime
-  name: activesupport
+  requirement: *id005
   prerelease: false
+  name: activesupport
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,12 +109,12 @@ dependencies:
         - 1
         - 2
         version: 0.1.2
-  version_requirements: *id006
-  type: :runtime
-  name: tidy_ffi
+  requirement: *id006
   prerelease: false
+  name: tidy_ffi
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,12 +125,12 @@ dependencies:
         - 5
         - 5
         version: 0.5.5
-  version_requirements: *id007
-  type: :development
-  name: jeremymcanally-context
+  requirement: *id007
   prerelease: false
+  name: jeremymcanally-context
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,10 +141,10 @@ dependencies:
         - 1
         - 0
         version: 0.1.0
-  version_requirements: *id008
-  type: :development
-  name: jeremymcanally-matchy
+  requirement: *id008
   prerelease: false
+  name: jeremymcanally-matchy
+  type: :development
 description: 
 email: company@entp.com
 executables: []
@@ -163,6 +163,7 @@ 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
@@ -197,7 +198,7 @@ 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 redcarpet (markdown) and Tender/Lighthouse extensions.