wikitext 4.1.2 → 4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1378ca1ddd1c1cf06f25d955061712f48503d43
-  data.tar.gz: c8bfe2d68c0640f78b525e228fb0560a83bcd884
+  metadata.gz: 40a9dd24504ec4ae9b1584450ef0676eec9e185b
+  data.tar.gz: dc04f479a91ada21d9eac782e1c42ba9c66ada0b
 SHA512:
-  metadata.gz: 06704aea976718a7b04e96f68056f5a9f4e3606e06f92fc6ea1693df1185f773caf882532b45d3bd65c81b1641deed3fffbaaf814a842ae23c5e5b01e6ca68f2
-  data.tar.gz: 534acddbedea011466fe3fa0db6bfc8a1352e6d3a9f66a1ab9d15de7b0297844ec6691c375e46d7237841c9403359a6210cd6be33115a62a56a8258fda45f629
+  metadata.gz: c670c7c9a76287bfea763268c6658b159384b5dfdd1568a8ecc91dac70449725df2fe9a2fe77a888b3f67c3c89b2376c985d2660ae08bb0ad8243a16a086a168
+  data.tar.gz: fc956347dc61cbf9c12420b8bd6e9dae4a48e874f5a51bc41f21c6cb51becfb8b9baee3676d4c021209b3327048c1bb9cb3499766375eefa35b1243478eae842

data/ext/wikitext/parser.c

@@ -61,6 +61,7 @@ typedef struct
     bool    pending_crlf;
     bool    autolink;
     bool    space_to_underscore;
+    bool    pre_code;
 } parser_t;
 
 const char null_str[]                   = { 0 };
@@ -165,6 +166,7 @@ parser_t *parser_new(void)
     parser->pending_crlf            = false;
     parser->autolink                = true;
     parser->space_to_underscore     = true;
+    parser->pre_code                = false;
     return parser;
 }
 
@@ -525,6 +527,8 @@ void wiki_append_pre_start(parser_t *parser, token_t *token)
     }
     else
         str_append(parser->output, pre_start, sizeof(pre_start) - 1);
+    if (parser->pre_code)
+        str_append(parser->output, code_start, sizeof(code_start) - 1);
     ary_push(parser->scope, PRE_START);
     ary_push(parser->line, PRE_START);
 }
@@ -565,6 +569,8 @@ void wiki_pop_from_stack(parser_t *parser, str_t *target)
     {
         case PRE:
         case PRE_START:
+            if (parser->pre_code)
+                str_append(target, code_end, sizeof(code_end) - 1);
             str_append(target, pre_end, sizeof(pre_end) - 1);
             str_append_str(target, parser->line_ending);
             wiki_dedent(parser, false);
@@ -1013,6 +1019,7 @@ VALUE Wikitext_parser_initialize(int argc, VALUE *argv, VALUE self)
     VALUE img_prefix                    = rb_str_new2("/images/");
     VALUE output_style                  = ID2SYM(rb_intern("html"));
     VALUE space_to_underscore           = Qtrue;
+    VALUE pre_code                      = Qfalse;
     VALUE minimum_fulltext_token_length = INT2NUM(3);
     VALUE base_heading_level            = INT2NUM(0);
 
@@ -1031,6 +1038,7 @@ VALUE Wikitext_parser_initialize(int argc, VALUE *argv, VALUE self)
         img_prefix                      = OVERRIDE_IF_SET(img_prefix);
         output_style                    = OVERRIDE_IF_SET(output_style);
         space_to_underscore             = OVERRIDE_IF_SET(space_to_underscore);
+        pre_code                        = OVERRIDE_IF_SET(pre_code);
         minimum_fulltext_token_length   = OVERRIDE_IF_SET(minimum_fulltext_token_length);
         base_heading_level              = OVERRIDE_IF_SET(base_heading_level);
     }
@@ -1046,6 +1054,7 @@ VALUE Wikitext_parser_initialize(int argc, VALUE *argv, VALUE self)
     rb_iv_set(self, "@img_prefix",                      img_prefix);
     rb_iv_set(self, "@output_style",                    output_style);
     rb_iv_set(self, "@space_to_underscore",             space_to_underscore);
+    rb_iv_set(self, "@pre_code",                        pre_code);
     rb_iv_set(self, "@minimum_fulltext_token_length",   minimum_fulltext_token_length);
     rb_iv_set(self, "@base_heading_level",              base_heading_level);
     return self;
@@ -1150,6 +1159,7 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
     parser->img_prefix              = rb_iv_get(self, "@img_prefix");
     parser->autolink                = rb_iv_get(self, "@autolink") == Qtrue ? true : false;
     parser->space_to_underscore     = rb_iv_get(self, "@space_to_underscore") == Qtrue ? true : false;
+    parser->pre_code                = rb_iv_get(self, "@pre_code") == Qtrue ? true : false;
     parser->line_ending             = str_new_from_string(line_ending);
     parser->base_indent             = base_indent;
     parser->base_heading_level      = base_heading_level;
@@ -1248,6 +1258,8 @@ VALUE Wikitext_parser_parse(int argc, VALUE *argv, VALUE self)
                     wiki_pop_from_stack_up_to(parser, NULL, BLOCKQUOTE, false);
                     wiki_indent(parser);
                     str_append(parser->output, pre_start, sizeof(pre_start) - 1);
+                    if (parser->pre_code)
+                        str_append(parser->output, code_start, sizeof(code_start) - 1);
                     ary_push(parser->scope, PRE);
                 }
                 break;

data/lib/wikitext/version.rb

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

data/spec/pre_spec.rb

@@ -54,6 +54,13 @@ describe Wikitext::Parser, 'parsing PRE blocks' do
     @parser.parse(' ').should == "<pre></pre>\n"
   end
 
+  it 'assumes PRE blocks are code when :pre_code is set' do
+    Wikitext::Parser.
+      new(:pre_code => true).
+      parse(' foo').
+      should == "<pre><code>foo</code></pre>\n"
+  end
+
   it 'should sanely handle a leading empty line' do
     @parser.parse(" \n foo").should == "<pre>\nfoo</pre>\n"
   end
@@ -148,6 +155,13 @@ describe Wikitext::Parser, 'parsing PRE_START/PRE_END blocks' do
     @parser.parse('<pre>foo</pre>').should == "<pre>foo</pre>\n"
   end
 
+  it 'assumes PRE_START/PRE_END blocks are code when :pre_code is set' do
+    Wikitext::Parser.
+      new(:pre_code => true).
+      parse('<pre>foo</pre>').
+      should == "<pre><code>foo</code></pre>\n"
+  end
+
   it 'should pass through PRE unchanged in PRE_START/PRE_END blocks' do
     input = dedent <<-END
       <pre>line 1

metadata

@@ -1,100 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: wikitext
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: '4.2'
 platform: ruby
 authors:
 - Greg Hurrell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.5.2
 - !ruby/object:Gem::Dependency
   name: wopen3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-description: "    Wikitext is a fast wikitext-to-HTML translator written in C.\n"
+        version: '4.9'
+description: |2
+      Wikitext is a fast wikitext-to-HTML translator written in C.
 email: greg@hurrell.net
 executables:
 - wikitext
@@ -103,21 +104,21 @@ extensions:
 extra_rdoc_files: []
 files:
 - bin/wikitext
-- ext/wikitext/ary.c
-- ext/wikitext/ary.h
-- ext/wikitext/depend
 - ext/wikitext/extconf.rb
+- ext/wikitext/ary.c
 - ext/wikitext/parser.c
+- ext/wikitext/str.c
+- ext/wikitext/token.c
+- ext/wikitext/wikitext.c
+- ext/wikitext/wikitext_ragel.c
+- ext/wikitext/ary.h
 - ext/wikitext/parser.h
 - ext/wikitext/ruby_compat.h
-- ext/wikitext/str.c
 - ext/wikitext/str.h
-- ext/wikitext/token.c
 - ext/wikitext/token.h
-- ext/wikitext/wikitext.c
 - ext/wikitext/wikitext.h
-- ext/wikitext/wikitext_ragel.c
 - ext/wikitext/wikitext_ragel.h
+- ext/wikitext/depend
 - lib/wikitext/haml_filter.rb
 - lib/wikitext/nil_class.rb
 - lib/wikitext/parser.rb
@@ -151,7 +152,6 @@ files:
 - spec/p_spec.rb
 - spec/parser_spec.rb
 - spec/pre_spec.rb
-- spec/rails_spec.rb
 - spec/regressions_spec.rb
 - spec/spec_helper.rb
 - spec/string_spec.rb
@@ -174,18 +174,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: wikitext
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Wikitext-to-HTML translator
 test_files: []
+has_rdoc: 

data/spec/rails_spec.rb

@@ -1,239 +0,0 @@
-# Copyright 2009-present Greg Hurrell. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-require 'spec_helper'
-require 'wikitext/version'
-require 'fileutils'
-require 'pathname'
-require 'wopen3'
-
-module RailsSpecs
-  TRASH_PATH              = Pathname.new(__FILE__).dirname + '.trash'
-  AREL_CLONE_PATH         = TRASH_PATH + 'arel.git'
-  AREL_REPO               = 'git://github.com/rails/arel.git'
-  RAILS_CLONE_PATH        = TRASH_PATH + 'rails.git'
-  RAILS_REPO              = 'git://github.com/rails/rails.git'
-  WIKITEXT_GEM_PATH       = TRASH_PATH + '..' + '..'
-  SUCCESSFUL_TEST_RESULT  = /1 tests, 3 assertions, 0 failures, 0 errors/
-
-  def run cmd, *args
-    result = Wopen3.system(*([cmd] + args))
-    if result.status != 0
-      command_string = ([cmd] + args).join(' ')
-      puts "\n*** COMMAND #{command_string} EXITED WITH NON-ZERO EXIT STATUS (#{result.status})"
-      puts "*** STDOUT FOR COMMAND #{command_string}:", result.stdout
-      puts "*** STDERR FOR COMMAND #{command_string}:", result.stderr
-      raise "non-zero exit status (#{result.status}) for '#{command_string}'"
-    end
-    result
-  end
-
-  def clone repo, path
-    if File.exist? path
-      FileUtils.cd path do
-        run 'git', 'fetch'
-      end
-    else
-      run 'git', 'clone', repo, path
-    end
-  end
-
-  def app_path version
-    version = 'edge' if version.nil?
-    version = "v#{version}" if version =~ /\A\d\./
-    TRASH_PATH + "#{version}-app"
-  end
-
-  # if version is nil will create an "Edge" app
-  def create_rails3_app rails_version, arel_version = nil
-    app = app_path rails_version
-    clone AREL_REPO, AREL_CLONE_PATH
-    FileUtils.cd AREL_CLONE_PATH do
-      if arel_version
-        run 'git', 'reset', '--hard', "v#{arel_version}"
-      else # "Edge"
-        run 'git', 'reset', '--hard', 'origin/master'
-      end
-      run 'git', 'clean', '-f'
-    end
-
-    clone RAILS_REPO, RAILS_CLONE_PATH
-    FileUtils.cd RAILS_CLONE_PATH do
-      if rails_version
-        run 'git', 'reset', '--hard', "v#{rails_version}"
-      else # "Edge"
-        run 'git', 'reset', '--hard', 'origin/master'
-      end
-      run 'git', 'clean', '-f'
-
-      begin
-        clean_bundler_environment
-        run 'env', "AREL=#{AREL_CLONE_PATH}",
-            'bundle', 'install', '--path', '../bundle', '--without', 'db'
-        FileUtils.rm_r(app) if File.exist?(app)
-        run 'env', "AREL=#{AREL_CLONE_PATH}",
-            'bundle', 'exec', 'bin/rails', 'new', app, '--skip-activerecord', '--dev'
-      ensure
-        restore_bundler_environment
-      end
-    end
-
-    create_gemfile app
-    bundlerize app
-  end
-
-  def insert text, after, infile
-    output = []
-    found   = false
-    File.read(infile).split("\n").each do |line|
-      output << line
-      if found == false && line =~ /#{Regexp.escape(after)}/
-        found = true
-        output << text
-      end
-    end
-    File.open(infile, 'wb') { |f| f.write(output.join("\n")) }
-    raise "text '#{after}' not found" unless found
-  end
-
-  def add_text_to_routes text, infile
-    insert text, 'Application.routes.draw', infile
-  end
-
-  def create_gemfile app
-    File.open(app + 'Gemfile', 'w') do |f|
-      f.write <<-GEMFILE
-        source :rubygems
-        gem 'arel', :path => "#{AREL_CLONE_PATH.realpath}"
-        gem 'rake'
-        gem 'rails', :path => "#{RAILS_CLONE_PATH.realpath}"
-        gem 'sqlite3'
-        gem 'wikitext', :path => "#{WIKITEXT_GEM_PATH.realpath}"
-      GEMFILE
-    end
-  end
-
-  def bundlerize app
-    clean_bundler_environment
-    Dir.chdir app do
-      run 'bundle', 'install', '--path', '../bundle', '--binstubs'
-    end
-  ensure
-    restore_bundler_environment
-  end
-
-  def create_controller app
-    File.open(app + 'app' + 'controllers' + 'wiki_controller.rb', 'w') do |f|
-      f.write 'class WikiController < ApplicationController; end'
-    end
-  end
-
-  def create_template app
-    template_dir = app + 'app' + 'views' + 'wiki'
-    FileUtils.mkdir template_dir
-    File.open(template_dir + 'index.html.wikitext', 'w') do |f|
-      f.write '* hello, world!'
-    end
-  end
-
-  def create_test app
-    # integration tests won't run without a schema.rb
-    FileUtils.touch app + 'db' + 'schema.rb'
-
-    File.open(app + 'test' + 'integration' + 'wiki_test.rb', 'w') do |f|
-      f.write <<'TEST'
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
-
-class WikiTest < ActionController::IntegrationTest
-  def test_wiki_index
-    get "/wiki"
-    assert_response :success
-    assert_template "wiki/index"
-    assert_select 'ul>li', 'hello, world!'
-  end
-end
-TEST
-      end
-  end
-
-  def update_routes app
-    routes = app + 'config' + 'routes.rb'
-    add_text_to_routes 'match "/wiki" => "wiki#index"', routes
-  end
-
-  def setup_rails_app rails_version = nil, arel_version = nil
-    create_rails3_app rails_version, arel_version
-    path = app_path rails_version
-    update_routes path
-    create_controller path
-    create_template path
-    create_test path
-  end
-
-  def clean_bundler_environment
-    @bundler_env = ENV.select { |key, value| key =~ /\A(BUNDLE|GEM)_/ }
-    @bundler_env.each { |pair| ENV.delete(pair.first) }
-  end
-
-  def restore_bundler_environment
-    @bundler_env.each { |pair| ENV[pair[0]] = pair[1] }
-  end
-
-  def run_integration_test app
-    clean_bundler_environment
-    FileUtils.cd app do
-      return run('bin/rake', 'test:integration').stdout
-    end
-  ensure
-    restore_bundler_environment
-  end
-end # module RailsSpecs
-
-# different versions of Rails require different versions of Arel
-{ '3.1.0' => '2.1.1' }.each do |rails_version, arel_version|
-  describe "Template handler in Rails #{rails_version}" do
-    include RailsSpecs
-
-    before :all do
-      setup_rails_app rails_version, arel_version
-      @path = app_path rails_version
-    end
-
-    it 'should process the template using the wikitext module' do
-      run_integration_test(@path).should =~ RailsSpecs::SUCCESSFUL_TEST_RESULT
-    end
-  end
-end
-
-describe 'Template handler in Edge Rails' do
-  include RailsSpecs
-
-  before :all do
-    setup_rails_app
-    @path = app_path nil
-  end
-
-  it 'should process the template using the wikitext module' do
-    run_integration_test(@path).should =~ RailsSpecs::SUCCESSFUL_TEST_RESULT
-  end
-end