sinatra 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26f095dff5ea1010cfcf4cb7059a25aadf478a5c
-  data.tar.gz: 72d51178bb74784cda5ed6fd22dff39782510730
+  metadata.gz: fd75c727db7b65c390511a4adeb420a6d8a93e18
+  data.tar.gz: a0be265c79512e4f331270bf1fb71af08a06ee1f
 SHA512:
-  metadata.gz: 56d6d5c81311d1b54cb9beabf7f328ff8949796f4c91c1891006d81b1782e3be438cd87d07e8945489ee47fd565b94f09df02128986c71889fe7c21b338311ee
-  data.tar.gz: 6b12c4051b97b9fb4b752d282e66c587ac248c95fa7332b4c9aee248ac5df1ef7cbc9b44a02a70de0868fc69e47bacd6e575276471256e15a8222df75420bea2
+  metadata.gz: f6de783030b6c39cd7d3f0bab6dc7789fc83d714c41f52f89a953014798dfcf4d8c98565a2df4ac53165d077a98c3431b448a89754a7b3a6d029eb83415df5c2
+  data.tar.gz: 3bc6a1b14338af6e723bbdd07dd22ffed9058def429183be213df539cf5b3ec04bb021eb40adae0f66266c8883a827963e42f118ea8eeb4d16f65765111a1909

data/LICENSE

@@ -1,3 +1,5 @@
+The MIT License (MIT)
+
 Copyright (c) 2007, 2008, 2009 Blake Mizerany
 Copyright (c) 2010-2017 Konstantin Haase
 Copyright (c) 2015-2017 Zachary Scott

data/lib/sinatra/base.rb

@@ -240,6 +240,18 @@ module Sinatra
     def http_status; 404 end
   end
 
+  class IndifferentHash < Hash
+    def [](key)
+      value = super(key)
+      return super(key.to_s) if value.nil? && Symbol === key
+      value
+    end
+
+    def has_key?(key)
+      super(key) || (Symbol === key && super(key.to_s))
+    end
+  end
+
   # Methods available to routes, before/after filters, and views.
   module Helpers
     # Set or retrieve the response status code.
@@ -1070,7 +1082,7 @@ module Sinatra
     def indifferent_params(object)
       case object
       when Hash
-        new_hash = indifferent_hash
+        new_hash = IndifferentHash.new
         object.each { |key, value| new_hash[key] = indifferent_params(value) }
         new_hash
       when Array
@@ -1080,11 +1092,6 @@ module Sinatra
       end
     end
 
-    # Creates a Hash with indifferent access.
-    def indifferent_hash
-      Hash.new { |hash, key| hash[key.to_s] if Symbol === key }
-    end
-
     # Run the block with 'throw :halt' support and apply result to the response.
     def invoke
       res = catch(:halt) { yield }

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0.rc2'
 end

data/sinatra.gemspec

@@ -8,7 +8,17 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
   s.email             = "sinatrarb@googlegroups.com"
   s.homepage          = "http://www.sinatrarb.com/"
   s.license           = 'MIT'
-  s.files = %w(.yardopts AUTHORS.md CHANGELOG.md CONTRIBUTING.md Gemfile LICENSE MAINTENANCE.md Rakefile SECURITY.md sinatra.gemspec) + Dir['README*.md', 'lib/**/*', 'examples/*']
+  s.files             = Dir['README*.md', 'lib/**/*', 'examples/*'] + [
+    ".yardopts",
+    "AUTHORS.md",
+    "CHANGELOG.md",
+    "CONTRIBUTING.md",
+    "Gemfile",
+    "LICENSE",
+    "MAINTENANCE.md",
+    "Rakefile",
+    "SECURITY.md",
+    "sinatra.gemspec"]
   s.test_files        = s.files.select { |p| p =~ /^test\/.*_test.rb/ }
   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]
@@ -17,6 +27,6 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
 
   s.add_dependency 'rack', '~> 2.0'
   s.add_dependency 'tilt', '~> 2.0'
-  s.add_dependency 'rack-protection', '2.0.0.rc1'
+  s.add_dependency 'rack-protection', '2.0.0.rc2'
   s.add_dependency 'mustermann',  '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL