grape 0.8.0 → 0.9.0

data/spec/grape/validations/zh-CN.yml

@@ -1,7 +1,7 @@
 zh-CN:
   grape:
     errors:
-      format: ! '%{attribute}%{message}'
+      format: ! '%{attributes}%{message}'
       attributes:
         age: 年龄
       messages:

data/spec/grape/validations_spec.rb

@@ -659,7 +659,7 @@ describe Grape::Validations do
         class Customvalidator < Grape::Validations::Validator
           def validate_param!(attr_name, params)
             unless params[attr_name] == 'im custom'
-              raise Grape::Exceptions::Validation, param: @scope.full_name(attr_name), message: "is not custom!"
+              raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: "is not custom!"
             end
           end
         end
@@ -802,6 +802,37 @@ describe Grape::Validations do
           end
         end
       end
+
+      context 'when using options on param' do
+        module CustomValidations
+          class CustomvalidatorWithOptions < Grape::Validations::SingleOptionValidator
+            def validate_param!(attr_name, params)
+              unless params[attr_name] == @option[:text]
+                raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: @option[:error_message]
+              end
+            end
+          end
+        end
+
+        before do
+          subject.params do
+            optional :custom, customvalidator_with_options: { text: 'im custom with options', error_message: "is not custom with options!" }
+          end
+          subject.get '/optional_custom' do
+            'optional with custom works!'
+          end
+        end
+
+        it 'validates param with custom validator with options' do
+          get '/optional_custom', custom: 'im custom with options'
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eq('optional with custom works!')
+
+          get '/optional_custom', custom: 'im wrong'
+          expect(last_response.status).to eq(400)
+          expect(last_response.body).to eq('custom is not custom with options!')
+        end
+      end
     end # end custom validation
 
     context 'named' do
@@ -813,9 +844,9 @@ describe Grape::Validations do
           end
         end
 
-        it 'in helper module which kind of Grape::API::Helpers' do
+        it 'in helper module which kind of Grape::DSL::Helpers::BaseHelper' do
           module SharedParams
-            extend Grape::API::Helpers
+            extend Grape::DSL::Helpers::BaseHelper
             params :pagination do
             end
           end
@@ -826,7 +857,7 @@ describe Grape::Validations do
       context 'can be included in usual params' do
         before do
           module SharedParams
-            extend Grape::API::Helpers
+            extend Grape::DSL::Helpers::BaseHelper
             params :period do
               optional :start_date
               optional :end_date
@@ -929,7 +960,7 @@ describe Grape::Validations do
 
           get '/mutually_exclusive', beer: 'string', wine: 'anotherstring'
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to eq("[:beer, :wine] are mutually exclusive")
+          expect(last_response.body).to eq "beer, wine are mutually exclusive"
         end
       end
 
@@ -949,15 +980,14 @@ describe Grape::Validations do
 
           get '/mutually_exclusive', beer: 'true', wine: 'true', scotch: 'true', aquavit: 'true'
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to match(/\[:beer, :wine\] are mutually exclusive/)
-          expect(last_response.body).to match(/\[:scotch, :aquavit\] are mutually exclusive/)
+          expect(last_response.body).to eq "beer, wine are mutually exclusive, scotch, aquavit are mutually exclusive"
         end
       end
     end
 
     context 'exactly one of' do
       context 'params' do
-        it 'errors when two or more are present' do
+        before :each do
           subject.params do
             optional :beer
             optional :wine
@@ -967,26 +997,58 @@ describe Grape::Validations do
           subject.get '/exactly_one_of' do
             'exactly_one_of works!'
           end
+        end
 
+        it 'errors when none are present' do
+          get '/exactly_one_of'
+          expect(last_response.status).to eq(400)
+          expect(last_response.body).to eq "beer, wine, juice are missing, exactly one parameter must be provided"
+        end
+
+        it 'succeeds when one is present' do
+          get '/exactly_one_of', beer: 'string'
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eq 'exactly_one_of works!'
+        end
+
+        it 'errors when two or more are present' do
           get '/exactly_one_of', beer: 'string', wine: 'anotherstring'
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to eq("[:beer, :wine] are mutually exclusive")
+          expect(last_response.body).to eq "beer, wine are mutually exclusive"
         end
+      end
+    end
 
-        it 'errors when none is selected' do
+    context 'at least one of' do
+      context 'params' do
+        before :each do
           subject.params do
             optional :beer
             optional :wine
             optional :juice
-            exactly_one_of :beer, :wine, :juice
+            at_least_one_of :beer, :wine, :juice
           end
-          subject.get '/exactly_one_of' do
-            'exactly_one_of works!'
+          subject.get '/at_least_one_of' do
+            'at_least_one_of works!'
           end
+        end
 
-          get '/exactly_one_of'
+        it 'errors when none are present' do
+          get '/at_least_one_of'
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to eq("[:beer, :wine, :juice] - exactly one parameter must be provided")
+          expect(last_response.body).to eq "beer, wine, juice are missing, at least one parameter must be provided"
+        end
+
+        it 'does not error when one is present' do
+          get '/at_least_one_of', beer: 'string'
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eq 'at_least_one_of works!'
+        end
+
+        it 'does not error when two are present' do
+          get '/at_least_one_of', beer: 'string', wine: 'string'
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eq 'at_least_one_of works!'
         end
       end
     end

data/spec/spec_helper.rb

@@ -23,4 +23,5 @@ I18n.enforce_available_locales = false
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
+  config.raise_errors_for_deprecations!
 end

data/spec/support/endpoint_faker.rb

@@ -0,0 +1,23 @@
+module Spec
+  module Support
+    class EndpointFaker
+      class FakerAPI < Grape::API
+        get '/' do
+        end
+      end
+
+      def initialize(app, endpoint = FakerAPI.endpoints.first)
+        @app = app
+        @endpoint = endpoint
+      end
+
+      def call(env)
+        @endpoint.instance_exec do
+          @request = Grape::Request.new(env.dup)
+        end
+
+        @app.call(env.merge('api.endpoint' => @endpoint))
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +234,48 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cookiejar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby framework for rapid API development with great conventions.
 email:
 - michael@intridea.com
@@ -244,6 +286,7 @@ files:
 - .gitignore
 - .rspec
 - .rubocop.yml
+- .rubocop_todo.yml
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -259,7 +302,17 @@ files:
 - grape.png
 - lib/grape.rb
 - lib/grape/api.rb
+- lib/grape/api/helpers.rb
 - lib/grape/cookies.rb
+- lib/grape/dsl/callbacks.rb
+- lib/grape/dsl/configuration.rb
+- lib/grape/dsl/helpers.rb
+- lib/grape/dsl/inside_route.rb
+- lib/grape/dsl/middleware.rb
+- lib/grape/dsl/parameters.rb
+- lib/grape/dsl/request_response.rb
+- lib/grape/dsl/routing.rb
+- lib/grape/dsl/validations.rb
 - lib/grape/endpoint.rb
 - lib/grape/error_formatter/base.rb
 - lib/grape/error_formatter/json.rb
@@ -285,9 +338,9 @@ files:
 - lib/grape/http/request.rb
 - lib/grape/locale/en.yml
 - lib/grape/middleware/auth/base.rb
-- lib/grape/middleware/auth/basic.rb
-- lib/grape/middleware/auth/digest.rb
-- lib/grape/middleware/auth/oauth2.rb
+- lib/grape/middleware/auth/dsl.rb
+- lib/grape/middleware/auth/strategies.rb
+- lib/grape/middleware/auth/strategy_info.rb
 - lib/grape/middleware/base.rb
 - lib/grape/middleware/error.rb
 - lib/grape/middleware/filter.rb
@@ -308,6 +361,7 @@ files:
 - lib/grape/util/deep_merge.rb
 - lib/grape/util/hash_stack.rb
 - lib/grape/validations.rb
+- lib/grape/validations/at_least_one_of.rb
 - lib/grape/validations/coerce.rb
 - lib/grape/validations/default.rb
 - lib/grape/validations/exactly_one_of.rb
@@ -316,7 +370,17 @@ files:
 - lib/grape/validations/regexp.rb
 - lib/grape/validations/values.rb
 - lib/grape/version.rb
+- spec/grape/api/helpers_spec.rb
 - spec/grape/api_spec.rb
