sinatra 1.4.2 → 1.4.3

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

data/sinatra.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
   s.extra_rdoc_files  = s.files.select { |p| p =~ /^README/ } << 'LICENSE'
   s.rdoc_options      = %w[--line-numbers --inline-source --title Sinatra --main README.rdoc --encoding=UTF-8]
 
-  s.add_dependency 'rack', '~> 1.5', '>= 1.5.2'
+  s.add_dependency 'rack', '~> 1.4'
   s.add_dependency 'tilt', '~> 1.3', '>= 1.3.4'
   s.add_dependency 'rack-protection', '~> 1.4'
 end

data/test/helpers_test.rb

@@ -1,5 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 require 'date'
+require 'json'
 
 class HelpersTest < Test::Unit::TestCase
   def test_default

data/test/request_test.rb

@@ -52,6 +52,7 @@ class RequestTest < Test::Unit::TestCase
 
   it "makes accept types behave like strings" do
     request = Sinatra::Request.new('HTTP_ACCEPT' => 'image/jpeg; compress=0.25')
+    assert                     request.accept?('image/jpeg')
     assert_equal 'image/jpeg', request.preferred_type.to_s
     assert_equal 'image/jpeg', request.preferred_type.to_str
     assert_equal 'image',      request.preferred_type.split('/').first

data/test/routing_test.rb

@@ -1378,4 +1378,14 @@ class RoutingTest < Test::Unit::TestCase
     assert_equal 4, signature.length
     assert list.include?(signature)
   end
+
+  it "sets env['sinatra.route'] to the matched route" do
+    mock_app do
+      after do
+        assert_equal 'GET /users/:id/status', env['sinatra.route']
+      end
+      get('/users/:id/status') { 'ok' }
+    end
+    get '/users/1/status'
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.2
-  prerelease: 
+  version: 1.4.3
 platform: ruby
 authors:
 - Blake Mizerany
@@ -12,56 +11,45 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,7 +57,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -217,6 +204,7 @@ files:
 - test/yajl_test.rb
 homepage: http://www.sinatrarb.com/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -229,28 +217,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 748751327798285916
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 748751327798285916
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Classy web-development dressed in a DSL
 test_files:
 - test/base_test.rb
@@ -296,3 +276,4 @@ test_files:
 - test/textile_test.rb
 - test/wlang_test.rb
 - test/yajl_test.rb
+has_rdoc: