wikitext 2.1.1 → 3.0b

data/lib/wikitext/rails_template_handler.rb

@@ -1,4 +1,4 @@
-# Copyright 2008-2010 Wincent Colaiuta. All rights reserved.
+# Copyright 2008-2011 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -27,29 +27,11 @@ require 'wikitext/string'
 module ActionView
   class Template
     module Handlers
-
-      begin
-
-        # assume Rails 3
-        class Wikitext < Handler
-          include Compilable
-
-          def compile template
-            "'" + template.source.w.gsub("'", "\\\\'") + "'"
-          end
-        end # class Wikitext
-
-      rescue NameError
-
-        # fall back to Rails 2
-        class Wikitext
-          def self.call template
-            'template.source.w'
-          end
-        end # class Wikitext
-
-      end
-
+      class Wikitext
+        def self.call template
+          "'" + template.source.w.gsub("'", "\\\\'") + "'"
+        end
+      end # class Wikitext
     end # module Handlers
   end # class Template
 end # module ActionView

data/lib/wikitext/version.rb

@@ -1,4 +1,4 @@
-# Copyright 2007-2010 Wincent Colaiuta. All rights reserved.
+# Copyright 2007-2011 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -22,5 +22,5 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 module Wikitext
-  VERSION = '2.1.1'
+  VERSION = '3.0b'
 end # module Wikitext

data/spec/rails_spec.rb

@@ -1,4 +1,4 @@
-# Copyright 2009-2010 Wincent Colaiuta. All rights reserved.
+# Copyright 2009-2011 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,93 +26,80 @@ 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'
-  RAILS2_BIN_PATH         = CLONE_PATH + 'railties' + 'bin' + 'rails'
-  RAILS3_BIN_PATH         = CLONE_PATH + 'bin' + 'rails'
+  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 = 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
+    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 (#{status})"
+      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 (#{status}) for '#{cmd}'"
+      raise "non-zero exit status (#{result.status}) for '#{command_string}'"
     end
     result
   end
 
-  def clone
-    if File.exist? CLONE_PATH
-      FileUtils.cd CLONE_PATH do
+  def clone repo, path
+    if File.exist? path
+      FileUtils.cd path do
         run 'git', 'fetch'
       end
     else
-      run 'git', 'clone', 'git://github.com/rails/rails.git', CLONE_PATH
+      run 'git', 'clone', repo, path
     end
   end
 
   def app_path version
     version = 'edge' if version.nil?
-    version = "v#{version}" if version =~ /\A3\./
+    version = "v#{version}" if version =~ /\A\d\./
     TRASH_PATH + "#{version}-app"
   end
 
-  def create_rails2_app version
-    app = app_path version
-    clone
-    FileUtils.rm_r(app) if File.exist?(app)
-    FileUtils.cd CLONE_PATH do
-      run 'git', 'checkout', '-f', "v#{version}"
+  # 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
-    run 'ruby', RAILS2_BIN_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
 
-  # if version is nil will create an "Edge" app
-  def create_rails3_app version
-    app = app_path version
-    clone
-    FileUtils.rm_r(app) if File.exist?(app)
-    FileUtils.cd CLONE_PATH do
-      if version
-        run 'git', 'checkout', '-f', "v#{version}"
+    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', 'checkout', '-f', 'master'
-        run 'git', 'merge', 'origin/master'
+        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
-    run 'ruby', RAILS3_BIN_PATH, 'new', app, '--skip-activerecord', '--dev'
+
     create_gemfile app
+    bundlerize app
   end
 
   def insert text, after, infile
@@ -129,12 +116,6 @@ module RailsSpecs
     raise "text '#{after}' not found" unless found
   end
 
-  # Rails 2 only
-  def add_text_to_initializer text, infile
-    insert text, 'Rails::Initializer.run do', infile
-  end
-
-  # Rails 3 only
   def add_text_to_routes text, infile
     insert text, 'Application.routes.draw', infile
   end
@@ -142,12 +123,25 @@ module RailsSpecs
   def create_gemfile app
     File.open(app + 'Gemfile', 'w') do |f|
       f.write <<-GEMFILE
-        gem 'rails', :path => "#{CLONE_PATH.realpath}"
+        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'
@@ -182,90 +176,47 @@ TEST
       end
   end
 
-  # Rails 2 only
-  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
-
-  # Rails 3 only
   def update_routes app
     routes = app + 'config' + 'routes.rb'
     add_text_to_routes 'match "/wiki" => "wiki#index"', routes
   end
 
-  def setup_rails2_app version
-    create_rails2_app version
-    path = app_path version
-    update_environment path
+  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 setup_rails3_app version = nil
-    create_rails3_app version
-    path = app_path version
-    update_routes path
-    create_controller path
-    create_template path
-    create_test path
+  def clean_bundler_environment
+    @bundler_env = ENV.select { |key, value| key =~ /\A(BUNDLE|GEM)_/ }
+    @bundler_env.each { |pair| ENV.delete(pair.first) }
   end
 
-  def setup_edge_app
-    setup_rails3_app
+  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('rake', 'test:integration').stdout
+      return run('bin/rake', 'test:integration').stdout
     end
+  ensure
+    restore_bundler_environment
   end
 end # module RailsSpecs
 
-describe 'Template handler in Rails 2.3.0' do
-  include RailsSpecs
-
-  before :all do
-    setup_rails2_app '2.3.0'
-    @path = app_path '2.3.0'
-  end
-
-  it 'should process the template using the wikitext module' do
-    pending 'Rack::Lint::LintError'
-    # Rack::Lint::LintError: a header value must be a String, but the value of
-    # 'Set-Cookie' is a Array
-    run_integration_test(@path).should =~ RailsSpecs::SUCCESSFUL_TEST_RESULT
-  end
-end
-
-# test other Rails 2 versions
-%w{2.2.2 2.2.3 2.3.1 2.3.2 2.3.2.1 2.3.3 2.3.3.1 2.3.4 2.3.5 2.3.6
-   2.3.7 2.3.8}.each do |version|
-  describe "Template handler in Rails #{version}" do
-    include RailsSpecs
-
-    before :all do
-      setup_rails2_app version
-      @path = app_path version
-    end
-
-    it 'should process the template using the wikitext module' do
-      run_integration_test(@path).should =~ RailsSpecs::SUCCESSFUL_TEST_RESULT
-    end
-  end
-end
-
-%w{3.0.0.beta4}.each do |version|
-  describe "Template handler in Rails #{version}" do
+# 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_rails3_app version
-      @path = app_path version
+      setup_rails_app rails_version, arel_version
+      @path = app_path rails_version
     end
 
     it 'should process the template using the wikitext module' do
@@ -278,7 +229,7 @@ describe 'Template handler in Edge Rails' do
   include RailsSpecs
 
   before :all do
-    setup_edge_app
+    setup_rails_app
     @path = app_path nil
   end
 

data/spec/version_spec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Copyright 2009 Wincent Colaiuta. All rights reserved.
+# Copyright 2009-2011 Wincent Colaiuta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -26,7 +26,7 @@ require 'spec_helper'
 require 'wikitext/version'
 
 describe Wikitext, 'versioning' do
-  it 'should provide a version string' do
+  it 'provides a version string' do
     Wikitext::VERSION.should be_instance_of(String)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wikitext
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 99
+  prerelease: 3
   segments: 
-  - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 3
+  - 0
+  - b
+  version: 3.0b
 platform: ruby
 authors: 
 - Wincent Colaiuta
@@ -15,13 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 +01:00
-default_executable: 
+date: 2011-05-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,28 +30,27 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
         - 2
         - 0
-        - 0
-        version: 2.0.0
-  type: :development
-  version_requirements: *id002
+        version: "2.0"
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -76,12 +75,12 @@ dependencies:
         - 5
         - 8
         version: 0.5.8
-  type: :development
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   name: wopen3
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,8 +89,21 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: ZenTest
+  prerelease: false
   type: :development
-  version_requirements: *id005
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
 description: "    Wikitext is a fast wikitext-to-HTML translator written in C.\n"
 email: win@wincent.com
 executables: 
@@ -123,7 +135,6 @@ files:
 - lib/wikitext/rails_template_handler.rb
 - lib/wikitext/string.rb
 - lib/wikitext/version.rb
-- rails/init.rb
 - spec/autolinking_spec.rb
 - spec/base_heading_level_spec.rb
 - spec/blockquote_spec.rb
@@ -162,7 +173,6 @@ files:
 - spec/version_spec.rb
 - spec/vim_formatter.rb
 - spec/wikitext_spec.rb
-has_rdoc: false
 homepage: https://wincent.com/products/wikitext
 licenses: []
 
@@ -184,16 +194,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: wikitext
-rubygems_version: 1.3.7
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Wikitext-to-HTML translator

data/rails/init.rb

@@ -1,29 +0,0 @@
-# Copyright 2008-2010 Wincent Colaiuta. 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.
-
-# this file evaluated automatically under Rails 2
-unless $gems_build_rake_task
-  # avoid Rails bug #2266 by not requiring during "rake gems:build"
-  # see: https://rails.lighthouseapp.com/projects/8994/tickets/2266
-  require 'wikitext'
-end