redclothcoderay 0.3.5 → 0.3.6

data/README.rdoc

@@ -38,21 +38,27 @@ You can specify the CodeRay options, too (defaults to RedclothCoderay::CODERAY_O
 This input:
 
  Hello, this is *textilized*. It also has <source>@inline_code_examples</source>!
- 
+
  What about a multi-line code sample?
- 
+
  <source:html>
  <h1>Hello, world!</h1>
  </source>
-    
-produces this output (indented for clarity):
 
- <p>Hello, this is <strong>textilized</strong>. It also has <code class="inline_code">
-   <span class="iv">@inline_code_examples</span>
- </code>!</p>
- 
- <p>What about a multi-line code sample?</p>
- 
- <pre><code class=\"multiline_code\">
-   <span class=\"ta\">&amp;lt;h1&amp;gt;</span>Hello, world!<span class=\"ta\">&amp;lt;/h1&amp;gt;</span>
- </code></pre>
+Produces this output (indented for clarity):
+
+ <p>
+     Hello, this is <strong>textilized</strong>. It also has
+     <code class="inline_code">
+         <span class="iv">
+             @inline_code_examples
+         </span>
+     </code>!
+ </p>
+
+ <p>
+     What about a multi-line code sample?
+ </p>
+ <div class="multiline_code">
+     <span class="ta">&lt;h1&gt;</span>Hello, world!<span class="ta">&lt;/h1&gt;</span>
+ </div>

data/Rakefile

@@ -20,4 +20,24 @@ namespace :test do
     
     load "test/redclothcoderay_test.rb"
   end
-end
+end
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = "redclothcoderay"
+    gemspec.summary = "Integrates CodeRay with RedCloth by adding a <source> tag."
+    gemspec.description = %q{Adds CodeRay syntax highlighting support to RedCloth, with a ‘source’ tag.}
+    gemspec.email = ["augustlilleaas@gmail.com", "korhonen.matt@gmail.com"]
+    gemspec.homepage = "http://redclothcoderay.rubyforge.org"
+    gemspec.authors = ['August Lilleaas', 'Matias Korhonen']
+    gemspec.add_dependency('RedCloth')
+    gemspec.add_dependency('coderay')
+    gemspec.has_rdoc = true
+    gemspec.rubyforge_project = "redclothcoderay"
+    gemspec.files = FileList["lib", "lib/redclothcoderay.rb", "MIT-LICENSE", "Rakefile", "README.rdoc", "redclothcoderay.gemspec", "test", "test/coderay_options_test.rb", "test/redclothcoderay_test.rb", "test/test_helper.rb"]
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
+end
+

data/lib/redclothcoderay.rb

@@ -3,7 +3,7 @@ module RedclothCoderay
   MULTI_LINE = '<div class="multiline_code">%s</div>'
   SOURCE_TAG_REGEXP = /(([\t\n])?<source(?:\:([a-z]+))?>(.+?)<\/source>([\t\n])?)/m
   CODERAY_OPTIONS = {:wrap => nil, :css => :class}
-  
+
   def preprocess_with_syntax_highlighting(text)
     text.gsub(SOURCE_TAG_REGEXP) do |m|
       all_of_it = $~[1]
@@ -11,14 +11,20 @@ module RedclothCoderay
       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)
-      
+      if all_of_it =~ /\n/
+        highlighted = wrap_in % CodeRay.scan(code, lang).div(CODERAY_OPTIONS)
+      else
+        options = CODERAY_OPTIONS
+        options[:line_numbers] = nil
+        highlighted = wrap_in % CodeRay.scan(code, lang).span(options)
+      end
+
       "#{whitespace_before}<notextile>#{highlighted}</notextile>#{whitespace_after}"
     end
   end
-  
+
   def self.coderay_options(options)
     CODERAY_OPTIONS.replace(options)
   end
