sinatra-contrib 2.0.0.beta2 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2eb499fee5169418408b644b1a18045800e5d81
-  data.tar.gz: c799c9fd1234decb3d112cc8adc6852fadb65744
+  metadata.gz: 6d991b914291bb371442ba8031c64548acd0ed2f
+  data.tar.gz: 87caaefbed03e5ad9b760fe37e9a855dd7b2f728
 SHA512:
-  metadata.gz: 9dd1cbc8a9c822e433fd5f2e55940483f3ef0f157aa13a9671d13f6a3ac0ece73926923fa9da11f2757868548900970bbea751a9207b28c7c0ffcab28dc8e2ef
-  data.tar.gz: b590b7b27c2c15cb4797dad68c8e86abd8b1052f21b7604d1ff1aefbe0f36c0e4d4245de6a9c61d9ffb004776ed2bde2d81ae835d0dbd0837f54923e0cef4f71
+  metadata.gz: 187c5077d865228cef464aab890399b53c2c9f299b0c91710f64d74342307ddefcb0c20e03cf72cedd831243535d199b327cb92245345cf6e5dff7a0caaa897d
+  data.tar.gz: 021b1a649f15e0eb78a92fe70b9a88e771103e6b4736baf62ba2da088b14c1dcc1fc87448b18e9c3dbf06c7dc2d44fb2a0f9d3f06cfbde7562dacef5502ce138

data/lib/sinatra/config_file.rb

@@ -129,7 +129,7 @@ module Sinatra
         paths.each do |pattern|
           Dir.glob(pattern) do |file|
             raise UnsupportedConfigType unless ['.yml', '.erb'].include?(File.extname(file))
-            $stderr.puts "loading config file '#{file}'" if logging?
+            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|
@@ -161,7 +161,7 @@ module Sinatra
       end
 
       if hash.respond_to? :to_hash
-        indifferent_hash = Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
+        indifferent_hash = Hash.new { |hash, key| hash[key.to_s] if Symbol === key }
         indifferent_hash.merge hash.to_hash
       else
         hash

data/lib/sinatra/content_for.rb

@@ -179,7 +179,7 @@ module Sinatra
     private
 
     def content_blocks
-      @content_blocks ||= Hash.new {|h,k| h[k] = [] }
+      @content_blocks ||= Hash.new { |h, k| h[k] = [] }
     end
   end
 

data/lib/sinatra/cookies.rb

@@ -86,7 +86,7 @@ module Sinatra
       end
 
       def []=(key, value)
-        @response.set_cookie key.to_s, @options.merge(:value => value)
+        set(key, value: value)
       end
 
       def assoc(key)
@@ -240,6 +240,10 @@ module Sinatra
 
       alias select! keep_if if Hash.method_defined? :select!
 
+      def set(key, options = {})
+        @response.set_cookie key.to_s, @options.merge(options)
+      end
+
       def shift
         key, value = to_hash.shift
         delete(key)

data/lib/sinatra/respond_with.rb

@@ -206,6 +206,8 @@ module Sinatra
     end
 
     def respond_to(*formats)
+      @respond_to ||= nil
+
       if formats.any?
         @respond_to ||= []
         @respond_to.concat formats

data/lib/sinatra/streaming.rb

@@ -98,6 +98,8 @@ module Sinatra
 
       def <<(data)
         raise IOError, 'not opened for writing' if closed?
+
+        @transformer ||= nil
         data = data.to_s
         data = @transformer[data] if @transformer
         @pos += data.bytesize
@@ -116,6 +118,8 @@ module Sinatra
       end
 
       def map!(&block)
+        @transformer ||= nil
+
         if @transformer
           inner, outer = @transformer, block
           block = proc { |value| outer[inner[value]] }

data/lib/sinatra/test_helpers.rb

@@ -1,6 +1,10 @@
 require 'sinatra/base'
-require 'rack/test'
 require 'rack'
+begin
+  require 'rack/test'
+rescue LoadError
+  abort 'Add rack-test to your Gemfile to use this module!'
+end
 require 'forwardable'
 
 module Sinatra

data/sinatra-contrib.gemspec

@@ -217,10 +217,9 @@ 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.beta2"
+  s.add_dependency "mustermann",  "1.0.0"
   s.add_dependency "backports", ">= 2.0"
   s.add_dependency "tilt",      ">= 1.3", "< 3"
-  s.add_dependency "rack-test"
   s.add_dependency "rack-protection", Sinatra::VERSION
   s.add_dependency "multi_json"
 
@@ -242,4 +241,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "wikicloth"
   s.add_development_dependency "markaby"
   s.add_development_dependency "rake", "< 11"
+  s.add_development_dependency "rack-test"
 end

data/spec/config_file_spec.rb

@@ -24,12 +24,12 @@ describe Sinatra::ConfigFile do
 
   it 'should render options in ERB tags when using .yml files' do
     config_file 'key_value.yml'
-    settings.bar.should == "bar"
-    settings.something.should == 42
-    settings.nested['a'].should == 1
-    settings.nested[:a].should == 1
-    settings.nested['b'].should == 2
-    settings.nested[:b].should == 2
+    expect(settings.bar).to eq "bar"
+    expect(settings.something).to eq 42
+    expect(settings.nested['a']).to eq 1
+    expect(settings.nested[:a]).to eq 1
+    expect(settings.nested['b']).to eq 2
+    expect(settings.nested[:b]).to eq 2
   end
 
   it 'should render options in ERB tags when using .yml.erb files' do

data/spec/cookies_spec.rb

@@ -719,6 +719,29 @@ describe Sinatra::Cookies do
     end
   end
 
+  describe :set do
+    it 'sets a cookie' do
+      cookie_route { cookies.set('foo', value: 'bar') }
+      expect(cookie_jar['foo']).to eq('bar')
+    end
+
+    it 'sets a cookie with HttpOnly' do
+      expect(cookie_route do
+        request.script_name = '/foo'
+        cookies.set('foo', value: 'bar', httponly: true)
+        response['Set-Cookie'].lines.detect { |l| l.start_with? 'foo=' }
+      end).to include('HttpOnly')
+    end
+
+    it 'sets a cookie without HttpOnly' do
+      expect(cookie_route do
+        request.script_name = '/foo'
+        cookies.set('foo', value: 'bar', httponly: false)
+        response['Set-Cookie'].lines.detect { |l| l.start_with? 'foo=' }
+      end).not_to include('HttpOnly')
+    end
+  end
+
   describe :select do
     it 'removes entries from new hash' do
       jar = cookies('foo=bar', 'bar=baz')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Konstantin Haase
@@ -57,7 +57,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -65,28 +65,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: mustermann
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
@@ -121,34 +121,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -415,6 +401,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '11'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Collection of useful Sinatra extensions
 email:
 - konstantin.mailinglists@googlemail.com
@@ -587,4 +587,3 @@ signing_key:
 specification_version: 4
 summary: Collection of useful Sinatra extensions
 test_files: []
-has_rdoc: