redclothcoderay 0.2.0 → 0.3.0

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2008 August Lilleaas
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/{README → README.rdoc}

@@ -13,6 +13,9 @@ Installation as usual:
 
  sudo gem install redclothcoderay
  
+You can also install the gem via github, to get the latest HEAD.
+
+ sudo gem install augustl-redclothcoderay --source=http://gems.github.com/
  
 == Using
 

data/Rakefile

@@ -1,9 +1,23 @@
 require 'rake'
 require 'rake/testtask'
+$LOAD_PATH << File.join(File.dirname(__FILE__), 'test')
 
-task :default => :test
+task :default => "test:v4"
 
-task :test do
-  $LOAD_PATH << File.join(File.dirname(__FILE__), 'test')
-  load "test/redclothcoderay_test.rb"
+namespace :test do
+  desc "Test RedCloth 3"
+  task :v3 do
+    gem 'RedCloth', "< 4.0.0"
+    require 'RedCloth'
+    
+    load "test/redclothcoderay_test.rb"
+  end
+  
+  desc "Test RedCloth 4"
+  task :v4 do
+    gem 'RedCloth', ">= 4.0.0"
+    require 'RedCloth'
+    
+    load "test/redclothcoderay_test.rb"
+  end
 end

data/lib/redclothcoderay.rb

@@ -1,38 +1,21 @@
 module RedclothCoderay
   SINGLE_LINE = '<code class="inline_code">%s</code>'
   MULTI_LINE = '<pre><code class="multiline_code">%s</code></pre>'
-  SOURCE_TAG_REGEXP = /(([\t\n])?<source(?:\:([a-z]+))?>(.+?)<\/source>[\t\n]?)/m
+  SOURCE_TAG_REGEXP = /(([\t\n])?<source(?:\:([a-z]+))?>(.+?)<\/source>([\t\n])?)/m
   CODERAY_OPTIONS = {:wrap => nil, :css => :class}
   
-  # The RedCloth extension that performs the syntax highlighting.
-  def refs_syntax_highlighter(text)
-    text.gsub!(SOURCE_TAG_REGEXP) do |m|
+  def preprocess_with_syntax_highlighting(text)
+    text.gsub(SOURCE_TAG_REGEXP) do |m|
       all_of_it = $~[1]
       whitespace_before = $~[2]
       lang = ($~[3] || :ruby).to_sym
       code = $~[4].strip
+      whitespace_after = $~[5]
       
       wrap_in = all_of_it =~ /\n/ ? MULTI_LINE : SINGLE_LINE
       highlighted = wrap_in % CodeRay.scan(code, lang).div(CODERAY_OPTIONS)
       
-      "#{whitespace_before}<notextile>#{highlighted}</notextile>"
-    end
-  end
-  
-  # Adds the syntax highlighter to all RedCloth#to_htmls, so that you don't have to
-  # do that to_html(:textile, :refs_syntax_highlighter) thin.
-  def self.always_on
-    if RedCloth::VERSION.to_s < "4"
-      RedCloth::DEFAULT_RULES << :refs_syntax_highlighter
-    else
-      RedCloth::TextileDoc.class_eval {
-        alias :_to_html :to_html
-        
-        def to_html(*rules)
-          rules << :refs_syntax_highlighter
-          _to_html(*rules)
-        end
-      }
+      "#{whitespace_before}<notextile>#{highlighted}</notextile>#{whitespace_after}"
     end
   end
   
@@ -41,4 +24,15 @@ module RedclothCoderay
   end
 end
 
-RedCloth.class_eval { include RedclothCoderay }
+redcloth_thingie = RedCloth::VERSION.to_s < "4" ? RedCloth : RedCloth::TextileDoc
+
+redcloth_thingie.class_eval {
+  alias_method :_initialize, :initialize
+  
+  def initialize(text, *args)
+    text = preprocess_with_syntax_highlighting(text)
+    _initialize(text, *args)
+  end
+}
+
+redcloth_thingie.send(:include, RedclothCoderay)

data/redclothcoderay.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "redclothcoderay"
-  s.version = "0.2.0"
-  s.date = "2009-04-23"
+  s.version = "0.3.0"
+  s.date = "2009-05-06"
   s.authors = ["August Lilleaas"]
   s.email = "augustlilleaas@gmail.com"
   s.rubyforge_project = "redclothcoderay"
@@ -11,14 +11,5 @@ Gem::Specification.new do |s|
   s.summary = "Integrates CodeRay with RedCloth by adding a <source> tag."
   s.homepage = "http://redclothcoderay.rubyforge.org"
   s.extensions = ["Rakefile"]