@@ -28,7 +34,7 @@ redcloth_thingie = RedCloth::VERSION.to_s < "4" ? RedCloth : RedCloth::TextileDo
 
 redcloth_thingie.class_eval {
   alias_method :_initialize, :initialize
-  
+
   def initialize(text, *args)
     text = preprocess_with_syntax_highlighting(text)
     _initialize(text, *args)

data/redclothcoderay.gemspec

@@ -1,16 +1,57 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
-  s.name = "redclothcoderay"
-  s.version = "0.3.5"
+  s.name = %q{redclothcoderay}
+  s.version = "0.3.6"
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.date = Time.now
-  s.authors = ['August Lilleaas', 'Matias Korhonen']
-  s.email = "augustlilleaas@gmail.com"
-  s.files = ["lib", "lib/redclothcoderay.rb", "MIT-LICENSE", "Rakefile", "README.rdoc", "redclothcoderay.gemspec", "test", "test/coderay_options_test.rb", "test/redclothcoderay_test.rb", "test/test_helper.rb"]
-  s.rubyforge_project = "redclothcoderay"
-  s.has_rdoc = true
-  s.add_dependency('RedCloth')
-  s.add_dependency('coderay')
-  s.summary = "Integrates CodeRay with RedCloth by adding a <source> tag."
-  s.homepage = "http://redclothcoderay.rubyforge.org"
+  s.authors = ["August Lilleaas", "Matias Korhonen"]
+  s.date = %q{2009-11-15}
   s.description = %q{Adds CodeRay syntax highlighting support to RedCloth, with a ‘source’ tag.}
+  s.email = ["augustlilleaas@gmail.com", "korhonen.matt@gmail.com"]
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "lib/redclothcoderay.rb",
+     "redclothcoderay.gemspec",
+     "test/coderay_options_test.rb",
+     "test/redclothcoderay_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://redclothcoderay.rubyforge.org}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{redclothcoderay}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Integrates CodeRay with RedCloth by adding a <source> tag.}
+  s.test_files = [
+    "test/redclothcoderay_code_tag.rb",
+     "test/test_helper.rb",
+     "test/redclothcoderay_test.rb",
+     "test/coderay_options_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
+      s.add_runtime_dependency(%q<coderay>, [">= 0"])
+    else
+      s.add_dependency(%q<RedCloth>, [">= 0"])
+      s.add_dependency(%q<coderay>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<RedCloth>, [">= 0"])
+    s.add_dependency(%q<coderay>, [">= 0"])
+  end
 end
+

data/test/redclothcoderay_code_tag.rb

@@ -0,0 +1,74 @@
+require 'test_helper'
+require 'redclothcoderay'
+
+class PluginWithCodeTagTest < Test::Unit::TestCase
+  def test_parsing_inline_code
+    text = "Hello, this is *textilized*. It also has <code>@inline_code_examples</code>!"
+    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
+  
+  def test_parsing_multiline_code
+    text = %Q{Hello, this is *textilized*.
+    <code>
+    def hello_world
+      puts "Allright"
+    end
+    </code>}
+    result = RedCloth.new(text).to_html
+    
+    assert result.include?(%Q{<strong>textilized</strong>})
+    assert result.include?(%Q{<pre><code class="multiline_code">})
+  end
+  
+  def test_one_liner_multiline_code
+    text = %Q{Hello, this is *textilized*.
+      
+    <code>
+    hello_to_you
+    </code>
+    }
+    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>})
+  end
+  
+  def test_parsing_other_languages
+    text = %Q{Hello, this is *textilized* with some <code:html><p>HTML code</p></code>!}
+    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>})
+  end
+  
+  def test_after_a_header
+    text = %Q{h2. Hello, world.
+
+<code>
+hello_world
+</code>}
+    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.
+
+<code>
+class Person < ActiveRecord::Base
+  composed_of :address, :class_name => "Address", 
+    :mapping => [
+      [:address_street, :street],
+      [:address_postal_code, :postal_code]]
+end
+</code>}
+
+    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.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - August Lilleaas
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +03:00
+date: 2009-11-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,18 +34,20 @@ dependencies:
         version: "0"
     version: 
 description: "Adds CodeRay syntax highlighting support to RedCloth, with a \xE2\x80\x98source\xE2\x80\x99 tag."
-email: augustlilleaas@gmail.com
+email: 
+- augustlilleaas@gmail.com
+- korhonen.matt@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
-- lib/redclothcoderay.rb
 - MIT-LICENSE
-- Rakefile
 - README.rdoc
+- Rakefile
+- lib/redclothcoderay.rb
 - redclothcoderay.gemspec
 - test/coderay_options_test.rb
 - test/redclothcoderay_test.rb
@@ -55,8 +57,8 @@ homepage: http://redclothcoderay.rubyforge.org
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -78,5 +80,8 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Integrates CodeRay with RedCloth by adding a <source> tag.
-test_files: []
-
+test_files: 
+- test/redclothcoderay_code_tag.rb
+- test/test_helper.rb
+- test/redclothcoderay_test.rb
+- test/coderay_options_test.rb