redclothcoderay 0.1.1 → 0.1.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+*0.1.2 (November 25th 2008)
+
+* Fixed some issues with whitespaces before <source> tags
+
+* Removed String#has_newlines?, doing it "by hand" instead.
+
 *0.1.1 (November 18th 2008)
 
 * Removed any references to Rails

data/Manifest

@@ -4,5 +4,4 @@ Manifest
 MIT-LICENSE
 Rakefile
 README
-redclothcoderay.gemspec
 test/redclothcoderay_test.rb

data/README

@@ -11,7 +11,7 @@ A short summary of what you can do:
 
 Installation as usual:
 
- sudo gem install redcloth
+ sudo gem install redclothcoderay
  
  
 == Using
@@ -21,9 +21,19 @@ You have to specify that you want to use refs_syntax_highlighter when calling Re
  require 'rubygems'
  require 'redcloth'
  require 'coderay'
- require 'redclothcoderay'
+ require 'redcloth_with_coderay'
  
  RedCloth.new('I am *bold* and <source>@hi_tech</source>').to_html(:textile, :refs_syntax_highlighter)
+ 
+== In Ruby on Rails
+
+Ruby on Rails provides you with a textilize helper. You probably want to override it. Something like this is probably sensible:
+
+ module ApplicationHelper
+   def textilize(text)
+     RedCloth.new(text).to_html(:textile, :refs_syntax_highlighter)
+   end
+ end
 
 == Example
 

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('redclothcoderay', '0.1.1') do |p|
+Echoe.new('redclothcoderay', '0.1.2') do |p|
   p.description    = "Integrates CodeRay with RedCloth by adding a <source> tag."
   p.url            = "http://redclothcoderay.rubyforge.org/"
   p.author         = "August Lilleaas"

data/lib/redcloth_with_coderay.rb

@@ -1,26 +1,20 @@
-class String
-  # Utility method to check if a string contains newlines.
-  def contains_newlines?
-    self =~ /\n/
-  end
-end
-
 module RedclothWithCoderay
   SINGLE_LINE = '<code class="inline_code">%s</code>'
   MULTI_LINE = '<pre><code class="multiline_code">%s</code></pre>'
-  WRAPPER = '<notextile>%s</notextile>'
-  SOURCE_TAG_REGEXP = /([\t\n]?<source(?:\:([a-z]+))?>(.+?)<\/source>[\t\n]?)/m
+  SOURCE_TAG_REGEXP = /(([\t\n])?<source(?:\:([a-z]+))?>(.+?)<\/source>[\t\n]?)/m
   
   # The RedCloth extension that performs the syntax highlighting.
   def refs_syntax_highlighter(text)
     text.gsub!(SOURCE_TAG_REGEXP) do |m|
       all_of_it = $~[1]
-      lang = ($~[2] || :ruby).to_sym
-      code = $~[3].strip
+      whitespace_before = $~[2]
+      lang = ($~[3] || :ruby).to_sym
+      code = $~[4].strip
       
-      wrap_in = all_of_it.contains_newlines? ? MULTI_LINE : SINGLE_LINE
+      wrap_in = all_of_it =~ /\n/ ? MULTI_LINE : SINGLE_LINE
       highlighted = wrap_in % CodeRay.scan(code, lang).div(:wrap => nil, :css => :class)
-      WRAPPER % highlighted
+      
+      "#{whitespace_before}<notextile>#{highlighted}</notextile>"
     end
   end
 end

data/redclothcoderay.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{redclothcoderay}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["August Lilleaas"]
-  s.date = %q{2008-11-18}
+  s.date = %q{2008-11-25}
   s.description = %q{Integrates CodeRay with RedCloth by adding a <source> tag.}
   s.email = %q{augustlilleaas@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "lib/redcloth_with_coderay.rb", "README"]
-  s.files = ["CHANGELOG", "lib/redcloth_with_coderay.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README", "redclothcoderay.gemspec", "test/redclothcoderay_test.rb"]
+  s.files = ["CHANGELOG", "lib/redcloth_with_coderay.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README", "test/redclothcoderay_test.rb", "redclothcoderay.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://redclothcoderay.rubyforge.org/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Redclothcoderay", "--main", "README"]

data/test/redclothcoderay_test.rb

@@ -45,8 +45,18 @@ class PluginTest < Test::Unit::TestCase
   def test_parsing_other_languages
     text = %Q{Hello, this is *textilized* with some <source:html><p>HTML code</p></source>!}
     result = RedCloth.new(text).to_html(:textile, :refs_syntax_highlighter)
-    
+
     assert result.include?(%Q{<strong>textilized</strong>})
     assert result.include?(%Q{<code class="inline_code"><span class="ta">&lt;p&gt;</span>HTML code<span class="ta">&lt;/p&gt;</span></code>})
   end
+  
+  def test_after_a_header
+    text = %Q{h2. Hello, world.
+
+<source>
+hello_world
+</source>}
+    result = RedCloth.new(text).to_html(:textile, :refs_syntax_highlighter)
+    assert result.include?(%Q{<h2>Hello, world.</h2>})
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redclothcoderay
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - August Lilleaas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 +01:00
+date: 2008-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,8 +59,8 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README
-- redclothcoderay.gemspec
 - test/redclothcoderay_test.rb
+- redclothcoderay.gemspec
 has_rdoc: true
 homepage: http://redclothcoderay.rubyforge.org/
 post_install_message: