RedCloth 4.2.4.pre3 → 4.2.4

data/.gitignore

@@ -23,3 +23,4 @@ pkg
 rdoc
 release
 tmp
+Gemfile.lock

data/CHANGELOG

@@ -1,5 +1,8 @@
-=== *edge*
+=== 4.2.4 / February 7, 2011
 
+* Add .gemtest to opt-in to rubygems-test program (gem install rubygems-test to participate)
+* Allow attributes to be set on hr and br tags [Jesse Stormier]
+* Fix dangling <li> [Stephen Bannasch]
 * Switch to bundler and rake-compiler for gem management/compilation
 * Fix invalid YAML for Ruby 1.9.2 [Aaron Patterson]
 

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jason Garber
+Copyright (c) 2011 Jason Garber
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/Gemfile

@@ -1,2 +1,7 @@
 source :rubygems
 gemspec
+
+group :development do
+  gem 'rvm'
+  gem 'rake-compiler', '~> 0.7.1'
+end

data/README

@@ -27,17 +27,17 @@ compiled from C sources automatically when you install the gem on the ruby
 platform. Precompiled binary gems are provided for JRuby and Win32 platforms.
 
 RedCloth can be compiled with <tt>rake compile</tt>. Ragel 6.3 or greater is
-needed to build, compile, and package RedCloth. Again, Ragel is NOT needed to
-simply use RedCloth.
+required. Again, Ragel is NOT needed to simply use RedCloth.
 
 === Supported platforms
 
-By default, the rake compile task builds a native C Ruby extension that works
-with Ruby 1.8 or 1.9 or a Java extension for JRuby 1.3. A pure Ruby version
-can also be generated, but not easily because the parser it produces is slow
-and incompatible with Ruby 1.9. The JRuby and pure-Ruby extensions don't
-support multi-byte characters. The RedCloth::EXTENSION_LANGUAGE constant
-indicates in which language your copy of RedCloth is compiled.
+By default, the rake compile task builds a native C extension (MRI 1.8 or 1.9)
+or Java extension (JRuby 1.3). A pure Ruby version can also be generated, but
+it's super slow and Ruby 1.8-only. The JRuby and pure-Ruby extensions don't
+support multi-byte characters. Cross-compiling for win32 uses rake-compiler.
+
+The RedCloth::EXTENSION_LANGUAGE constant indicates in which language your
+copy of RedCloth is compiled.
 
 === Compiling gems
 
@@ -47,6 +47,8 @@ takes care of compiling and packaging all gems.
 
 # gem install bundler
 # bundle install
+# rake-compiler cross-ruby VERSION=1.8.6-p398
+# rake-compiler cross-ruby VERSION=1.9.1-p243
 # rake build:all
 
 == Bugs
@@ -55,7 +57,7 @@ Please submit bugs to http://jgarber.lighthouseapp.com/projects/13054-redcloth/o
 
 == Using RedCloth
 
-RedCloth is simply an extension of the String class, which can handle
+RedCloth is simply an extension of the String class that can handle
 Textile formatting.  Use it like a String and output HTML with its
 RedCloth#to_html method.
 

data/Rakefile

@@ -2,9 +2,15 @@
 require 'rubygems'
 require 'bundler'
 Bundler.setup
-Bundler::GemHelper.install_tasks
 ENV['RUBYOPT'] = nil # Necessary to prevent Bundler from *&^%$#ing up rake-compiler.
 
 require 'rake/clean'
 
-Dir['tasks/**/*.rake'].each { |rake| load File.expand_path(rake) }
+if File.directory? "ragel"
+  Bundler::GemHelper.install_tasks
+  Bundler.setup(:development)
+  Dir['tasks/**/*.rake'].each { |rake| load File.expand_path(rake) }
+else
+  # Omit generation/compile tasks. In a gem package we only need testing tasks.
+  load 'tasks/rspec.rake'
+end

data/lib/redcloth/formatters/html.rb

@@ -15,7 +15,7 @@ module RedCloth::Formatters::HTML
   end
   
   def hr(opts)
-    "<hr />\n"
+    "<hr#{pba(opts)} />\n"
   end
   
   def acronym(opts)
@@ -205,7 +205,7 @@ module RedCloth::Formatters::HTML
     if hard_breaks == false
       "\n"
     else
-      "<br />\n"
+      "<br#{pba(opts)} />\n"
     end
   end
   

data/lib/redcloth/version.rb

