grape 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.4.1 (4/1/2013)
+================
+
+* [#375](https://github.com/intridea/grape/pull/375): Fix: throwing an `:error` inside a middleware doesn't respect the `format` settings - [@dblock](https://github.com/dblock).
+* Your contribution here.
+
 0.4.0 (3/17/2013)
 =================
 
@@ -11,7 +17,7 @@
 * [#357](https://github.com/intridea/grape/pull/357): Grape now requires Rack 1.3.0 or newer - [@jhecking](https://github.com/jhecking).
 * [#320](https://github.com/intridea/grape/issues/320): API `namespace` now supports `requirements` - [@niedhui](https://github.com/niedhui).
 * [#353](https://github.com/intridea/grape/issues/353): Revert to standard Ruby logger formatter, `require active_support/all` if you want old behavior - [@rhunter](https://github.com/rhunter), [@dblock](https://github.com/dblock).
-* Fix: `undefined method `call' for nil:NilClass` for an API method implementation without a block, now returns an empty string - [@dblock](https://github.com/dblock).
+* Fix: `undefined method 'call' for nil:NilClass` for an API method implementation without a block, now returns an empty string - [@dblock](https://github.com/dblock).
 
 0.3.2 (2/28/2013)
 =================

data/README.md

@@ -12,7 +12,7 @@ content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the stable release 0.4.0.
+You're reading the documentation for the stable 0.4.1 release of Grape.
 
 ## Project Tracking
 
@@ -1139,7 +1139,7 @@ describe Twitter::API do
 end
 ```
 
-In Rails, HTTP request tests would go into the `spec/request` group. You may want your API code to go into
+In Rails, HTTP request tests would go into the `spec/requests` group. You may want your API code to go into
 `app/api` - you can match that layout under `spec` by adding the following in `spec/spec_helper.rb`.
 
 ```ruby

data/lib/grape.rb

@@ -8,6 +8,7 @@ require 'rack/auth/digest/md5'
 require 'hashie'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/ordered_hash'
+require 'active_support/core_ext/object/conversions'
 require 'grape/util/deep_merge'
 require 'grape/util/content_types'
 require 'multi_json'

data/lib/grape/endpoint.rb

@@ -395,6 +395,7 @@ module Grape
 
       b.use Rack::Head
       b.use Grape::Middleware::Error,
+        :format => settings[:format],
         :default_status => settings[:default_error_status] || 403,
         :rescue_all => settings[:rescue_all],
         :rescued_errors => aggregate_setting(:rescued_errors),

data/lib/grape/version.rb

@@ -1,3 +1,3 @@
 module Grape
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/grape/api_spec.rb

@@ -1739,7 +1739,7 @@ describe Grape::API do
       end
     end
   end
-  context 'format' do
+  describe '.format' do
     context ':txt' do
       before(:each) do
         subject.format :txt
@@ -1801,33 +1801,48 @@ describe Grape::API do
         get '/meaning_of_life', {}, { 'HTTP_ACCEPT' => 'text/html' }
         last_response.body.should == { :meaning_of_life => 42 }.to_json
       end
+      it 'raised :error from middleware' do
+        middleware = Class.new(Grape::Middleware::Base) do
+          def before
+            throw :error, :message => "Unauthorized", :status => 42
+          end
+        end
+        subject.use middleware
+        subject.get do
+
+        end
+        get "/"
+        last_response.status.should == 42
+        last_response.body.should == { :error => "Unauthorized" }.to_json
+      end
+
     end
     context ':serializable_hash' do
       before(:each) do
-        class SimpleExample
+        class SerializableHashExample
           def serializable_hash
-            {:abc => 'def'}
+            { :abc => 'def' }
           end
         end
         subject.format :serializable_hash
       end
       it 'instance' do
         subject.get '/example' do
-          SimpleExample.new
+          SerializableHashExample.new
         end
         get '/example'
         last_response.body.should == '{"abc":"def"}'
       end
       it 'root' do
         subject.get '/example' do
-          { "root" => SimpleExample.new }
+          { "root" => SerializableHashExample.new }
         end
         get '/example'
         last_response.body.should == '{"root":{"abc":"def"}}'
       end
       it 'array' do
         subject.get '/examples' do
-          [ SimpleExample.new, SimpleExample.new ]
+          [ SerializableHashExample.new, SerializableHashExample.new ]
         end
         get '/examples'
         last_response.body.should == '[{"abc":"def"},{"abc":"def"}]'
@@ -1879,6 +1894,25 @@ XML
   <string>example1</string>
   <string>example2</string>
 </strings>
+XML
+      end
+      it 'raised :error from middleware' do
+        middleware = Class.new(Grape::Middleware::Base) do
+          def before
+            throw :error, :message => "Unauthorized", :status => 42
+          end
+        end
+        subject.use middleware
+        subject.get do
+
+        end
+        get "/"
+        last_response.status.should == 42
+        last_response.body.should == <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<error>
+  <message>Unauthorized</message>
+</error>
 XML
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -378,7 +378,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -881959779
+      hash: -2839578735981182036
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -387,12 +387,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -881959779
+      hash: -2839578735981182036
 requirements: []
 rubyforge_project: grape
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple Ruby framework for building REST-like APIs.
-test_files: []
+test_files:
+- spec/grape/api_spec.rb
+- spec/grape/endpoint_spec.rb
+- spec/grape/entity_spec.rb
+- spec/grape/exceptions/invalid_formatter_spec.rb
+- spec/grape/exceptions/invalid_versioner_option_spec.rb
+- spec/grape/exceptions/missing_mime_type_spec.rb
+- spec/grape/exceptions/missing_option_spec.rb
+- spec/grape/exceptions/unknown_options_spec.rb
+- spec/grape/exceptions/unknown_validator_spec.rb
+- spec/grape/middleware/auth/basic_spec.rb
+- spec/grape/middleware/auth/digest_spec.rb
+- spec/grape/middleware/auth/oauth2_spec.rb
+- spec/grape/middleware/base_spec.rb
+- spec/grape/middleware/error_spec.rb
+- spec/grape/middleware/exception_spec.rb
+- spec/grape/middleware/formatter_spec.rb
+- spec/grape/middleware/versioner/header_spec.rb
+- spec/grape/middleware/versioner/param_spec.rb
+- spec/grape/middleware/versioner/path_spec.rb
+- spec/grape/middleware/versioner_spec.rb
+- spec/grape/util/hash_stack_spec.rb
+- spec/grape/validations/coerce_spec.rb
+- spec/grape/validations/presence_spec.rb
+- spec/grape/validations/regexp_spec.rb
+- spec/grape/validations/zh-CN.yml
+- spec/grape/validations_spec.rb
+- spec/shared/versioning_examples.rb
+- spec/spec_helper.rb
+- spec/support/basic_auth_encode_helpers.rb
+- spec/support/versioned_helpers.rb
 has_rdoc: