wikitext 1.3.0 → 1.3.1

data/lib/wikitext/rails.rb

@@ -16,10 +16,10 @@ require 'wikitext/string'
 
 module Wikitext
   class TemplateHandler
-
-    # tested with Rails 2.2.2: the API has now changed so many times that I'm no longer going to support older versions of Rails
     def self.call template
       'template.source.w'
     end
   end
 end
+
+ActionView::Template.register_template_handler :wikitext, Wikitext::TemplateHandler

data/lib/wikitext/version.rb

@@ -13,5 +13,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Wikitext
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end # module Wikitext

data/spec/#spec_helper.rb#

@@ -0,0 +1,78 @@
+# Copyright 2007-2009 Wincent Colaiuta
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'pathname'
+require 'rubygems'
+require 'spec'
+
+# allow indenting of multiline spec data for better readability
+# but must dedent it before actually doing the comparison
+def dedent spaces, string = nil
+  if spaces.kind_of? String
+    if not string.nil?
+      raise 'When first argument is a String, second argument must be nil'
+    else
+      # default use: single String parameter, dedent by 6
+      string = spaces
+      spaces = 6
+    end
+  elsif spaces.kind_of? Integer
+    if string.nil? or not string.kind_of?(String)
+      raise 'When first argument is a number, second must be a String'
+    end
+  else
+    raise 'Invalid argument'
+  end
+  string.each do |line|
+    if not line =~ /\A {#{spaces.to_i}}/
+      raise "Underlength indent for line: #{line.inspect}"
+    end
+  end
+  string.gsub /^ {#{spaces.to_i}}/, ''
+end
+
+module Wikitext
+  if not const_defined? 'BASEDIR'
+    # prepend the local "ext" directory 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
+
+module UTF8
+  if not const_defined? 'Invalid'
+    module Invalid
+      TWO_BYTES_MISSING_SECOND_BYTE       = [0b11011111].pack('C*')
+      TWO_BYTES_MALFORMED_SECOND_BYTE     = [0b11011111, 0b00001111].pack('C*') # should be 10......
+      OVERLONG                            = [0b11000000, 0b10000000].pack('C*') # lead byte is 110..... but code point is <= 127
+      OVERLONG_ALT                        = [0b11000001, 0b10000000].pack('C*') # lead byte is 110..... but code point is <= 127
+      THREE_BYTES_MISSING_SECOND_BYTE     = [0b11100000].pack('C*')
+      THREE_BYTES_MISSING_THIRD_BYTE      = [0b11100000, 0b10000000].pack('C*')
+      THREE_BYTES_MALFORMED_SECOND_BYTE   = [0b11100000, 0b00001111, 0b10000000].pack('C*') # should be 10......
+      THREE_BYTES_MALFORMED_THIRD_BYTE    = [0b11100000, 0b10000000, 0b00001111].pack('C*') # should be 10......
+      FOUR_BYTES_MISSING_SECOND_BYTE      = [0b11110000].pack('C*')
+      FOUR_BYTES_MISSING_THIRD_BYTE       = [0b11110000, 0x10111111].pack('C*')
+      FOUR_BYTES_MISSING_FOURTH_BYTE      = [0b11110000, 0x10111111, 0x10111111].pack('C*')
+      FOUR_BYTES_ILLEGAL_FIRST_BYTE       = [0b11110101, 0x10111111, 0x10111111, 0x10111111].pack('C*')
+      FOUR_BYTES_ILLEGAL_FIRST_BYTE_ALT   = [0b11110101, 0x10111111, 0x10111111, 0x10111111].pack('C*')
+      FOUR_BYTES_ILLEGAL_FIRST_BYTE_ALT2  = [0b11110101, 0x10111111, 0x10111111, 0x10111111].pack('C*')
+      UNEXPECTED_BYTE                     = [0b11111000].pack('C*')
+    end # module Invalid
+  end
+end # module UTF8
+
+require 'wikitext'

data/spec/rails_spec.rb

@@ -0,0 +1,212 @@
+#!/usr/bin/env ruby
+# Copyright 2009 Wincent Colaiuta
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require File.join(File.dirname(__FILE__), 'spec_helper.rb')
+require 'wikitext/version'
+require 'fileutils'
+require 'pathname'
+require 'wopen3'
+require 'ostruct'
+
+module RailsSpecs
+  TRASH_PATH    = Pathname.new(__FILE__).dirname + 'trash'
+  CLONE_PATH    = TRASH_PATH + 'rails.git'
+  RAILS_PATH    = CLONE_PATH + 'railties' + 'bin' + 'rails'
+  EDGE_APP_PATH = TRASH_PATH + 'edge-app'
+
+  def run cmd, *args
+    result = OpenStruct.new
+    result.stdout = ''
+    result.stderr = ''
+    Wopen3.popen3(*([cmd] + args)) do |stdin, stdout, stderr|
+      threads = []
+      threads << Thread.new(stdout) do |out|
+        out.each { |line| result.stdout << line }
+      end
+      threads << Thread.new(stderr) do |err|
+        err.each { |line| result.stderr << line }
+      end
+      threads.each { |thread| thread.join }
+    end
+    status = $?.exitstatus
+    if status != 0
+      command_string = ([cmd] + args).join(' ')
+      puts "*** COMMAND #{command_string} EXITED WITH NON-ZERO EXIT STATUS (#{status})"
+      puts "*** STDOUT FOR COMMAND #{command_string}:", result.stdout
+      puts "*** STDERR FOR COMMAND #{command_string}:", result.stderr
+      raise "non-zero exit status (#{status}) for '#{cmd}'"
+    end
+    result
+  end
+
+  def clone
+    if File.exist? CLONE_PATH
+      FileUtils.cd CLONE_PATH do
+        run 'git', 'fetch'
+      end
+    else
+      run 'git', 'clone', 'git://github.com/rails/rails.git', CLONE_PATH
+    end
+  end
+
+  def app_path version
+    TRASH_PATH + "#{version}-app"
+  end
+
+  def create_base_app_and_symlinks app, &block
+    clone
+    FileUtils.rm_r(app) if File.exist?(app)
+    yield
+    run 'ruby', RAILS_PATH, app
+    vendor = app + 'vendor'
+    gems = vendor + 'gems'
+    FileUtils.cd vendor do
+      FileUtils.ln_s '../../rails.git', 'rails'
+    end
+    FileUtils.mkdir gems
+    FileUtils.cd gems do
+      FileUtils.ln_s '../../../../..', "wikitext-#{Wikitext::VERSION}"
+    end
+  end
+
+  def create_release_app version
+    create_base_app_and_symlinks app_path(version) do
+      FileUtils.cd CLONE_PATH do
+        run 'git', 'checkout', "v#{version}"
+        run 'git', 'clean', '-f'
+      end
+    end
+  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_initializer text, infile
+    insert text, 'Rails::Initializer.run do', infile
+  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 create_edge_app
+    create_base_app_and_symlinks EDGE_APP_PATH do
+      FileUtils.cd CLONE_PATH do
+        run 'git', 'checkout', 'master'
+        run 'git', 'merge', 'origin/master'
+        run 'git', 'clean', '-f'
+      end
+    end
+  end
+
+  def update_environment app
+    environment =  app + 'config' + 'environment.rb'
+    add_text_to_initializer "  config.gem 'wikitext', :version => '#{Wikitext::VERSION}'", environment
+    FileUtils.cd app do
+      run 'rake', 'gems:refresh_specs'
+    end
+  end
+
+  def setup_release_app version
+    create_release_app version
+    path = app_path(version)
+    update_environment path
+    create_controller path
+    create_template path
+    create_test path
+  end
+
+  def setup_edge_app
+    create_edge_app
+    update_environment EDGE_APP_PATH
+    create_controller EDGE_APP_PATH
+    create_template EDGE_APP_PATH
+    create_test EDGE_APP_PATH
+  end
+
+  def run_integration_test app
+    FileUtils.cd app do
+      return run('rake', 'test:integration').stdout
+    end
+  end
+end # module RailsSpecs
+
+describe 'Template handler in Rails 2.2.2' do
+  include RailsSpecs
+  version = '2.2.2'
+
+  before(:all) do
+    setup_release_app version
+    @path = app_path(version)
+  end
+
+  it 'should process the template using the wikitext module' do
+    run_integration_test(@path).should =~ /1 tests, 3 assertions, 0 failures, 0 errors/
+  end
+end
+
+describe 'Template handler in Edge Rails' do
+  include RailsSpecs
+
+  before(:all) do
+    setup_edge_app
+    @path = RailsSpecs::EDGE_APP_PATH
+  end
+
+  it 'should process the template using the wikitext module' do
+    run_integration_test(@path).should =~ /1 tests, 3 assertions, 0 failures, 0 errors/
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# Copyright 2007-2008 Wincent Colaiuta
+# Copyright 2007-2009 Wincent Colaiuta
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -43,12 +43,13 @@ def dedent spaces, string = nil
 end
 
 module Wikitext
-  if not const_defined? 'EXTDIR'
+  if not const_defined? 'BASEDIR'
     # prepend the local "ext" directory to search path if not already present
-    base        = File.join(File.dirname(__FILE__), '..')
-    EXTDIR      = Pathname.new(File.join(base, 'ext')).realpath
+    BASEDIR     = Pathname.new(__FILE__).dirname + '..'
+    extdir      = (BASEDIR + 'ext').realpath
+    libdir      = (BASEDIR + 'lib').realpath
     normalized  = $:.collect { |path| Pathname.new(path).realpath rescue path }
-    $:.unshift(EXTDIR) unless normalized.include?(EXTDIR)
+    [libdir, extdir].each { |d| $:.unshift(d) unless normalized.include?(d) }
   end
 end # module Wikitext
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wikitext
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 +01:00
+date: 2009-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- spec/#spec_helper.rb#
 - spec/autolinking_spec.rb
 - spec/blockquote_spec.rb
 - spec/em_spec.rb
@@ -45,11 +46,13 @@ files:
 - spec/nowiki_spec.rb
 - spec/p_spec.rb
 - spec/pre_spec.rb
+- spec/rails_spec.rb
 - spec/regressions_spec.rb
 - spec/spec_helper.rb
 - spec/strong_em_spec.rb
 - spec/strong_spec.rb
 - spec/tokenizing_spec.rb
+- spec/trash
 - spec/tt_spec.rb
 - spec/ul_spec.rb
 - spec/wikitext_spec.rb