RedCloth 4.2.4-x86-mingw32 → 4.2.5-x86-mingw32

data/lib/redcloth/version.rb

@@ -2,7 +2,7 @@ module RedCloth
   module VERSION
     MAJOR = 4
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
     RELEASE_CANDIDATE = nil
 
     STRING = [MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')

data/redcloth.gemspec

@@ -16,16 +16,13 @@ Gem::Specification.new do |s|
   s.rubygems_version   = "1.3.7"
   s.default_executable = "redcloth"
 
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {spec}/*`.split("\n")
-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.extra_rdoc_files = ["COPYING", "README", "CHANGELOG"]
+  s.files            = Dir['.gemtest', '.rspec', 'CHANGELOG', 'COPYING', 'Gemfile', 'README.rdoc', 'Rakefile', 'doc/**/*', 'bin/**/*', 'lib/**/*', 'redcloth.gemspec', 'spec/**/*', 'tasks/**/*']
+  s.test_files       = Dir['spec/**/*']
+  s.executables      = ['redcloth']
+  s.extra_rdoc_files = ["COPYING", "README.rdoc", "CHANGELOG"]
   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']
   s.files -= Dir['lib/**/*.dll']
   s.files -= Dir['lib/**/*.bundle']
@@ -41,7 +38,15 @@ Gem::Specification.new do |s|
     s.extensions = Dir['ext/**/extconf.rb']
   end
 
+  s.add_development_dependency('bundler', '~> 1.0.10')
   s.add_development_dependency('rake', '~> 0.8.7')
   s.add_development_dependency('rspec', '~> 2.4')
-  s.add_development_dependency('diff-lcs')
+  s.add_development_dependency('diff-lcs', '~> 1.1.2')
+  
+  # Have to load these even though they're only needed for
+  # gem packaging. Otherwise, Bundler complains that they're
+  # not installed even though they're not required.
+  # See https://github.com/carlhuda/bundler/issues/issue/1021
+  s.add_development_dependency('rvm', '~> 1.2.6')
+  s.add_development_dependency('rake-compiler', '~> 0.7.1')
 end

data/spec/benchmark_spec.rb

@@ -5,7 +5,7 @@ describe "Benchmarking", :type => :formatter do
   platform = RedCloth.const_defined?(:EXTENSION_LANGUAGE) ? RedCloth::EXTENSION_LANGUAGE : (version < "4.0.0" ? "ruby-regex" : "C")
   
   it "should not be too slow" do
-    puts "Benchmarking version #{version} compiled in #{platform}..."
+    # puts "Benchmarking version #{version} compiled in #{platform}..."
     fixtures.each do |name, doc|
       if doc['html']
         RedCloth.new(doc['in']).to_html

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-2010.02']
+  RVM_RUBIES = ['jruby-1.5.6' , 'ruby-1.8.6-p398', 'ruby-1.9.1-p243', 'ruby-1.9.2-p136', 'ree-1.8.7-2010.02']
   RVM_GEMSET_NAME = 'redcloth'
   
   task :setup do
@@ -22,6 +22,7 @@ namespace :rvm do
       STDERR << RVM.run('bundle update').stderr 
             
       result = RVM.perform_set_operation(:rake)
+      STDOUT << result.stdout
       STDERR << result.stderr
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RedCloth
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 4
   - 2
-  - 4
-  version: 4.2.4
+  - 5
+  version: 4.2.5
 platform: x86-mingw32
 authors: 
 - Jason Garber
@@ -21,8 +21,23 @@ date: 2011-02-07 00:00:00 -06:00
 default_executable: redcloth
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
   version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 0
+        - 10
+        version: 1.0.10
+  prerelease: false
+  type: :development
+  requirement: *id001
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -35,10 +50,10 @@ dependencies:
         version: 0.8.7
   prerelease: false
   type: :development
-  requirement: *id001
+  requirement: *id002
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,21 +65,56 @@ dependencies:
         version: "2.4"
   prerelease: false
   type: :development
-  requirement: *id002
+  requirement: *id003
+  name: rspec
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
+        version: 1.1.2
+  prerelease: false
+  type: :development
+  requirement: *id004
   name: diff-lcs
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
+        segments: 
+        - 1
+        - 2
+        - 6
+        version: 1.2.6
+  prerelease: false
+  type: :development
+  requirement: *id005
+  name: rvm
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 1
+        version: 0.7.1
   prerelease: false
   type: :development
-  requirement: *id003
+  requirement: *id006
+  name: rake-compiler
 description: Textile parser for Ruby.
 email: redcloth-upwards@rubyforge.org
 executables: 
@@ -73,22 +123,19 @@ extensions: []
 
 extra_rdoc_files: 
 - COPYING
-- README
+- README.rdoc
 - CHANGELOG
 files: 
-- .bundle/config
 - .gemtest
-- .gitignore
 - .rspec
 - CHANGELOG
 - COPYING
 - Gemfile
-- README
+- README.rdoc
 - Rakefile
-- bin/redcloth
 - doc/textile_reference.html
+- bin/redcloth
 - lib/case_sensitive_require/RedCloth.rb
-- lib/redcloth.rb
 - lib/redcloth/erb_extension.rb
 - lib/redcloth/formatters/base.rb
 - lib/redcloth/formatters/html.rb
@@ -96,6 +143,8 @@ files:
 - lib/redcloth/formatters/latex_entities.yml
 - lib/redcloth/textile_doc.rb
 - lib/redcloth/version.rb
+- lib/redcloth.rb
+- lib/redcloth_scan.jar
 - lib/tasks/pureruby.rake
 - redcloth.gemspec
 - spec/benchmark_spec.rb
@@ -136,8 +185,6 @@ files:
 - tasks/release.rake
 - tasks/rspec.rake
 - tasks/rvm.rake
-- test/ragel_profiler.rb
-- test/validate_fixtures.rb
 - ext/redcloth_scan/redcloth_attributes.c
 - ext/redcloth_scan/redcloth_inline.c
 - ext/redcloth_scan/redcloth_scan.c
@@ -177,6 +224,37 @@ rubyforge_project: redcloth
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: RedCloth-4.2.4
-test_files: []
-
+summary: RedCloth-4.2.5
+test_files: 
+- spec/benchmark_spec.rb
+- spec/custom_tags_spec.rb
+- spec/erb_spec.rb
+- spec/extension_spec.rb
+- spec/fixtures/basic.yml
+- spec/fixtures/code.yml
+- spec/fixtures/definitions.yml
+- spec/fixtures/extra_whitespace.yml
+- spec/fixtures/filter_html.yml
+- spec/fixtures/filter_pba.yml
+- spec/fixtures/html.yml
+- spec/fixtures/images.yml
+- spec/fixtures/instiki.yml
+- spec/fixtures/links.yml
+- spec/fixtures/lists.yml
+- spec/fixtures/poignant.yml
+- spec/fixtures/sanitize_html.yml
+- spec/fixtures/table.yml
+- spec/fixtures/textism.yml
+- spec/fixtures/threshold.yml
+- spec/formatters/class_filtered_html_spec.rb
+- spec/formatters/filtered_html_spec.rb
+- spec/formatters/html_no_breaks_spec.rb
+- spec/formatters/html_spec.rb
+- spec/formatters/id_filtered_html_spec.rb
+- spec/formatters/latex_spec.rb
+- spec/formatters/lite_mode_html_spec.rb
+- spec/formatters/no_span_caps_html_spec.rb
+- spec/formatters/sanitized_html_spec.rb
+- spec/formatters/style_filtered_html_spec.rb
+- spec/parser_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,26 +0,0 @@
-*.log
-*.rbc
-*.sw?
-.bundle
-.DS_Store
-coverage
-doc/rdoc/*
-ext/redcloth_scan/*.bundle
-ext/redcloth_scan/*.class
-ext/redcloth_scan/*.jar
-ext/redcloth_scan/*.java
-ext/redcloth_scan/*.so
-ext/redcloth_scan/*.[co]
-ext/redcloth_scan/extconf.rb
-ext/redcloth_scan/Makefile
-ext/redcloth_scan/redcloth_*.rb
-lib/*.bundle
-lib/*.jar
-lib/*.so
-lib/**/*.so
-lib/redcloth_scan.rb
-pkg
-rdoc
-release
-tmp
-Gemfile.lock

data/test/ragel_profiler.rb

@@ -1,73 +0,0 @@
-class RagelProfiler
-  MEM_CONVERSION = 1024
-  
-  COMMANDS =  { :compile => %w(ragel rlgen-cd gcc-4.0 gnumake cc1),
-                :test    => %w(ruby) }
-                
-  FIELDS = %w(compile_time compile_max_rss test_time test_max_rss file_size)
-                
-  @@results = {}
-
-  def initialize(name)
-    @name = name
-    @@results[name] = []
-  end
-  
-  def measure(type)
-    raise "not a valid type" unless COMMANDS.keys.include?(type)
-    regex = COMMANDS[type].map {|c| Regexp.escape(c) }.join("|")
-    t = Thread.new do
-      Thread.current[:max] = 0
-      loop do
-        Thread.current[:max] = [run(regex), Thread.current[:max]].max
-        sleep 0.5
-      end
-    end
-    begin_time = Time.now
-    yield
-    total_time = Time.now - begin_time
-
-    t.kill
-    store_result(type, "time", total_time)
-    store_result(type, "max_rss", t[:max])
-  end
-  
-  def ext_size(file)
-    store_result(:file, "size", File.size(file) / MEM_CONVERSION)
-  end
-  
-  def self.results
-    out = []
-    out << "name\t" + FIELDS.join("\t")
-    @@results.each do |name, results|
-      out << [name, results ].flatten.join("\t")
-    end
-    out.join("\n")
-  end
-  
-  private
-  
-  def store_result(type, metric, value)
-    index = FIELDS.index("#{type.to_s}_#{metric}")
-    @@results[@name][index] = "%.2f" % value
-  end
-  
-  def run(ps_regex)
-    ps_command   = "ps axucww"
-    ps_output    = `#{ps_command}`
-    fields       = ps_output.to_a.first.downcase.split
-    memory_index = fields.index("rss")
-    pid_index    = fields.index("pid")
-    ppid_index   = fields.index("ppid")
-    total        = ps_output.grep(/(#{ps_regex})\s+$/i).map do |com|
-                     Float(com.split[memory_index]).abs
-                   end.inject(0) { |s,v| s += v }
-    if total
-      return total/MEM_CONVERSION
-    else
-      STDERR.puts "Command not found. No processes found matching #{ps_regex}."
-    end
-
-  end
-
-end

data/test/validate_fixtures.rb

@@ -1,74 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.join(File.dirname(__FILE__), 'helper')
-
-require 'erb'
-require 'w3c_validators'
-
-class ValidateFixtures < Test::Unit::TestCase
-  include W3CValidators
-
-  def setup
-    @v = MarkupValidator.new
-    sleep 1 # delay per WC3 request
-  end
-
-  HTML_4_0_TEMPLATE = <<EOD
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<title><%= test_name %></title>
-</head>
-<body>
-<%= content %>
-</body>
-</html>
-EOD
-  XHTML_1_0_TEMPLATE = <<EOD
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<title><%= test_name %></title>
-</head>
-<body>
-<%= content %>
-</body>
-</html>
-EOD
-  
-  fixtures.each do |name, doc|
-   if doc['html'] && (doc['valid_html'].nil? || doc['valid_html'])
-     define_method("test_html_output_validity_of_#{name}") do
-       assert_produces_valid_html(name, doc['html'])
-     end
-     define_method("test_xhtml_output_validity_of_#{name}") do
-       assert_produces_valid_xhtml(name, doc['html'])
-     end
-   end
-  end
-  
-  private
-  def assert_produces_valid_html(test_name, content)
-    body = ERB.new(HTML_4_0_TEMPLATE, nil,'-%').result(binding)    
-    assert_validates(body)
-  end
-
-  def assert_produces_valid_xhtml(test_name, content)
-    body = ERB.new(XHTML_1_0_TEMPLATE, nil,'-%').result(binding)    
-    assert_validates(body)
-  end
-  
-  def assert_validates(body)
-    results = @v.validate_text(body)
-    errors = results.errors
-    warnings = results.warnings.reject {|w| w.message_id == "247" } # NET-enabling start-tag requires SHORTTAG YES.
-    
-    assert(errors.empty?, "Validator errors: \n" +
-      errors.collect {|e| "'#{e.to_s}'"}.join("\n"))
-    
-    assert(warnings.empty?, "Validator warnings: \n" +
-      warnings.collect {|w| "'#{w.to_s}'"}.join("\n"))
-  end
-  
-end