sinatra 1.1.4 → 1.2.0

data/AUTHORS

@@ -36,7 +36,7 @@ Sinatra would not be possible:
 * Rick Olson (technoweenie) for the killer plug at RailsConf '08.
 * Steven Garcia for the amazing custom artwork you see on 404's and 500's
 * Pat Nakajima (nakajima) for fixing non-nested params in nested params Hash's.
-* Konstantin Haase for his hard work and ongoing commitment to improving 
+* Konstantin Haase for his hard work and ongoing commitment to improving
   Sinatra, for 1.1.0, 1.2.0 and beyond..
 * Zachary Scott for adding Konstantin to the AUTHORS file. He also did help
   writing the book, but mainly for adding Konstantin.
@@ -45,6 +45,10 @@ 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
+* cactus for digging through code and specs, multiple times.
+* Nicolás Sanguinetti (foca) for strong demand of karma and shaping
+  helpers/register.
 
 and last but not least:
 

data/CHANGES

@@ -1,6 +1,51 @@
-= 1.1.4 / 2011-04-13
+= 1.2.0 / 2011-03-03
 
- * Compatible with Tilt 1.3. (Konstantin Haase)
+ * Added `slim` rendering method for rendering Slim templates. (Steve
+   Hodgkiss)
+
+ * The `markaby` rendering method now allows passing a block, making inline
+   usage possible. Requires Tilt 1.2 or newer. (Konstantin Haase)
+
+ * All render methods now take a `:layout_engine` option, allowing to use a
+   layout in a different template language. Even more useful than using this
+   directly (`erb :index, :layout_engine => :haml`) is setting this globally for
+   a template engine that otherwise does not support layouts, like Markdown or
+   Textile (`set :markdown, :layout_engine => :erb`). (Konstantin Haase)
+
+ * Before and after filters now support conditions, both with and without
+   patterns (`before '/api/*', :agent => /Songbird/`). (Konstantin Haase)
+
+ * Added a `url` helper method which constructs absolute URLs. Copes with
+   reverse proxies and Rack handlers correctly. Aliased to `to`, so you can
+   write `redirect to('/foo')`. (Konstantin Haase)
+
+ * If running on 1.9, patterns for routes and filters now support named
+   captures: `get(%r{/hi/(?<name>[^/?#]+)}) { "Hi #{params['name']}" }`.
+   (Steve Price)
+
+ * All rendering methods now take a `:scope` option, which renders them in
+   another context. Note that helpers and instance variables will be
+   unavailable if you use this feature. (Paul Walker)
+
+ * The behavior of `redirect` can now be configured with `absolute_redirects`
+   and `prefixed_redirects`. (Konstantin Haase)
+
+ * `send_file` now allows overriding the Last-Modified header, which defaults
+   to the file's mtime, by passing a `:last_modified` option. (Konstantin Haase)
+
+ * You can use your own template lookup method by defining `find_template`.
+   This allows, among other things, using more than one views folder.
+   (Konstantin Haase)
+
+ * Largely improved documentation. (burningTyger, Vasily Polovnyov, Gabriel
+   Andretta, Konstantin Haase)
+
+ * Improved error handling. (cactus, Konstantin Haase)
+
+ * Skip missing template engines in tests correctly. (cactus)
+
+ * Sinatra now ships with a Gemfile for development dependencies, since it eases
+   supporting different platforms, like JRuby. (Konstantin Haase)
 
 = 1.1.3 / 2011-02-20
 

data/Gemfile

@@ -0,0 +1,53 @@
+# Why use bundler?
+# Well, not all development dependencies install on all rubies. Moreover, `gem 
+# install sinatra --development` doesn't work, as it will also try to install
+# development dependencies of our dependencies, and those are not conflict free.
+# So, here we are, `bundle install`.
+#
+# If you have issues with a gem: `bundle install --without-coffee-script`.
+
+RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
+
+source :rubygems unless ENV['QUICK']
+gemspec
+
+gem 'rake'
+gem 'rack-test', '>= 0.5.6'
+
+gem 'haml', '>= 3.0', :group => 'haml'
+gem 'builder', :group => 'builder'
+gem 'erubis', :group => 'erubis'
+gem 'less', :group => 'less'
+gem 'liquid', :group => 'liquid'
+gem 'nokogiri', :group => 'nokogiri'
+gem 'slim', :group => 'slim'
+
+
+if RUBY_VERSION > '1.8.6'
+  gem 'coffee-script', '>= 2.0', :group => 'coffee-script'
+  gem 'rdoc', :group => 'rdoc'
+else
+  gem 'rack', '~> 1.1.0'
+end
+
+platforms :ruby do
+  gem 'rdiscount', :group => 'rdiscount'
+end
+
+platforms :ruby_18, :jruby do
+  gem 'json', :group => 'coffee-script'
+  gem 'markaby', :group => 'markaby'
+  gem 'radius', :group => 'radius'
+end
+
+platforms :mri do
+  # bundler platforms are broken
+  next unless RUBY_ENGINE == 'ruby'
+  gem 'RedCloth', :group => 'redcloth'
+end
+
+platforms :mri_18 do
+  # bundler platforms are broken
+  next unless RUBY_ENGINE == 'ruby'
+  gem 'rcov', :group => 'rcov'
+end