sinatra 1.2.8 → 1.2.9

data/CHANGES

@@ -1,3 +1,17 @@
+= 1.2.9 (backports release) / 2013-03-15
+
+IMPORTANT: THIS IS THE LAST 1.2.x RELEASE, PLEASE UPGRADE.
+
+ * Display EOL warning when loading Sinatra. (Konstantin Haase)
+
+ * Improve documentation. (Anurag Priyam, Konstantin Haase)
+
+ * Do not modify the load path. (Konstantin Haase)
+
+ * Display deprecation warning if RUBY_IGNORE_CALLERS is used. (Konstantin Haase)
+
+ * Add backports library so we can still run on Ruby 1.8.6. (Konstantin Haase)
+
 = 1.2.8 (backports release) / 2011-12-30
 
 Backported from 1.3.2:

data/Gemfile

@@ -8,6 +8,7 @@
 
 RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
 source :rubygems unless ENV['QUICK']
+gemspec
 
 gem 'rake', '~> 0.8.7'
 gem 'rack-test', '>= 0.5.6'
@@ -28,12 +29,13 @@ end
 gem 'haml', '~> 3.0.0', :group => 'haml'
 gem 'builder', :group => 'builder'
 gem 'erubis', :group => 'erubis'
-gem 'less', '~> 1.0', :group => 'less'
 gem 'liquid', :group => 'liquid'
-gem 'slim', :group => 'slim'
-gem 'RedCloth', :group => 'redcloth' if RUBY_VERSION < "1.9.3" and RUBY_ENGINE != 'macruby'
 
 if RUBY_VERSION > '1.8.6'
+  #gem 'less', '~> 1.0', :group => 'less'
+  gem 'slim', :group => 'slim'
+  gem 'RedCloth', :group => 'redcloth' if RUBY_VERSION < "1.9.3" and RUBY_ENGINE != 'macruby'
+
   if RUBY_ENGINE == 'jruby'
     gem 'nokogiri', '!= 1.5.0'
   elsif RUBY_ENGINE != 'maglev'
@@ -41,20 +43,14 @@ if RUBY_VERSION > '1.8.6'
   end
   gem 'coffee-script', '>= 2.0', :group => 'coffee-script'
   gem 'rdoc', '< 3.10', :group => 'rdoc'
-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 :ruby do
+    gem 'rdiscount', :group => 'rdiscount'
+  end
 
-platforms :mri_18 do
-  # bundler platforms are broken
-  next unless RUBY_ENGINE == 'ruby'
-  gem 'rcov', :group => 'rcov'
+  if RUBY_VERSION < '1.9'
+    gem 'json', :group => 'coffee-script'
+    gem 'markaby', :group => 'markaby'
+    gem 'radius', :group => 'radius'
+  end
 end

data/README.rdoc

@@ -801,6 +801,20 @@ route handlers and templates:
     bar(params[:name])
   end
 
+Alternatively, helper methods can be separately defined in a module:
+
+  module FooUtils
+    def foo(name) "#{name}foo" end
+  end
+
+  module BarUtils
+    def bar(name) "#{name}bar" end
+  end
+
+  helpers FooUtils, BarUtils
+
+The effect is the same as including the modules in the application class.
+
 === Using Sessions
 
 A session is used to keep state during requests. If activated, you have one

data/lib/sinatra.rb

@@ -1,6 +1,3 @@
-libdir = File.dirname(__FILE__)
-$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
-
 require 'sinatra/base'
 require 'sinatra/main'
 

data/lib/sinatra/base.rb

@@ -5,9 +5,12 @@ require 'rack'
 require 'rack/builder'
 require 'sinatra/showexceptions'
 require 'tilt'
+require 'backports'
+
+warn "WARNING: Sinatra 1.2.x has reached its EOL. Please upgrade."
 
 module Sinatra
-  VERSION = '1.2.8'
+  VERSION = '1.2.9'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -1092,7 +1095,7 @@ module Sinatra
         public_folder
       end
 
-   private
+    private
       # Condition for matching host name. Parameter might be String or Regexp.
       def host_name(pattern)
         condition { pattern === request.host }
