Skip to content

Commit

Permalink
Merge pull request #88 from randomecho/linkrot
Browse files Browse the repository at this point in the history
Updates links on About, Docs, FAQ, Config to correct locations
  • Loading branch information
cschneid committed Dec 14, 2012
2 parents 7617305 + 640d5da commit 6346b79
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 69 deletions.
14 changes: 7 additions & 7 deletions about.markdown
Expand Up @@ -12,14 +12,14 @@ California.

Sinatra would not have been possible whithout strong company backing.
In the past, financial and emotional support have been provided mainly by
[Heroku](http://heroku.com), [GitHub](http://github.com) and
[Heroku](http://heroku.com), [GitHub](https://github.com) and
[Engine Yard](http://www.engineyard.com/), and is now taken care of by
[Travis CI](http://travis-ci.com/).

Special thanks to the following extraordinary individuals, without whom
Sinatra would not be possible:

* [Ryan Tomayko](http://tomayko.com/about) (rtomayko) for constantly fixing
* [Ryan Tomayko](http://tomayko.com/) (rtomayko) for constantly fixing
whitespace errors __60d5006__
* [Ezra Zygmuntowicz](http://brainspl.at/) (ezmobius) for initial help and
letting Blake steal some of merbs internal code.
Expand All @@ -38,16 +38,16 @@ Sinatra would not be possible:
Thin/Passenger.
* [Jon Crosby](http://joncrosby.me/) (jcrosby) for coffee breaks, doc fixes, and
just because, man.
* [Karel Minarik](http://github.com/karmi) (karmi) for screaming until the
* [Karel Minarik](https://github.com/karmi) (karmi) for screaming until the
website came back up.
* [Jeremy Evans](http://code.jeremyevans.net/) (jeremyevans) for unbreaking
optional path params (twice!)
* [The GitHub guys](http://github.com/) for stealing Blake's table.
* [The GitHub guys](https://github.com/) for stealing Blake's table.
* [Nickolas Means](http://nmeans.org/) (nmeans) for Sass template support.
* [Victor Hugo Borja](http://github.com/vic) (vic) for splat'n routes specs and
* [Victor Hugo Borja](https://github.com/vic) (vic) for splat'n routes specs and
doco.
* [Avdi Grimm](http://avdi.org/) (avdi) for basic RSpec support.
* [Jack Danger Canty](http://6brand.com/) for a more accurate root directory
* [Jack Danger Canty](http://jåck.com/) for a more accurate root directory
and for making me watch [this](http://www.youtube.com/watch?v=ueaHLHgskkw) just
now.
* **Mathew Walker** for making escaped paths work with static files.
Expand All @@ -68,7 +68,7 @@ Sinatra would not be possible:
* **Vasily Polovnyov**, **Nickolay Schwarz**, **Luciano Sousa**, **Wu Jiang**,
**Mickael Riga**, **Bernhard Essl**, **Janos Hardi**, **Kouhei Yanagita** and
**"burningTyger"** for willingly translating whatever ends up in the README.
* [Wordy](http://www.wordy.com/) for proofreading our README. **73e137d**
* [Wordy](https://wordy.com/) for proofreading our README. **73e137d**
* **cactus** for digging through code and specs, multiple times.
* **Nicolás Sanguinetti** (foca) for strong demand of karma and shaping
helpers/register.
Expand Down
2 changes: 1 addition & 1 deletion configuration.markdown
Expand Up @@ -236,7 +236,7 @@ handler or Rack middleware, such as [`Rack::ShowExceptions`][se] or
[`Rack::MailExceptions`][me].

[se]: http://rack.rubyforge.org/doc/classes/Rack/ShowExceptions.html
[me]: http://github.com/rack/rack-contrib/blob/master/lib/rack/contrib/mailexceptions.rb
[me]: https://github.com/rack/rack-contrib/blob/master/lib/rack/contrib/mailexceptions.rb

### `:lock` - ensure single request concurrency with a mutex lock

Expand Down
76 changes: 38 additions & 38 deletions documentation.markdown
Expand Up @@ -45,53 +45,53 @@ in `#sinatra`.

See the `CHANGES` file included for release notes about each release:

* [1.3.3](http://github.com/sinatra/sinatra/blob/1.3.3/CHANGES)
* [1.3.3](https://github.com/sinatra/sinatra/blob/1.3.3/CHANGES)
August 19, 2012
* [1.3.2](http://github.com/sinatra/sinatra/blob/1.3.2/CHANGES)
* [1.3.2](https://github.com/sinatra/sinatra/blob/1.3.2/CHANGES)
December 30, 2011
* [1.3.1](http://github.com/sinatra/sinatra/blob/47c11e5f624f0018e961dc3e0628a8d732b683a5/CHANGES)
* [1.3.1](https://github.com/sinatra/sinatra/blob/47c11e5f624f0018e961dc3e0628a8d732b683a5/CHANGES)
October 4, 2011
* [1.3.0](http://github.com/sinatra/sinatra/blob/1.3.0/CHANGES)
* [1.3.0](https://github.com/sinatra/sinatra/blob/1.3.0/CHANGES)
September 30, 2011
* [1.2.8](http://github.com/sinatra/sinatra/blob/1.2.8/CHANGES)
* [1.2.8](https://github.com/sinatra/sinatra/blob/1.2.8/CHANGES)
December 30, 2011
* [1.2.7](http://github.com/sinatra/sinatra/blob/1.2.7/CHANGES)
* [1.2.7](https://github.com/sinatra/sinatra/blob/1.2.7/CHANGES)
September 30, 2011
* [1.2.6](http://github.com/sinatra/sinatra/blob/1.2.6/CHANGES)
* [1.2.6](https://github.com/sinatra/sinatra/blob/1.2.6/CHANGES)
May 1, 2011
* [1.2.5](http://github.com/sinatra/sinatra/blob/1.2.5/CHANGES)
* [1.2.5](https://github.com/sinatra/sinatra/blob/1.2.5/CHANGES)
April 30, 2011
* [1.2.4](http://github.com/sinatra/sinatra/blob/1.2.4/CHANGES)
* [1.2.4](https://github.com/sinatra/sinatra/blob/1.2.4/CHANGES)
April 30, 2011
* [1.2.3](http://github.com/sinatra/sinatra/blob/1.2.3/CHANGES)
* [1.2.3](https://github.com/sinatra/sinatra/blob/1.2.3/CHANGES)
April 13, 2011
* [1.2.2](http://github.com/sinatra/sinatra/blob/1.2.2/CHANGES)
* [1.2.2](https://github.com/sinatra/sinatra/blob/1.2.2/CHANGES)
April 08, 2011
* [1.2.1](http://github.com/sinatra/sinatra/blob/1.2.1/CHANGES)
* [1.2.1](https://github.com/sinatra/sinatra/blob/1.2.1/CHANGES)
March 17, 2011
* [1.2.0](http://github.com/sinatra/sinatra/blob/1.2.0/CHANGES)
* [1.2.0](https://github.com/sinatra/sinatra/blob/1.2.0/CHANGES)
March 03, 2011
* [1.1.3](http://github.com/sinatra/sinatra/blob/1.1.3/CHANGES)
* [1.1.3](https://github.com/sinatra/sinatra/blob/1.1.3/CHANGES)
February 20, 2011
* [1.1.2](http://github.com/sinatra/sinatra/blob/1.1.2/CHANGES)
* [1.1.2](https://github.com/sinatra/sinatra/blob/1.1.2/CHANGES)
December 25, 2010
* [1.1.0](http://github.com/sinatra/sinatra/blob/1.1.0/CHANGES)
* [1.1.0](https://github.com/sinatra/sinatra/blob/1.1.0/CHANGES)
October 24, 2010
* [1.0.0](http://github.com/sinatra/sinatra/blob/1.0/CHANGES)
* [1.0.0](https://github.com/sinatra/sinatra/blob/1.0/CHANGES)
March 23, 2010
* [0.9.6](http://github.com/sinatra/sinatra/blob/0.9.6/CHANGES)
* [0.9.6](https://github.com/sinatra/sinatra/blob/0.9.6/CHANGES)
March 07, 2010
* [0.9.5](http://github.com/sinatra/sinatra/blob/0.9.5/CHANGES)
* [0.9.5](https://github.com/sinatra/sinatra/blob/0.9.5/CHANGES)
March 05, 2010
* [0.9.4](http://github.com/sinatra/sinatra/blob/0.9.4/CHANGES)
* [0.9.4](https://github.com/sinatra/sinatra/blob/0.9.4/CHANGES)
July 26, 2009
* [0.9.3](http://github.com/sinatra/sinatra/blob/0.9.3/CHANGES)
* [0.9.3](https://github.com/sinatra/sinatra/blob/0.9.3/CHANGES)
June 08, 2009
* [0.9.2](http://github.com/sinatra/sinatra/blob/0.9.2/CHANGES)
* [0.9.2](https://github.com/sinatra/sinatra/blob/0.9.2/CHANGES)
March 18, 2009
* [0.9.1](http://github.com/sinatra/sinatra/blob/0.9.1/CHANGES)
* [0.9.1](https://github.com/sinatra/sinatra/blob/0.9.1/CHANGES)
March 02, 2009
* [0.9.0](http://github.com/sinatra/sinatra/blob/0.9.0/CHANGES)
* [0.9.0](https://github.com/sinatra/sinatra/blob/0.9.0/CHANGES)
January 18, 2009
* [0.3.3](https://github.com/sinatra/sinatra/blob/0.3.3/ChangeLog)
November 2, 2008
Expand All @@ -101,19 +101,19 @@ See the `CHANGES` file included for release notes about each release:
September 8, 2008
* [0.3.0](https://github.com/sinatra/sinatra/blob/0.3.0/ChangeLog)
August 31, 2008
* [0.2.2](http://github.com/sinatra/sinatra/blob/0.2.2/CHANGELOG)
* [0.2.2](https://github.com/sinatra/sinatra/blob/0.2.2/CHANGELOG)
April 15, 2008
* [0.2.1](http://github.com/sinatra/sinatra/blob/0.2.1/CHANGELOG)
* [0.2.1](https://github.com/sinatra/sinatra/blob/0.2.1/CHANGELOG)
April 15, 2008
* [0.2.0](http://github.com/sinatra/sinatra/blob/0.2.0/CHANGELOG)
* [0.2.0](https://github.com/sinatra/sinatra/blob/0.2.0/CHANGELOG)
April 11, 2008
* [0.1.7](http://github.com/sinatra/sinatra/blob/0.1.6/CHANGELOG)
* [0.1.7](https://github.com/sinatra/sinatra/blob/0.1.6/CHANGELOG)
October 23, 2007
* [0.1.6](http://github.com/sinatra/sinatra/blob/0.1.6/CHANGELOG)
* [0.1.6](https://github.com/sinatra/sinatra/blob/0.1.6/CHANGELOG)
October 15, 2007
* [0.1.5](http://github.com/sinatra/sinatra/blob/0.1.5/CHANGELOG)
* [0.1.5](https://github.com/sinatra/sinatra/blob/0.1.5/CHANGELOG)
October 7, 2007
* [0.1.0](http://github.com/sinatra/sinatra/blob/0.1.0/CHANGELOG)
* [0.1.0](https://github.com/sinatra/sinatra/blob/0.1.0/CHANGELOG)
October 4, 2007
* [0.0.1](https://github.com/sinatra/sinatra/tree/0.0.1)
September 09, 2007
Expand All @@ -131,8 +131,8 @@ List of applications, libraries, websites and companies using Sinatra.
An in-depth look at building and deploying Sinatra applications.
Maintained by [Chris Schneider][cschneid] and [Zachary Scott][zzak].

[cschneid]: http://github.com/cschneid
[zzak]: http://github.com/zzak
[cschneid]: https://github.com/cschneid
[zzak]: https://github.com/zzak

### [Sinatra Recipes](http://recipes.sinatrarb.com/)

Expand All @@ -149,23 +149,23 @@ rack and rack middlware at Melbourne RORO shortly after Railsconf (US).
### [RubyConf 08: Lightweight Web Services](http://rubyconf2008.confreaks.com/lightweight-web-services.html)

Adam Wiggins and Blake Mizerany present Sinatra and
[RestClient](http://github.com/adamwiggins/rest-client/tree/master)
[RestClient](https://github.com/adamwiggins/rest-client)
at RubyConf 2008. The talk details Sinatra's underlying philosophy and
reflects on using Sinatra to build real world applications.

### [Meet Sinatra](http://peepcode.com/products/sinatra) (PeepCode)
### [Meet Sinatra](https://peepcode.com/products/sinatra) (PeepCode)

Dan Benjamin introduces Sinatra in an hour-long screencast. Build an ad server with DataMapper, JavaScript, HAML, and Sinatra. In collaboration with Sinatra creator Blake Mizerany. Only $9.

### [Classy Web Development with Sinatra](http://www.pragprog.com/screencasts/v-aksinatra/classy-web-development-with-sinatra) (Prag's Screencast Series)
### [Classy Web Development with Sinatra](http://pragprog.com/screencasts/v-aksinatra/classy-web-development-with-sinatra) (Prag's Screencast Series)

Adam Keys and The Pragmatic Programmers have started a series of screencasts
on Sinatra. The first two episodes cover creating a tiny web app and creating
a REST service. <em>$5 a pop.</em>

### [Sinatra at Locos x Rails](http://www.slideshare.net/godfoca/sinatra-1282891), in Buenos Aires

By [Nicolás Sanguinetti](http://github.com/foca), April 2009.
By [Nicolás Sanguinetti](https://github.com/foca), April 2009.

### [Introduction to Sinatra](http://screencasts.org/episodes/introduction-to-sinatra) (screencasts.org)

Expand All @@ -188,4 +188,4 @@ applications, and presentations.
Christopher's blog is a treasure-trove of useful Sinatra related
information.

### [Using Compass for CSS in your Sinatra application](http://log.openmonkey.com/post/73462983/using-compass-for-css-in-your-sinatra-application)
### [Using Compass for CSS in your Sinatra application](http://openmonkey.com/blog/2009/01/27/using-compass-for-css-in-your-sinatra-application/)
26 changes: 13 additions & 13 deletions extensions-wild.markdown
Expand Up @@ -29,46 +29,46 @@ and requiring a file. Consult these steps if you run into problems:

These extensions add helper methods to the request context:

1. [sinatra-prawn](http://github.com/sbfaulkner/sinatra-prawn/)
1. [sinatra-prawn](https://github.com/sbfaulkner/sinatra-prawn/)
adds support for PDF rendering with Prawn templates.
1. [sinatra-markaby](http://github.com/sbfaulkner/sinatra-markaby/)
1. [sinatra-markaby](https://github.com/sbfaulkner/sinatra-markaby/)
enables rendering of HTML files using markaby templates.
1. [sinatra-maruku](http://github.com/wbzyl/sinatra-maruku/)
1. [sinatra-maruku](https://github.com/wbzyl/sinatra-maruku/)
provides Maruku templates for a Sinatra application.
1. [sinatra-rdiscount](http://github.com/wbzyl/sinatra-rdiscount/)
1. [sinatra-rdiscount](https://github.com/wbzyl/sinatra-rdiscount/)
provides RDiscount templates for a Sinatra application.
1. [sinatra-effigy](http://github.com/dancroak/sinatra-effigy/)
1. [sinatra-effigy](https://github.com/croaky/sinatra-effigy/)
provides Effigy templates and views for a Sinatra application.
1. [sinatra-content-for](http://github.com/foca/sinatra-content-for/)
1. [sinatra-content-for](https://github.com/foca/sinatra-content-for/)
provides `content_for` helper similar to Rails one.
1. [sinatra-url-for](http://github.com/emk/sinatra-url-for/)
1. [sinatra-url-for](https://github.com/emk/sinatra-url-for/)
construct absolute paths and full URLs to actions
in a Sinatra application
1. [sinatra-static-assets](http://github.com/wbzyl/sinatra-static-assets/)
1. [sinatra-static-assets](https://github.com/wbzyl/sinatra-static-assets/)
implements `image_tag`, `stylesheet_link_tag`, `javascript_script_tag`
and `link_tag` helpers. These helpers construct correct absolute paths
for applications dispatched to sub URI.
1. [sinatra-mapping](http://github.com/hallison/sinatra-mapping/)
1. [sinatra-mapping](https://github.com/codigorama/sinatra-mapping)
implements `map` in the DSL syntax commands which creates dynamically
`mapname_path` method.
1. [sinatra\_more](http://github.com/nesquena/sinatra_more) Library with agnostic generators,
form builders, named route mappings, easy mailer support among other functionality.
1. [sinatra-authorization](http://github.com/integrity/sinatra-authorization)
1. [sinatra-authorization](https://github.com/integrity/sinatra-authorization)
HTTP auth helpers
1. [sinatra-simple-navigation](http://github.com/andi/sinatra-simple-navigation) enables creating
1. [sinatra-simple-navigation](https://github.com/andi/sinatra-simple-navigation) enables creating
navigations using the simple-navigation gem.

## DSL Extensions

These extensions add methods to Sinatra's application DSL:

1. [snap](http://github.com/bcarlso/snap/)
1. [snap](https://github.com/bcarlso/snap/)
provides support for named routes and helper methods for building URLs for
use in links and redirects.

## Extensions which handle setup and configuration

1. [sinatra-mongoid](http://github.com/dancroak/sinatra-mongoid)
1. [sinatra-mongoid](https://github.com/croaky/sinatra-mongoid)
sets up a MongoDB connection, provides Mongoid to your app, and
provides options for configuration.

Expand Down
2 changes: 1 addition & 1 deletion faq.markdown
Expand Up @@ -141,7 +141,7 @@ The code used to live in a [gist](https://gist.github.com/119874),
but we have put it in a gem so we can maintain it properly and
provide an easier way for developers to include its behaviour.
It was adapted from [Chris Schneider](http://www.gittr.com/)'s
original [partials.rb](http://github.com/cschneid/irclogger/blob/master/lib/partials.rb)
original [partials.rb](https://github.com/cschneid/irclogger/blob/master/lib/partials.rb)
implementation.

Use it as follows to render the `mypartial.haml`(1) or the `admin/mypartial.haml`(2)
Expand Down
15 changes: 6 additions & 9 deletions testing.markdown
Expand Up @@ -7,7 +7,7 @@ id: testing
Testing Sinatra with Rack::Test
===============================

All examples in the following sections assume that `Test::Unit` is being
All examples in the following sections assume that [`Test::Unit`][Test::Unit] is being
used in an attempt to be as general as possible. See the [Test Framework
Examples](#frameworks) for information on using the test helpers in
other testing environments. To use `Rack::Test` library used when you require `rack/test`, you'll need to install the `rack-test` gem.
Expand Down Expand Up @@ -336,15 +336,12 @@ more information on `get`, `post`, `put`, `delete` and friends.

[Test::Unit]: http://www.ruby-doc.org/stdlib/libdoc/test/unit/rdoc/classes/Test/Unit.html
[RSpec]: http://rspec.info
[Bacon]: http://github.com/chneukirchen/bacon
[Bacon]: https://github.com/chneukirchen/bacon
[Test::Spec]: http://rubyforge.org/projects/test-spec/
[Sinatra::Test]: http://github.com/sinatra/sinatra/blob/987d622a52f3eaf28f8f6beb7451c3e43c23f075/test/test_test.rb
[Rack::Test]: http://github.com/brynary/rack-test/
[test]: http://github.com/sinatra/sinatra/blob/master/test/test_test.rb
[wild]: /wild.html
[Rack::Test]: https://github.com/brynary/rack-test/
[spec]: http://rack.rubyforge.org/doc/files/SPEC.html
[Rack::MockRequest]: http://rack.rubyforge.org/doc/classes/Rack/MockRequest.html
[Rack::MockResponse]: http://rack.rubyforge.org/doc/classes/Rack/MockResponse.html
[Webrat]: http://github.com/brynary/webrat
[examples]: http://wiki.github.com/brynary/webrat/sinatra
[Capybara]: http://github.com/jnicklas/capybara
[Webrat]: https://github.com/brynary/webrat
[examples]: https://github.com/brynary/webrat/wiki/sinatra
[Capybara]: https://github.com/jnicklas/capybara

0 comments on commit 6346b79

Please sign in to comment.