-  s.files =
-    ["redclothcoderay.gemspec",
-    "README",
-    "Rakefile",
-    "lib/redclothcoderay.rb",
-    "test/redclothcoderay_test.rb",
-    "test/always_on_3_test.rb",
-    "test/always_on_4_test.rb",
-    "test/coderay_options_test.rb",
-    "test/test_helper.rb"]
+  s.files = Dir["**/*"].select {|d| File.file?(d) }
 end

data/test/redclothcoderay_test.rb

@@ -1,11 +1,10 @@
 require 'test_helper'
-require 'redcloth'
 require 'redclothcoderay'
 
 class PluginTest < Test::Unit::TestCase
   def test_parsing_inline_code
     text = "Hello, this is *textilized*. It also has <source>@inline_code_examples</source>!"
-    result = RedCloth.new(text).to_html(:textile, :refs_syntax_highlighter)
+    result = RedCloth.new(text).to_html
     
     assert_equal(%Q{<p>Hello, this is <strong>textilized</strong>. It also has <code class="inline_code"><span class="iv">@inline_code_examples</span></code>!</p>}, result)
   end
@@ -17,7 +16,7 @@ class PluginTest < Test::Unit::TestCase
       puts "Allright"
     end
     </source>}
-    result = RedCloth.new(text).to_html(:textile, :refs_syntax_highlighter)
+    result = RedCloth.new(text).to_html
     
     assert result.include?(%Q{<strong>textilized</strong>})
     assert result.include?(%Q{<pre><code class="multiline_code">})
@@ -30,7 +29,7 @@ class PluginTest < Test::Unit::TestCase
     hello_to_you
     </source>
     }
-    result = RedCloth.new(text).to_html(:textile, :refs_syntax_highlighter)
+    result = RedCloth.new(text).to_html
     
     assert result.include?(%Q{<strong>textilized</strong>})
     assert result.include?(%Q{<pre><code class=\"multiline_code\">hello_to_you</code></pre>})
@@ -38,7 +37,7 @@ 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)
+    result = RedCloth.new(text).to_html
 
     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>})
@@ -50,7 +49,26 @@ class PluginTest < Test::Unit::TestCase
 <source>
 hello_world
 </source>}
-    result = RedCloth.new(text).to_html(:textile, :refs_syntax_highlighter)
+    result = RedCloth.new(text).to_html
     assert result.include?(%Q{<h2>Hello, world.</h2>})
   end
+  
+  # This case is a real case that caused borks, which lead to 0.3.0.
+  def test_odd_indents
+    text = %Q{Let's try, now.
+
+<source>
+class Person < ActiveRecord::Base
+  composed_of :address, :class_name => "Address", 
+    :mapping => [
+      [:address_street, :street],
+      [:address_postal_code, :postal_code]]
+end
+</source>}
+
+    result = RedCloth.new(text).to_html
+    
+    assert result.include?(%{[<span class="sy">:address_street</span>, <span class="sy">:street</span>],})
+    assert result.include?(%{composed_of <span class="sy">:address</span>, <span class="sy">:class_name</span> =&gt; <span class="s"><span class="dl">&quot;</span><span class="k">Address</span><span class="dl">&quot;</span></span>,})
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redclothcoderay
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - August Lilleaas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-23 00:00:00 +02:00
+date: 2009-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,14 +41,13 @@ extensions:
 extra_rdoc_files: []
 
 files: 
-- redclothcoderay.gemspec
-- README
-- Rakefile
 - lib/redclothcoderay.rb
-- test/redclothcoderay_test.rb
-- test/always_on_3_test.rb
-- test/always_on_4_test.rb
+- MIT-LICENSE
+- Rakefile
+- README.rdoc
+- redclothcoderay.gemspec
 - test/coderay_options_test.rb
+- test/redclothcoderay_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://redclothcoderay.rubyforge.org

data/test/always_on_3_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-gem 'RedCloth', "< 4.0.0"
-require 'RedCloth'
-require 'redclothcoderay'
-
-# Is in isolation, because it meddles with states and shit. CBA to mock that.
-class AlwaysOn3Test < Test::Unit::TestCase
-  def test_always_on
-    RedclothCoderay.always_on
-    result = RedCloth.new(%{I thar. <source>inline_code</source> and *textile*!}).to_html
-    assert result.include?("<strong>textile</strong>")
-    assert result.include?('<code class="inline_code">')
-  end
-end

data/test/always_on_4_test.rb

@@ -1,14 +0,0 @@
-require 'test_helper'
-gem 'RedCloth', ">= 4.0.0"
-require 'RedCloth'
-require 'redclothcoderay'
-
-# Is in isolation, because it meddles with states and shit. CBA to mock that.
-class AlwaysOn3Test < Test::Unit::TestCase
-  def test_always_on
-    RedclothCoderay.always_on
-    result = RedCloth.new(%{I thar. <source>inline_code</source> and *textile*!}).to_html
-    assert result.include?("<strong>textile</strong>")
-    assert result.include?('<code class="inline_code">')
-  end
-end