@@ -3,9 +3,9 @@ module RedCloth
     MAJOR = 4
     MINOR = 2
     TINY  = 4
-    RELEASE_CANDIDATE = "pre3"
+    RELEASE_CANDIDATE = nil
 
-    STRING = [MAJOR, MINOR, TINY, RELEASE_CANDIDATE].join('.')
+    STRING = [MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')
     TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')
     FULL_VERSION = "#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')}"
     

data/redcloth.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
 
+  s.files -= ['.rvmrc']
   s.files -= Dir['ext/**/*']
   s.files -= Dir['ragel/*']
   s.files -= Dir['lib/redcloth.jar']
@@ -38,11 +39,9 @@ Gem::Specification.new do |s|
     s.files += %w[attributes inline scan].map {|f| "ext/redcloth_scan/redcloth_#{f}.c"}
     s.files += ["ext/redcloth_scan/redcloth.h"]
     s.extensions = Dir['ext/**/extconf.rb']
-    s.add_development_dependency('rvm')
   end
 
   s.add_development_dependency('rake', '~> 0.8.7')
-  s.add_development_dependency('rspec', '~> 2.1')
+  s.add_development_dependency('rspec', '~> 2.4')
   s.add_development_dependency('diff-lcs')
-  s.add_development_dependency('rake-compiler', '~> 0.7.1')
 end

data/spec/fixtures/html.yml

@@ -337,4 +337,12 @@ name: notextile beginning the line
 in: |-
   <notextile><a href="http://a.com">Sir Bobby Robson</a></notextile>, is a famous footballer
 html: |-
-  <p><a href="http://a.com">Sir Bobby Robson</a>, is a famous footballer</p>
+  <p><a href="http://a.com">Sir Bobby Robson</a>, is a famous footballer</p>
+---
+name: br tag with class
+in: "br(clear). "
+html: "<br class=\"clear\" />"
+---
+name: hr tag with class
+in: "hr(clear). "
+html: "<hr class=\"clear\" />"

data/spec/parser_spec.rb

@@ -75,6 +75,13 @@ describe RedCloth do
     html = "<p>This is a paragraph</p>\n<p>This is a<br />\nline break.</p>\n<div>\n<p>test</p>\n</div>"
     RedCloth.new(input).to_html.should == html
   end
+
+  it "should not add spurious li tags to the end of markup" do
+    input         = "* one\n* two\n* three \n\n"
+    failing_input = "* one\n* two\n* three \n\n\n"
+    RedCloth.new(input).to_html.should_not match(/<li>$/)
+    RedCloth.new(failing_input).to_html.should_not match(/<li>$/)
+  end
   
   if RUBY_VERSION > "1.9.0"
     it "should preserve character encoding" do

data/tasks/compile.rake

@@ -6,8 +6,8 @@ CLEAN.include [
 ]
 CLOBBER.include [
   'pkg',
-  '**/*.{c}',
-  'lib/*.{bundle,so,o,obj,pdb,lib,def,exp,jar}', 
+  '**/*.{c,java}',
+  'lib/**/*.{bundle,so,o,obj,pdb,lib,def,exp,jar}', 
   'lib/redcloth_scan.rb', 
 ]
 
@@ -30,7 +30,7 @@ else
       io.write(<<-EOF)
 require 'mkmf'
 CONFIG['warnflags'].gsub!(/-Wshorten-64-to-32/, '') if CONFIG['warnflags']
-$CFLAGS << ' -O0 -Wall' if CONFIG['CC'] =~ /gcc/
+$CFLAGS << ' -O0 -Wall -Werror' if CONFIG['CC'] =~ /gcc/
 dir_config("redcloth_scan")
 have_library("c", "main")
 create_makefile("redcloth_scan")

data/tasks/gems.rake

@@ -28,9 +28,8 @@ namespace :build do
 
     desc "Build ruby, windows, and jruby gems into the pkg directory"
     task :all => [
-      "rvm:bundle",
       :clobber,
-      :spec,
+      "rvm:spec",
       :jruby,
       :win,
       :build

data/tasks/rspec.rake

@@ -7,5 +7,7 @@ RSpec::Core::RakeTask.new(:rcov) do |t|
   t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
 end
 
-task :default  => [:spec]
-task :spec     => [:compile]
+task :default  => :spec
+task :spec     => :compile
+
+RSpec::Core::RakeTask.new(:test) # for rubygems-test

data/tasks/rvm.rake

@@ -1,6 +1,6 @@
 namespace :rvm do
   
-  RVM_RUBIES = ['jruby-1.5.3', 'ruby-1.8.6-p398', 'ruby-1.9.1-p243', 'ruby-1.9.2-head', 'ree-1.8.7']
+  RVM_RUBIES = ['jruby-1.5.3', 'ruby-1.8.6-p398', 'ruby-1.9.1-p243', 'ruby-1.9.2-head', 'ree-1.8.7-2010.02']
   RVM_GEMSET_NAME = 'redcloth'
   
   task :setup do
@@ -13,16 +13,50 @@ namespace :rvm do
     end
   end
   
-  desc "Install development gems using bundler to each rubie version"
-  task :bundle => :setup do
-    rvm_each_rubie { RVM.run 'gem install bundler; bundle install' }
+  desc "Runs specs under each rvm ruby"
+  task :spec => :setup do
+    puts rvm_rubies.join(',')
+    rvm_each_rubie do
+      # Make sure all dependencies are installed but ignore Gemfile.lock. It 
+      # gets confused when locked to java and running ruby and vice-versa.
+      STDERR << RVM.run('bundle update').stderr 
+            
+      result = RVM.perform_set_operation(:rake)
+      STDERR << result.stderr
+    end
   end
   
-  desc "Echo command to run specs under each rvm ruby"
-  task :spec => :setup do
-    puts "rvm #{rvm_rubies.join(',')} rake"
+  desc "Show rubies"
+  task :rubies => :setup do
+    puts rvm_rubies.join(",")
   end
   
+  namespace :install do
+    task :rubies => :setup do
+      installed_rubies = RVM.list_strings
+      RVM_RUBIES.each do |rubie|
+        if installed_rubies.include?(rubie)
+          puts "info: Rubie #{rubie} already installed."
+        else
+          good_msg = "info: Rubie #{rubie} installed."
+          bad_msg = "Failed #{rubie} install! Check RVM logs here: #{RVM.path}/log/#{rubie}"
+          puts "info: Rubie #{rubie} installation inprogress. This could take awhile..."
+          if RVM.install(rubie,{})
+            puts(good_msg)
+            RVM.use(rubie)
+            RVM.perform_set_operation(:gem, 'install', 'bundler')
+            RVM.reset_current!
+          else
+            abort(bad_msg)
+          end
+        end
+      end
+    end
+  end
+
+  task :remove => :setup do
+    rvm_rubies.each { |rubie| RVM.remove(rubie) }
+  end
 end
 
 
@@ -31,6 +65,7 @@ end
 def rvm_each_rubie
   rvm_rubies.each do |rubie|
     RVM.use(rubie)
+    puts "Using #{rubie}"
     yield
   end
 ensure

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RedCloth
 version: !ruby/object:Gem::Version 
-  hash: 270495422
-  prerelease: true
+  hash: 63
+  prerelease: 
   segments: 
   - 4
   - 2
   - 4
-  - pre3
-  version: 4.2.4.pre3
+  version: 4.2.4
 platform: ruby
 authors: 
 - Jason Garber
@@ -18,27 +17,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -06:00
+date: 2011-02-07 00:00:00 -06:00
 default_executable: redcloth
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rvm
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,26 +35,26 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 2
-        - 1
-        version: "2.1"
+        - 4
+        version: "2.4"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: diff-lcs
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,23 +64,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 7
-        - 1
-        version: 0.7.1
-  type: :development
-  version_requirements: *id005
+  version_requirements: *id003
 description: Textile parser for Ruby.
 email: redcloth-upwards@rubyforge.org
 executables: 
@@ -108,14 +77,12 @@ extra_rdoc_files:
 - CHANGELOG
 files: 
 - .bundle/config
+- .gemtest
 - .gitignore
 - .rspec
-- .rvmrc
 - CHANGELOG
 - COPYING
 - Gemfile
-- Gemfile.lock
-- Manifest
 - README
 - Rakefile
 - bin/redcloth
@@ -131,7 +98,6 @@ files:
 - lib/redcloth/version.rb
 - lib/tasks/pureruby.rake
 - redcloth.gemspec
-- setup.rb
 - spec/benchmark_spec.rb
 - spec/custom_tags_spec.rb
 - spec/erb_spec.rb
@@ -198,20 +164,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: redcloth
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: RedCloth-4.2.4.pre3
+summary: RedCloth-4.2.4
 test_files: []