+- spec/grape/dsl/callbacks_spec.rb
+- spec/grape/dsl/configuration_spec.rb
+- spec/grape/dsl/helpers_spec.rb
+- spec/grape/dsl/inside_route_spec.rb
+- spec/grape/dsl/middleware_spec.rb
+- spec/grape/dsl/parameters_spec.rb
+- spec/grape/dsl/request_response_spec.rb
+- spec/grape/dsl/routing_spec.rb
+- spec/grape/dsl/validations_spec.rb
 - spec/grape/endpoint_spec.rb
 - spec/grape/entity_spec.rb
 - spec/grape/exceptions/invalid_formatter_spec.rb
@@ -326,9 +390,9 @@ files:
 - spec/grape/exceptions/unknown_options_spec.rb
 - spec/grape/exceptions/unknown_validator_spec.rb
 - spec/grape/exceptions/validation_errors_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/auth/base_spec.rb
+- spec/grape/middleware/auth/dsl_spec.rb
+- spec/grape/middleware/auth/strategies_spec.rb
 - spec/grape/middleware/base_spec.rb
 - spec/grape/middleware/error_spec.rb
 - spec/grape/middleware/exception_spec.rb
@@ -340,6 +404,7 @@ files:
 - spec/grape/middleware/versioner_spec.rb
 - spec/grape/path_spec.rb
 - spec/grape/util/hash_stack_spec.rb
+- spec/grape/validations/at_least_one_of_spec.rb
 - spec/grape/validations/coerce_spec.rb
 - spec/grape/validations/default_spec.rb
 - spec/grape/validations/exactly_one_of_spec.rb
@@ -353,6 +418,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/basic_auth_encode_helpers.rb
 - spec/support/content_type_helpers.rb
+- spec/support/endpoint_faker.rb
 - spec/support/versioned_helpers.rb
 homepage: https://github.com/intridea/grape
 licenses:
@@ -379,7 +445,17 @@ signing_key:
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
 test_files:
+- spec/grape/api/helpers_spec.rb
 - spec/grape/api_spec.rb
+- spec/grape/dsl/callbacks_spec.rb
+- spec/grape/dsl/configuration_spec.rb
+- spec/grape/dsl/helpers_spec.rb
+- spec/grape/dsl/inside_route_spec.rb
+- spec/grape/dsl/middleware_spec.rb
+- spec/grape/dsl/parameters_spec.rb
+- spec/grape/dsl/request_response_spec.rb
+- spec/grape/dsl/routing_spec.rb
+- spec/grape/dsl/validations_spec.rb
 - spec/grape/endpoint_spec.rb
 - spec/grape/entity_spec.rb
 - spec/grape/exceptions/invalid_formatter_spec.rb
@@ -389,9 +465,9 @@ test_files:
 - spec/grape/exceptions/unknown_options_spec.rb
 - spec/grape/exceptions/unknown_validator_spec.rb
 - spec/grape/exceptions/validation_errors_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/auth/base_spec.rb
+- spec/grape/middleware/auth/dsl_spec.rb
+- spec/grape/middleware/auth/strategies_spec.rb
 - spec/grape/middleware/base_spec.rb
 - spec/grape/middleware/error_spec.rb
 - spec/grape/middleware/exception_spec.rb
@@ -403,6 +479,7 @@ test_files:
 - spec/grape/middleware/versioner_spec.rb
 - spec/grape/path_spec.rb
 - spec/grape/util/hash_stack_spec.rb
+- spec/grape/validations/at_least_one_of_spec.rb
 - spec/grape/validations/coerce_spec.rb
 - spec/grape/validations/default_spec.rb
 - spec/grape/validations/exactly_one_of_spec.rb
@@ -416,5 +493,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/basic_auth_encode_helpers.rb
 - spec/support/content_type_helpers.rb
+- spec/support/endpoint_faker.rb
 - spec/support/versioned_helpers.rb
 has_rdoc: 

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

@@ -1,13 +0,0 @@
-require 'rack/auth/basic'
-
-module Grape
-  module Middleware
-    module Auth
-      class Basic < Grape::Middleware::Auth::Base
-        def base_request
-          Rack::Auth::Basic::Request.new(env)
-        end
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-require 'rack/auth/digest/md5'
-
-module Grape
-  module Middleware
-    module Auth
-      class Digest < Grape::Middleware::Auth::Base
-        def base_request
-          Rack::Auth::Digest::Request.new(env)
-        end
-      end
-    end
-  end
-end