wikitext 2.1 → 2.1.1

data/ext/parser.c

@@ -2011,6 +2011,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                             wiki_start_para_if_necessary(parser);
                             str_append(parser->output, ext_link_start, sizeof(ext_link_start) - 1);
                             wiki_append_hyperlink(parser, Qnil, token_str, NULL, parser->external_link_class, parser->external_link_rel, true);
+                            continue;
                         }
                     }
                     else
@@ -2054,6 +2055,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                             wiki_start_para_if_necessary(parser);
                             str_append(parser->output, ext_link_start, sizeof(ext_link_start) - 1);
                             str_append_str(parser->output, token_str);
+                            continue;
                         }
                     }
                     else

data/lib/wikitext/version.rb

@@ -22,5 +22,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Wikitext
-  VERSION = '2.1'
+  VERSION = '2.1.1'
 end # module Wikitext

data/spec/autolinking_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'autolinking' do
   before do

data/spec/base_heading_level_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext/parser'
 
 describe Wikitext::Parser, 'base_heading_level' do

data/spec/blockquote_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'standard blockquotes (">" in first column)' do
   before do

data/spec/em_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <em> spans' do
   before do

data/spec/encoding_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'iconv'
 
 describe Wikitext, 'with invalidly encoded input' do

data/spec/entity_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing entities' do
   before do

data/spec/external_link_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'external links' do
   before do

data/spec/fulltext_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'fulltext tokenizing' do
   before do

data/spec/h1_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <h1> blocks' do
   before do

data/spec/h2_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <h2> blocks' do
   before do

data/spec/h3_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <h3> blocks' do
   before do

data/spec/h4_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <h4> blocks' do
   before do

data/spec/h5_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <h5> blocks' do
   before do

data/spec/h6_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <h6> blocks' do
   before do

data/spec/img_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'embedding img tags' do
   before do

data/spec/indentation_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 # this is the inverse of the dedent method in spec_helper.rb
 # it's only in this file because it isn't needed anywhere else

data/spec/integration_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'with large slab of input text' do
   before do

data/spec/internal_link_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'internal links (space to underscore off)' do
   before do

data/spec/line_endings_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser do
   before do

data/spec/link_encoding_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'uri'
 
 describe Wikitext, 'encoding a link target' do

data/spec/link_sanitizing_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext, 'sanitizing a link target' do
   it 'should complain if passed nil' do

data/spec/nil_class_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext/nil_class'
 
 describe NilClass, 'wikitext extensions' do

data/spec/nowiki_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <nowiki> spans' do
   before do

data/spec/p_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing paragraphs' do
   before do

data/spec/parser_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext/parser'
 
 describe Wikitext::Parser do

data/spec/pre_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing PRE blocks' do
   before do

data/spec/rails_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext/version'
 require 'fileutils'
 require 'pathname'

data/spec/regressions_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 # this is a general-purpose file in which I'll add specs for former bugs to make sure that they don't regress
 describe Wikitext::Parser, 'regressions' do
@@ -864,4 +864,30 @@ describe Wikitext::Parser, 'regressions' do
     # and this one returned: <p><a href="/wiki/">foo</a></p>\n
     @parser.parse('[[  |foo]]').should == "<p>[[  |foo]]</p>\n"
   end
+
+  # first manifested itself in this comment: https://wincent.com/comments/6427
+  it 'handles "`[/`"' do
+    # This is, of course, an invalid link, but it could be handled more
+    # gracefully (we were opening a <code> span and instead of just rolling
+    # back the failed link and then proceeding with the parse and closing
+    # the span, we skipped the second backtick, causing the remainder of
+    # the input to appear inside the <code> span).
+    #
+    # Although the bug manifested itself with backticks, it could also have
+    # happened with any non-space token appearing after a EXT_LINK_START +
+    # PATH sequence (any such token would just be dropped on the floor).
+    @parser.parse('with `[/` then').should == "<p>with <code>[/</code> then</p>\n"
+
+    # related example from the original ticket: https://wincent.com/issues/1726
+    @parser.parse('[/bar?baz=bat link]').should == "<p>[/bar?baz=bat link]</p>\n"
+  end
+
+  it 'handles "[http://foo.com]"' do
+    # Same bug as above, but with a EXT_LINK_START + URI rather than
+    # EXT_LINK_START + PATH; again we expect to see a SPACE, but when we
+    # see something else, we roll back and drop the unexpected token on
+    # the floor.
+    expected = %Q{<p>[<a href="http://foo.com" class="external">http://foo.com</a>]</p>\n}
+    @parser.parse('[http://foo.com]').should == expected
+  end
 end

data/spec/spec_helper.rb

@@ -22,7 +22,6 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 require 'pathname'
-require 'rubygems'
 require 'rspec'
 
 # allow indenting of multiline spec data for better readability
@@ -51,16 +50,12 @@ def dedent spaces, string = nil
   string.gsub /^ {#{spaces.to_i}}/, ''
 end
 
-module Wikitext
-  if not const_defined? 'BASEDIR'
-    # prepend local directories to search path if not already present
-    BASEDIR     = Pathname.new(__FILE__).dirname + '..'
-    extdir      = (BASEDIR + 'ext').realpath
-    libdir      = (BASEDIR + 'lib').realpath
-    normalized  = $:.collect { |path| Pathname.new(path).realpath rescue path }
-    [libdir, extdir].each { |d| $:.unshift(d) unless normalized.include?(d) }
-  end
-end # module Wikitext
+# prepend local directories to search path if not already present
+basedir     = Pathname.new(__FILE__).dirname + '..'
+extdir      = (basedir + 'ext').realpath
+libdir      = (basedir + 'lib').realpath
+normalized  = $:.map { |path| Pathname.new(path).realpath rescue path }
+[libdir, extdir].each { |d| $:.unshift(d) unless normalized.include?(d) }
 
 module UTF8
   if not const_defined? 'Invalid'
@@ -85,3 +80,5 @@ module UTF8
 end # module UTF8
 
 require 'wikitext'
+
+ENV['RUBYOPT'] = nil

data/spec/string_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext/string'
 
 describe String, 'wikitext extensions' do

data/spec/strong_em_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing combined <strong>/<em> spans' do
   before do

data/spec/strong_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser, 'parsing <strong> spans' do
   before do

data/spec/tokenizing_spec.rb

@@ -21,7 +21,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 
 describe Wikitext::Parser::Token do
   before do

data/spec/tt_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext'
 
 describe Wikitext::Parser, 'parsing <tt> spans' do

data/spec/ul_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext'
 
 describe Wikitext::Parser, 'parsing unordered lists' do

data/spec/version_spec.rb

@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext/version'
 
 describe Wikitext, 'versioning' do

data/spec/wikitext_spec.rb

@@ -23,7 +23,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'spec_helper'
 require 'wikitext'
 
 describe Wikitext::Parser do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wikitext
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 1
-  version: "2.1"
+  - 1
+  version: 2.1.1
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -14,13 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 +02:00
+date: 2010-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   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: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -32,11 +47,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,11 +61,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,11 +77,11 @@ dependencies:
         - 8
         version: 0.5.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: wopen3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,7 +91,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: "    Wikitext is a fast wikitext-to-HTML translator written in C.\n"
 email: win@wincent.com
 executables: