sinatra-contrib 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64ccf4e1e4d7f4b815eca96f762f60861be3c6b9
-  data.tar.gz: 23254cf9a8ea40d37287c79d747f51eea7f59060
+SHA256:
+  metadata.gz: 8c8f28c33c3ece99365dbedf54e005d0ca8c1f67fa9b185ea3e3007d02859c01
+  data.tar.gz: 6faec8475cd013a114fa920ce028ecd635e217da2693e4d313530c3eea2cfd93
 SHA512:
-  metadata.gz: e81c0fa5f000e6929dc9230eeda7f5c00cf51a04b95a785defae763e9ea646d65a65a78c0a2304c7757d2f0e9cd1afea9c93378d0d2881ee1876cf72dc17c01e
-  data.tar.gz: 01a00fbcf1e8c78e8508d46bc24aff45dbe0716ae001a88186813b11f0b3ddb25f45580f23107ca00ccf5b4ff9188f96aa7fbb05ebc73e3d4d0ad4ba161e6bc5
+  metadata.gz: e1200e05c63c903e39a349c1959c681304bdcd848abdbac6cd30a008e27ee4e335f5194504289dde64156bb7b572369c7b4bd9c45a4a322d1b0b48fe12ff5fdf
+  data.tar.gz: 229bd1e2f2f9166a914aa0936ebb2fee6ae95acdcd4fd188a1879881096e6079fd11e85f42dfe7076a3c7f80d06c18eca62208ffb208c555c095c0547dfa9364

data/README.md

@@ -154,22 +154,22 @@ end
 For more info check the [official docs](http://www.sinatrarb.com/contrib/) and
 [api docs](http://www.rubydoc.info/gems/sinatra-contrib).
 
-[sinatra-reloader]: /contrib/reloader
-[sinatra-namespace]: /contrib/namespace
-[sinatra-content-for]: /contrib/content_for
-[sinatra-cookies]: /contrib/cookies
-[sinatra-streaming]: /contrib/streaming
-[sinatra-webdav]: /contrib/webdav
-[sinatra-runner]: /contrib/runner
-[sinatra-extension]: /contrib/extension
-[sinatra-test-helpers]: /contrib/test_helpers
-[sinatra-required-params]: /contrib/required_params
-[sinatra-custom-logger]: /contrib/custom_logger
-[sinatra-multi-route]: /contrib/multi_route
-[sinatra-json]: /contrib/json
-[sinatra-respond-with]: /contrib/respond_with
-[sinatra-config-file]: /contrib/config_file
-[sinatra-link-header]: /contrib/link_header
-[sinatra-capture]: /contrib/capture
-[sinatra-engine-tracking]: /contrib/engine_tracking
+[sinatra-reloader]: http://www.sinatrarb.com/contrib/reloader
+[sinatra-namespace]: http://www.sinatrarb.com/contrib/namespace
+[sinatra-content-for]: http://www.sinatrarb.com/contrib/content_for
+[sinatra-cookies]: http://www.sinatrarb.com/contrib/cookies
+[sinatra-streaming]: http://www.sinatrarb.com/contrib/streaming
+[sinatra-webdav]: http://www.sinatrarb.com/contrib/webdav
+[sinatra-runner]: http://www.sinatrarb.com/contrib/runner
+[sinatra-extension]: http://www.sinatrarb.com/contrib/extension
+[sinatra-test-helpers]: https://github.com/sinatra/sinatra/blob/master/sinatra-contrib/lib/sinatra/test_helpers.rb
+[sinatra-required-params]: http://www.sinatrarb.com/contrib/required_params
+[sinatra-custom-logger]: http://www.sinatrarb.com/contrib/custom_logger
+[sinatra-multi-route]: http://www.sinatrarb.com/contrib/multi_route
+[sinatra-json]: http://www.sinatrarb.com/contrib/json
+[sinatra-respond-with]: http://www.sinatrarb.com/contrib/respond_with
+[sinatra-config-file]: http://www.sinatrarb.com/contrib/config_file
+[sinatra-link-header]: http://www.sinatrarb.com/contrib/link_header
+[sinatra-capture]: http://www.sinatrarb.com/contrib/capture
+[sinatra-engine-tracking]: https://github.com/sinatra/sinatra/blob/master/sinatra-contrib/lib/sinatra/engine_tracking.rb
 

data/lib/sinatra/config_file.rb

@@ -8,7 +8,7 @@ module Sinatra
   #
   # <tt>Sinatra::ConfigFile</tt> is an extension that allows you to load the
   # application's configuration from YAML files.  It automatically detects if
-  # the files contains specific environment settings and it will use the
+  # the files contain specific environment settings and it will use those
   # corresponding to the current one.
   #
   # You can access those options through +settings+ within the application. If
@@ -94,18 +94,11 @@ module Sinatra
   # In either case, <tt>settings.foo</tt> will return the environment name, and
   # <tt>settings.bar</tt> will return <tt>"bar"</tt>.
   #
-  # Be aware that if you have a different environment, besides development,
-  # test and production, you will also need to adjust the +environments+
-  # setting, otherwise the settings will not load.  For instance, when
-  # you also have a staging environment:
+  # If you wish to provide defaults that may be shared among all the
+  # environments, this can be done by using a YAML alias, and then overwriting
+  # values in environments where appropriate:
   #
-  #     set :environments, %w{development test production staging}
-  #
-  # If you wish to provide defaults that may be shared among all the environments,
-  # this can be done by using one of the existing environments as the default using
-  # the YAML alias, and then overwriting values in the other environments:
-  #
-  #     development: &common_settings
+  #     default: &common_settings
   #       foo: 'foo'
   #       bar: 'bar'
   #
@@ -131,11 +124,9 @@ module Sinatra
             raise UnsupportedConfigType unless ['.yml', '.erb'].include?(File.extname(file))
             logger.info "loading config file '#{file}'" if logging? && respond_to?(:logger)
             document = ERB.new(IO.read(file)).result
-            yaml = config_for_env(YAML.load(document)) || {}
-            yaml.each_pair do |key, value|
-              for_env = config_for_env(value)
-              set key, for_env unless value and for_env.nil? and respond_to? key
-            end
+            yaml = YAML.load(document)
+            config = config_for_env(yaml)
+            config.each_pair { |key, value| set(key, value) }
           end
         end
       end
@@ -149,23 +140,32 @@ module Sinatra
 
     private
 
-    # Given a +hash+ with some application configuration it returns the
-    # settings applicable to the current environment.  Note that this can only
-    # be done when all the keys of +hash+ are environment names included in the
-    # +environments+ setting (which is an Array of Strings).  Also, the
-    # returned config is a indifferently accessible Hash, which means that you
-    # can get its values using Strings or Symbols as keys.
+    # Given a +hash+ containing application configuration it returns
+    # settings applicable to the current environment. Note: It gives
+    # precedence to environment settings defined at the root-level.
     def config_for_env(hash)
-      if hash.respond_to?(:keys) && hash.keys.all? { |k| environments.include?(k.to_s) }
-        hash = hash[environment.to_s] || hash[environment.to_sym]
-      end
+      return from_environment_key(hash) if environment_keys?(hash)
 
-      if hash.respond_to?(:to_hash)
-        IndifferentHash[hash.to_hash]
-      else
-        hash
+      hash.each_with_object(IndifferentHash[]) do |(k, v), acc|
+        if environment_keys?(v)
+          acc.merge!(k => v[environment.to_s]) if v.key?(environment.to_s)
+        else
+          acc.merge!(k => v)
+        end
       end
     end
+
+    # Given a +hash+ returns the settings corresponding to the current
+    # environment.
+    def from_environment_key(hash)
+      hash[environment.to_s] || hash[environment.to_sym] || {}
+    end
+
+    # Returns true if supplied with a hash that has any recognized
+    # +environments+ in its root keys.
+    def environment_keys?(hash)
+      hash.is_a?(Hash) && hash.any? { |k, _| environments.include?(k.to_s) }
+    end
   end
 
   register ConfigFile

data/lib/sinatra/contrib/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Contrib
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end
 

data/lib/sinatra/required_params.rb

@@ -8,7 +8,7 @@ module Sinatra
   # == Usage
   #
   # Set required query parameter keys in the argument.
-  # It'll halt with 400 if requried keys don't exist.
+  # It'll halt with 400 if required keys don't exist.
   #
   #   get '/simple_keys' do
   #     required_params :p1, :p2
@@ -60,7 +60,7 @@ module Sinatra
         elsif key.is_a?(Array)
           _required_params(p, *key)
         else
-          halt 400 unless p.has_key?(key.to_s)
+          halt 400 unless p && p.respond_to?(:has_key?) && p.has_key?(key.to_s)
         end
       end
       true

data/sinatra-contrib.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "sinatra", version
   s.add_dependency "mustermann", "~> 1.0"
-  s.add_dependency "backports", ">= 2.0"
+  s.add_dependency "backports", "~> 2.8.2"
   s.add_dependency "tilt",      ">= 1.3", "< 3"
   s.add_dependency "rack-protection", version
   s.add_dependency "multi_json"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - https://github.com/sinatra/sinatra/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -420,7 +420,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Collection of useful Sinatra extensions