sinatra 1.3.0 → 1.3.1

data/CHANGES

@@ -1,4 +1,9 @@
-= 1.3.0 / Not Yet Released
+= 1.3.1 / Not Yet Released
+
+ * Support adding more than one callback to the stream object. (Konstantin
+   Haase)
+
+= 1.3.0 / 2011-09-30
 
  * Added `stream` helper method for easily creating streaming APIs, Server
    Sent Events or even WebSockets. See README for more on that topic.
@@ -125,7 +130,7 @@
  * Fix handling of broken query params when displaying exceptions. (Luke
    Jahnke)
 
-= 1.2.7 (backports release) / Not Yet Released
+= 1.2.7 (backports release) / 2011-09-30
 
 Custom changes:
 

data/lib/sinatra/base.rb

@@ -247,11 +247,14 @@ module Sinatra
       def self.defer(*)    yield end
 
       def initialize(scheduler = self.class, keep_open = false, &back)
-        @back, @scheduler, @callback, @keep_open = back.to_proc, scheduler, nil, keep_open
+        @back, @scheduler, @keep_open = back.to_proc, scheduler, keep_open
+        @callbacks, @closed = [], false
       end
 
       def close
-        @scheduler.schedule { @callback.call if @callback }
+        return if @closed
+        @closed = true
+        @scheduler.schedule { @callbacks.each { |c| c.call }}
       end
 
       def each(&front)
@@ -272,7 +275,7 @@ module Sinatra
       end
 
       def callback(&block)
-        @callback = block
+        @callbacks << block
       end
 
       alias errback callback
@@ -845,7 +848,7 @@ module Sinatra
       return unless path.start_with?(public_dir) and File.file?(path)
 
       env['sinatra.static_file'] = path
-      cache_control *settings.static_cache_control if settings.static_cache_control?
+      cache_control(*settings.static_cache_control) if settings.static_cache_control?
       send_file path, :disposition => nil
     end
 
@@ -1213,7 +1216,7 @@ module Sinatra
         keys = []
         if path.respond_to? :to_str
           pattern = path.to_str.gsub(/[^\?\%\\\/\:\*\w]/) { |c| encoded(c) }
-          pattern.gsub! /((:\w+)|\*)/ do |match|
+          pattern.gsub!(/((:\w+)|\*)/) do |match|
             if match == "*"
               keys << 'splat'
               "(.*?)"
@@ -1360,8 +1363,8 @@ module Sinatra
 
       def setup_protection(builder)
         return unless protection?
-        options = Hash === protection ? protection.dup : {:except => [:escaped_params]}
-        options[:except] = Array options[:except]
+        options = Hash === protection ? protection.dup : {}
+        options[:except] = Array(options[:except] || :escaped_params)
         options[:except] += [:session_hijacking, :remote_token] unless sessions?
         builder.use Rack::Protection, options
       end

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/sinatra.gemspec

@@ -7,12 +7,12 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
   s.authors           = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet", "Konstantin Haase"]
   s.email             = "sinatrarb@googlegroups.com"
   s.homepage          = "http://www.sinatrarb.com/"
-  s.files             = `git ls-files`.split("\n")
+  s.files             = `git ls-files`.split("\n") - %w[.gitignore .travis.yml]
   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]
 
-  s.add_dependency 'rack',            '~> 1.3'
-  s.add_dependency 'rack-protection', '~> 1.1'
-  s.add_dependency 'tilt',            '~> 1.3'
+  s.add_dependency 'rack',            '~> 1.3', '>= 1.3.4'
+  s.add_dependency 'rack-protection', '~> 1.1', '>= 1.1.2'
+  s.add_dependency 'tilt',            '~> 1.3', '>= 1.3.3'
 end

data/test/routing_test.rb

@@ -114,6 +114,8 @@ class RoutingTest < Test::Unit::TestCase
 
   it 'matches empty PATH_INFO to "" if a route is defined for ""' do
     mock_app do
+      disable :protection
+
       get '/' do
         'did not work'
       end

data/test/streaming_test.rb

@@ -56,6 +56,16 @@ class StreamingTest < Test::Unit::TestCase
     assert_equal 0, final
   end
 
+  it 'allows adding more than one callback' do
+    a = b = false
+    stream = Stream.new { }
+    stream.callback { a = true }
+    stream.callback { b = true }
+    stream.each { |str| }
+    assert a, 'should trigger first callback'
+    assert b, 'should trigger second callback'
+  end
+
   class MockScheduler
     def initialize(*)     @schedule, @defer = [], []                end
     def schedule(&block)  @schedule << block                        end
@@ -97,4 +107,9 @@ class StreamingTest < Test::Unit::TestCase
     scheduler.defer!
     assert_raise(RuntimeError) { scheduler.schedule! }
   end
+
+  it 'does not trigger an infinite loop if you call close in a callback' do
+    stream = Stream.new { |out| out.callback { out.close }}
+    stream.each { |str| }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,41 +12,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153226420 !ruby/object:Gem::Requirement
+  requirement: &2156366140 !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: *2153226420
+  version_requirements: *2156366140
 - !ruby/object:Gem::Dependency
   name: rack-protection
-  requirement: &2153224900 !ruby/object:Gem::Requirement
+  requirement: &2156364800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153224900
+  version_requirements: *2156364800
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2153223640 !ruby/object:Gem::Requirement
+  requirement: &2156363420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153223640
+  version_requirements: *2156363420
 description: Sinatra is a DSL for quickly creating web applications in Ruby with minimal
   effort.
 email: sinatrarb@googlegroups.com
@@ -65,8 +74,6 @@ extra_rdoc_files:
 - README.zh.rdoc
 - LICENSE
 files:
-- .gitignore
-- .travis.yml
 - .yardopts
 - AUTHORS
 - CHANGES

data/.gitignore

@@ -1,6 +0,0 @@
-# please add general patterns to your global ignore list
-# see https://github.com/github/gitignore#readme
-
-/pkg
-/doc/api
-/Gemfile.lock

data/.travis.yml

@@ -1,16 +0,0 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - rbx
-  - rbx-2.0
-  - jruby
-  - ruby-head
-env:
-  - "rack=1.3.0"
-  - "rack=master"
-  - "tilt=1.3.2"
-  - "tilt=master"
-notifications:
-  recipients:
-    - k.haase@finn.de