sinatra-contrib 2.0.0.rc2 → 2.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a3837b4e5796761383a09064e40f682862a48a9
-  data.tar.gz: c0e347a6f786ca317d0c42d62d20e72dfffe46b6
+  metadata.gz: c3113e75c9840776c917bb1fdc1d22ebcf89017e
+  data.tar.gz: 11d60f002820bd757d704f1cbd8ca05e03f2cd6b
 SHA512:
-  metadata.gz: 0eed9a63680ab183eb8b2ed3161eed6b38280c668196a9052225e86ebea07b2af4aaa3c9c6a5cb87ada74146b30f4efee7eca66815cd2f5f1c8ee63e611ec192
-  data.tar.gz: e5a2555a09268cb5c1c96dd023ad764c1758da22e01751cdc40adc1c14ee42df05306375bec6606131d512ab795d1fc656d6e6e3c2b591b5999ae14397c5c3fb
+  metadata.gz: ec1cc4f6dff963d41307afa1c4be976e76f940a651a25e7056190d4aad39650d13423bc151fa278af30fd47a70edf9ff6a1347423a4d7a6eb76830f1cca4788d
+  data.tar.gz: 92a56af9e32b074e1fc63252231f24ea821de066a8d583d8c98bb5429c2c2c3d49979d9119d535ab4ddd7e462ca7af0a640c58e023ff4262fbba949d09a2c71d

data/Rakefile

@@ -11,7 +11,7 @@ task(:default => :spec)
 namespace :doc do
   task :readmes do
     Dir.glob 'lib/sinatra/*.rb' do |file|
-      excluded_files = %w[lib/sinatra/contrib.rb lib/sinatra/capture.rb lib/sinatra/engine_tracking.rb]
+      excluded_files = %w[lib/sinatra/contrib.rb lib/sinatra/capture.rb lib/sinatra/decompile.rb lib/sinatra/engine_tracking.rb]
       next if excluded_files.include?(file)
       doc  = File.read(file)[/^module Sinatra(\n)+(  #[^\n]*\n)*/m].scan(/^ *#(?!#) ?(.*)\n/).join("\n")
       file = "doc/#{file[4..-4].tr("/_", "-")}.rdoc"

data/lib/sinatra/config_file.rb

@@ -156,13 +156,12 @@ module Sinatra
     # returned config is a indifferently accessible Hash, which means that you
     # can get its values using Strings or Symbols as keys.
     def config_for_env(hash)
-      if hash.respond_to? :keys and hash.keys.all? { |k| environments.include? k.to_s }
+      if hash.respond_to?(:keys) && hash.keys.all? { |k| environments.include?(k.to_s) }
         hash = hash[environment.to_s] || hash[environment.to_sym]
       end
 
-      if hash.respond_to? :to_hash
-        indifferent_hash = Hash.new { |hash, key| hash[key.to_s] if Symbol === key }
-        indifferent_hash.merge hash.to_hash
+      if hash.respond_to?(:to_hash)
+        IndifferentHash[hash.to_hash]
       else
         hash
       end

data/lib/sinatra/contrib/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Contrib
-    VERSION = ::Sinatra::VERSION
+    VERSION = '2.0.0.rc5'
   end
 end
 

data/lib/sinatra/namespace.rb

@@ -333,7 +333,7 @@ module Sinatra
       end
 
       def prefixed(method, pattern = nil, conditions = {}, &block)
-        default = /.*/ if method == :before or method == :after
+        default = %r{(?:/.*)?} if method == :before or method == :after
         pattern, conditions = compile pattern, conditions, default
         result = base.send(method, pattern, conditions, &block)
         invoke_hook :route_added, method.to_s.upcase, pattern, block

data/sinatra-contrib.gemspec

@@ -1,11 +1,10 @@
 # -*- encoding: utf-8 -*-
 
-$:.unshift File.expand_path("../../lib", __FILE__)
-require "sinatra/version"
+version = File.read(File.expand_path("../../VERSION", __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.name        = "sinatra-contrib"
-  s.version     = Sinatra::VERSION
+  s.version     = version
   s.description = "Collection of useful Sinatra extensions"
   s.homepage    = "http://github.com/sinatra/sinatra/tree/master/sinatra-contrib"
   s.license     = "MIT"
@@ -22,11 +21,11 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.2.0'
 
-  s.add_dependency "sinatra", Sinatra::VERSION
-  s.add_dependency "mustermann",  "1.0.0"
+  s.add_dependency "sinatra", version
+  s.add_dependency "mustermann", "~> 1.0"
   s.add_dependency "backports", ">= 2.0"
   s.add_dependency "tilt",      ">= 1.3", "< 3"
-  s.add_dependency "rack-protection", Sinatra::VERSION
+  s.add_dependency "rack-protection", version
   s.add_dependency "multi_json"
 
   s.add_development_dependency "rspec", "~> 3.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc5
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc5
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc2
+        version: 2.0.0.rc5
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -420,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Collection of useful Sinatra extensions