diff --git a/Gemfile b/Gemfile index 9762297a..e6db28d8 100644 --- a/Gemfile +++ b/Gemfile @@ -12,11 +12,13 @@ gem "will_paginate", "~> 3.0.pre2" gem 'jquery-rails' gem 'client_side_validations' gem 'simple_form' -gem 'rails3_acts_as_paranoid' +gem 'rails3_acts_as_paranoid', '0.0.9' gem 'meta_where' gem 'meta_search' gem 'inherited_resources' gem 'localize_input', :git => "git://github.com/bennibu/localize_input.git" +gem 'acts_as_configurable' +gem 'wikicloth' group :development do gem 'annotate' diff --git a/Gemfile.lock b/Gemfile.lock index f8bee640..478af5ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,6 +34,7 @@ GEM activemodel (= 3.0.7) activesupport (= 3.0.7) activesupport (3.0.7) + acts_as_configurable (0.0.8) annotate (2.4.0) arel (2.0.9) builder (2.1.2) @@ -42,6 +43,7 @@ GEM erubis (2.6.6) abstract (>= 1.0.0) exception_notification (2.4.0) + expression_parser (0.9.0) fastercsv (1.5.4) haml (3.1.1) has_scope (0.5.0) @@ -71,10 +73,10 @@ GEM mysql (2.8.1) polyglot (0.3.1) prawn (0.6.3) - prawn-core (< 0.7, >= 0.6.3) - prawn-format (< 0.3, >= 0.2.3) - prawn-layout (< 0.4, >= 0.3.2) - prawn-security (< 0.2, >= 0.1.1) + prawn-core (>= 0.6.3, < 0.7) + prawn-format (>= 0.2.3, < 0.3) + prawn-layout (>= 0.3.2, < 0.4) + prawn-security (>= 0.1.1, < 0.2) prawn-core (0.6.3) prawn-format (0.2.3) prawn-core @@ -93,8 +95,8 @@ GEM activesupport (= 3.0.7) bundler (~> 1.0) railties (= 3.0.7) - rails3_acts_as_paranoid (0.0.7) - activerecord (>= 3.0) + rails3_acts_as_paranoid (0.0.9) + activerecord (~> 3.0) railties (3.0.7) actionpack (= 3.0.7) activesupport (= 3.0.7) @@ -108,12 +110,16 @@ GEM treetop (1.4.9) polyglot (>= 0.3.1) tzinfo (0.3.27) + wikicloth (0.8.0) + builder + expression_parser will_paginate (3.0.pre2) PLATFORMS ruby DEPENDENCIES + acts_as_configurable annotate client_side_validations exception_notification @@ -128,7 +134,8 @@ DEPENDENCIES mysql prawn (<= 0.6.3) rails (= 3.0.7) - rails3_acts_as_paranoid + rails3_acts_as_paranoid (= 0.0.9) sass simple_form + wikicloth will_paginate (~> 3.0.pre2) diff --git a/vendor/plugins/acts_as_configurable/MIT-LICENSE b/vendor/plugins/acts_as_configurable/MIT-LICENSE deleted file mode 100644 index b445594d..00000000 --- a/vendor/plugins/acts_as_configurable/MIT-LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2006 Jacob Radford - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/vendor/plugins/acts_as_configurable/README b/vendor/plugins/acts_as_configurable/README deleted file mode 100644 index cfe12ff8..00000000 --- a/vendor/plugins/acts_as_configurable/README +++ /dev/null @@ -1,94 +0,0 @@ -= acts_as_configurable - -This mixin adds a number of methods to an ActiveRecord module which -enable saving any settings you want (see examples below). -ActiveRecord is required. - -== Install - - ./script/plugin install http://svn.nkryptic.com/plugins/acts_as_configurable - -== Usage - -This mixin will provide your model with a large variety of configuration options. - class User < ActiveRecord::Base - acts_as_configurable - end - -Example: - - user = User.create(:name => 'joe') - user.settings # => [] - - user.settings[:friends] = ['jane','sam','karl'] - user.settings[:friends] # => ['jane','sam','karl'] - user.settings[:age] = 25 - user.settings[:age] # => 25 - -OR - - user = User.create(:name => 'joe') - post = Post.find(:first) - - user.settings_for(post) # => [] - user.settings_for(post)[:show_headlines] = true - - user.settings_for(post)[:show_headlines] # => true - user.settings_for(post).size # => 1 - - # but the user's untargeted settings are still empty - user.settings # => [] - - update: now there is a method each_with_key - user.settings.each_with_key {|k,s| do something} # k is the key (a string) and s is the setting - and - user.settings_for(post).each_with_key {|k,s| do something} # k is the key (a string) and s is the setting - - -This mixin will provide your model with the ability to see where it is used as a target of acts_as_configurable - class Post < ActiveRecord::Base - acts_as_configurable_target - end - -Example: - - user = User.create(:name => 'joe') - post = Post.find(:first) - - user.settings_for(post) # => [] - user.settings_for(post)[:num_lines] = 15 - - user.settings_for(post)[:num_lines] # => 15 - post.targeted_settings[:num_lines].size # => 1 - post.targeted_settings[:num_lines].first # => 15 - post.targeted_settings[:num_lines].first.owner # => user - -OR - - user = User.create(:name => 'joe') - post = Post.find(:first) - - user.settings_for(post) # => [] - user.settings_for(post)[:num_lines] = 15 - - user.settings_for(post)[:num_lines] # => 15 - user.settings_for(post)[:hide_comments] # => true - post.targeted_settings_for(user)[:num_lines] # => 15 - post.targeted_settings_for(user) # => [15,true] - post.targeted_settings_for(user).collect {|x| x.name} # => ['num_lines','hide_comments'] - -== Subversion - - http://svn.nkryptic.com/plugins/acts_as_configurable - -== Credits - -I was insprired by the following people/works - -* Rick Olson - acts_as_versioned plugin (plugin design) -* Bill Katz - authorization plugin (roles applied to any model) -* Tobias Luetke - Typo (configuration settings manager with ruby-typing of value) -* Rails core - AssociationCollection and AssociationProxy classes - - - diff --git a/vendor/plugins/acts_as_configurable/Rakefile b/vendor/plugins/acts_as_configurable/Rakefile deleted file mode 100644 index 3281c528..00000000 --- a/vendor/plugins/acts_as_configurable/Rakefile +++ /dev/null @@ -1,22 +0,0 @@ -require 'rake' -require 'rake/testtask' -require 'rake/rdoctask' - -desc 'Default: run unit tests.' -task :default => :test - -desc 'Test the acts_as_configurable plugin.' -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.pattern = 'test/**/*_test.rb' - t.verbose = true -end - -desc 'Generate documentation for the acts_as_configurable plugin.' -Rake::RDocTask.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'ActsAsConfigurable' - rdoc.options << '--line-numbers' << '--inline-source' - rdoc.rdoc_files.include('README') - rdoc.rdoc_files.include('lib/**/*.rb') -end diff --git a/vendor/plugins/acts_as_configurable/init.rb b/vendor/plugins/acts_as_configurable/init.rb deleted file mode 100644 index 43930e6a..00000000 --- a/vendor/plugins/acts_as_configurable/init.rb +++ /dev/null @@ -1,5 +0,0 @@ - -require 'acts_as_configurable' -ActiveRecord::Base.send(:include, Nkryptic::ActsAsConfigurable) - -require 'configurable_setting' \ No newline at end of file diff --git a/vendor/plugins/acts_as_configurable/install.rb b/vendor/plugins/acts_as_configurable/install.rb deleted file mode 100644 index bd23f1bb..00000000 --- a/vendor/plugins/acts_as_configurable/install.rb +++ /dev/null @@ -1 +0,0 @@ -puts IO.read(File.join(File.dirname(__FILE__), 'README')) diff --git a/vendor/plugins/acts_as_configurable/lib/acts_as_configurable.rb b/vendor/plugins/acts_as_configurable/lib/acts_as_configurable.rb deleted file mode 100644 index 5c2e4264..00000000 --- a/vendor/plugins/acts_as_configurable/lib/acts_as_configurable.rb +++ /dev/null @@ -1,497 +0,0 @@ - -module Nkryptic # :nodoc: - module ActsAsConfigurable #:nodoc: - def self.included(base) # :nodoc: - base.extend ClassMethods - end - - # These methods will be available to any ActiveRecord::Base descended model. - module ClassMethods - - # == Acts As Configurable - # requirements:: - # model descended from ActiveRecord::Base - # configurable_settings table has been created - # - # class User < ActiveRecord::Base - # acts_as_configurable - # end - # - # This mixin will provide your model with a large variety of configuration options. - # - # see:: settings and settins_for - # - def acts_as_configurable(options = {}) - - # don't allow multiple calls - return if self.included_modules.include?(Nkryptic::ActsAsConfigurable::InstanceMethods) - send :include, Nkryptic::ActsAsConfigurable::InstanceMethods - - cattr_accessor :defaults - self.defaults = (options.class == Hash ? options : {}).with_indifferent_access - - has_many :_configurable_settings, - :as => :configurable, - :class_name => 'ConfigurableSetting', - :dependent => :destroy - - end - - # == Acts As Configurable Target - # requirements:: - # model descended from ActiveRecord::Base - # configurable_settings table has been created - # - # class User < ActiveRecord::Base - # acts_as_configurable_target - # end - # - # This mixin will provide your model with the ability to see where it is used as a target of acts_as_configurable - # - # see:: targetable_settings and targetable_settings_for - # - def acts_as_configurable_target(options = {}) - return if self.included_modules.include?(Nkryptic::ActsAsConfigurable::TargetInstanceMethods) - send :include, Nkryptic::ActsAsConfigurable::TargetInstanceMethods - - has_many :_targetable_settings, - :as => :targetable, - :class_name => 'ConfigurableSetting', - :dependent => :destroy - - end - end - - module InstanceMethods - - def self.included(base) # :nodoc: - base.extend Nkryptic::ActsAsConfigurable::InstanceMethods::ClassMethods - end - - # * specify any setting you want for an instance of a model - # - # Example: - # - # user = User.create(:name => 'joe') - # user.settings # => [] - # - # user.settings[:friends] = ['jane','sam','karl'] - # user.settings[:friends] # => ['jane','sam','karl'] - # user.settings[:age] = 25 - # user.settings[:age] # => 25 - # - def settings - @general_settings ||= ConfigurableSettings.new(self) - end - - # * specify any setting you want for an instance of a model targeting another object - # - # Example: - # - # user = User.create(:name => 'joe') - # post = Post.find(:first) - # - # user.settings_for(post) # => [] - # user.settings_for(post)[:show_headlines] = true - # - # user.settings_for(post)[:show_headlines] # => true - # user.settings_for(post).size # => 1 - # - # # but the user's untargeted settings are still empty - # user.settings # => [] - # - def settings_for(obj) - if obj.is_a? Class - # wire the settings object to only deal with settings targeting this class obj - variable_name = "settings_for_class_#{obj.name}" - else - # wire the settings object to only deal with settings targeting this instance obj - variable_name = "settings_for_#{obj.class}_#{obj.id}" - end - settings_obj = instance_variable_get("@#{variable_name}") - settings_obj = instance_variable_set("@#{variable_name}",ConfigurableSettings.new(self, obj)) if settings_obj.nil? - settings_obj - end - - # These are class methods that are mixed in with the model class. - module ClassMethods # :nodoc: - - end - end - - module TargetInstanceMethods - - def self.included(base) # :nodoc: - base.extend Nkryptic::ActsAsConfigurable::TargetInstanceMethods::ClassMethods - end - - # * specify any setting you want for an instance of a model targeting another object - # - # Example: - # - # user = User.create(:name => 'joe') - # post = Post.find(:first) - # - # user.settings_for(post) # => [] - # user.settings_for(post)[:num_lines] = 15 - # - # user.settings_for(post)[:num_lines] # => 15 - # post.targeted_settings[:num_lines].size # => 1 - # post.targeted_settings[:num_lines].first # => 15 - # post.targeted_settings[:num_lines].first.owner # => user - # - def targeted_settings - @targeted_settings ||= TargetedSettings.new(self) - end - - # * specify any setting you want for an instance of a model targeting another object - # - # Example: - # - # user = User.create(:name => 'joe') - # post = Post.find(:first) - # - # user.settings_for(post) # => [] - # user.settings_for(post)[:num_lines] = 15 - # - # user.settings_for(post)[:num_lines] # => 15 - # user.settings_for(post)[:hide_comments] # => true - # post.targeted_settings_for(user)[:num_lines] # => 15 - # post.targeted_settings_for(user) # => [15,true] - # post.targeted_settings_for(user).collect {|x| x.name} # => ['num_lines','hide_comments'] - # - def targeted_settings_for(obj) - if obj.is_a? Class - # wire the targeted_settings object to only deal with settings targeting this class obj - variable_name = "targeted_settings_for_class_#{obj.name}" - else - # wire the targeted_settings object to only deal with settings targeting this instance obj - variable_name = "targeted_settings_for_#{obj.class}_#{obj.id}" - end - settings_obj = instance_variable_get("@#{variable_name}") - settings_obj = instance_variable_set("@#{variable_name}",TargetedSettings.new(self, obj)) if settings_obj.nil? - settings_obj - end - - # These are class methods that are mixed in with the model class. - module ClassMethods # :nodoc: - - end - end - - - class ProxySettings # :nodoc: - alias_method '__class', 'class' - instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$)/ } - - #class_inheritable_accessor(:sql_word) - - def initialize(source, reference=nil) - @source = source - @reference = reference - true - end - - def real_class - __class - end - - def settings - @source.send(@settings) - end - - def to_ary - find_settings.collect do |x| - ProxySetting.new(x) - end - end - - def responds_to?(what) - settings.responds_to?(what) - end - - def ==(what) - find_settings == what - end - - def size - find_settings.size - end - - def inspect - find_settings.inspect - end - - def each(&block) - find_settings.each do |x| - yield ProxySetting.new(x) - end - end - - def each_with_key(&block) - find_settings.each do |x| - yield(x.name, ProxySetting.new(x)) - end - end - - def select(&block) - find_settings.select do |x| - yield ProxySetting.new(x) - end - end - - def reject(&block) - find_settings.reject do |x| - yield ProxySetting.new(x) - end - end - - def collect(&block) - find_settings.collect do |x| - yield ProxySetting.new(x) - end - end - - def has_key?(name) - name = name.to_s - setting = find_setting(name) - if setting.nil? - false - else - if setting.is_a? Array - setting.size == 0 ? false : true - else - true - end - end - end - - def [](name) - name = name.to_s - setting = find_setting(name) - return nil if setting.nil? - if setting.is_a? Array - setting.collect {|x| ProxySetting.new(x)} - else - ProxySetting.new(setting) - end - end - - def []=(name, value) - name = name.to_s - setting = find_setting(name) - if setting.is_a? Array - setting.collect do |x| - x.value_type = value.class.to_s - x.value = value.to_yaml - x.save - ProxySetting.new(x) - end - else - if setting.nil? - setting = create_setting(name) - end - setting.value_type = value.class.to_s - setting.value = value.to_yaml - setting.save - ProxySetting.new(setting) - end - end - - private - - def find_settings; nil end - - def find_setting(name); nil end - - def create_setting(name); nil end - - def method_missing(method, *args, &block) - settings.send(method, *args, &block) - end - - end - - class ConfigurableSettings < ProxySettings # :nodoc: - - def initialize(source, reference=nil) - super - @settings = '_configurable_settings' - @@sql_word = "targetable" - true - end - - private - - def find_settings - if @reference.is_a? Class - settings.find( :all, - :conditions => [ "#{@@sql_word}_type = ? and #{@@sql_word}_id IS NULL", @reference.to_s ] ) - elsif @reference - settings.find( :all, - :conditions => [ "#{@@sql_word}_type = ? and #{@@sql_word}_id = ?", @reference.class.to_s, @reference.id ] ) - else - settings.find( :all, - :conditions => [ "#{@@sql_word}_type is null and #{@@sql_word}_id is null" ] ) - end - end - - def find_setting(name) - if @reference.is_a? Class - settings.find( :first, - :conditions => [ "name = ? and #{@@sql_word}_type = ? and #{@@sql_word}_id IS NULL", name, @reference.to_s ] ) - elsif @reference - settings.find( :first, - :conditions => [ "name = ? and #{@@sql_word}_type = ? and #{@@sql_word}_id = ?", name, @reference.class.to_s, @reference.id ] ) - else - settings.find( :first, - :conditions => [ "name = ? and #{@@sql_word}_type is null and #{@@sql_word}_id is null", name ] ) - end - end - - def create_setting(name) - if @reference.is_a? Class - settings.create( :name => name, "#{@@sql_word}_type" => @reference.to_s ) - elsif @reference - settings.create( :name => name, "#{@@sql_word}_type" => @reference.class.to_s, "#{@@sql_word}_id" => @reference.id ) - else - settings.create( :name => name ) - end - end - - end - - class TargetedSettings < ProxySettings # :nodoc: - - def initialize(target, owner=nil) - super - @settings = '_targetable_settings' - @@sql_word = "configurable" - true - end - - private - - def find_settings - if @reference.is_a? Class - settings.find( :all, - :conditions => [ "#{@@sql_word}_type = ? and #{@@sql_word}_id IS NULL", @reference.to_s ] ) - elsif @reference - settings.find( :all, - :conditions => [ "#{@@sql_word}_type = ? and #{@@sql_word}_id = ?", @reference.class.to_s, @reference.id ] ) - else - settings.find( :all ) - end - end - - def find_setting(name) - if @reference.is_a? Class - settings.find( :first, - :conditions => [ "name = ? and #{@@sql_word}_type = ? and #{@@sql_word}_id IS NULL", name, @reference.to_s ] ) - elsif @reference - settings.find( :first, - :conditions => [ "name = ? and #{@@sql_word}_type = ? and #{@@sql_word}_id = ?", name, @reference.class.to_s, @reference.id ] ) - else - settings.find( :all, - :conditions => [ "name = ?", name ] ) - end - end - - def create_setting(name) - if @reference.is_a? Class - settings.create( :name => name, "#{@@sql_word}_type" => @reference.to_s ) - elsif @reference - settings.create( :name => name, "#{@@sql_word}_type" => @reference.class.to_s, "#{@@sql_word}_id" => @reference.id ) - end - end - - end - - class ProxySetting # :nodoc: - - alias_method '__class', 'class' - instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$)/ } - - def initialize(setting) - @_setting = setting - true - end - - def real_class - ProxySetting - end - - def target - unless @_setting.targetable_type.blank? or @_setting.targetable_id.blank? - ConfigurableSetting.find_targetable(@_setting.targetable_type, @_setting.targetable_id) - else - nil - end - end - - def owner - unless @_setting.configurable_type.blank? or @_setting.configurable_id.blank? - ConfigurableSetting.find_configurable(@_setting.configurable_type, @_setting.configurable_id) - else - nil - end - end - - def []=(name, val) - obj = self.value - if obj.responds_to? '[]=' - obj[name] = val - self.value = obj - self.save - else - method_missing('[]=', [name,val]) - end - end - - def delete(name) - obj = self.value - if obj.responds_to? 'delete' - obj.delete(name) - self.value = obj - self.save - else - method_missing('delete', [name,val]) - end - end - - def save - @_setting.save - end - - protected - - def value - @value ||= YAML.load(@_setting.value) - end - - def value=(val) - @value = val - self.set_value - end - - def set_value - @_setting.value_type = @value.class.to_s - @_setting.value = @value.to_yaml - end - - private - - def method_missing(method, *args, &block) - return_value = self.value.send(method, *args, &block) - if @value != YAML.load(@_setting.value) - STDERR.puts "#{method} called with args #{args} for ProxySetting" - self.set_value - end - return_value - end - - end - - - end -end \ No newline at end of file diff --git a/vendor/plugins/acts_as_configurable/lib/configurable_setting.rb b/vendor/plugins/acts_as_configurable/lib/configurable_setting.rb deleted file mode 100644 index ec9a6f74..00000000 --- a/vendor/plugins/acts_as_configurable/lib/configurable_setting.rb +++ /dev/null @@ -1,50 +0,0 @@ -# this is the base class of all configurable settings -class ConfigurableSetting < ActiveRecord::Base - belongs_to :configurable, :polymorphic => true - belongs_to :targetable, :polymorphic => true - - # ==For migration up - # in your migration self.up method: - # ConfigurableSetting.create_table - def self.create_table - self.connection.create_table :configurable_settings, :options => 'ENGINE=InnoDB' do |t| - t.column :configurable_id, :integer - t.column :configurable_type, :string - t.column :targetable_id, :integer - t.column :targetable_type, :string - t.column :name, :string, :null => false - t.column :value_type, :string - t.column :value, :text, :null => true - end - self.connection.add_index :configurable_settings, :name - end - - # ==For migration down - # in your migration self.down method: - # ConfigurableSetting.drop_table - def self.drop_table - self.connection.remove_index :configurable_settings, :name - self.connection.drop_table :configurable_settings - end - - # returns a string with the classname of configurable - def self.configurable_class(configurable) # :nodoc: - ActiveRecord::Base.send(:class_name_of_active_record_descendant, configurable.class).to_s - end - - # returns a string with the classname of configurable - def self.targetable_class(targetable) # :nodoc: - ActiveRecord::Base.send(:class_name_of_active_record_descendant, targetable.class).to_s - end - - # returns the instance of the "owner" of the setting - def self.find_configurable(configured_class, configured_id) # :nodoc: - configured_class.constantize.find(configured_id) - end - - # returns the instance of the "target" of the setting - def self.find_targetable(targeted_class, targeted_id) # :nodoc: - targeted_class.constantize.find(targeted_id) - end - -end \ No newline at end of file diff --git a/vendor/plugins/acts_as_configurable/tasks/acts_as_configurable_tasks.rake b/vendor/plugins/acts_as_configurable/tasks/acts_as_configurable_tasks.rake deleted file mode 100644 index bdcde759..00000000 --- a/vendor/plugins/acts_as_configurable/tasks/acts_as_configurable_tasks.rake +++ /dev/null @@ -1,28 +0,0 @@ -require 'rake/testtask' -require 'rake/rdoctask' - -namespace :test do - desc "run the acts as configurable test suite" - task :acts_as_configurable do - Rake::TestTask.new(:aac_test) do |t| - t.libs << File.join(File.dirname(__FILE__), '/../lib') - t.pattern = File.join(File.dirname(__FILE__), '/../test/**/*_test.rb') - t.verbose = true - end - Rake::Task[:aac_test].invoke - end -end - -namespace :doc do - desc "generate the acts as configurable rdoc files" - task :acts_as_configurable do - Rake::RDocTask.new(:aac_rdoc) do |rdoc| - rdoc.rdoc_dir = File.join(File.dirname(__FILE__), '/../rdoc') - rdoc.title = 'Acts As Configurable' - rdoc.options << '--line-numbers' << '--inline-source' - rdoc.rdoc_files.include(File.join(File.dirname(__FILE__), '/../README')) - rdoc.rdoc_files.include(File.join(File.dirname(__FILE__), '/../lib/**/*.rb')) - end - Rake::Task[:aac_rdoc].invoke - end -end \ No newline at end of file diff --git a/vendor/plugins/acts_as_configurable/test/acts_as_configurable_test.rb b/vendor/plugins/acts_as_configurable/test/acts_as_configurable_test.rb deleted file mode 100644 index d4739fc6..00000000 --- a/vendor/plugins/acts_as_configurable/test/acts_as_configurable_test.rb +++ /dev/null @@ -1,117 +0,0 @@ -require 'test/unit' -require File.dirname(__FILE__) + '/test_helper' -require File.join(File.dirname(__FILE__), 'fixtures/entities') - - -class ActsAsConfigurableTest < Test::Unit::TestCase - fixtures :test_users, :test_groups - - def setup - @group = TestGroup.create(:display_name => 'Rails Core') - @user = TestUser.create(:login => 'sam', :name => 'Sam Testuser', :email => 'sam@example.com') - end - - SETTINGS = ActiveRecord::Base.const_get('ConfigurableSettings') - TARGETEDSETTINGS = ActiveRecord::Base.const_get('TargetedSettings') - PROXYSETTING = ActiveRecord::Base.const_get('ProxySetting') - USR_CFG = { - :how_many_time_i_eat_out_a_week => 4, - 'what i am made of' => 'steel', - :friends => ['bob', 'ken'] - } - GR_ROLES = ['creator', 'member', 'fundraiser'] - - def test_user_model_settings - - assert_equal 'sam', @user.login - assert_equal 'Rails Core', @group.display_name - - assert_equal 0, @user._configurable_settings.size - assert_equal Array, @user.settings.class - assert_equal SETTINGS, @user.settings.real_class - assert_equal 0, @user.settings.size - - @user.settings[:config] = USR_CFG - - assert_equal 1, @user._configurable_settings.size - assert_equal USR_CFG, @user.settings[:config] - assert_equal 1, @user.settings.size - assert_equal Hash, @user.settings[:config].class - assert_equal PROXYSETTING, @user.settings[:config].real_class - assert_equal 3, @user.settings[:config].keys.size - assert_equal 4, @user.settings[:config][:how_many_time_i_eat_out_a_week] - assert_equal Array, @user.settings[:config][:friends].class - assert_equal 2, @user.settings[:config][:friends].size - - @user.settings[:my_group] = @group - - assert_equal 2, @user.settings.size - assert_equal TestGroup, @user.settings[:my_group].class - - end - - def test_new_each_with_key - @user.settings[:config] = USR_CFG - @user.settings.each_with_key do |key, setting| - assert_equal :config.to_s, key - assert_equal USR_CFG, setting - end - end - - - def test_valid_raw_setting - - assert ConfigurableSetting.find(:first).nil? - - @user.settings[:config] = USR_CFG - - first_setting = ConfigurableSetting.find(:first) - - assert_equal 'config', first_setting.name - assert_equal 'TestUser', first_setting.configurable_type - assert_equal @user.id, first_setting.configurable_id - assert_equal nil, first_setting.targetable_type - assert_equal nil, first_setting.targetable_id - assert_equal USR_CFG.to_yaml, first_setting.value - - end - - - def test_associated_settings - - assert_equal [], @user.settings - assert_equal [], @user.settings_for(@group) - - @user.settings_for(@group)[:roles] = GR_ROLES - - assert_equal GR_ROLES, @user.settings_for(@group)[:roles] - assert_equal 1, @user.settings_for(@group).size - assert_equal 0, @user.settings.size - - end - - - def test_associated_target_settings - - assert_equal [], @group.targeted_settings - assert_equal TARGETEDSETTINGS, @group.targeted_settings.real_class - - @user.settings_for(@group)[:roles] = GR_ROLES - - assert_equal 1, @group._targetable_settings.size - assert_equal 1, @group.targeted_settings.size - assert_equal 1, @group.targeted_settings_for(@user).size - assert_equal GR_ROLES, @group.targeted_settings_for(@user)[:roles] - @group.targeted_settings.each do |x| - assert x.owner == @user and x.target == @group and x.name == 'roles' - end - @group.targeted_settings.each do |x| - assert x == GR_ROLES - end - @group.targeted_settings[:roles].each do |x| - assert x.owner == @user and x == GR_ROLES - end - - end - -end \ No newline at end of file diff --git a/vendor/plugins/acts_as_configurable/test/fixtures/entities.rb b/vendor/plugins/acts_as_configurable/test/fixtures/entities.rb deleted file mode 100644 index cdffde3b..00000000 --- a/vendor/plugins/acts_as_configurable/test/fixtures/entities.rb +++ /dev/null @@ -1,14 +0,0 @@ -class TestUser < ActiveRecord::Base - - acts_as_configurable - -end - - - -class TestGroup < ActiveRecord::Base - - acts_as_configurable - acts_as_configurable_target - -end diff --git a/vendor/plugins/acts_as_configurable/test/fixtures/test_groups.yml b/vendor/plugins/acts_as_configurable/test/fixtures/test_groups.yml deleted file mode 100644 index e20efdc9..00000000 --- a/vendor/plugins/acts_as_configurable/test/fixtures/test_groups.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -test_groups_001: - id: "1" - display_name: Clan of the Cavebear diff --git a/vendor/plugins/acts_as_configurable/test/fixtures/test_users.yml b/vendor/plugins/acts_as_configurable/test/fixtures/test_users.yml deleted file mode 100644 index 8ec0af99..00000000 --- a/vendor/plugins/acts_as_configurable/test/fixtures/test_users.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -test_users_001: - name: Bob Testuser - id: "1" - login: bob - email: bob@example.com -test_users_002: - name: Ken Testuser - id: "2" - login: ken - email: ken@example.com diff --git a/vendor/plugins/acts_as_configurable/test/schema.rb b/vendor/plugins/acts_as_configurable/test/schema.rb deleted file mode 100644 index fedbe4a8..00000000 --- a/vendor/plugins/acts_as_configurable/test/schema.rb +++ /dev/null @@ -1,28 +0,0 @@ -ActiveRecord::Migration.verbose = false - -ActiveRecord::Schema.define(:version => 0) do - - create_table :configurable_settings, :force => true do |t| - t.column :configurable_id, :integer - t.column :configurable_type, :string - t.column :targetable_id, :integer - t.column :targetable_type, :string - t.column :name, :string, :default => "", :null => false - t.column :value_type, :string - t.column :value, :text - end - add_index :configurable_settings, :name - - create_table :test_groups, :force => true do |t| - t.column :display_name, :string, :limit => 80 - end - - create_table :test_users, :force => true do |t| - t.column :login, :string, :limit => 20 - t.column :name, :string, :limit => 80 - t.column :email, :string - end - -end - -ActiveRecord::Migration.verbose = true \ No newline at end of file diff --git a/vendor/plugins/acts_as_configurable/test/test_helper.rb b/vendor/plugins/acts_as_configurable/test/test_helper.rb deleted file mode 100644 index c54f915c..00000000 --- a/vendor/plugins/acts_as_configurable/test/test_helper.rb +++ /dev/null @@ -1,30 +0,0 @@ -ENV["RAILS_ENV"] = "test" -require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment") - -require 'test/unit' -require 'active_record/fixtures' - -ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log") - -load(File.dirname(__FILE__) + '/schema.rb') - -Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + '/fixtures/' -$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path) - -class Test::Unit::TestCase #:nodoc: - def create_fixtures(*table_names) - if block_given? - Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield } - else - Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) - end - end - - # Turn off transactional fixtures if you're working with MyISAM tables in MySQL - self.use_transactional_fixtures = true - - # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david) - self.use_instantiated_fixtures = false - - # Add more helper methods to be used by all tests here... -end \ No newline at end of file diff --git a/vendor/plugins/wikicloth/MIT-LICENSE b/vendor/plugins/wikicloth/MIT-LICENSE deleted file mode 100644 index 9df1f933..00000000 --- a/vendor/plugins/wikicloth/MIT-LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2009. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/plugins/wikicloth/README b/vendor/plugins/wikicloth/README deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/plugins/wikicloth/Rakefile b/vendor/plugins/wikicloth/Rakefile deleted file mode 100644 index 85ecf4dc..00000000 --- a/vendor/plugins/wikicloth/Rakefile +++ /dev/null @@ -1,23 +0,0 @@ -require 'rake' -require 'rake/testtask' -require 'rake/rdoctask' - -desc 'Default: run unit tests.' -task :default => :test - -desc 'Test the wikicloth plugin.' -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.libs << 'test' - t.pattern = 'test/**/*_test.rb' - t.verbose = true -end - -desc 'Generate documentation for the wikicloth plugin.' -Rake::RDocTask.new(:rdoc) do |rdoc| - rdoc.rdoc_dir = 'rdoc' - rdoc.title = 'WikiCloth' - rdoc.options << '--line-numbers' << '--inline-source' - rdoc.rdoc_files.include('README') - rdoc.rdoc_files.include('lib/**/*.rb') -end diff --git a/vendor/plugins/wikicloth/init.rb b/vendor/plugins/wikicloth/init.rb deleted file mode 100644 index 89f624af..00000000 --- a/vendor/plugins/wikicloth/init.rb +++ /dev/null @@ -1,5 +0,0 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "core_ext") -require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "wiki_cloth") -require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "wiki_buffer") -require File.join(File.expand_path(File.dirname(__FILE__)), "lib", "wiki_link_handler") -String.send(:include, ExtendedString) diff --git a/vendor/plugins/wikicloth/install.rb b/vendor/plugins/wikicloth/install.rb deleted file mode 100644 index e69de29b..00000000 diff --git a/vendor/plugins/wikicloth/lib/core_ext.rb b/vendor/plugins/wikicloth/lib/core_ext.rb deleted file mode 100644 index 509f697b..00000000 --- a/vendor/plugins/wikicloth/lib/core_ext.rb +++ /dev/null @@ -1,43 +0,0 @@ -module ExtendedString - - def blank? - respond_to?(:empty?) ? empty? : !self - end - - def to_slug - self.gsub(/\W+/, '-').gsub(/^-+/,'').gsub(/-+$/,'').downcase - end - - def auto_link - url_check = Regexp.new( '(^|[\n ])([\w]+?://[\w]+[^ \"\r\n\t<]*)', Regexp::MULTILINE | Regexp::IGNORECASE ) - www_check = Regexp.new( '(^|[\n ])((www)\.[^ \"\t\n\r<]*)', Regexp::MULTILINE | Regexp::IGNORECASE ) - self.gsub!(url_check, '\1\2') - self.gsub!(www_check, '\1\2') - to_s - end - - def dump() - ret = to_s - delete!(to_s) - ret - end - - def smart_split(char) - ret = [] - tmp = "" - inside = 0 - to_s.each_char do |x| - if x == char && inside == 0 - ret << tmp - tmp = "" - else - inside += 1 if x == "[" || x == "{" || x == "<" - inside -= 1 if x == "]" || x == "}" || x == ">" - tmp += x - end - end - ret << tmp unless tmp.empty? - ret - end - -end diff --git a/vendor/plugins/wikicloth/lib/wiki_buffer.rb b/vendor/plugins/wikicloth/lib/wiki_buffer.rb deleted file mode 100644 index 248661f8..00000000 --- a/vendor/plugins/wikicloth/lib/wiki_buffer.rb +++ /dev/null @@ -1,279 +0,0 @@ -module WikiCloth -class WikiBuffer - - def initialize(data="",options={}) - @options = options - self.data = data - self.buffer_type = nil - @section_count = 0 - @buffers ||= [ ] - @buffers << self - @list_data = [] - end - - def run_globals? - true - end - - def skip_html? - false - end - - def data - @data ||= "" - end - - def params - @params ||= [ "" ] - end - - def buffer_type - @buffer_type - end - - def to_s - "
" + self.params.join("\n") + "
" - end - - def check_globals() - return false if self.class != WikiBuffer - - if previous_char == "\n" - if @indent == @buffers[-1].object_id && current_char != " " - # close pre tag - cc_temp = current_char - "".each_char { |c| self.add_char(c) } - # get the parser back on the right track - "\n#{cc_temp}".each_char { |c| @buffers[-1].add_char(c) } - @indent = nil - return true - end - if current_char == " " && @indent.nil? && @buffers[-1].class != WikiBuffer::HTMLElement - "".each_char { |c| @buffers[-1].add_char(c) } - @indent = @buffers[-1].object_id - return true - end - end - - if @buffers[-1].run_globals? - # new html tag - if @check_new_tag == true && current_char =~ /([a-z])/ && !@buffers[-1].skip_html? - @buffers[-1].data.chop! - parent = @buffers[-1].element_name if @buffers[-1].class == WikiBuffer::HTMLElement - @buffers << WikiBuffer::HTMLElement.new("",@options,parent) - end - @check_new_tag = current_char == '<' ? true : false - - # global - case - # start variable - when previous_char == '{' && current_char == '{' - @buffers[-1].data.chop! - @buffers << WikiBuffer::Var.new("",@options) - return true - - # start link - when current_char == '[' && previous_char != '[' - @buffers << WikiBuffer::Link.new("",@options) - return true - - # start table - when previous_char == '{' && current_char == "|" - @buffers[-1].data.chop! - @buffers << WikiBuffer::Table.new("",@options) - return true - - end - end - - return false - end - - def add_char(c) - self.previous_char = self.current_char - self.current_char = c - - if self.check_globals() == false - case - when @buffers.size == 1 - return self.new_char() - when @buffers[-1].add_char(c) == false && self.class == WikiBuffer - tmp = @buffers.pop - @buffers[-1].data += tmp.to_s - # any data left in the buffer we feed into the parent - unless tmp.data.blank? - tmp.data.each_char { |c| self.add_char(c) } - end - end - end - end - - protected - # only executed in the default state - def new_char() - case - when current_char == "\n" - if @options[:extended_markup] == true - self.data.gsub!(/---([^-]+)---/,"\\1") - self.data.gsub!(/_([^_]+)_/,"\\1") - end - self.data.gsub!(/__([a-zA-Z0-9]+)__/) { |r| - case $1 - when "NOEDITSECTION" - @noeditsection = true - end - "" - } - self.data.gsub!(/^([-]{4,})/) { |r| "
" } - self.data.gsub!(/^([=]{1,6})\s*(.*?)\s*(\1)/) { |r| - @section_count += 1 - "" + (@noeditsection == true ? "" : - "[edit]") + - " #{$2} " - } - self.data.gsub!(/([\']{2,5})(.*?)(\1)/) { |r| - tmp = "#{$2}" if $1.length == 2 - tmp = "#{$2}" if $1.length == 3 - tmp = "'#{$2}'" if $1.length == 4 - tmp = "#{$2}" if $1.length == 5 - tmp - } - lines = self.data.split("\n") - self.data = "" - for line in lines - if !@list_data.empty? && (line.blank? || line =~ /^([^#\*:;]+)/) - tmp = "" - @list_data.reverse! - @list_data.each { |x| tmp += "" + list_inner_tag_for(x) + ">#{list_tag_for(x)}>" } - line = "#{tmp} #{line}" - @list_data = [] - end - line.gsub!(/^([#\*:;]+)(.*)$/) { |r| - cdata = [] - tmp = "" - $1.each_char { |c| cdata << c } - if @list_data.empty? - tmp += "<#{list_tag_for(cdata[0])}>" - cdata[1..-1].each { |x| tmp += "<" + list_inner_tag_for(cdata[0]) + "><#{list_tag_for(x)}>" } if cdata.size > 1 - else - case - when cdata.size > @list_data.size - i = cdata.size-@list_data.size - cdata[-i,i].each { |x| tmp += "<#{list_tag_for(x)}>" } - when cdata.size < @list_data.size - i = @list_data.size-cdata.size - nlist = @list_data[-i,i].reverse - nlist.each { |x| tmp += "" + list_inner_tag_for(x) + ">#{list_tag_for(x)}>" } - tmp += "#{list_inner_tag_for(cdata.last)}>" - else - if cdata != @list_data - # FIXME: this will only work if the change depth is one level - unless (@list_data.last == ';' || @list_data.last == ':') && (cdata.last == ';' || cdata.last == ':') - tmp += "#{list_tag_for(@list_data.pop)}>" - tmp += "<#{list_tag_for(cdata.last)}>" - end - else - tmp += "" + list_inner_tag_for(@list_data.last) + ">" - end - end - end - # FIXME: still probably does not detect the : properly - peices = cdata.last == ";" ? $2.smart_split(":") : [ $2 ] - if peices.size > 1 - tmp += "<#{list_inner_tag_for(cdata.last)}>#{peices[0]}#{list_inner_tag_for(cdata.last)}>" - tmp += "
" if self.data.blank?
-
- self.params << self.data.auto_link
- self.data = ""
- else
- self.data += current_char
- end
- return true
- end
-
- def name_current_param()
- params[-1] = { :value => "", :name => params[-1] } unless params[-1].kind_of?(Hash) || params[-1].nil?
- end
-
- def current_param=(val)
- unless self.params[-1].nil? || self.params[-1].kind_of?(String)
- self.params[-1][:value] = val
- else
- self.params[-1] = val
- end
- end
-
- def params=(val)
- @params = val
- end
-
- def buffer_type=(val)
- @buffer_type = val
- end
-
- def data=(val)
- @data = val
- end
-
- def current_char=(val)
- @current_char = val
- end
-
- def current_char
- @current_char ||= ""
- end
-
- def previous_char=(val)
- @previous_char = val
- end
-
- def previous_char
- @previous_char
- end
-
- def current_line=(val)
- @current_line = val
- end
-
- def current_line
- @current_line ||= ""
- end
-
- def list_tag_for(tag)
- case tag
- when "#" then "ol"
- when "*" then "ul"
- when ";" then "dl"
- when ":" then "dl"
- end
- end
-
- def list_inner_tag_for(tag)
- case tag
- when "#" then "li"
- when "*" then "li"
- when ";" then "dt"
- when ":" then "dd"
- end
- end
-
-end
-
-end
-
-require File.join(File.expand_path(File.dirname(__FILE__)), "wiki_buffer", "html_element")
-require File.join(File.expand_path(File.dirname(__FILE__)), "wiki_buffer", "table")
-require File.join(File.expand_path(File.dirname(__FILE__)), "wiki_buffer", "var")
-require File.join(File.expand_path(File.dirname(__FILE__)), "wiki_buffer", "link")
diff --git a/vendor/plugins/wikicloth/lib/wiki_buffer/html_element.rb b/vendor/plugins/wikicloth/lib/wiki_buffer/html_element.rb
deleted file mode 100644
index 9648c17f..00000000
--- a/vendor/plugins/wikicloth/lib/wiki_buffer/html_element.rb
+++ /dev/null
@@ -1,237 +0,0 @@
-require 'rubygems'
-require 'builder'
-
-module WikiCloth
-
-class WikiBuffer::HTMLElement < WikiBuffer
-
- ALLOWED_ELEMENTS = ['a','b','i','div','span','sup','sub','strike','s','u','font','big','ref','tt','del',
- 'small','blockquote','strong','pre','code','references','ol','li','ul','dd','dt','dl','center',
- 'h2','h3','h4','h5','h6']
- ALLOWED_ATTRIBUTES = ['id','name','style','class','href','start','value']
- ESCAPED_TAGS = [ 'nowiki', 'pre', 'code' ]
- SHORT_TAGS = [ 'meta','br','hr','img' ]
- NO_NEED_TO_CLOSE = ['li','p'] + SHORT_TAGS
-
- def initialize(d="",options={},check=nil)
- super("",options)
- self.buffer_type = "Element"
- @in_quotes = false
- @in_single_quotes = false
- @start_tag = 1
- @tag_check = check unless check.nil?
- end
-
- def run_globals?
- return ESCAPED_TAGS.include?(self.element_name) ? false : true
- end
-
- def to_s
- if NO_NEED_TO_CLOSE.include?(self.element_name)
- return "<#{self.element_name} />" if SHORT_TAGS.include?(self.element_name)
- return "#{self.element_name}><#{self.element_name}>" if @tag_check == self.element_name
- end
-
- if ESCAPED_TAGS.include?(self.element_name)
- # escape all html inside this element
- self.element_content = self.element_content.gsub('<','<').gsub('>','>')
- # hack to fix ..."
- ret += "
"
- end
-
- protected
- def rows=(val)
- @rows = val
- end
-
- def table_caption_attributes=(val)
- @caption = { :style => val, :value => self.table_caption } unless @caption.kind_of?(Hash)
- @caption[:style] = val if @caption.kind_of?(Hash)
- end
-
- def table_caption=(val)
- @caption = val unless @caption.kind_of?(Hash)
- @caption[:value] = val if @caption.kind_of?(Hash)
- end
-
- def next_row()
- self.params << ""
- self.rows << []
- end
-
- def next_cell(type="td")
- if self.rows[-1].size == 0
- self.rows[-1] = [ { :type => type, :value => "", :style => "" } ]
- else
- self.rows[-1][-1][:value] = self.data
- self.rows[-1] << { :type => type, :value => "", :style => "" }
- end
- end
-
- def new_char()
- if @check_cell_data == 1
- case
- when current_char != '|' && @start_caption == false && self.rows[-1][-1][:style].blank?
- self.rows[-1][-1][:style] = self.data
- self.data = ""
- when current_char != '|' && @start_caption == true && self.table_caption_attributes.blank?
- self.table_caption_attributes = self.data
- self.data = ""
- end
- @check_cell_data = 0
- end
-
- case
- # Next table cell in row (TD)
- when current_char == "|" && (previous_char == "\n" || previous_char == "|") && @in_quotes == false
- self.data.chop!
- self.next_cell() unless self.data.blank? && previous_char == "|"
- self.data = ""
-
- # Next table cell in row (TH)
- when current_char == "!" && (previous_char == "\n" || previous_char == "!") && @in_quotes == false
- self.data.chop!
- self.next_cell('th')
- self.data = ""
-
- # End of a table
- when current_char == '}' && previous_char == '|'
- self.data = ""
- self.rows[-1].pop
- return false
-
- # Start table caption
- when current_char == '+' && previous_char == '|' && @in_quotes == false
- self.data = ""
- self.rows[-1].pop
- @start_caption = true
-
- # Table cell might have attributes
- when current_char == '|' && previous_char != "\n" && @in_quotes == false
- @check_cell_data = 1
-
- # End table caption
- when current_char == "\n" && @start_caption == true && @in_quotes == false
- @start_caption = false
- self.table_caption = self.data
- self.data = ""
-
- # in quotes
- when current_char == '"' && previous_char != '\\'
- @in_quotes = !@in_quotes
- self.data += '"'
-
- # Table params
- when current_char == "\n" && @start_table == true && @in_quotes == false
- @start_table = false
- unless self.data.blank?
- self.current_param = self.data
- self.params << ""
- end
- self.data = ""
-
- # Table row params
- when current_char == "\n" && @start_row == true && @in_quotes == false
- @start_row = false
- unless self.data.blank?
- self.current_param = self.data
- end
- self.data = ""
-
- # Start new table row
- when current_char == '-' && previous_char == '|' && @in_quotes == false
- self.data.chop!
- self.rows[-1].pop
- self.next_row()
- @start_row = true
-
- else
- self.data += current_char
- end
-
- return true
- end
-
-end
-
-end
diff --git a/vendor/plugins/wikicloth/lib/wiki_buffer/var.rb b/vendor/plugins/wikicloth/lib/wiki_buffer/var.rb
deleted file mode 100644
index 81cd8677..00000000
--- a/vendor/plugins/wikicloth/lib/wiki_buffer/var.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-module WikiCloth
-
-class WikiBuffer::Var < WikiBuffer
-
- def initialize(data="",options={})
- super(data,options)
- self.buffer_type = "var"
- @in_quotes = false
- end
-
- def skip_html?
- true
- end
-
- def function_name
- @fname
- end
-
- def to_s
- if self.is_function?
- ret = "#{buffer_type}"
- ret += " function #{function_name}"
- ret += "(#{params.inspect})"
- ret += " [#{data}]"
- else
- ret = @options[:link_handler].include_resource("#{params[0]}".strip,params[1..-1])
- end
- ret ||= ""
- ret
- end
-
- def is_function?
- self.function_name.nil? || self.function_name.blank? ? false : true
- end
-
- protected
- def function_name=(val)
- @fname = val
- end
-
- def new_char()
- case
- when current_char == '|' && @in_quotes == false
- self.current_param = self.data
- self.data = ""
- self.params << ""
-
- # Start of either a function or a namespace change
- when current_char == ':' && @in_quotes == false && self.params.size <= 1
- self.function_name = self.data
- self.data = ""
- puts "[found var function (#{function_name})"
-
- # Dealing with variable names within functions
- # and variables
- when current_char == '=' && @in_quotes == false
- self.current_param = self.data
- self.data = ""
- self.name_current_param()
-
- # End of a template, variable, or function
- when current_char == '}' && previous_char == '}'
- self.data.chop!
- self.current_param = self.data
- self.data = ""
- return false
-
- else
- self.data += current_char
- end
-
- return true
- end
-
-end
-
-end
diff --git a/vendor/plugins/wikicloth/lib/wiki_cloth.rb b/vendor/plugins/wikicloth/lib/wiki_cloth.rb
deleted file mode 100644
index 4bdf6630..00000000
--- a/vendor/plugins/wikicloth/lib/wiki_cloth.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'jcode'
-
-module WikiCloth
-
-class WikiCloth
-
- def initialize(opt={})
- self.load(opt[:data],opt[:params]) unless opt[:data].nil? || opt[:data].blank?
- self.options[:link_handler] = opt[:link_handler] unless opt[:link_handler].nil?
- end
-
- def load(data,p={})
- data.gsub!(//,"")
- self.params = p
- self.html = data
- end
-
- def render(opt={})
- self.options = { :output => :html, :link_handler => self.link_handler, :params => self.params }.merge(opt)
- self.options[:link_handler].params = options[:params]
- buffer = WikiBuffer.new("",options)
- self.html.each_char { |c| buffer.add_char(c) }
- buffer.to_s
- end
-
- def to_html(opt={})
- self.render(opt)
- end
-
- def link_handler
- self.options[:link_handler] ||= WikiLinkHandler.new
- end
-
- def html
- @page_data
- end
-
- def params
- @page_params ||= {}
- end
-
- protected
- def options=(val)
- @options = val
- end
-
- def options
- @options ||= {}
- end
-
- def html=(val)
- @page_data = val
- end
-
- def params=(val)
- @page_params = val
- end
-
-end
-
-end
diff --git a/vendor/plugins/wikicloth/lib/wiki_link_handler.rb b/vendor/plugins/wikicloth/lib/wiki_link_handler.rb
deleted file mode 100644
index b240ad75..00000000
--- a/vendor/plugins/wikicloth/lib/wiki_link_handler.rb
+++ /dev/null
@@ -1,138 +0,0 @@
-require 'rubygems'
-require 'builder'
-
-module WikiCloth
-
-class WikiLinkHandler
-
- def references
- @references ||= []
- end
-
- def section_link(section)
- ""
- end
-
- def params
- @params ||= {}
- end
-
- def external_links
- @external_links ||= []
- end
-
- def find_reference_by_name(n)
- references.each { |r| return r if !r[:name].nil? && r[:name].strip == n }
- return nil
- end
-
- def reference_index(h)
- references.each_index { |r| return r+1 if references[r] == h }
- return nil
- end
-
- def references=(val)
- @references = val
- end
-
- def params=(val)
- @params = val
- end
-
- def external_link(url,text)
- self.external_links << url
- elem.a({ :href => url }) { |x| x << (text.blank? ? url : text) }
- end
-
- def external_links=(val)
- @external_links = val
- end
-
- def url_for(page)
- "javascript:void(0)"
- end
-
- def link_attributes_for(page)
- { :href => url_for(page) }
- end
-
- def link_for(page, text)
- ltitle = !text.nil? && text.blank? ? self.pipe_trick(page) : text
- ltitle = page if text.nil?
- elem.a(link_attributes_for(page)) { |x| x << ltitle.strip }
- end
-
- def include_resource(resource, options=[])
- return self.params[resource] unless self.params[resource].nil?
- end
-
- def link_for_resource(prefix, resource, options=[])
- ret = ""
- prefix.downcase!
- case
- when ["image","file","media"].include?(prefix)
- ret += wiki_image(resource,options)
- else
- title = options[0] ? options[0] : "#{prefix}:#{resource}"
- ret += link_for("#{prefix}:#{resource}",title)
- end
- ret
- end
-
- protected
- def pipe_trick(page)
- t = page.split(":")
- t = t[1..-1] if t.size > 1
- return t.join("").split(/[,(]/)[0]
- end
-
- # this code needs some work... lots of work
- def wiki_image(resource,options)
- pre_img = ''
- post_img = ''
- css = []
- loc = "right"
- type = nil
- w = 180
- h = nil
- title = nil
- ffloat = false
-
- options.each do |x|
- case
- when ["thumb","thumbnail","frame","border"].include?(x.strip)
- type = x.strip
- when ["left","right","center","none"].include?(x.strip)
- ffloat = true
- loc = x.strip
- when x.strip =~ /^([0-9]+)\s*px$/
- w = $1
- css << "width:#{w}px"
- when x.strip =~ /^([0-9]+)\s*x\s*([0-9]+)\s*px$/
- w = $1
- css << "width:#{w}px"
- h = $2
- css << "height:#{h}px"
- else
- title = x.strip
- end
- end
- css << "float:#{loc}" if ffloat == true
- css << "border:1px solid #000" if type == "border"
-
- sane_title = title.nil? ? "" : title.gsub(/<\/?[^>]*>/, "")
- if type == "thumb" || type == "thumbnail" || type == "frame"
- pre_img = '"
- for cell in row
- cell_attributes = cell[:style].blank? ? "" : " #{cell[:style].strip}"
- ret += "<#{cell[:type]}#{cell_attributes}>\n#{cell[:value].strip}\n#{cell[:type]}>"
- end
- ret += " "
- end
- ret += "#{post_img}"
- end
-
- def elem
- Builder::XmlMarkup.new
- end
-
-end
-
-end
diff --git a/vendor/plugins/wikicloth/run_tests.rb b/vendor/plugins/wikicloth/run_tests.rb
deleted file mode 100644
index e4a6f22c..00000000
--- a/vendor/plugins/wikicloth/run_tests.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-require 'init'
-include WikiCloth
-
-class CustomLinkHandler < WikiLinkHandler
- def include_resource(resource,options=[])
- case resource
- when "date"
- Time.now.to_s
- else
- # default behavior
- super(resource,options)
- end
- end
- def url_for(page)
- "javascript:alert('You clicked on: #{page}');"
- end
- def link_attributes_for(page)
- { :href => url_for(page) }
- end
-end
-@wiki = WikiCloth::WikiCloth.new({
- :data => "
Wikipedia Cheatsheet
-For more advanced details, see [[Wikipedia:How to edit a page|How to edit a page]]
-|-
-| width="25%" style="background:#cee0f2; padding:0.3em; text-align:center;"|'''Description'''
-| style="background:#cee0f2; padding:0.3em; text-align:center;"|'''You type'''
-| width="25%" style="background:#cee0f2; padding:0.3em; text-align:center;"|'''You get'''
-|-
-|[[Wikipedia:How_to_edit_a_page#Character_formatting|Italic text]]{{Anchor|Italic text}}
-|
-
-
-
-[[Name of page|Text to display]]
-|-
-|colspan="3" style="border-top:1px solid #cee0f2;"|
-|-
-|[[Wikipedia:How_to_edit_a_page#Links_and_URLs|External link]]{{Anchor|External link}}
-
-
-
-[http://www.example.org]
-http://www.example.org
-|-
-|colspan="3" style="border-top:1px solid #cee0f2;"|
-|-
-|[[Wikipedia:Redirect|Redirect to another page]]{{Anchor|Redirect to another page}}
-|
-
-{{tl|Reflist}}
-|
-|-
-|colspan="3" style="border-top:1px solid #cee0f2;"|
-|-
-|[[Wikipedia:How_to_edit_a_page#Headings|Section headings]]{{Anchor|Section headings}}''Applies only at the very beginning of lines.''
-
-
-
-
-
-* Two
-** Two point one
-* Three
-|
-* One
-* Two
-** Two point one
-* Three
-|-
-|colspan="3" style="border-top:1px solid #cee0f2;"|
-|-
-|[[Help:List|Numbered list]]{{Anchor|Numbered list}}
-
-# Two
-## Two point one
-# Three
-|
-# One
-# Two
-## Two point one
-# Three
-|-
-|colspan="3" style="border-top:1px solid #cee0f2;"|
-|-
-|[[Wikipedia:Extended_image_syntax|Thumbnail image]]{{Anchor|Thumbnail image}}
-|
-
-
-[[Special:Mypage|Username]] ([[Special:Mytalk|talk]])
-|-
-|colspan="3" style="border-top:1px solid #cee0f2;"|
-|-
-|Indenting text{{Anchor|Indenting text}}
-|
-
-
-
-
-:first indent
-::second indent
-:::third indent
-|-
-
-|colspan="3" style="border-top:1px solid #cee0f2; font-size:0.9em;"|
Martha Parke Custis (stepdaughter)
[[Eleanor Parke Custis Lewis]] (step-granddaughter, raised by Washington)
[[George Washington Parke Custis]] (step-grandson, raised by Washington)
-|religion = [[Church of England]]{{\}}[[Episcopal Church (United States)|Episcopal]]
-|occupation = [[Farmer]] ([[Plantation|Planter]])
[[Soldier]] ([[Officer (armed forces)|Officer]])
-|signature = George Washington signature.svg
-|allegiance = {{flagicon|United Kingdom|1606}} [[Kingdom of Great Britain]]
{{flag|United States|1777}}
-|branch =
-|serviceyears = 1752–1758
1775–1783
1798–1799
-|rank = [[Lieutenant General (United States)|Lieutenant General]]
[[General of the Armies|General of the Armies of the United States]] (posthumously in 1976)
-|commands = [[British Army]]'s [[Virginia Regiment]]
[[Continental Army]]
[[United States Army]]
-|battles = [[French and Indian War]]
*[[Battle of Jumonville Glen]]
*[[Battle of Fort Necessity]]
*[[Battle of the Monongahela]]
*[[Battle of Fort Duquesne]]
[[American Revolutionary War]]
*[[Boston campaign]]
*[[New York and New Jersey campaigns|New York campaign]]
*[[New York and New Jersey campaigns|New Jersey campaign]]
*[[Philadelphia campaign]]
*[[Yorktown Campaign|Yorktown campaign]]
-|awards = [[Congressional Gold Medal]], [[Thanks of Congress]]
-|footnotes = a See [[President of the Continental Congress|President of the United States, in Congress Assembled]].
b General Knox served as the [[Commanding General of the United States Army|Senior Officer of the United States Army]].
-}}
-'''George Washington''' ({{OldStyleDateDY|February 22,|1732|February 11, 1731}}Engber, Daniel (2006).[http://www.slate.com/id/2134455/ What's Benjamin Franklin's Birthday?]. (Both Franklin's and Washington's confusing birth dates are clearly explained.) Retrieved on June 17, 2009.The birth and death of George Washington are given using the [[Gregorian calendar]]. However, he was born when Britain and her colonies still used the Julian calendar, so contemporary records record his birth as February 11, 1731. The provisions of the [[Calendar (New Style) Act 1750]], implemented in 1752, altered the official British dating method to the Gregorian calendar with the start of the year on January 1.{{cite web |title=Image of page from family Bible |url=http://gwpapers.virginia.edu/project/faq/bible.html |publisher=Papers of George Washington |accessdate=2008-01-26}}{{ndash}} December 14, 1799) was the commander of the [[Continental Army]] in the [[American Revolutionary War]] (1775–1783) and served as the [[List of Presidents of the United States|first]] [[President of the United States|President]] of the [[United States]] of America (1789–1797).Under the Articles of Confederation Congress called its presiding officer "President of the United States in Congress Assembled." He had no executive powers, but the similarity of titles has confused people into thinking there were other presidents before Washington. Merrill Jensen, ''The Articles of Confederation'' (1959), 178–9 For his essential roles in both war and peace, he is often referred to as the father of his country.{{cite web |url=http://www.americaslibrary.gov/cgi-bin/page.cgi/aa/wash |title=George Washington |publisher=[[Library of Congress]] |accessdate=June 27, 2009}}{{cite web |url=http://www.pbs.org/georgewashington/father/index.html |title=Rediscovering George Washington |publisher=[[Public Broadcasting Service]] |accessdate=June 27, 2009}}
-
-The [[Continental Congress]] appointed Washington [[Commander-in-chief#United States|commander-in-chief]] of the American revolutionary forces in 1775. The following year, he forced the [[Boston campaign#Siege ends|British out of Boston]], [[New York and New Jersey campaign#Capture of New York|lost New York City]], and crossed the [[Delaware River]] [[New York and New Jersey campaign#Washington's counterstrike|in New Jersey, defeating the surprised enemy units]] later that year. As a result of his strategy, Revolutionary forces captured the two main British combat armies at [[Battles of Saratoga|Saratoga]] and [[Siege of Yorktown|Yorktown]]. Negotiating with Congress, the colonial states, and [[Early Modern France|French allies]], he held together a tenuous army and a fragile nation amid the threats of disintegration and failure. Following the end of the war in 1783, Washington returned to private life and retired to his plantation at [[Mount Vernon, Virginia|Mount Vernon]], prompting an incredulous [[George III of the United Kingdom|King George III]] to state, "If he does that, he will be the greatest man in the world."{{cite book
-|title= George Washington: The Founding Father |last=Johnson |first=Paul |publisher=Eminent Lives |date=2005 |quote=In London, George III questioned the American-born painter Benjamin West what Washington would do now he had won the war. 'Oh,' said West, 'they say he will return to his farm.' 'If he does that,' said the king, 'he will be the greatest man in the world.' |isbn=0-06-075365-X |publisher=HarperCollins |page=78 }}
-
-He presided over the [[Philadelphia Convention]] that drafted the [[United States Constitution]] in 1787 because of general dissatisfaction with the [[Articles of Confederation]]. Washington became President of the United States in 1789 and established many of the customs and usages of the [[Federal government of the United States|new government's]] executive department. He sought to create a nation capable of surviving in a world torn asunder by war between Britain and France. His unilateral [[Proclamation of Neutrality]] of 1793 provided a basis for [[United States non-interventionism|avoiding any involvement in foreign conflicts]]. He supported plans to build a strong [[federal government|central government]] by funding the [[Government debt|national debt]], implementing an [[Taxation in the United States|effective tax system]], and creating a [[national bank]]. Washington avoided the temptation of war and began a decade of peace with Britain via the [[Jay Treaty]] in 1795; he used his prestige to get it ratified over intense opposition from the [[Democratic-Republican Party|Jeffersonians]]. Although never officially joining the [[Federalist Party]], he supported its programs and was its inspirational leader. Washington's [[George Washington's Farewell Address|farewell address]] was a primer on republican virtue and a stern warning against partisanship, sectionalism, and involvement in foreign wars.
-
-Washington was awarded the very first [[Congressional Gold Medal]] with the [[Thanks of Congress]].[http://www.gutenberg.org/ebooks/21880 Loubat, J. F. and Jacquemart, Jules, Illustrator, ''The Medallic History of the United States of America 1776-1876''.]
-
-Washington died in 1799, and the funeral oration delivered by [[Henry Lee III|Henry Lee]] stated that of all Americans, he was "first in war, first in peace, and first in the hearts of his countrymen."[[Henry Lee III|Henry Lee]]'s eulogy to George Washington, December 26, 1799. {{cite book|last=Safire|first=William|authorlink=William Safire|title=Lend Me Your Ears: Great Speeches in History|year=2004|publisher=[[W. W. Norton & Company]]|location=New York|isbn=0-393-05931-6|pages=185–186}} Washington has been consistently ranked by scholars as one of the [[Historical rankings of United States Presidents|greatest U.S. Presidents]].
-
-==Early life and education==
-{{main|George Washington's early life}}
-[[Image:Gwstatue waterford.jpg|thumb|left|upright|Washington presents message at [[Fort Le Boeuf]] in 1753]]
-George Washington was born on {{OldStyleDateDY|February 22,|1732|February 11, 1731}} the first son of [[Augustine Washington]] and his second wife, [[Mary Ball Washington]], on the family's [[George Washington Birthplace National Monument|Pope's Creek Estate]] near present-day [[Colonial Beach, Virginia|Colonial Beach]] in [[Westmoreland County, Virginia]]. Moving to [[Ferry Farm]] in [[Stafford County, Virginia|Stafford County]] at age six, George was educated in the home by his father and older brother.{{cite book
-|last=Bell
-|first=William Gardner
-|title=Commanding Generals and Chiefs of Staff: 1775-2005; Portraits & Biographical Sketches of the United States Army's Senior Officer
-|url=http://www.history.army.mil/books/CG&CSA/CG-TOC.htm
-|accessdate=2009-03-04
-|date=1983
-|publisher=Center of Military History – United States Army
-|isbn=0–16–072376–0
-|id=CMH Pub 70–14
-|pages=52 & 66}} The growth of tobacco as a commodity in Virginia could be measured by the number of slaves imported to cultivate it. When Washington was born, the population of the colony was 50 percent black, mostly enslaved [[Africans]] and [[African Americans]].[http://www.nps.gov/archive/gewa/bowden&history.htm "Slavery at Popes Creek Plantation"], George Washington Birthplace National Monument, National Park Service, accessed 15 Apr 2009
-
-In his youth, Washington worked as a [[Surveying|surveyor]], and acquired what would become invaluable knowledge of the terrain around his native [[Colony of Virginia|Colony]] of [[History of Virginia|Virginia]].At the time Virginia included [[West Virginia]] and the upper [[Ohio River|Ohio Valley]] area around present day [[Pittsburgh]].
-
-==Career==
-Washington embarked upon a career as a planter, which historians defined as those who held 20 or more slaves. In 1748 he was invited to help survey [[Thomas Fairfax, 6th Lord Fairfax of Cameron|Lord Fairfax's]] lands west of the [[Blue Ridge Mountains|Blue Ridge]]. In 1749, he was appointed to his first public office, surveyor of newly created [[Culpeper County, Virginia|Culpeper County]]."[http://memory.loc.gov/ammem/gmdhtml/gwmaps.html Washington As Public Land Surveyor: Boyhood and Beginnings]" George Washington: Surveyor and Mapmaker. American Memory. Library of Congress. Retrieved on May 17, 2007. Through his half-brother, [[Lawrence Washington (1718–1752)|Lawrence Washington]], he became interested in the [[Ohio Company]], which aimed to exploit Western lands. In 1751, George and his half-brother traveled to [[Barbados]], staying at Bush Hill House,[http://research.history.org/Archaeological_Research/Research_Articles/ThemeCompCol/Barbados.cfm Bush Hill House] - Colonial Williamsburg Research Division hoping for an improvement in Lawrence's [[tuberculosis]]. This was the only time George Washington traveled outside what is now the United States.{{cite web |url=http://www.georgewashingtonbarbados.org/ |title=George Washington House Restoration Project in Barbados |accessdate=2008-01-21 }} After Lawrence's death in 1752, George inherited part of his estate and took over some of Lawrence's duties as [[adjutant]] of the colony.[http://memory.loc.gov/learn/lessons/gw/leader.html "George Washington: Making of a Military Leader]", ''American Memory'', Library of Congress. Retrieved on May 17, 2007
-
-Washington was appointed a district [[adjutant general]] in the [[Virginia militia]] in 1752, which appointed him Major Washington at the age of 20. He was charged with training the [[militia]] in the quarter assigned to him.Sparks, Jared (1839). [http://books.google.com/books?id=dBQOAAAAIAAJ&pg=RA1-PA17 ''The Life of George Washington''], Boston: Ferdinand Andrews. p. 17. Digitized by Google. Retrieved on May 17, 2007. At age 21, in [[Fredericksburg, Virginia|Fredericksburg]], Washington became a [[Master Mason]] in the organization of [[Freemasonry|Freemasons]], a [[fraternity|fraternal organization]] that was a lifelong influence.Tabbert, Mark A. (January 29, 2007). "[http://www.freemasons-freemasonry.com/tabbert1.html A Masonic Memorial to a Virtuous Man]". Pietre-Stones Review of Freemasonry. Retrieved on May 17, 2007.Washington Daylight Lodge #14 (2006). "[http://www.washingtondaylight.org/news/GW-Birthday-Speech.pdf Commemoration of George Washington’s Birthday]". Retrieved on August 21, 2007.
-
-In December 1753, Washington was asked by Governor [[Robert Dinwiddie]] of Virginia to carry a British ultimatum to the French on the [[Ohio]] frontier. Washington assessed French military strength and intentions, and delivered the message to the French at [[Fort Le Boeuf]] in present day [[Waterford, Pennsylvania]]. The message, which went unheeded, called for the French to abandon their development of the Ohio country. The two colonial powers were heading toward worldwide conflict. Washington's report on the affair was widely read on both sides of the Atlantic.
-
-==French and Indian War (Seven Years War)==
-{{main|George Washington in the French and Indian War}}
-{{Campaign
-|name=George Washington and [[French and Indian War|The French and Indian War]]
-|raw_name=Campaignbox French and Indian War
-|battles=[[Battle of Jumonville Glen|Jumonville Glen]] – [[Battle of the Great Meadows|Great Meadows]] - [[Braddock expedition|Monongahela]] - [[Battle of Fort Duquesne|Fort Duquesne]]
-}}
-[[Image:Washington 1772.jpg|thumb|right|The earliest known portrait of Washington, painted in 1772 by [[Charles Willson Peale]], showing Washington in uniform as colonel of the Virginia Regiment.]]
-In 1754, Dinwiddie commissioned Washington a [[Lieutenant Colonel|lieutenant colonel]] and ordered him to lead an expedition to [[Fort Duquesne]] to drive out the French. With his [[Native Americans in the United States|American Indian]] allies led by [[Tanacharison]], Washington and his troops [[Battle of Jumonville Glen|ambushed a French scouting party]] of some 30 men, led by [[Joseph Coulon de Jumonville]].Fred Anderson, ''Crucible of War'' (Vintage Books, 2001), p. 6. Washington and his troops were [[Battle of Fort Necessity|overwhelmed at Fort Necessity]] by a larger and better positioned French and Indian force. The terms of surrender included a statement that Washington had assassinated Jumonville after the ambush. Washington could not read French, and, unaware of what it said, signed his name.Lengel p.48 Released by the French, Washington returned to Virginia, where he was cleared of blame for the defeat, but resigned because he did not like the new arrangement of the Virginia Militia.
-
-In 1755, Washington was an aide to British General [[Edward Braddock]] on the ill-fated [[Braddock expedition|Monongahela expedition]]. This was a major effort to retake the Ohio Country. While Braddock was killed and the expedition ended in disaster, Washington distinguished himself as the Hero of the Monongahela.On British attitudes see John Shy, ''Numerous and Armed: Reflections on the Military Struggle for American Independence'' (1990) p. 39; Douglas Edward Leach. ''Roots of Conflict: British Armed Forces and Colonial Americans, 1677–1763'' (1986) p. 106; and John Ferling. ''Setting the World Ablaze: Washington, Adams, Jefferson, and the American Revolution'' (2002) p. 65 While Washington's role during the battle has been debated, biographer [[Joseph Ellis]] asserts that Washington rode back and forth across the battlefield, rallying the remnant of the British and Virginian forces to a retreat.[[Joseph J. Ellis|Ellis, Joseph J.]] ''[[His Excellency: George Washington]]''. (2004) ISBN 1-4000-4031-0. Subsequent to this action, Washington was given a difficult frontier command in the Virginia mountains, and was rewarded by being promoted to [[colonel]] and named commander of all Virginia forces.
-
-In 1758, Washington participated as a [[Brigadier General|brigadier general]] in the [[John Forbes (British Army officer)|Forbes expedition]] that prompted French evacuation of [[Fort Duquesne]], and British establishment of [[Pittsburgh]]. Later that year, Washington resigned from active military service and spent the next sixteen years as a Virginia planter and politician.For negative treatments of Washington's excessive ambition and military blunders, see Bernhard Knollenberg, ''George Washington: The Virginia Period, 1732–1775'' (1964) and Thomas A. Lewis, ''For King and Country: The Maturing of George Washington, 1748–1760'' (1992).
-
-==Between the wars==
-[[Image:Martha Dandridge Custis.jpg|thumb|A mezzotint of [[Martha Washington|Martha Dandridge Custis]], based on a 1757 portrait by [[John Wollaston (painter)|John Wollaston]].]]
-
-On [[January 6]], [[1759]], Washington married the widow [[Martha Washington|Martha Dandridge Custis]]. Surviving letters suggest that he may have been in love at the time with [[Sally Fairfax]], the wife of a friend. Some historians believe George and Martha were distantly related.
-
-Nevertheless, George and Martha made a good marriage, and together raised her two children from her previous marriage, [[John Parke Custis]] and Martha Parke Custis, affectionately called "Jackie" and "Patsy" by the family. Later the Washingtons raised two of Mrs. Washington's grandchildren, [[Eleanor Parke Custis Lewis|Eleanor Parke Custis]] and [[George Washington Parke Custis]]. George and Martha never had any children together—his earlier bout with smallpox followed, possibly, by tuberculosis may have made him sterile. The newlywed couple moved to Mount Vernon, where he took up the life of a planter and political figure.John K. Amory, M.D., "George Washington’s infertility: Why was the father of our country never a father?", ''Fertility and Sterility'', Vol. 81, No. 3, March 2004. [http://www.asrm.org/Professionals/Fertility&Sterility/georgewashington.pdf (online, PDF format)]
-
-Washington's marriage to Martha, a wealthy widow, greatly increased his property holdings and social standing. He acquired one-third of the 18,000 acre (73 km²) Custis estate upon his marriage, and managed the remainder on behalf of Martha's children. He frequently purchased additional land in his own name. In addition, he was granted land in what is now [[West Virginia]] as a bounty for his service in the French and Indian War. By 1775, Washington had doubled the size of Mount Vernon to {{convert|6500|acre|km2|0}}, and had increased the slave population there to more than 100 persons. As a respected military hero and large landowner, he held local office and was elected to the Virginia provincial legislature, the [[House of Burgesses]], beginning in 1758."Acreage, slaves, and social standing", Joseph Ellis, ''His Excellency, George Washington'', pp. 41–42, 48.
-[[Image:Mtvernon1.jpg|thumb|left|Washington enlarged the mansion at [[Mount Vernon]] after his marriage.]]
-
-Washington lived an aristocratic lifestyle—fox hunting was a favorite leisure activity. Like most Virginia planters, he imported luxuries and other goods from England and paid for them by exporting his tobacco crop. Extravagant spending and the unpredictability of the tobacco market meant that many Virginia planters of Washington's day were losing money. ([[Thomas Jefferson]], for example, would die deeply in debt.)
-
-Washington began to pull himself out of debt by diversification. By 1766, he had switched Mount Vernon's primary cash crop from tobacco to wheat, a crop which could be sold in America, and diversified operations to include flour milling, fishing, horse breeding, spinning, and weaving. Patsy Custis's tragic death in 1773 from epilepsy enabled Washington to pay off his British creditors, since half of her inheritance passed to him.Fox hunting: Ellis p. 44. Mount Vernon economy: John Ferling, ''The First of Men'', pp. 66–67; Ellis pp. 50–53; Bruce A. Ragsdale, "George Washington, the British Tobacco Trade, and Economic Opportunity in Pre-Revolutionary Virginia", in Don Higginbotham, ed., ''George Washington Reconsidered'', pp. 67–93.
-
-During these years, Washington concentrated on his business activities and remained somewhat aloof from politics. Although he expressed opposition to the [[Stamp Act 1765|1765 Stamp Act]], the first direct tax on the colonies, he did not take a leading role in the growing colonial resistance until after protests of the [[Townshend Acts]] (enacted in 1767) had become widespread. In May 1769, Washington introduced a proposal drafted by his friend [[George Mason]], which called for Virginia to boycott English goods until the Acts were repealed. Parliament repealed the Townshend Acts in 1770, and, for Washington at least, the crisis had passed. However, Washington regarded the passage of the [[Intolerable Acts]] in 1774 as "an Invasion of our Rights and Privileges". In July 1774, he chaired the meeting at which the "[[Fairfax Resolves]]" were adopted, which called for, among other things, the convening of a [[Continental Congress]]. In August, Washington attended the [[Virginia Conventions|First Virginia Convention]], where he was selected as a delegate to the [[First Continental Congress]].Washington, quoted in Ferling, p. 99.
-
-==American Revolution==
-{{main|George Washington in the American Revolution}}
-{{Campaign
-|name=George Washington and [[American Revolutionary War|The American Revolutionary War]]
-|raw_name=Campaignbox French and Indian War
-|battles=[[Siege of Boston|Boston]] – [[Battle of Long Island|Long Island]] - [[Battle of Kip's Bay|Kip's Bay]] - [[Battle of Harlem Heights|Harlem Heights]] -[[Battle of White Plains|White Plains]] - [[Battle of Fort Washington|Fort Washington]] - [[Battle of Trenton|Trenton]] - [[Battle of the Assunpink Creek|Assunpink Creek]] - [[Battle of Princeton|Princeton]] - [[Battle of Brandywine|Brandywine]] - [[Battle of Germantown|Germantown]] - [[Battle of White Marsh|White Marsh]] - [[Battle of Monmouth|Monmouth]] - [[Siege of Yorktown|Yorktown]]
-}}
-[[Image:Portrait of George Washington.jpeg|thumb|right|upright|Portrait of George Washington in military uniform, painted by [[Rembrandt Peale]].]]
-After [[Battles of Lexington and Concord|fighting broke out]] in April 1775, Washington appeared at the [[Second Continental Congress]] in military uniform, signaling that he was prepared for war. Washington had the prestige, the military experience, the charisma and military bearing, the reputation of being a strong patriot, and he was supported by the South, especially Virginia. Although he did not explicitly seek the office of commander and even claimed that he was not equal to it, there was no serious competition. Congress created the [[Continental Army]] on June 14, 1775; the next day, on the nomination of John Adams of [[Massachusetts]], Washington was appointed [[Major General]] and elected by Congress to be [[Commander-in-chief]].
-
-Washington assumed command of the Continental Army in the field at [[Cambridge, Massachusetts]] in July 1775, during the ongoing [[siege of Boston]]. Realizing his army's desperate shortage of gunpowder, Washington asked for new sources. British arsenals were raided (including some in the [[Caribbean]]) and some manufacturing was attempted; a barely adequate supply (about 2.5 million pounds) was obtained by the end of 1776, mostly from France.Orlando W. Stephenson, "The Supply of Gunpowder in 1776," ''American Historical Review'', Vol. 30, No. 2 (January 1925), pp. 271–281 in JSTOR Washington reorganized the army during the long standoff, and forced the British to withdraw by putting artillery on [[Fortification of Dorchester Heights|Dorchester Heights]] overlooking the city. The British [[Evacuation Day (Massachusetts)|evacuated Boston]] and Washington moved his army to [[New York City]].
-
-Although negative toward the patriots in the Continental Congress, British newspapers routinely praised Washington's personal character and qualities as a military commander.Bickham, Troy O. "Sympathizing with Sedition? George Washington, the British Press, and British Attitudes During the American War of Independence." ''William and Mary Quarterly'' 2002 59(1): 101–122. ISSN 0043-5597 [http://historycooperative.press.uiuc.edu/cgi-bin/justtop.cgi?act=justtop&url=http://www.historycooperative.org/journals/wm/59.1/bickham.html Fulltext online in History Cooperative] Moreover, both sides of the aisle in Parliament found the American general's courage, endurance, and attentiveness to the welfare of his troops worthy of approbation and examples of the virtues they and most {{Who|date=May 2009}} other Britons found wanting in their own commanders.{{Fact|date=May 2009}} Washington's refusal to become involved in politics buttressed his reputation as a man fully committed to the military mission at hand and above the factional fray.
-
-In August 1776, British General [[William Howe, 5th Viscount Howe|William Howe]] launched a massive naval and land campaign designed to seize New York and offer a negotiated settlement. The Continental Army under Washington engaged the enemy for the first time as an army of the newly declared independent United States at the [[Battle of Long Island]], the largest battle of the entire war. This and several other British victories sent Washington scrambling out of New York and across [[New Jersey]], leaving the future of the Continental Army in doubt. On the night of December 25, 1776, Washington staged a [[Battle of Trenton|counterattack]], leading the American forces [[Washington's crossing of the Delaware River|across the Delaware River]] to capture nearly 1,000 [[Hessian (soldiers)|Hessian]]s in [[Trenton, New Jersey]]. Washington followed up his victory at Trenton with another [[Battle of Princeton|one at Princeton]] in early January. These winter victories quickly raised the morale of the army, secured Washington's position as Commander, and inspired young men to join the army.{{Fact|date=June 2009}}
-
-British forces defeated Washington's troops in the [[Battle of Brandywine]] on September 11, 1777. Howe outmaneuvered Washington and marched into Philadelphia unopposed on September 26. Washington's army [[Battle of Germantown|unsuccessfully attacked]] the British garrison at [[Germantown, Philadelphia, Pennsylvania|Germantown]] in early October. Meanwhile, Burgoyne, out of reach from help from Howe, was trapped and forced to [[Battles of Saratoga|surrender his entire army]] at [[Saratoga, New York]]. France responded to Burgoyne's defeat by entering the war, openly allying with America and turning the Revolutionary War into a major worldwide war. Washington's loss of Philadelphia prompted some members of Congress to discuss removing Washington from command. This [[Conway Cabal|attempt]] failed after Washington's supporters rallied behind him.Fleming, T: "Washington's Secret War: the Hidden History of Valley Forge.", Smithsonian Books, 2005
-
-Washington's army camped at [[Valley Forge]] in December 1777, staying there for the next six months. Over the winter, 2,500 men of the 10,000-strong force died from disease and exposure. The next spring, however, the army emerged from Valley Forge in good order, thanks in part to a full-scale training program supervised by [[Friedrich Wilhelm von Steuben|Baron von Steuben]], a veteran of the Prussian general staff. The British evacuated Philadelphia to New York in 1778 but Washington [[Battle of Monmouth|attacked them at Monmouth]] and drove them from the battlefield. Afterwards, the British continued to head towards New York. Washington moved his army outside of New York.
-
-In the summer of 1779 at Washington's direction, [[Sullivan Expedition|General John Sullivan]] carried out a decisive [[scorched earth]] campaign that destroyed at least forty [[Iroquois]] villages throughout present-day central and upstate New York in retaliation for Iroquois and Tory attacks against American settlements earlier in the war. Washington delivered the final blow to the British in 1781, after a [[Battle of the Chesapeake|French naval victory]] allowed American and French forces to trap a British army in Virginia. The [[siege of Yorktown|surrender at Yorktown]] on October 17, 1781 marked the end of most fighting. Though known for his successes in the war and of his life that followed, Washington suffered many defeats before achieving victory.
-
-[[Image:General George Washington Resigning his Commission.jpg|thumb|left|Depiction by [[John Trumbull]] of Washington resigning his commission as [[commander-in-chief]].]]
-In March 1783, Washington used his influence to disperse a [[Newburgh Conspiracy|group of Army officers]] who had threatened to confront Congress regarding their back pay. By the [[Treaty of Paris (1783)|Treaty of Paris]] (signed that September), Great Britain recognized the independence of the United States. Washington disbanded his army and, on November 2, gave an eloquent farewell address to his soldiers.[http://memory.loc.gov/cgi-bin/ampage?collId=mgw3&fileName=mgw3b/gwpage016.db&recNum=347 George Washington Papers 1741–1799: Series 3b Varick Transcripts], ''American Memory'', Library of Congress, Accessed May 22, 2006.
-
-On November 25, the [[Evacuation Day (New York)|British evacuated New York City]], and Washington and the governor took possession. At [[Fraunces Tavern]] on December 4, Washington formally bade his officers farewell and on December 23, 1783, he resigned his commission as commander-in-chief, emulating the [[Cincinnatus|Roman general Cincinnatus]]. He was an exemplar of the republican ideal of citizen leadership who rejected power. During this period, the United States was governed without a President under the [[Articles of Confederation]], the forerunner to the [[United States Constitution|Constitution]].
-
-Washington's retirement to Mount Vernon was short-lived. He made an exploratory trip to the western frontier in 1784, was persuaded to attend the Constitutional Convention in [[Philadelphia]] in the summer of 1787, and was unanimously elected president of the Convention. He participated little in the debates involved (though he did vote for or against the various articles), but his high prestige maintained collegiality and kept the delegates at their labors. The delegates designed the presidency with Washington in mind, and allowed him to define the office once elected. After the Convention, his support convinced many, including the Virginia legislature, to vote for ratification; the new [[United States Constitution|Constitution]] was ratified by all 13 states.
-
-==Presidency==
-{{main|Presidency of George Washington}}
-
-[[Image:George Washington 1795.jpg|left|thumb|upright|Portrait by [[Gilbert Stuart]], 1795]]
-The [[Electoral College (United States)|Electoral College]] elected Washington unanimously in [[United States presidential election, 1789|1789]], and again in the [[United States presidential election, 1792|1792 election]]; he remains the only president to receive 100% of the electoral votes. At his inauguration, he insisted on having Barbados Rum served.Frost, Doug (January 6, 2005). "[http://www.sfgate.com/cgi-bin/article.cgi?file=/c/a/2005/01/06/WIGMQAL3K21.DTL Rum makers distill unsavory history into fresh products]". San Francisco Chronicle. [[John Adams]] was elected [[Vice President of the United States|vice president]]. Washington took the [[Oath of office of the President of the United States|oath of office]] as the [[George Washington 1789 presidential inauguration|first President under the Constitution]] for the United States of America on April 30, 1789 at [[Federal Hall]] in New York City although, at first, he had not wanted the position.{{cite book|last=Morison|first=Samuel Eliot|title=The Oxford History of the American People, Vol. 2|publisher=Meridian|year=1972|chapter=Washington's First Administration: 1789–1793}}
-
-The [[1st United States Congress]] voted to pay Washington a salary of $25,000 a year—a large sum in 1789. Washington, already wealthy, declined the salary, since he valued his image as a selfless public servant. At the urging of Congress, however, he ultimately accepted the payment, to avoid setting a precedent whereby the presidency would be perceived as limited only to independently wealthy individuals who could serve without any salary. Washington attended carefully to the pomp and ceremony of office, making sure that the titles and trappings were suitably republican and never emulated European royal courts. To that end, he preferred the title "Mr. President" to the more majestic names suggested.[http://revwar.blogspot.com/2008/07/george-washington-part-5-of-5.html My Crazy RevWar Life: George Washington - Part 5 of 5]
-
-Washington proved an able administrator. An excellent delegator and judge of talent and character, he held regular cabinet meetings to debate issues before making a final decision. In handling routine tasks, he was "systematic, orderly, energetic, solicitous of the opinion of others but decisive, intent upon general goals and the consistency of particular actions with them." Leonard D. White, ''The Federalists: A Study in Administrative History'' (1948)
-
-Washington reluctantly served a [[George Washington 1793 presidential inauguration|second term]] as president. He refused to run for a third, establishing the customary policy of a maximum of two terms for a president which later became law by the [[Twenty-second Amendment to the United States Constitution|22nd Amendment to the Constitution]].After [[Franklin D. Roosevelt|Franklin Delano Roosevelt]] was elected to an unprecedented four terms, the two-term limit was formally integrated into the Federal Constitution by the 22nd Amendment.
-
-===Domestic issues===
-Washington was not a member of any political party and hoped that they would not be formed, fearing conflict and stagnation. His closest advisors formed two factions, setting the framework for the future [[First Party System]]. Secretary of Treasury [[Alexander Hamilton]] had bold plans to establish the national credit and build a financially powerful nation, and formed the basis of the [[Federalist Party (United States)|Federalist Party]]. Secretary of State [[Thomas Jefferson]], founder of the [[Democratic-Republican Party|Jeffersonian Republicans]], strenuously opposed Hamilton's agenda, but Washington favored Hamilton over Jefferson.
-
-The [[Residence Act|Residence Act of 1790]], which Washington signed, authorized the President to select the specific location of the permanent seat of the government, which would be located along the Potomac River. The Act authorized the President to appoint three commissioners to survey and acquire property for this seat. [[History of Washington, D.C.#Founding|Washington personally oversaw this effort]] throughout his term in office. In 1791, the commissioners named the permanent seat of government "The City of Washington in the Territory of Columbia" to honor Washington. In 1800, the Territory of Columbia became the [[District of Columbia]] when the federal government moved to the site in accordance with the provisions of the Residence Act.[http://books.google.com/books?id=5Q81AAAAIAAJ&printsec=titlepage&source=gbs_summary_r&cad=0#PPR1,M1 Crew, Harvey W., Webb, William Bensing, Wooldridge, John, ''Centennial History of the City of Washington, D.C.'', United Brethren Publishing House, Dayton, Ohio, 1892], [http://books.google.com/books?id=5Q81AAAAIAAJ&printsec=titlepage&source=gbs_summary_r&cad=0#PPA87,M1 Chapter IV. "Permanent Capital Site Selected", p. 87] ''in'' [http://books.google.com/books Google Books]. Accessed May 7, 2009.[http://memory.loc.gov/cgi-bin/ampage?collId=llsl&fileName=001/llsl001.db&recNum=253 Text of Residence Act] ''in'' "[http://memory.loc.gov "American Memory" in official website of the U.S. Library of Congress] Accessed April 15, 2009.
-
-In 1791, Congress imposed an [[excise]] on distilled [[Distilled beverage|spirits]], which led to protests in frontier districts, especially Pennsylvania. By 1794, after Washington ordered the protesters to appear in [[United States district court|U.S. district court]], the protests turned into full-scale riots known as the [[Whiskey Rebellion]]. The federal army was too small to be used, so Washington invoked the [[Militia Act of 1792]] to summon the militias of Pennsylvania, Virginia, and several other states. The governors sent the troops and Washington took command, marching into the rebellious districts.{{cite web |last=Hoover |first=Michael |url=http://www.ttb.gov/public_info/whisky_rebellion.shtml |title=The Whiskey Rebellion |accessdate=2007-10-19 |date= |publisher=[[Alcohol and Tobacco Tax and Trade Bureau|United States Alcohol and Tobacco Tax and Trade Bureau]]}} There was no fighting, but Washington's forceful action proved the new government could protect itself. It also was one of only two times that a sitting President would personally command the military in the field. These events marked the first time under the new constitution that the federal government used strong military force to exert authority over the states and citizens.
-
-===Foreign affairs===
-[[Image:George Washington P1190516.jpg|thumb|upright|Statue of Washington in [[Paris]], [[France]]]]
-In 1793, the [[French Revolution|revolutionary government of France]] sent diplomat [[Edmond-Charles Genêt]], called "Citizen Genêt," to America. Genêt issued [[letter of marque|letters of marque and reprisal]] to American ships so they could capture British merchant ships. He attempted to turn popular sentiment towards American involvement in the [[French Revolutionary Wars|French war against Britain]] by creating a network of [[Democratic-Republican Societies]] in major cities. Washington rejected this interference in domestic affairs, demanded the French government recall Genêt, and denounced his societies.
-
-Hamilton and Washington designed the [[Jay Treaty]] to normalize trade relations with Britain, remove them from western forts, and resolve financial debts left over from the Revolution. [[John Jay]] negotiated and signed the treaty on November 19, 1794. The Jeffersonians supported France and strongly attacked the treaty. Washington and Hamilton, however, mobilized public opinion and won ratification by the Senate by emphasizing Washington's support. The British agreed to depart their forts around the [[Great Lakes]], the Canadian-U.S. boundary was adjusted, numerous pre-Revolutionary debts were liquidated, and the British opened their West Indies colonies to American trade. Most importantly, the treaty delayed war with Britain and instead brought a decade of prosperous trade with that country. This angered the French and became a central issue in political debates.
-
-===Farewell Address===
-[[George Washington's Farewell Address|Washington's Farewell Address]] (issued as a public letter in 1796) was one of the most influential statements of American political values. Matthew Spalding, ''The Command of its own Fortunes: Reconsidering Washington's Farewell address," in William D. Pederson, Mark J. Rozell, Ethan M. Fishman, eds. ''George Washington'' (2001) ch 2; Virginia Arbery, "Washington's Farewell Address and the Form of the American Regime." in Gary L. Gregg II and Matthew Spalding, eds. ''George Washington and the American Political Tradition.'' 1999 pp. 199–216.
-Drafted primarily by Washington himself, with help from Hamilton, it gives advice on the necessity and importance of national union, the value of the Constitution and the rule of law, the evils of political parties, and the proper virtues of a republican people. While he declined suggested versions[http://www.loc.gov/exhibits/religion/rel06.html Library of Congress - see Farewell Address section] that would have included statements that there could be no morality without religion, he called morality "a necessary spring of popular government". He said, "Whatever may be conceded to the influence of refined education on minds of peculiar structure, reason and experience both forbid us to expect that national morality can prevail in exclusion of religious principle.""[http://www.loc.gov/exhibits/religion/rel06.html Religion and the Federal Government]". Religion and the Founding of the American Republic. Library of Congress Exhibition. Retrieved on May 17, 2007.
-
-Washington's public political address warned against foreign influence in domestic affairs and American meddling in European affairs. He warned against bitter partisanship in domestic politics and called for men to move beyond partisanship and serve the common good. He warned against 'permanent alliances with any portion of the foreign world' ""[http://avalon.law.yale.edu/18th_century/washing.asp Washington's Farewell Address, 1796]" , saying the United States must concentrate primarily on American interests. He counseled friendship and commerce with all nations, but warned against involvement in European wars and entering into long-term "entangling" alliances. The address quickly set American values regarding religion and foreign affairs.
-
-==Retirement and death==
-After retiring from the presidency in March 1797, Washington returned to Mount Vernon with a profound sense of relief. He devoted much time to [[farming]].
-
-On July 4, 1798, Washington was commissioned by President [[John Adams]] to be [[Lieutenant General]] and [[Commander-in-chief]] of the armies raised or to be raised for service in a prospective war with France. He served as the [[Commanding General of the United States Army|senior officer of the United States Army]] between July 13, 1798 and December 14, 1799. He participated in the planning for a Provisional Army to meet any emergency that might arise, but did not take the field.{{cite book |comment=This reference is only for the July 4, 1798 date of the commissioning as a "Lieutenant General and Commander-in-chief of the armies raised or to be raised." (note this source notes that GW was commissioned while the CMH reference uses "appointed". The quote is slightly different in that this source has "of the armies raised" while the CMH reference uses "of all armies raised") |title=The World Book Encyclopedia |edition=1969 |volume=W*X*Y*Z |date=1969 |origyear=1917 |publisher=Field Enterprises Educational Corporation |oclc= |doi= |bibcode= |id=LOC 69-10030 |page=84a}}
-
-On December 12, 1799, Washington spent several hours inspecting his farms on horseback, in snow and later hail and freezing rain. He sat down to dine that evening without changing his wet clothes. The next morning, he awoke with a bad cold, fever, and a throat infection called [[peritonsillar abscess|quinsy]] that turned into acute [[laryngitis]] and [[pneumonia]]. Washington died on the evening of December 14, 1799, at his home aged 67, while attended by Dr. [[James Craik]], one of his closest friends, Dr. [[Gustavus Richard Brown]], Dr. [[Elisha C. Dick]], and [[Tobias Lear V]], Washington's personal secretary. Lear would record the account in his journal, writing that Washington's last words were "''
(Senior Officer of the US Army)}}
-{{s-bef|before=Brig. [[James Wilkinson]]}}
-{{s-ttl|title=[[Commanding General of the United States Army|Senior Officer of the United States Army]]|years=July 13, 1798–December 14, 1799}}
-{{s-aft|after=Maj. Gen. [[Alexander Hamilton]]}}
-{{s-off}}
-{{s-bef|before=Position created}}
-{{s-ttl|title=[[President of the United States]]|years=April 30, 1789–March 4, 1797}}
-{{s-aft|after=[[John Adams]]}}
-{{s-hon}}
-{{s-new}}
-{{s-ttl|title=[[oldest living United States president|Oldest U.S. President still living]]|years=April 30, 1789{{ndash}} December 14, 1799}}
-{{s-aft|after=[[John Adams]]}}
-{{s-aca}}
-{{succession box | title=Chancellor of [[The College of William & Mary]] | before=[[Richard Terrick]] | after=[[John Tyler]]
| years=1788–1799}}
-{{s-end}}
-{{GeorgeWashington}}
-{{US Presidents}}
-{{United States Constitution signatories}}
-{{Washington cabinet}}
-{{US Army Chiefs of Staff}}
-{{Washington family}}
-
-{{Persondata
-|NAME = Washington, George
-|ALTERNATIVE NAMES =
-|SHORT DESCRIPTION = 1st President of the United States, Commander in Chief of the Continental Army
-|DATE OF BIRTH = {{birth date|1732|2|22|mf=y}}
-|PLACE OF BIRTH = [[Colonial Beach, Virginia]], [[United States of America]]
-|DATE OF DEATH = {{death date|1799|12|14|mf=y}}
-|PLACE OF DEATH = [[Mount Vernon (plantation)]], [[Mount Vernon, Virginia]], United States of America
-}}
-[[Category:American Episcopalians]]
-[[Category:American farmers]]
-[[Category:1732 births]]
-[[Category:1799 deaths]]
-[[Category:American foreign policy writers]]
-[[Category:British colonial army officers]]
-[[Category:Chancellors of the College of William and Mary]]
-[[Category:College of William and Mary alumni]]
-[[Category:Congressional Gold Medal recipients]]
-[[Category:Continental Army generals]]
-[[Category:Continental Army officers from Virginia]]
-[[Category:Continental Congressmen from Virginia]]
-[[Category:George Washington| ]]
-[[Category:House of Burgesses members]]
-[[Category:People of Virginia in the French and Indian War]]
-[[Category:People of Virginia in the American Revolution]]
-[[Category:Presidents of the United States]]
-[[Category:Recipients of a posthumous promotion]]
-[[Category:Signers of the United States Constitution]]
-[[Category:United States presidential candidates, 1789]]
-[[Category:United States presidential candidates, 1792]]
-[[Category:United States presidential candidates, 1796]]
-[[Category:Virginia colonial people]]
-[[Category:Washington College alumni]]
-[[Category:Washington family]]
-[[Category:American planters]]
-[[Category:English Americans]]
-{{lifetime|1732|1799|Washington, George}}
-
-{{Link FA|bg}}
-{{Link FA|dv}}
-[[af:George Washington]]
-[[am:ጆርጅ ዋሽንግተን]]
-[[ang:George Washington]]
-[[ar:جورج واشنطن]]
-[[arc:ܓܘܪܓ ܘܐܫܝܢܓܛܘܢ]]
-[[ast:George Washington]]
-[[az:Corc Vaşinqton]]
-[[bn:জর্জ ওয়াশিংটন]]
-[[zh-min-nan:George Washington]]
-[[ba:Джордж Вашингтон]]
-[[be:Джордж Вашынгтон]]
-[[be-x-old:Джордж Вашынгтон]]
-[[bar:George Washington]]
-[[bs:George Washington]]
-[[br:George Washington]]
-[[bg:Джордж Вашингтон]]
-[[ca:George Washington]]
-[[ceb:George Washington]]
-[[cs:George Washington]]
-[[co:George Washington]]
-[[cy:George Washington]]
-[[da:George Washington]]
-[[de:George Washington]]
-[[dv:ޖޯޖް ވޮޝިންގޓަން]]
-[[et:George Washington]]
-[[el:Τζωρτζ Ουάσινγκτων]]
-[[es:George Washington]]
-[[eo:George Washington]]
-[[eu:George Washington]]
-[[fa:جورج واشنگتن]]
-[[fo:George Washington]]
-[[fr:George Washington]]
-[[fy:George Washington]]
-[[ga:George Washington]]
-[[gd:Seòras Washington]]
-[[gl:George Washington]]
-[[gan:喬治·華盛頓]]
-[[ko:조지 워싱턴]]
-[[hy:Ջորջ Վաշինգտոն]]
-[[hi:जार्ज वाशिंगटन]]
-[[hr:George Washington]]
-[[io:George Washington]]
-[[id:George Washington]]
-[[is:George Washington]]
-[[it:George Washington]]
-[[he:ג'ורג' וושינגטון]]
-[[jv:George Washington]]
-[[kn:ಜಾರ್ಜ್ ವಾಷಿಂಗ್ಟನ್]]
-[[pam:George Washington]]
-[[ka:ჯორჯ ვაშინგტონი]]
-[[sw:George Washington]]
-[[ku:George Washington]]
-[[la:Georgius Washingtonius]]
-[[lv:Džordžs Vašingtons]]
-[[lb:George Washington]]
-[[lt:George Washington]]
-[[hu:George Washington]]
-[[mk:Џорџ Вашингтон]]
-[[mg:George Washington]]
-[[ml:ജോര്ജ് വാഷിംഗ്ടണ്]]
-[[mr:जॉर्ज वॉशिंग्टन]]
-[[arz:جورج واشينطون]]
-[[ms:George Washington]]
-[[nah:George Washington]]
-[[nl:George Washington (president)]]
-[[ja:ジョージ・ワシントン]]
-[[no:George Washington]]
-[[nn:George Washington]]
-[[oc:George Washington]]
-[[uz:George Washington]]
-[[pap:George Washington]]
-[[nds:George Washington]]
-[[pl:George Washington]]
-[[pt:George Washington]]
-[[ksh:George Washington]]
-[[ro:George Washington]]
-[[qu:George Washington]]
-[[ru:Вашингтон, Джордж]]
-[[sa:जार्ज वाशिंगटन]]
-[[sco:George Washington]]
-[[sq:George Washington]]
-[[scn:George Washington]]
-[[simple:George Washington]]
-[[sk:George Washington]]
-[[sl:George Washington]]
-[[sr:Џорџ Вашингтон]]
-[[sh:George Washington]]
-[[fi:George Washington]]
-[[sv:George Washington]]
-[[tl:George Washington]]
-[[ta:ஜார்ஜ் வாஷிங்டன்]]
-[[th:จอร์จ วอชิงตัน]]
-[[tg:Ҷорҷ Вашингтон]]
-[[tr:George Washington]]
-[[uk:Джордж Вашингтон]]
-[[ur:جارج واشنگٹن]]
-[[vi:George Washington]]
-[[zh-classical:華盛頓]]
-[[yi:דזשארזש וואשינגטאן]]
-[[bat-smg:Džuordžos Vašėngtuons]]
-[[zh:乔治·华盛顿]]
diff --git a/vendor/plugins/wikicloth/sample_documents/images.wiki b/vendor/plugins/wikicloth/sample_documents/images.wiki
deleted file mode 100644
index 88933b7a..00000000
--- a/vendor/plugins/wikicloth/sample_documents/images.wiki
+++ /dev/null
@@ -1,15 +0,0 @@
-[[Image:wiki.png]]
-
-[[Image:wiki.png|Wikipedia, The Free Encyclopedia.]]
-
-[[Image:wiki.png|frame|Wikipedia Encyclopedia]]
-
-[[Image:wiki.png|thumb|Wikipedia Encyclopedia]]
-
-[[Image:wiki.png|right|Wikipedia Encyclopedia]]
-
-[[Image:wiki.png|30 px]]
-
-[[:Image:wiki.png]]
-
-
diff --git a/vendor/plugins/wikicloth/sample_documents/lists.wiki b/vendor/plugins/wikicloth/sample_documents/lists.wiki
deleted file mode 100644
index dfcd6f11..00000000
--- a/vendor/plugins/wikicloth/sample_documents/lists.wiki
+++ /dev/null
@@ -1,421 +0,0 @@
-This page deals with creating lists in Mediawiki.
-
-== List basics ==
-
-[[MediaWiki]] offers three types of lists. '''Ordered lists''', '''unordered lists''', and '''definition lists'''. In the following sections, ordered lists are used for examples. Unordered lists would give corresponding results.
-
-{|border="1" width="79%"
-!wikitext!!rendering
-|-
-|
- * Lists are easy to do:
- ** start every line
- * with a star
- ** more stars mean
- *** deeper levels
-||
-* Lists are easy to do:
-** start every line
-* with a star
-** more stars mean
-*** deeper levels
-|-
-|
- *A newline
- *in a list
- marks the end of the list.
- Of course
- *you can
- *start again.
-|
-*A newline
-*in a list
-marks the end of the list.
-Of course
-*you can
-*start again.
-|-
-|
- # Numbered lists are good
- ## very organized
- ## easy to follow
-|
-# Numbered lists are good
-## very organized
-## easy to follow
-|-
-|
- * You can also
- **break lines
- **like this
-|
-* You can also
-**break lines
-**like this
-|-
-|
- ; Definition lists
- ; item : definition
- ; semicolon plus term
- : colon plus definition
-|
-; Definition lists
-; item : definition
-; semicolon plus term
-: colon plus definition
-|-
-|
- * Or create mixed lists
- *# and nest them
- *#* like this
- *#*; definitions
- *#*: work:
- *#*; apple
- *#*; banana
- *#*: fruits
-|
-* Or create mixed lists
-*# and nest them
-*#* like this
-*#*; definitions
-*#*: work:
-*#*; apple
-*#*; banana
-*#*: fruits
-|}{{-}}
-
-== Paragraphs in lists ==
-
-For simplicity, list items in wiki markup cannot be longer than a paragraph. A following blank line will end the list and reset the counter on ordered lists. Separating unordered list items usually has no noticeable effects.
-
-Paragraphs can be forced in lists by using HTML tags. Two line break symbols,
, will create the desired effect. So will enclosing all but the first paragraph with
-
-For a list with items of more than one paragraph long, adding a blank line between items may be necessary to avoid confusion.
-
-*lists
-**ordered lists
-**unordered lists
-***definition lists
-
-==Continuing a list item after a sub-item==
-
-In HTML, a list item may contain several sublists, not necessarily adjacent; thus there may be parts of the list item not only before the first sublist, but also between sublists, and after the last one; however, in wiki-syntax, sublists follow the same rules as sections of a page: the only possible part of the list item not in sublists is before the first sublist.
-
-In the case of an unnumbered first-level list in wikitext code this limitation can be overcome by splitting the list into multiple lists; indented text between the partial lists may visually serve as part of a list item after a sublist; however, this may give, depending on CSS, a blank line before and after each list, in which case, for uniformity, every first-level list item could be made a separate list.
-
-Numbered lists illustrate that what should look like one list may, for the software, consist of multiple lists; unnumbered lists give a corresponding result, except that the problem of restarting with 1 is not applicable.
-
-{| style="border:1px;border-spacing:1px;background-color:black;" cellpadding="5"
-|- style="background-color:white;"
-|
-
-
-
continuing list item A1
-
-
-|- style="background-color:#E0E0E0;font-weight:bold;text-align:center;"
-| colspan="2" | vs.
-|- style="background-color:white;"
-|
- #list item A1
- ##list item B1
- ##list item B2
- #:continuing list item A1
- #list item A2
-|
-#list item A1
-##list item B1
-##list item B2
-#:continuing list item A1
-#list item A2
-|}
-
-One level deeper, with a sublist item continuing after a sub-sublist, one gets even more blank lines; however, the continuation of the first-level list is not affected:
-
-
continuing list item A1
-
-#list item A1
-##list item B1
-###list item C1
-##:continuing list item B1
-##list item B2
-#list item A2
-
-gives
-#list item A1
-##list item B1
-###list item C1
-##:continuing list item B1
-##list item B2
-#list item A2
-
-See also {{tim|List demo}} and [[Help:Section#Subdivisions in general|subdivisions]].
-
-== Changing the list type ==
-
-The list type (which type of marker appears before the list item) can be changed in CSS by setting the [http://www.w3.org/TR/REC-CSS2/generate.html#lists list-style-type] property:
-
-{|border="1" width="79%"
-!wikitext!!rendering
-|-
-|
-
-
-
-|-
-|}
-
-==Extra indentation of lists==
-In a numbered list in a large font, some browsers do not show more than two digits, unless extra indentation is applied (if there are multiple columns: for each column). This can be done with CSS:
- ol { margin-left: 2cm}
-or alternatively, like below.
-
-{|border=1
-!wikitext!!rendering
-! style="width: 40%" | comments
-|-
-|
-
-
-
-
-
-
-| MediaWiki translates an unordered list (ul) without any list items (li) into a div with a
-
-style="margin-left: 2em"
, causing indentation of the contents. This is '''the most versatile method''', as it allows starting with a number other than 1, see below.
-
-|-
-|
-
-#abc
-#def
-#ghi
-
-
-#abc
-#def
-#ghi
-
-|Like above, with the content of the "unordered list without any list items", which itself is an ordered list, expressed with # codes. The HTML produced, and hence the rendering, is the same. This is the '''recommended''' method when not starting with a number other than 1.
-
-|}
-
-To demonstrate that all three methods show all digits of 3-digit numbers, see [[m:Help:List demo|List demo]].
-
-==Specifying a starting value==
-Specifying a starting value is only possible with HTML syntax.
-(W3C has deprecated the start
and value
attributes as used below in HTML 4.01 and XHTML 1.0. But as of 2007, no popular web browsers implement CSS counters, which were to replace these attributes. Wikimedia projects use XHTML Transitional, which contains the deprecated attributes.)
-
-
-
-gives
-
-
-
-
-
-Or:
-
-
-gives
-
-
-
-
-
-==Comparison with a table==
-Apart from providing automatic numbering, the numbered list also aligns the contents of the items, comparable with using table syntax:
-
-{|
-|-
-| align=right | 9.||Amsterdam
-|-
-| align=right | 10.||Rotterdam
-|-
-| align=right | 11.||The Hague
-|}
-
-gives
-{|
-|-
-| align=right | 9.||Amsterdam
-|-
-| align=right | 10.||Rotterdam
-|-
-| align=right | 11.||The Hague
-|}
-
-This non-automatic numbering has the advantage that if a text refers to the numbers, insertion or deletion of an item does not disturb the correspondence.
-
-==Multi-column bulleted list==
-
-{|
-|
-*1
-*2
-|
-*3
-*4
-|}
-
-gives:
-{|
-|
-*1
-*2
-|
-*3
-*4
-|}
-
-==Multi-column numbered list==
-Specifying a starting value is useful for a numbered list with multiple columns, to avoid restarting from one in each column. As mentioned above, this is only possible with HTML-syntax (for the first column either wiki-syntax or HTML-syntax can be used).
-
-In combination with the extra indentation explained in the previous section:
-
-{| valign="top"
-|-
-|
-|
-|}
-
-
-gives
-
-{| valign="top"
-|-
-|
-|
-|}
-
-Using {{tim|multi-column numbered list}} the computation of the starting values can be automated, and only the first starting value and the number of items in each column except the last has to be specified. Adding an item to, or removing an item from a column requires adjusting only one number, the number of items in that column, instead of changing the starting numbers for all subsequent columns.
-
-{{Multi-column numbered list|125|a
{{Multi-column numbered list|lst=lower-alpha|125|a
{{Multi-column numbered list|lst=lower-roman|125|a
{{Multi-column numbered list|lst=disc|125|a
||
|| [[g (factor)|g]]
-|-
-||
||
|| [[Boston, Massachusetts|Boston]]
-|-
-||
||
|| [[The Lord of the Rings: The Fellowship of the Ring (video game)|The Fellowship of the Ring]]
-|-
-! colspan="3" style="text-align: left;" | Redirection
-|-
-||
||
|| [[Bush (43)|Bush]]
-|-
-||
||
|| [[Bush (41)|Bush]]
-|-
-! colspan="3" style="text-align: left;" | Normal titles
-|-
-||
||
|| [[Wikipedia:Help|Help]]
-|-
-! colspan="3" style="text-align: left;" | Users
-|-
-||
||
|| [[User:Example|Example]]
-|-
-|}
-
-==Where it does not work==
-===Cite.php <ref> footnotes===
-
-
-The trick does not work when enclosing between [[wikipedia:footnotes|"ref" tags]].
[[Roger Taylor (author)|]] renders in the references list (generated by the
renders in the edit history as:
-
-([[#Edit summaries and the pipe trick|→]]Edit summaries and the pipe trick: as tested in [[WP:SAND]])
-
-== Slash trick ==
-You can achieve the same effect for subpages by adding a slash:
generates the same output as
. Unlike the pipe trick, though, it will not be transformed in the [[wikitext]].
-
-This trick only works in namespaces where
would.
-
-== Reverse pipe trick ==
-Typing !!
) or start on new lines, each with its own single mark (!
).
-|-
-|
-
) or start on new lines, each with its own single mark (
).
-|-
-|
- ||
and !!
for optionally adding consecutive cells to a line. However, blank spaces at the beginning of a line are ignored.
-*'''XHTML attributes.''' Each mark, except table end, optionally accepts one or more XHTML attributes. Attributes must be on the same line as the mark. Separate attributes from each other with a single space.
-**Cells and caption (|
or ||
, !
or !!
, and |+
) hold content. So separate any attributes from content with a single pipe (|
). Cell content may follow on same line or on following lines.
-**Table and row marks ({|
and |-
) do not directly hold content. Do ''not'' add pipe (|
) after their optional attributes. If you erroneously add a pipe after attributes for the table mark or row mark the parser will delete it ''and'' your final attribute if it was touching the erroneous pipe!
-*'''Content''' may (a) follow its cell mark on the same line after any optional XHTML attributes or (b) on lines below the cell mark. Content that uses wiki markup that itself needs to start on a new line, such as lists, headings, or nested tables, must be on its own new line.
-
-==Basics==
-The following table lacks borders and good spacing but shows the simplest wiki markup table structure.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{|
-|Orange
-|Apple
-|-
-|Bread
-|Pie
-|-
-|Butter
-|Ice cream
-|}
-
-|
-{|
-|Orange
-|Apple
-|-
-|Bread
-|Pie
-|-
-|Butter
-|Ice cream
-|}
-|}
-
-The cells in the same row can be listed on one line separated by ||
.
-
-Extra spaces within cells in the wiki markup, as in the wiki markup below, do not affect the actual table rendering.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{|
-| Orange || Apple || more
-|-
-| Bread || Pie || more
-|-
-| Butter || Ice cream || and more
-|}
-
-|
-{|
-| Orange || Apple || more
-|-
-| Bread || Pie || more
-|-
-| Butter || Ice cream || and more
-|}
-|}
-
-=== Table headers ===
-Table headers can be created by using "!
" instead of "|
". Headers usually show up bold and centered by default.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{|
-! Item
-! Amount
-! Cost
-|-
-|Orange
-|10
-|7.00
-|-
-|Bread
-|4
-|3.00
-|-
-|Butter
-|1
-|5.00
-|-
-!Total
-|
-|15.00
-|}
-
-|
-{|
-! Item
-! Amount
-! Cost
-|-
-|Orange
-|10
-|7.00
-|-
-|Bread
-|4
-|3.00
-|-
-|Butter
-|1
-|5.00
-|-
-!Total
-|
-|15.00
-|}
-|}
-
-===Caption===
-A '''table caption''' can be added to the top of any table as follows.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{|
-|+Food complements
-|-
-|Orange
-|Apple
-|-
-|Bread
-|Pie
-|-
-|Butter
-|Ice cream
-|}
-
-|
-{|
-|+ Food complements
-|-
-|Orange
-|Apple
-|-
-|Bread
-|Pie
-|-
-|Butter
-|Ice cream
-|}
-|}
-
-== XHTML attributes ==
-You can add XHTML attributes to tables. For the authoriative source on these, see [http://www.w3.org/TR/REC-html40/struct/tables.html the W3C's HTML 4.01 Specification page on tables].
-
-=== Attributes on tables ===
-Placing attributes after the table start tag ({|
) applies attributes to the entire table.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{| border="1"
-|Orange
-|Apple
-|12,333.00
-|-
-|Bread
-|Pie
-|500.00
-|-
-|Butter
-|Ice cream
-|1.00
-|}
-
-|
-{| border="1"
-|Orange
-|Apple
-|12,333.00
-|-
-|Bread
-|Pie
-|500.00
-|-
-|Butter
-|Ice cream
-|1.00
-|}
-|}
-
-=== Attributes on cells ===
-You can put attributes on individual '''cells'''. For example, numbers may look better aligned right.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{| border="1"
-|Orange
-|Apple
-|align="right" | 12,333.00
-|-
-|Bread
-|Pie
-|align="right" | 500.00
-|-
-|Butter
-|Ice cream
-|align="right" | 1.00
-|}
-
-|
-{| border="1"
-|Orange
-|Apple
-|align="right"|12,333.00
-|-
-|Bread
-|Pie
-|align="right"|500.00
-|-
-|Butter
-|Ice cream
-|align="right"|1.00
-|}
-|}
-
-You can also use '''cell''' attributes when you are listing multiple '''cells''' on a single line. Note that the '''cells''' are separated by ||
, and within each '''cell''' the attribute(s) and value are separated by |
.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{| border="1"
-| Orange || Apple || align="right" | 12,333.00
-|-
-| Bread || Pie || align="right" | 500.00
-|-
-| Butter || Ice cream || align="right" | 1.00
-|}
-
-|
-{| border="1"
-| Orange || Apple || align="right" | 12,333.00
-|-
-| Bread || Pie || align="right" | 500.00
-|-
-| Butter || Ice cream || align="right" | 1.00
-|}
-|}
-
-===Attributes on rows===
-You can put attributes on individual '''rows''', too.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{| border="1"
-|Orange
-|Apple
-|align="right"|12,333.00
-|-
-|Bread
-|Pie
-|align="right"|500.00
-|- style="font-style:italic; color:green;"
-|Butter
-|Ice cream
-|align="right"|1.00
-|}
-
-|
-{| border="1"
-|Orange
-|Apple
-|align="right"|12,333.00
-|-
-|Bread
-|Pie
-|align="right"|500.00
-|- style="font-style:italic; color:green;"
-|Butter
-|Ice cream
-|align="right"|1.00
-|}
-|}
-
-===With HTML attributes and CSS styles===
-CSS style attributes can be added with or without other HTML attributes.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{| style="color:green; background-color:#ffffcc;" cellpadding="20" cellspacing="0" border="1"
-|Orange
-|Apple
-|-
-|Bread
-|Pie
-|-
-|Butter
-|Ice cream
-|}
-
-|
-{| style="color:green; background-color:#ffffcc;" cellpadding="20" cellspacing="0" border="1"
-|Orange
-|Apple
-|-
-|Bread
-|Pie
-|-
-|Butter
-|Ice cream
-|}
-|}
-
-'''Attributes''' can be added to the caption and headers as follows.
-
-{| cellspacing="0" border="1"
-!style="width:50%"|You type
-!style="width:50%"|You get
-|-
-|
-
-{| border="1" cellpadding="20" cellspacing="0"
-|+ align="bottom" style="color:#e76700;" |''Food complements''
-|-
-|Orange
-|Apple
-|-
-|Bread
-|Pie
-|-
-|Butter
-|Ice cream
-|}
-
-|
-{| border="1" cellpadding="20" cellspacing="0"
-|+ align="bottom" style="color:#e76700;" |''Food complements''
-|-
-|Orange
-|Apple
-|-
-|Bread
-|Pie
-|-
-|Butter
-|Ice cream
-|}
-|}
-
-==Caveats==
-===Negative numbers===
-If you start a cell on a new line with a negative number with a minus sign (or a parameter that evaluates to a negative number), your table can get broken, because the characters |-
will be parsed as the wiki markup for table row, not table cell. To avoid this, insert a space before the value (| -6
) or use in-line cell markup (|| -6
).
-===CSS vs Attributes===
-Table borders specified through CSS rather then the border attribute will render incorrectly in a small subset of text browsers.
-
diff --git a/vendor/plugins/wikicloth/tasks/wikicloth_tasks.rake b/vendor/plugins/wikicloth/tasks/wikicloth_tasks.rake
deleted file mode 100644
index e69de29b..00000000
diff --git a/vendor/plugins/wikicloth/test/test_helper.rb b/vendor/plugins/wikicloth/test/test_helper.rb
deleted file mode 100644
index 7d230758..00000000
--- a/vendor/plugins/wikicloth/test/test_helper.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-equire 'rubygems'
-require 'active_support'
-require 'active_support/test_case'
diff --git a/vendor/plugins/wikicloth/test/wiki_cloth_test.rb b/vendor/plugins/wikicloth/test/wiki_cloth_test.rb
deleted file mode 100644
index 552d7cd6..00000000
--- a/vendor/plugins/wikicloth/test/wiki_cloth_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class WikiClothTest < ActiveSupport::TestCase
- # Replace this with your real tests.
- test "the truth" do
- assert true
- end
-end
diff --git a/vendor/plugins/wikicloth/uninstall.rb b/vendor/plugins/wikicloth/uninstall.rb
deleted file mode 100644
index e69de29b..00000000