@@ -1343,8 +1346,11 @@ module Sinatra
         /<internal:/                                     # internal in ruby >= 1.9.2
       ]
 
-      # add rubinius (and hopefully other VM impls) ignore patterns ...
-      CALLERS_TO_IGNORE.concat(RUBY_IGNORE_CALLERS) if defined?(RUBY_IGNORE_CALLERS)
+      # contrary to what the comment said previously, rubinius never supported this
+      if defined?(RUBY_IGNORE_CALLERS)
+        warn "RUBY_IGNORE_CALLERS is deprecated and will no longer be supported by Sinatra 2.0"
+        CALLERS_TO_IGNORE.concat(RUBY_IGNORE_CALLERS)
+      end
 
       # Like Kernel#caller but excluding certain magic entries and without
       # line / method information; the resulting array contains filenames only.

data/sinatra.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '1.2.8'
+  s.version = '1.2.9'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -122,8 +122,9 @@ Gem::Specification.new do |s|
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
 
   s.extra_rdoc_files = %w[README.rdoc README.de.rdoc README.jp.rdoc README.fr.rdoc README.es.rdoc README.hu.rdoc README.zh.rdoc LICENSE]
-  s.add_dependency 'rack', '~> 1.1'
+  s.add_dependency 'rack', '~> 1.1', '< 1.5'
   s.add_dependency 'tilt', '>= 1.2.2', '< 2.0'
+  s.add_dependency 'backports'
   s.add_development_dependency 'shotgun', '~> 0.6'
 
   s.homepage = "http://sinatra.rubyforge.org"

data/test/helpers_test.rb

@@ -739,7 +739,7 @@ class HelpersTest < Test::Unit::TestCase
             get '/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2010 23:43:52 GMT' }
             assert_equal 200, status
             assert_equal 'foo', body
-            get '/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2100 23:43:52 GMT' }
+            get '/compare', {}, { 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 26 Sep 2012 23:43:52 GMT' }
             assert_equal 304, status
             assert_equal '', body
           end

data/test/routing_test.rb

@@ -227,6 +227,12 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal "format=", body
   end
 
+  it 'does not concatinate params with the same name' do
+    mock_app { get('/:foo') { params[:foo] } }
+    get '/a?foo=b'
+    assert_body 'a'
+  end
+
   it "supports single splat params like /*" do
     mock_app {
       get '/*' do

metadata

@@ -1,10 +1,15 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sinatra
-version: !ruby/object:Gem::Version
-  version: 1.2.8
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 1
+  - 2
+  - 9
+  version: 1.2.9
 platform: ruby
-authors:
+authors: 
 - Blake Mizerany
 - Ryan Tomayko
 - Simon Rozet
@@ -12,49 +17,91 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2152939680 !ruby/object:Gem::Requirement
+
+date: 2013-03-15 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 5
+        version: "1.5"
+  version_requirements: *id001
+  name: rack
   prerelease: false
-  version_requirements: *2152939680
-- !ruby/object:Gem::Dependency
-  name: tilt
-  requirement: &2152938920 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 2
+        - 2
         version: 1.2.2
     - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  version_requirements: *id002
+  name: tilt
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
+  name: backports
   prerelease: false
-  version_requirements: *2152938920
-- !ruby/object:Gem::Dependency
-  name: shotgun
-  requirement: &2152937800 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        version: "0.6"
+  version_requirements: *id004
+  name: shotgun
   prerelease: false
-  version_requirements: *2152937800
+  type: :development
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - README.de.rdoc
 - README.jp.rdoc
@@ -63,7 +110,7 @@ extra_rdoc_files:
 - README.hu.rdoc
 - README.zh.rdoc
 - LICENSE
-files:
+files: 
 - AUTHORS
 - CHANGES
 - Gemfile
@@ -167,40 +214,46 @@ files:
 - test/views/layout2.test
 - test/views/nested.str
 - test/views/utf8.erb
+has_rdoc: true
 homepage: http://sinatra.rubyforge.org
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - Sinatra
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -1174004778160710546
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: sinatra
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
-test_files:
+test_files: 
 - test/base_test.rb
 - test/builder_test.rb
 - test/coffee_test.rb