grape 0.6.1 → 0.7.0

data/lib/grape/error_formatter/base.rb

@@ -1,9 +1,7 @@
 module Grape
   module ErrorFormatter
     module Base
-
       class << self
-
         FORMATTERS = {
           serializable_hash: Grape::ErrorFormatter::Json,
           json: Grape::ErrorFormatter::Json,
@@ -27,7 +25,6 @@ module Grape
             spec
           end
         end
-
       end
     end
   end

data/lib/grape/error_formatter/json.rb

@@ -2,7 +2,6 @@ module Grape
   module ErrorFormatter
     module Json
       class << self
-
         def call(message, backtrace, options = {}, env = nil)
           result = message.is_a?(Hash) ? message : { error: message }
           if (options[:rescue_options] || {})[:backtrace] && backtrace && !backtrace.empty?
@@ -10,7 +9,6 @@ module Grape
           end
           MultiJson.dump(result)
         end
-
       end
     end
   end

data/lib/grape/error_formatter/txt.rb

@@ -2,7 +2,6 @@ module Grape
   module ErrorFormatter
     module Txt
       class << self
-
         def call(message, backtrace, options = {}, env = nil)
           result = message.is_a?(Hash) ? MultiJson.dump(message) : message
           if (options[:rescue_options] || {})[:backtrace] && backtrace && !backtrace.empty?
@@ -11,7 +10,6 @@ module Grape
           end
           result
         end
-
       end
     end
   end

data/lib/grape/error_formatter/xml.rb

@@ -2,7 +2,6 @@ module Grape
   module ErrorFormatter
     module Xml
       class << self
-
         def call(message, backtrace, options = {}, env = nil)
           result = message.is_a?(Hash) ? message : { message: message }
           if (options[:rescue_options] || {})[:backtrace] && backtrace && !backtrace.empty?
@@ -10,7 +9,6 @@ module Grape
           end
           result.respond_to?(:to_xml) ? result.to_xml(root: :error) : result.to_s
         end
-
       end
     end
   end

data/lib/grape/exceptions/base.rb

@@ -1,7 +1,6 @@
 module Grape
   module Exceptions
     class Base < StandardError
-
       BASE_MESSAGES_KEY = 'grape.errors.messages'
       BASE_ATTRIBUTES_KEY = 'grape.errors.attributes'
       FALLBACK_LOCALE = :en
@@ -62,7 +61,6 @@ module Grape
         message = ::I18n.translate(key, options)
         message.present? ? message : ::I18n.translate(key, options.merge(locale: FALLBACK_LOCALE))
       end
-
     end
   end
 end

data/lib/grape/exceptions/incompatible_option_values.rb

@@ -2,12 +2,9 @@
 module Grape
   module Exceptions
     class IncompatibleOptionValues < Base
-
       def initialize(option1, value1, option2, value2)
         super(message: compose_message("incompatible_option_values", option1: option1, value1: value1, option2: option2, value2: value2))
       end
-
     end
-
   end
 end

data/lib/grape/exceptions/invalid_formatter.rb

@@ -2,12 +2,9 @@
 module Grape
   module Exceptions
     class InvalidFormatter < Base
-
       def initialize(klass, to_format)
         super(message: compose_message("invalid_formatter", klass: klass, to_format: to_format))
       end
-
     end
-
   end
 end

data/lib/grape/exceptions/invalid_versioner_option.rb

@@ -1,14 +1,10 @@
 # encoding: utf-8
 module Grape
   module Exceptions
-
     class InvalidVersionerOption < Base
-
       def initialize(strategy)
         super(message: compose_message("invalid_versioner_option", strategy: strategy))
       end
-
     end
-
   end
 end

data/lib/grape/exceptions/invalid_with_option_for_represent.rb

@@ -2,11 +2,9 @@
 module Grape
   module Exceptions
     class InvalidWithOptionForRepresent < Base
-
       def initialize
         super(message: compose_message("invalid_with_option_for_represent"))
       end
-
     end
   end
 end

data/lib/grape/exceptions/missing_mime_type.rb

@@ -2,13 +2,9 @@
 module Grape
   module Exceptions
     class MissingMimeType < Base
-
       def initialize(new_format)
         super(message: compose_message("missing_mime_type", new_format: new_format))
       end
-
     end
-
   end
-
 end

data/lib/grape/exceptions/missing_option.rb

@@ -2,12 +2,9 @@
 module Grape
   module Exceptions
     class MissingOption < Base
-
       def initialize(option)
         super(message: compose_message("missing_option", option: option))
       end
-
     end
-
   end
 end

data/lib/grape/exceptions/missing_vendor_option.rb

@@ -2,12 +2,9 @@
 module Grape
   module Exceptions
     class MissingVendorOption < Base
-
       def initialize
         super(message: compose_message("missing_vendor_option"))
       end
-
     end
-
   end
 end

data/lib/grape/exceptions/unknown_options.rb

@@ -2,13 +2,9 @@
 module Grape
   module Exceptions
     class UnknownOptions < Base
-
       def initialize(options)
         super(message: compose_message("unknown_options", options: options))
       end
-
     end
-
   end
-
 end

data/lib/grape/exceptions/unknown_validator.rb

@@ -2,11 +2,9 @@
 module Grape
   module Exceptions
     class UnknownValidator < Base
-
       def initialize(validator_type)
         super(message: compose_message("unknown_validator", validator_type: validator_type))
       end
-
     end
   end
 end

data/lib/grape/exceptions/validation_errors.rb

@@ -27,15 +27,16 @@ module Grape
       private
 
       def full_messages
-        map { |attribute, error| full_message(attribute, error) }
+        map { |attribute, error| full_message(attribute, error) }.uniq
       end
 
       def full_message(attribute, error)
-        I18n.t("grape.errors.format".to_sym, {
-          default:  "%{attribute} %{message}",
+        I18n.t(
+          "grape.errors.format".to_sym,
+          default: "%{attribute} %{message}",
           attribute: translate_attribute(attribute),
-          message:   error.message
-        })
+          message: error.message
+        )
       end
     end
   end

data/lib/grape/formatter/base.rb

@@ -1,9 +1,7 @@
 module Grape
   module Formatter
     module Base
-
       class << self
-
         FORMATTERS = {
           json: Grape::Formatter::Json,
           jsonapi: Grape::Formatter::Json,
@@ -27,7 +25,6 @@ module Grape
             spec
           end
         end
-
       end
     end
   end

data/lib/grape/formatter/json.rb

@@ -2,12 +2,10 @@ module Grape
   module Formatter
     module Json
       class << self
-
         def call(object, env)
           return object.to_json if object.respond_to?(:to_json)
           MultiJson.dump(object)
         end
-
       end
     end
   end

data/lib/grape/formatter/serializable_hash.rb

@@ -2,7 +2,6 @@ module Grape
   module Formatter
     module SerializableHash
       class << self
-
         def call(object, env)
           return object if object.is_a?(String)
           return MultiJson.dump(serialize(object)) if serializable?(object)
@@ -12,24 +11,24 @@ module Grape
 
         private
 
-          def serializable?(object)
-            object.respond_to?(:serializable_hash) || object.kind_of?(Array) && !object.map { |o| o.respond_to? :serializable_hash }.include?(false) || object.kind_of?(Hash)
-          end
+        def serializable?(object)
+          object.respond_to?(:serializable_hash) || object.kind_of?(Array) && !object.map { |o| o.respond_to? :serializable_hash }.include?(false) || object.kind_of?(Hash)
+        end
 
-          def serialize(object)
-            if object.respond_to? :serializable_hash
-              object.serializable_hash
-            elsif object.kind_of?(Array) && !object.map { |o| o.respond_to? :serializable_hash }.include?(false)
-              object.map { |o| o.serializable_hash }
-            elsif object.kind_of?(Hash)
-              object.inject({}) do |h, (k, v)|
-                h[k] = serialize(v)
-                h
-              end
-            else
-              object
+        def serialize(object)
+          if object.respond_to? :serializable_hash
+            object.serializable_hash
+          elsif object.kind_of?(Array) && !object.map { |o| o.respond_to? :serializable_hash }.include?(false)
+            object.map { |o| o.serializable_hash }
+          elsif object.kind_of?(Hash)
+            object.inject({}) do |h, (k, v)|
+              h[k] = serialize(v)
+              h
             end
+          else
+            object
           end
+        end
       end
     end
   end

data/lib/grape/formatter/txt.rb

@@ -2,11 +2,9 @@ module Grape
   module Formatter
     module Txt
       class << self
-
         def call(object, env)
           object.respond_to?(:to_txt) ? object.to_txt : object.to_s
         end
-
       end
     end
   end

data/lib/grape/formatter/xml.rb

@@ -2,12 +2,10 @@ module Grape
   module Formatter
     module Xml
       class << self
-
         def call(object, env)
           return object.to_xml if object.respond_to?(:to_xml)
           raise Grape::Exceptions::InvalidFormatter.new(object.class, 'xml')
         end
-
       end
     end
   end

data/lib/grape/http/request.rb

@@ -1,8 +1,7 @@
 module Grape
   class Request < Rack::Request
-
     def params
-      @env['grape.request.params'] = begin
+      @params ||= begin
         params = Hashie::Mash.new(super)
         if env['rack.routing_args']
           args = env['rack.routing_args'].dup
@@ -15,7 +14,7 @@ module Grape
     end
 
     def headers
-      @env['grape.request.headers'] ||= @env.dup.inject({}) do |h, (k, v)|
+      @headers ||= env.dup.inject({}) do |h, (k, v)|
         if k.to_s.start_with? 'HTTP_'
           k = k[5..-1].gsub('_', '-').downcase.gsub(/^.|[-_\s]./) { |x| x.upcase }
           h[k] = v
@@ -23,6 +22,5 @@ module Grape
         h
       end
     end
-
   end
 end

data/lib/grape/locale/en.yml

@@ -14,7 +14,7 @@ en:
         missing_mime_type:
           problem: 'missing mime type for %{new_format}'
           resolution:
-            "you can choose exist mime type from Grape::ContentTypes::CONTENT_TYPES
+            "you can choose existing mime type from Grape::ContentTypes::CONTENT_TYPES
             or add your own with content_type :%{new_format}, 'application/%{new_format}'
             "
         invalid_with_option_for_represent:

data/lib/grape/middleware/auth/oauth2.rb

@@ -5,9 +5,10 @@ module Grape::Middleware::Auth
       {
         token_class: 'AccessToken',
         realm: 'OAuth API',
-        parameter: %w(bearer_token oauth_token),
+        parameter: %w(bearer_token oauth_token access_token),
         accepted_headers: %w(HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION X-HTTP_AUTHORIZATION REDIRECT_X_HTTP_AUTHORIZATION),
-        header: [/Bearer (.*)/i, /OAuth (.*)/i]
+        header: [/Bearer (.*)/i, /OAuth (.*)/i],
+        required: true
       }
     end
 
@@ -15,9 +16,17 @@ module Grape::Middleware::Auth
       verify_token(token_parameter || token_header)
     end
 
+    def request
+      @request ||= Grape::Request.new(env)
+    end
+
+    def params
+      @params ||= request.params
+    end
+
     def token_parameter
       Array(options[:parameter]).each do |p|
-        return request[p] if request[p]
+        return params[p] if params[p]
       end
       nil
     end
@@ -45,7 +54,7 @@ module Grape::Middleware::Auth
       token = token_class.verify(token)
       if token
         if token.respond_to?(:expired?) && token.expired?
-          error_out(401, 'expired_token')
+          error_out(401, 'invalid_grant')
         else
           if !token.respond_to?(:permission_for?) || token.permission_for?(env)
             env['api.token'] = token
@@ -53,8 +62,8 @@ module Grape::Middleware::Auth
             error_out(403, 'insufficient_scope')
           end
         end
-      else
-        error_out(401, 'invalid_token')
+      elsif !!options[:required]
+        error_out(401, 'invalid_grant')
       end
     end
 

data/lib/grape/middleware/base.rb

@@ -27,14 +27,13 @@ module Grape
 
       # @abstract
       # Called before the application is called in the middleware lifecycle.
-      def before; end
+      def before
+      end
+
       # @abstract
       # Called after the application is called in the middleware lifecycle.
       # @return [Response, nil] a Rack SPEC response or nil to call the application afterwards.
-      def after; end
-
-      def request
-        Grape::Request.new(env)
+      def after
       end
 
       def response
@@ -54,9 +53,10 @@ module Grape
       end
 
       def mime_types
-        content_types.invert
+        content_types.each_with_object({}) { |(k, v), types_without_params|
+          types_without_params[k] = v.split(';').first
+        }.invert
       end
-
     end
   end
 end