wsoc 0.1.2 → 0.1.3

data/.gitignore

@@ -0,0 +1,10 @@
+doc
+pkg
+tmp/*
+.yardoc
+.bundle
+.DS_Store
+*.db
+*.log
+*.swp
+*~

data/.yardopts

@@ -0,0 +1 @@
+--markup markdown --title 'Web Spider Obstacle Course (WSOC) Documentation' --protected --files ChangeLog.md,COPYING.txt

data/{History.rdoc → ChangeLog.md}

@@ -1,20 +1,30 @@
-=== 0.1.2 / 2010-01-10
+### 0.1.3 / 2010-07-02
+
+* Migrated off of Hoe and to Jeweler.
+* Manage all development dependencies with Bundler.
+* Removed the dependencey on nokogiri.
+* Upgraded from json to json_pure ~> 1.4.0.
+* Upgraded to sinatra ~> 1.0.
+* Switched to markdown formatted YARD documentation.
+* Added a meta-refresh/redirect obstacle to the course (thanks zapnap).
+
+### 0.1.2 / 2010-01-10
 
 * Emergency fix for a typo that only effected Ruby 1.9.1.
 
-=== 0.1.1 / 2010-01-06
+### 0.1.1 / 2010-01-06
 
 * Added WSOC::Specs.metadata.
 * Added WSOC::Specs.config.
 * Added {WSOC::Helpers::Authentication}.
-* Added a failing link to <tt>/course/remote/start.html</tt> with a bad TLD.
-* Added a failing link to <tt>/course/remote/start.html</tt> with the bad
+* Added a failing link to `/course/remote/start.html` with a bad TLD.
+* Added a failing link to `/course/remote/start.html` with the bad
   IP address +191.255.0.0+.
-* Added <tt>/course/auth</tt> for testing spidering of HTTP Basic
+* Added `/course/auth` for testing spidering of HTTP Basic
   Auth protected pages.
   * Added auth store information to the metadata within the specs.
 
-=== 0.1.0 / 2010-01-02
+### 0.1.0 / 2010-01-02
 
 * Initial release:
   * Written as a Sinatra application.
@@ -26,7 +36,7 @@
     * Links with relative-paths.
     * Links with absolute-paths.
     * Remote links.
-    * <tt>javascript:</tt> links.
+    * `javascript:` links.
     * Links within +frameset+ and +iframe+ tags.
     * HTTP 300, 301, 302, 303 and 307 Redirects.
 

data/Gemfile

@@ -0,0 +1,22 @@
+source 'https://rubygems.org'
+
+group(:runtime) do
+  gem 'json_pure',	'~> 1.4.0'
+  gem 'sinatra',	'~> 1.0'
+end
+
+group(:development) do
+  gem 'rake',			'~> 0.8.7'
+  gem 'jeweler',		'~> 1.4.0', :git => 'git://github.com/technicalpickles/jeweler.git'
+end
+
+group(:doc) do
+  case RUBY_PLATFORM
+  when 'java'
+    gem 'maruku',	'~> 0.6.0'
+  else
+    gem 'rdiscount',	'~> 1.6.3'
+  end
+
+  gem 'yard',		'~> 0.5.3'
+end

data/{README.rdoc → README.md}

@@ -1,15 +1,15 @@
-= Web Spider Obstacle Course (WSOC)
+# Web Spider Obstacle Course (WSOC)
 
-* http://github.com/postmodern/wsoc
-* http://github.com/postmodern/wsoc/issues
+* [github.com/postmodern/wsoc](http://github.com/postmodern/wsoc/)
+* [github.com/postmodern/wsoc/issues](http://github.com/postmodern/wsoc/issues)
 * Postmodern (postmodern.mod3 at gmail.com)
 
-== DESCRIPTION:
+## Description
 
 The Web Spider Obstacle Course (WSOC) is an example web server that tests
 the thoroughness and resilience of Web Spiders.
 
-== FEATURES:
+## Features
 
 * Written as a Sinatra application.
 * Provides Specs for the expected behavior of a web spider for every link in
@@ -24,22 +24,23 @@ the thoroughness and resilience of Web Spiders.
   * Links within +frameset+ and +iframe+ tags.
   * Cookie protected pages.
   * HTTP 300, 301, 302, 303 and 307 Redirects.
+  * Meta-Refresh Redirects.
   * HTTP Baisc Auth protected pages.
 
-== SYNOPSIS:
+## Synopsis
 
-  $ wsoc_server -p 8080
+    $ wsoc_server -p 8080
 
-== REQUIREMENTS:
+## Requirements
 
-* {sinatra}[http://sinatrarb.com] >= 0.9.4
-* {json}[http://json.rubyforge.org] >= 1.2.0
+* [json_pure](http://flori.github.com/json/) ~> 1.4.0
+* [sinatra](http://sinatrarb.com) ~> 1.0
 
-== INSTALL:
+## Install
 
-  $ sudo gem install wsoc
+    $ sudo gem install wsoc
 
-== LICENSE:
+## License
 
 WSOC - The Web Spider Obstacle Course
 

data/Rakefile

@@ -1,21 +1,29 @@
-# -*- ruby -*-
-
 require 'rubygems'
-require 'hoe'
-require 'hoe/signing'
-
-Hoe.plugin :yard
+require 'bundler'
 
-Hoe.spec('wsoc') do
-  self.developer('Postmodern', 'postmodern.mod3@gmail.com')
+begin
+  Bundler.setup(:development, :doc)
+rescue Bundler::BundlerError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 
-  self.yard_opts += ['--protected']
-  self.remote_yard_dir = '/'
+require 'rake'
+require 'jeweler'
+require './lib/wsoc/version.rb'
 
-  self.extra_deps += [
-    ['json', '>=1.2.0'],
-    ['sinatra', '>=0.9.4']
-  ]
+Jeweler::Tasks.new do |gem|
+  gem.name = 'wsoc'
+  gem.version = WSOC::VERSION
+  gem.license = 'GPL-2'
+  gem.summary = %Q{An example web server that tests the thoroughness and resilience of Web Spiders}
+  gem.description = %Q{The Web Spider Obstacle Course (WSOC) is an example web server that tests the thoroughness and resilience of Web Spiders.}
+  gem.email = 'postmodern.mod3@gmail.com'
+  gem.homepage = 'http://github.com/postmodern/wsoc'
+  gem.authors = ['Postmodern']
+  gem.has_rdoc = 'yard'
 end
 
-# vim: syntax=ruby
+require 'yard'
+YARD::Rake::YardocTask.new

data/lib/wsoc/app.rb

@@ -25,7 +25,6 @@ require 'wsoc/version'
 
 require 'rubygems'
 require 'sinatra'
-require 'nokogiri'
 
 module WSOC
   class App < Sinatra::Base
@@ -113,6 +112,12 @@ module WSOC
 
     course_pass '/course/redirects/307/pass.html'
 
+    get '/course/redirects/meta.html' do
+      course_page :course_redirects_meta
+    end
+
+    course_pass '/course/redirects/meta/pass.html'
+
     get '/course/cookies/start.html' do
       response.set_cookie 'auth_level', '1'
 

data/lib/wsoc/course_specs.rb

@@ -125,6 +125,10 @@ module WSOC
                  'should visit the 307 HTTP redirect test page'
     should_visit '/course/redirects/307/pass.html',
                  'should follow HTTP 307 redirects'
+    should_visit '/course/redirects/meta.html',
+                 'should visit the meta refresh redirect test page'
+    should_visit '/course/redirects/meta/pass.html',
+                 'should follow meta refresh (soft) redirects'
 
     config :auth_store, {
       '/course/auth/' => {

data/lib/wsoc/version.rb

@@ -20,5 +20,5 @@
 
 module WSOC
   # wsoc version
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/views/course_redirects_meta.erb

@@ -0,0 +1,8 @@
+<html>
+  <head>
+    <meta http-equiv="refresh" content="2; url=/course/redirects/meta/pass.html">
+  </head>
+  <body>
+    Redirecting...
+  </body>
+</html>

data/views/course_redirects_start.erb

@@ -12,6 +12,7 @@
       <li><a href="302.html">HTTP 302 Redirect</a></li>
       <li><a href="303.html">HTTP 303 Redirect</a></li>
       <li><a href="307.html">HTTP 307 Redirect</a></li>
+      <li><a href="meta.html">Meta Refresh "Soft" Redirect</a></li>
     </ul>
   </body>
 </html>

data/wsoc.gemspec

@@ -0,0 +1,99 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{wsoc}
+  s.version = "0.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Postmodern"]
+  s.date = %q{2010-07-02}
+  s.default_executable = %q{wsoc_server}
+  s.description = %q{The Web Spider Obstacle Course (WSOC) is an example web server that tests the thoroughness and resilience of Web Spiders.}
+  s.email = %q{postmodern.mod3@gmail.com}
+  s.executables = ["wsoc_server"]
+  s.extra_rdoc_files = [
+    "ChangeLog.md",
+    "README.md"
+  ]
+  s.files = [
+    ".gitignore",
+    ".yardopts",
+    "COPYING.txt",
+    "ChangeLog.md",
+    "Gemfile",
+    "README.md",
+    "Rakefile",
+    "bin/wsoc_server",
+    "config.ru",
+    "lib/wsoc.rb",
+    "lib/wsoc/app.rb",
+    "lib/wsoc/config.rb",
+    "lib/wsoc/course.rb",
+    "lib/wsoc/course_specs.rb",
+    "lib/wsoc/helpers.rb",
+    "lib/wsoc/helpers/authentication.rb",
+    "lib/wsoc/helpers/course.rb",
+    "lib/wsoc/helpers/rendering.rb",
+    "lib/wsoc/runner.rb",
+    "lib/wsoc/specs.rb",
+    "lib/wsoc/version.rb",
+    "public/css/layout.css",
+    "public/css/specs.css",
+    "public/js/jquery-1.3.2.min.js",
+    "views/course_absolute_start.erb",
+    "views/course_auth_start.erb",
+    "views/course_cookies_get.erb",
+    "views/course_cookies_start.erb",
+    "views/course_empty_start.erb",
+    "views/course_fail.erb",
+    "views/course_frames_frame.erb",
+    "views/course_frames_iframe.erb",
+    "views/course_frames_start.erb",
+    "views/course_javascript_start.erb",
+    "views/course_loop_next.erb",
+    "views/course_loop_start.erb",
+    "views/course_pass.erb",
+    "views/course_redirects_meta.erb",
+    "views/course_redirects_start.erb",
+    "views/course_relative_start.erb",
+    "views/course_remote_next.erb",
+    "views/course_remote_start.erb",
+    "views/course_start.erb",
+    "views/layout.erb",
+    "views/specs.erb",
+    "views/welcome.erb",
+    "wsoc.gemspec"
+  ]
+  s.has_rdoc = %q{yard}
+  s.homepage = %q{http://github.com/postmodern/wsoc}
+  s.licenses = ["GPL-2"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{An example web server that tests the thoroughness and resilience of Web Spiders}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.0"])
+      s.add_runtime_dependency(%q<sinatra>, ["~> 1.0"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.4.0"])
+    else
+      s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
+      s.add_dependency(%q<sinatra>, ["~> 1.0"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
+    end
+  else
+    s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
+    s.add_dependency(%q<sinatra>, ["~> 1.0"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
+  end
+end
+

metadata

@@ -1,195 +1,170 @@
 --- !ruby/object:Gem::Specification 
 name: wsoc
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Postmodern
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDQDCCAiigAwIBAgIBADANBgkqhkiG9w0BAQUFADBGMRgwFgYDVQQDDA9wb3N0
-  bW9kZXJuLm1vZDMxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixk
-  ARkWA2NvbTAeFw0wOTA2MDMwNDU5MDNaFw0xMDA2MDMwNDU5MDNaMEYxGDAWBgNV
-  BAMMD3Bvc3Rtb2Rlcm4ubW9kMzEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYK
-  CZImiZPyLGQBGRYDY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-  1wvANkTDHFgVih5XLjuTwTZjgBq1lBGybXJiH6Id1lY2JOMqM5FB1DDHVvvij94i
-  mJabN0zkzu6VKWC70y0IwOxY7CPokr0eFdK/D0y7mCq1P8QITv76i2YqAl0eYqIt
-  W+IhIkANQ7E6uMZIZcdnfadC6lPAtlKkqtd9crvRbFgr6e3kyflmohbRnTEJHoRd
-  7SHHsybE6DSn7oTDs6XBTNrNIn5VfZA0z01eeos/+zBm1zKJOK2+/7xtLLDuDU9G
-  +Rd+ltUBbvxUrMNZmDG29pnmN2xTRH+Q8HxD2AxlvM5SRpK6OeZaHV7PaCCAVZ4L
-  T9BFl1sfMvRlABeGEkSyuQIDAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
-  sDAdBgNVHQ4EFgQUKwsd+PqEYmBvyaTyoL+uRuk+PhEwDQYJKoZIhvcNAQEFBQAD
-  ggEBAB4TvHsrlbcXcKg6gX5BIb9tI+zGkpzo0Z7jnxMEcNO7NGGwmzafDBI/xZYv
-  xkRH3/HXbGGYDOi6Q6gWt5GujSx0bOImDtYTJTH8jnzN92HzEK5WdScm1QpZKF1e
-  cezArMbxbSPaosxTCtG6LQTkE28lFQsmFZ5xzouugS4h5+LVJiVMmiP+l3EfkjFa
-  GOURU+rNEMPWo8MCWivGW7jes6BMzWHcW7DQ0scNVmIcCIgdyMmpscuAEOSeghy9
-  /fFs57Ey2OXBL55nDOyvN/ZQ2Vab05UH4t+GCxjAPeirzL/29FBtePT6VD44c38j
-  pDj+ws7QjtH/Qcrr1l9jfN0ehDs=
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2010-01-10 00:00:00 -08:00
-default_executable: 
+date: 2010-07-02 00:00:00 -07:00
+default_executable: wsoc_server
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: json_pure
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.0
-    version: 
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: yard
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe-yard
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
-    version: 
-description: |-
-  The Web Spider Obstacle Course (WSOC) is an example web server that tests
-  the thoroughness and resilience of Web Spiders.
-email: 
-- postmodern.mod3@gmail.com
+  prerelease: false
+  version_requirements: *id004
+description: The Web Spider Obstacle Course (WSOC) is an example web server that tests the thoroughness and resilience of Web Spiders.
+email: postmodern.mod3@gmail.com
 executables: 
 - wsoc_server
 extensions: []
 
 extra_rdoc_files: 
-- COPYING.txt
-- Manifest.txt
-- History.rdoc
+- ChangeLog.md
+- README.md
 files: 
+- .gitignore
+- .yardopts
 - COPYING.txt
-- History.rdoc
-- Manifest.txt
-- README.rdoc
+- ChangeLog.md
+- Gemfile
+- README.md
 - Rakefile
-- config.ru
 - bin/wsoc_server
+- config.ru
 - lib/wsoc.rb
+- lib/wsoc/app.rb
 - lib/wsoc/config.rb
-- lib/wsoc/specs.rb
+- lib/wsoc/course.rb
 - lib/wsoc/course_specs.rb
 - lib/wsoc/helpers.rb
-- lib/wsoc/helpers/rendering.rb
 - lib/wsoc/helpers/authentication.rb
 - lib/wsoc/helpers/course.rb
-- lib/wsoc/course.rb
-- lib/wsoc/app.rb
+- lib/wsoc/helpers/rendering.rb
 - lib/wsoc/runner.rb
+- lib/wsoc/specs.rb
 - lib/wsoc/version.rb
 - public/css/layout.css
 - public/css/specs.css
 - public/js/jquery-1.3.2.min.js
-- views/layout.erb
-- views/specs.erb
-- views/course_pass.erb
-- views/course_fail.erb
-- views/course_start.erb
-- views/course_relative_start.erb
 - views/course_absolute_start.erb
+- views/course_auth_start.erb
+- views/course_cookies_get.erb
+- views/course_cookies_start.erb
 - views/course_empty_start.erb
-- views/course_javascript_start.erb
-- views/course_frames_start.erb
+- views/course_fail.erb
 - views/course_frames_frame.erb
 - views/course_frames_iframe.erb
-- views/course_loop_start.erb
+- views/course_frames_start.erb
+- views/course_javascript_start.erb
 - views/course_loop_next.erb
-- views/course_remote_start.erb
-- views/course_remote_next.erb
-- views/course_cookies_start.erb
-- views/course_cookies_get.erb
+- views/course_loop_start.erb
+- views/course_pass.erb
+- views/course_redirects_meta.erb
 - views/course_redirects_start.erb
-- views/course_auth_start.erb
+- views/course_relative_start.erb
+- views/course_remote_next.erb
+- views/course_remote_start.erb
+- views/course_start.erb
+- views/layout.erb
+- views/specs.erb
 - views/welcome.erb
+- wsoc.gemspec
 has_rdoc: yard
 homepage: http://github.com/postmodern/wsoc
-licenses: []
-
+licenses: 
+- GPL-2
 post_install_message: 
-rdoc_options: 
-- --protected
-- --title
-- Wsoc Documentation
-- --quiet
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -852470147
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: wsoc
-rubygems_version: 1.3.5
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: The Web Spider Obstacle Course (WSOC) is an example web server that tests the thoroughness and resilience of Web Spiders.
+summary: An example web server that tests the thoroughness and resilience of Web Spiders
 test_files: []
 

data/Manifest.txt

@@ -1,43 +0,0 @@
-COPYING.txt
-History.rdoc
-Manifest.txt
-README.rdoc
-Rakefile
-config.ru
-bin/wsoc_server
-lib/wsoc.rb
-lib/wsoc/config.rb
-lib/wsoc/specs.rb
-lib/wsoc/course_specs.rb
-lib/wsoc/helpers.rb
-lib/wsoc/helpers/rendering.rb
-lib/wsoc/helpers/authentication.rb
-lib/wsoc/helpers/course.rb
-lib/wsoc/course.rb
-lib/wsoc/app.rb
-lib/wsoc/runner.rb
-lib/wsoc/version.rb
-public/css/layout.css
-public/css/specs.css
-public/js/jquery-1.3.2.min.js
-views/layout.erb
-views/specs.erb
-views/course_pass.erb
-views/course_fail.erb
-views/course_start.erb
-views/course_relative_start.erb
-views/course_absolute_start.erb
-views/course_empty_start.erb
-views/course_javascript_start.erb
-views/course_frames_start.erb
-views/course_frames_frame.erb
-views/course_frames_iframe.erb
-views/course_loop_start.erb
-views/course_loop_next.erb
-views/course_remote_start.erb
-views/course_remote_next.erb
-views/course_cookies_start.erb
-views/course_cookies_get.erb
-views/course_redirects_start.erb
-views/course_auth_start.erb
-views/welcome.erb