sinatra-rest-addons 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/sinatra/rest/routes.rb

@@ -98,11 +98,15 @@ module Sinatra
             when /^application\/x-www-form-urlencoded/i
               request.env['sinatra.decoded_input'] = request.env['rack.request.form_hash']
             else
-              if not size_range.include?(request.env['rack.input'].size)
+              content = ""
+              request.env['rack.input'].each do |block|
+                content.concat(block)
+                break if content.length > size_range.end
+              end
+              if not size_range.include?(content.length)
                 content_type :txt
                 halt 400, "Input data size must be between #{size_range.begin} and #{size_range.end} bytes."
               else
-                content = request.env['rack.input'].read
                 request.env['sinatra.decoded_input'] = parsing_proc.call(mime_type, content)
               end
             end

data/sinatra-rest-addons.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-rest-addons}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril Rohr"]
-  s.date = %q{2009-11-16}
+  s.date = %q{2009-11-23}
   s.description = %q{A set of helpers and extensions for sinatra apps that expose REST resources.}
   s.email = %q{cyril.rohr@gmail.com}
   s.extra_rdoc_files = [

data/test/test_routes.rb

@@ -161,6 +161,21 @@ class RoutesTest < Test::Unit::TestCase
       assert_equal JSON.dump(input), last_response.body
       assert_equal 'application/json', last_response.headers['Content-Type']
     end
+    test "should work" do
+      input = "{\"walltime\":3600,\"resources\":\"/nodes=1\",\"at\":1258552306,\"on_launch\":{\"in\":\"/home/crohr\",\"do\":\"id\"}}" 
+      mock_app {
+        register Sinatra::REST::Routes
+        post '/', :decode => [PARSING_PROC, 2...3000] do
+          content_type 'application/json'
+          JSON.dump request.env['sinatra.decoded_input']
+        end
+      }
+      post '/', input, {'CONTENT_TYPE' => "application/json"}
+      p last_response.body
+      assert_equal 200, last_response.status
+      assert_equal JSON.parse(input), JSON.parse(last_response.body)
+      assert_equal 'application/json', last_response.headers['Content-Type']
+    end
     test "should set the decoded input to the params hash already decoded by Sinatra, if the request's content type is application/x-www-form-urlencoded" do
       input = {"key1" => ["value1", "value2"]}
       mock_app {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-rest-addons
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Cyril Rohr
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +01:00
+date: 2009-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency