sinatra-sinatra 0.8.9 → 0.8.10

data/CHANGES

@@ -8,6 +8,10 @@
    Documentation on using these features is forth-coming; the following
    provides the basic gist: http://gist.github.com/38605
 
+ * Parameters with subscripts are now parsed into a nested/recursive
+   Hash structure. e.g., "post[title]=Hello&post[body]=World" yields
+   params: {'post' => {'title' => 'Hello', 'body' => 'World'}}.
+
  * Regular expressions may now be used in route pattens; captures are
    available at "params[:captures]".
 
@@ -41,6 +45,13 @@
    has the status code specified. It's also possible to register an error
    page for a range of status codes: "error(500..599)".
 
+ * Sinatra's testing support is no longer dependent on Test::Unit. Requiring
+   'sinatra/test' adds the Sinatra::Test module and Sinatra::TestHarness
+   class, which can be used with any test framework. The 'sinatra/test/unit',
+   'sinatra/test/spec', 'sinatra/test/rspec', or 'sinatra/test/bacon' files
+   can be required to setup a framework-specific testing environment. See the
+   README for more information.
+
  * Added support for Bacon (test framework). The 'sinatra/test/bacon' file
    can be required to setup Sinatra test helpers on Bacon::Context.
 

data/README.rdoc

@@ -464,13 +464,14 @@ friends.
 
 Sinatra applications can be run directly:
 
-  ruby myapp.rb [-h] [-x] [-p PORT] [-e ENVIRONMENT]
+  ruby myapp.rb [-h] [-x] [-e ENVIRONMENT] [-p PORT] [-s HANDLER]
 
 Options are:
 
   -h # help
   -p # set the port (default is 4567)
   -e # set the environment (default is development)
+  -s # specify rack server/handler (default is thin)
   -x # turn on the mutex lock (default is off)
 
 == Contributing

data/lib/sinatra/base.rb

@@ -4,7 +4,7 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.8.9'
+  VERSION = '0.8.10'
 
   class Request < Rack::Request
     def user_agent
@@ -14,6 +14,13 @@ module Sinatra
     def accept
       @env['HTTP_ACCEPT'].split(',').map { |a| a.strip }
     end
+
+    # Override Rack 0.9.x's #params implementation (see #72 in lighthouse)
+    def params
+      self.GET.update(self.POST)
+    rescue EOFError => boom
+      self.GET
+    end
   end
 
   class Response < Rack::Response
@@ -324,8 +331,7 @@ module Sinatra
       self.class.filters.each {|block| instance_eval(&block)}
       if routes = self.class.routes[@request.request_method]
         path = @request.path_info
-        original_params = Hash.new{ |hash,k| hash[k.to_s] if Symbol === k }
-        original_params.merge! @request.params
+        original_params = nested_params(@request.params)
 
         routes.each do |pattern, keys, conditions, method_name|
           if pattern =~ path
@@ -345,8 +351,7 @@ module Sinatra
               else
                 {}
               end
-            @params = original_params.dup
-            @params.merge!(params)
+            @params = original_params.merge(params)
 
             catch(:pass) {
               conditions.each { |cond|
@@ -359,6 +364,22 @@ module Sinatra
       raise NotFound
     end
 
+    def nested_params(params)
+      return indifferent_hash.merge(params) if !params.keys.join.include?('[')
+      params.inject indifferent_hash do |res, (key,val)|
+        if key =~ /\[.*\]/
+          splat = key.scan(/(^[^\[]+)|\[([^\]]+)\]/).flatten.compact
+          head, last = splat[0..-2], splat[-1]
+          head.inject(res){ |s,v| s[v] ||= indifferent_hash }[last] = val
+        end
+        res
+      end
+    end
+
+    def indifferent_hash
+      Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
+    end
+
     def invoke(handler)
       res = catch(:halt) {
         if handler.respond_to?(:call)

data/lib/sinatra/test.rb

@@ -60,6 +60,11 @@ module Sinatra
       end
     end
 
+    # Also check @response since we delegate there.
+    def respond_to?(symbol, include_private=false)
+      super || (@response && @response.respond_to?(symbol, include_private))
+    end
+
     RACK_OPT_NAMES = {
       :accept => "HTTP_ACCEPT",
       :agent => "HTTP_USER_AGENT",

data/sinatra.gemspec

@@ -3,13 +3,14 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '0.8.9'
-  s.date = '2009-01-14'
+  s.version = '0.8.10'
+  s.date = '2009-01-16'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
 
   s.authors = ["Blake Mizerany"]
+  s.email = "sinatrarb@googlegroups.com"
 
   # = MANIFEST =
   s.files = %w[
@@ -98,7 +99,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
 
   s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.add_dependency 'rack', '>= 0.9.0'
+  s.add_dependency 'rack', '>= 0.9.1'
 
   s.has_rdoc = true
   s.homepage = "http://sinatra.rubyforge.org"

data/test/filter_test.rb

@@ -6,11 +6,11 @@ describe "Filters" do
     mock_app do
       get('/') { 'Hello World' }
       before {
-        fail 'count != 0' if count != 0
+        assert_equal 0, count
         count = 1
       }
       before {
-        fail 'count != 1' if count != 1
+        assert_equal 1, count
         count = 2
       }
     end

data/test/helper.rb

@@ -18,3 +18,8 @@ module Sinatra::Test
     @app = Sinatra.new(base, &block)
   end
 end
+
+class Sinatra::Base
+  # Allow assertions in request context
+  include Test::Unit::Assertions
+end

data/test/helpers_test.rb

@@ -142,7 +142,7 @@ describe 'Sinatra::Helpers' do
     it 'creates a new session when none provided' do
       mock_app {
         get '/' do
-          fail "session != {}" unless session.empty?
+          assert session.empty?
           session[:foo] = 'bar'
           'Hi'
         end

data/test/mapped_error_test.rb

@@ -34,8 +34,8 @@ describe 'Exception Mappings' do
     mock_app {
       set :raise_errors, false
       error(FooError) {
-        fail "!env.include?('sinatra.error')" if !env.include?('sinatra.error')
-        fail unless env['sinatra.error'].kind_of?(FooError)
+        assert env.include?('sinatra.error')
+        assert env['sinatra.error'].kind_of?(FooError)
         'looks good'
       }
       get '/' do

data/test/request_test.rb

@@ -6,4 +6,13 @@ describe 'Sinatra::Request' do
     assert request.respond_to?(:user_agent)
     assert_equal 'Test', request.user_agent
   end
+
+  it 'parses POST params when Content-Type is form-dataish' do
+    request = Sinatra::Request.new(
+      'REQUEST_METHOD' => 'PUT',
+      'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
+      'rack.input' => StringIO.new('foo=bar')
+    )
+    assert_equal 'bar', request.params['foo']
+  end
 end

data/test/routing_test.rb

@@ -27,8 +27,8 @@ describe "Routing" do
   it "exposes params with indifferent hash" do
     mock_app {
       get '/:foo' do
-        fail unless params['foo'] == 'bar'
-        fail unless params[:foo] == 'bar'
+        assert_equal 'bar', params['foo']
+        assert_equal 'bar', params[:foo]
         'well, alright'
       end
     }
@@ -39,8 +39,8 @@ describe "Routing" do
   it "merges named params and query string params in params" do
     mock_app {
       get '/:foo' do
-        fail unless params['foo'] == 'bar'
-        fail unless params['baz'] == 'biz'
+        assert_equal 'bar', params['foo']
+        assert_equal 'biz', params['baz']
       end
     }
     get '/bar?baz=biz'
@@ -80,7 +80,7 @@ describe "Routing" do
   it "supports single splat params like /*" do
     mock_app {
       get '/*' do
-        fail unless params['splat'].kind_of?(Array)
+        assert params['splat'].kind_of?(Array)
         params['splat'].join "\n"
       end
     }
@@ -95,7 +95,7 @@ describe "Routing" do
   it "supports mixing multiple splat params like /*/foo/*/*" do
     mock_app {
       get '/*/foo/*/*' do
-        fail unless params['splat'].kind_of?(Array)
+        assert params['splat'].kind_of?(Array)
         params['splat'].join "\n"
       end
     }
@@ -110,8 +110,8 @@ describe "Routing" do
   it "supports mixing named and splat params like /:foo/*" do
     mock_app {
       get '/:foo/*' do
-        fail unless params['foo'] == 'foo'
-        fail unless params['splat'] == ['bar/baz']
+        assert_equal 'foo', params['foo']
+        assert_equal ['bar/baz'], params['splat']
       end
     }
 
@@ -119,6 +119,63 @@ describe "Routing" do
     assert ok?
   end
 
+  it "supports basic nested params" do
+    mock_app {
+      get '/hi' do
+        params["person"]["name"]
+      end
+    }
+
+    get "/hi?person[name]=John+Doe"
+    assert ok?
+    assert_equal "John Doe", body
+  end
+
+  it "exposes nested params with indifferent hash" do
+    mock_app {
+      get '/testme' do
+        assert_equal 'baz', params['bar']['foo']
+        assert_equal 'baz', params['bar'][:foo]
+        'well, alright'
+      end
+    }
+    get '/testme?bar[foo]=baz'
+    assert_equal 'well, alright', body
+  end
+
+  it "supports deeply nested params" do
+    input = {
+      'browser[chrome][engine][name]' => 'V8',
+      'browser[chrome][engine][version]' => '1.0',
+      'browser[firefox][engine][name]' => 'spidermonkey',
+      'browser[firefox][engine][version]' => '1.7.0',
+      'emacs[map][goto-line]' => 'M-g g',
+      'emacs[version]' => '22.3.1',
+      'paste[name]' => 'hello world',
+      'paste[syntax]' => 'ruby'
+    }
+    expected = {
+      "emacs" => {
+        "map"     => { "goto-line" => "M-g g" },
+        "version" => "22.3.1"
+      },
+      "browser" => {
+        "firefox" => {"engine" => {"name"=>"spidermonkey", "version"=>"1.7.0"}},
+        "chrome"  => {"engine" => {"name"=>"V8", "version"=>"1.0"}}
+      },
+      "paste" => {"name"=>"hello world", "syntax"=>"ruby"}
+    }
+    mock_app {
+      get '/foo' do
+        assert_equal expected, params
+        'looks good'
+      end
+    }
+    get "/foo?#{param_string(input)}"
+    assert ok?
+    assert_equal 'looks good', body
+  end
+
   it "supports paths that include spaces" do
     mock_app {
       get '/path with spaces' do
@@ -134,8 +191,8 @@ describe "Routing" do
   it "URL decodes named parameters and splats" do
     mock_app {
       get '/:foo/*' do
-        fail unless params['foo'] == 'hello world'
-        fail unless params['splat'] == ['how are you']
+        assert_equal 'hello world', params['foo']
+        assert_equal ['how are you'], params['splat']
         nil
       end
     }
@@ -159,7 +216,7 @@ describe "Routing" do
   it 'makes regular expression captures available in params[:captures]' do
     mock_app {
       get(/^\/fo(.*)\/ba(.*)/) do
-        fail unless params[:captures] == ['orooomma', 'f']
+        assert_equal ['orooomma', 'f'], params[:captures]
         'right on'
       end
     }
@@ -190,7 +247,7 @@ describe "Routing" do
       end
 
       get '/*' do
-        fail if params.include?('foo')
+        assert !params.include?('foo')
         'Hello World'
       end
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-14 00:00:00 -08:00
+date: 2009-01-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,10 +19,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 0.9.1
     version: 
 description: Classy web-development dressed in a DSL
-email: 
+email: sinatrarb@googlegroups.com
 executables: []
 
 extensions: []