grape 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e83be7840de205451cdb523c0a03f3a079300f
-  data.tar.gz: b16053b9a44c001cecae4f670de0073630b7b43e
+  metadata.gz: e3f8c2e0db297ca831e464a1c0db49f2e5ba6f2e
+  data.tar.gz: 34b6bcee2a26ecb8e87b207abbb59647d2376773
 SHA512:
-  metadata.gz: cd442f6727d63e80b631e36005c48ac93e639ad3bfd61f102cdcf2530dd67b528c9576e11bad705052108e7448181b74dd32fd4121100009e0bf42451eea6fa9
-  data.tar.gz: 8f79ccab0811111484bb920ae2b27edbe2c498db8e775fa063b4bf67655f5e6022e561fc22cfd6362e17e1ca27be2e857ef0ed51e8f34b00c4b4bed3e9e06847
+  metadata.gz: 98bbce31a09337c9ef681b59f7a63c2bfb7cdb472d6b46275d73bd22064bcff48288283d57f5ed04ba6f662571975d3a284a91b0448a3369149729c363838fde
+  data.tar.gz: 41d9f0ac8df0ba6c7105ab8b1e50183d569f5708bdd9469661cde03a79e6f3e604551d049e49fd4fc3eb49d49456d42523718fcd961711112c4f904389ed9b70

data/.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 
-sudo: false
-
 rvm:
   - 2.1
   - 2.0.0

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.10.1 (12/28/2014)
+===================
+
+* [#868](https://github.com/intridea/grape/pull/868), [#862](https://github.com/intridea/grape/pull/862), [#861](https://github.com/intridea/grape/pull/861): Fixed `version`, `prefix`, and other settings being overridden or changing scope when mounting API - [@yesmeck](https://github.com/yesmeck).
+* [#864](https://github.com/intridea/grape/pull/864): Fixed `declared(params, include_missing: false)` now returning attributes with `nil` and `false` values - [@ppadron](https://github.com/ppadron).
+
 0.10.0 (12/19/2014)
 ===================
 

data/README.md

@@ -1,6 +1,6 @@
 ![grape logo](grape.png)
 
-[![Build Status](https://travis-ci.org/intridea/grape.png?branch=master)](http://travis-ci.org/intridea/grape) [![Code Climate](https://codeclimate.com/github/intridea/grape.png)](https://codeclimate.com/github/intridea/grape) [![Inline docs](http://inch-ci.org/github/intridea/grape.png)](http://inch-ci.org/github/intridea/grape) [![Dependency Status](https://www.versioneye.com/ruby/grape/0.7.0/badge.png)](https://www.versioneye.com/ruby/grape/0.7.0)
+[![Build Status](https://travis-ci.org/intridea/grape.png?branch=master)](http://travis-ci.org/intridea/grape) [![Code Climate](https://codeclimate.com/github/intridea/grape.png)](https://codeclimate.com/github/intridea/grape) [![Inline docs](http://inch-ci.org/github/intridea/grape.png)](http://inch-ci.org/github/intridea/grape) [![Dependency Status](https://www.versioneye.com/ruby/grape/badge.png)](https://www.versioneye.com/ruby/grape)
 
 ## Table of Contents
 
@@ -86,7 +86,7 @@ content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the stable release of Grape, 0.10.0.
+You're reading the documentation for the stable release of Grape, which is be 0.10.1.
 Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
 
 ## Project Resources
@@ -637,6 +637,29 @@ curl -X POST -H "Content-Type: application/json" localhost:9292/users/signup -d
 }
 ````
 
+Note that an attribute with a `nil` value is not considered *missing* and will also be returned
+when `include_missing` is set to `false`:
+
+**Request**
+
+````bash
+curl -X POST -H "Content-Type: application/json" localhost:9292/users/signup -d '{"user": {"first_name":"first name", "last_name": null, "address": { "city": "SF"}}}'
+````
+
+**Response with include_missing:false**
+
+````json
+{
+  "declared_params": {
+    "user": {
+      "first_name": "first name",
+      "last_name": null,
+      "address": { "city": "SF"}
+    }
+  }
+}
+````
+
 ## Parameter Validation and Coercion
 
 You can define validations and coercion options for your parameters using a `params` block.

data/UPGRADING.md

@@ -1,6 +1,14 @@
 Upgrading Grape
 ===============
 
+### Upgrading to >= 0.10.1
+
+#### Changes to `declared(params, include_missing: false)`
+
+Attributes with `nil` values or with values that evaluate to `false` are no longer considered *missing* and will be returned when `include_missing` is set to `false`.
+
+See [#864](https://github.com/intridea/grape/pull/864) for more information.
+
 ### Upgrading to >= 0.10.0
 
 #### Changes to content-types

data/lib/grape/dsl/inside_route.rb

@@ -38,7 +38,7 @@ module Grape
             key.each_pair do |parent, children|
               output_key = options[:stringify] ? parent.to_s : parent.to_sym
 
-              next unless options[:include_missing] || children || params[parent]
+              next unless options[:include_missing] || children || params.key?(parent)
 
               if params.key?(parent) || options[:include_missing]
                 hash[output_key] = if children

data/lib/grape/endpoint.rb

@@ -99,7 +99,6 @@ module Grape
     def mount_in(route_set)
       if endpoints
         endpoints.each do |e|
-          e.inheritable_setting.inherit_from inheritable_setting
           e.mount_in(route_set)
         end
       else

data/lib/grape/util/inheritable_values.rb

@@ -39,8 +39,6 @@ module Grape
         self.new_values = other.new_values.deep_dup
       end
 
-      attr_writer :new_values
-
       protected
 
       def values

data/lib/grape/version.rb

@@ -1,3 +1,3 @@
 module Grape
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/spec/grape/api/nested_helpers_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Grape::API::Helpers do
+  subject do
+    module HelperMethods
+      extend Grape::API::Helpers
+      def current_user
+        @current_user ||= params[:current_user]
+      end
+    end
+
+    class Nested < Grape::API
+      resource :level1 do
+        helpers HelperMethods
+
+        get do
+          current_user
+        end
+
+        resource :level2 do
+          get do
+            current_user
+          end
+        end
+      end
+    end
+
+    class Main < Grape::API
+      mount Nested
+    end
+
+    Main
+  end
+
+  def app
+    subject
+  end
+
+  it 'can access helpers from a mounted resource' do
+    get '/level1', current_user: 'hello'
+    expect(last_response.body).to eq('hello')
+  end
+
+  it 'can access helpers from a mounted resource in a nested resource' do
+    get '/level1/level2', current_user: 'world'
+    expect(last_response.body).to eq('world')
+  end
+end

data/spec/grape/api_spec.rb

@@ -2415,6 +2415,100 @@ describe Grape::API do
         options '/v1/apples/colour'
         expect(last_response.status).to eql 204
       end
+
+      it 'mounts a versioned API with nested resources' do
+        api = Class.new(Grape::API) do
+          version 'v1'
+          resources :users do
+            get :hello do
+              'hello users'
+            end
+          end
+        end
+        subject.mount api
+
+        get '/v1/users/hello'
+        expect(last_response.body).to eq('hello users')
+      end
+
+      it 'mounts a prefixed API with nested resources' do
+        api = Class.new(Grape::API) do
+          prefix 'api'
+          resources :users do
+            get :hello do
+              'hello users'
+            end
+          end
+        end
+        subject.mount api
+
+        get '/api/users/hello'
+        expect(last_response.body).to eq('hello users')
+      end
+
+      it 'applies format to a mounted API with nested resources' do
+        api = Class.new(Grape::API) do
+          format :json
+          resources :users do
+            get do
+              { users: true }
+            end
+          end
+        end
+        subject.mount api
+
+        get '/users'
+        expect(last_response.body).to eq({ users: true }.to_json)
+      end
+
+      it 'applies auth to a mounted API with nested resources' do
+        api = Class.new(Grape::API) do
+          format :json
+          http_basic do |username, password|
+            username == 'username' && password == 'password'
+          end
+          resources :users do
+            get do
+              { users: true }
+            end
+          end
+        end
+        subject.mount api
+
+        get '/users'
+        expect(last_response.status).to eq(401)
+
+        get '/users', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('username', 'password')
+        expect(last_response.body).to eq({ users: true }.to_json)
+      end
+
+      it 'mounts multiple versioned APIs with nested resources' do
+        api1 = Class.new(Grape::API) do
+          version 'one', using: :header, vendor: 'test'
+          resources :users do
+            get :hello do
+              'one'
+            end
+          end
+        end
+
+        api2 = Class.new(Grape::API) do
+          version 'two', using: :header, vendor: 'test'
+          resources :users do
+            get :hello do
+              'two'
+            end
+          end
+        end
+
+        subject.mount api1
+        subject.mount api2
+
+        versioned_get '/users/hello', 'one', using: :header, vendor: 'test'
+        expect(last_response.body).to eq('one')
+        versioned_get '/users/hello', 'two', using: :header, vendor: 'test'
+        expect(last_response.body).to eq('two')
+      end
     end
   end
 

data/spec/grape/endpoint_spec.rb

@@ -328,6 +328,36 @@ describe Grape::Endpoint do
       expect(last_response.status).to eq(200)
     end
 
+    it 'includes attributes with value that evaluates to false' do
+      subject.params do
+        requires :first
+        optional :boolean
+      end
+
+      subject.post '/declared' do
+        error!('expected false', 400) if declared(params, include_missing: false)[:boolean] != false
+        ''
+      end
+
+      post '/declared', MultiJson.dump(first: 'one', boolean: false), 'CONTENT_TYPE' => 'application/json'
+      expect(last_response.status).to eq(201)
+    end
+
+    it 'includes attributes with value that evaluates to nil' do
+      subject.params do
+        requires :first
+        optional :second
+      end
+
+      subject.post '/declared' do
+        error!('expected nil', 400) unless declared(params, include_missing: false)[:second].nil?
+        ''
+      end
+
+      post '/declared', MultiJson.dump(first: 'one', second: nil), 'CONTENT_TYPE' => 'application/json'
+      expect(last_response.status).to eq(201)
+    end
+
     it 'does not include missing attributes when there are nested hashes' do
       subject.get '/dummy' do
       end
@@ -356,9 +386,9 @@ describe Grape::Endpoint do
 
       expect(last_response.status).to eq(200)
       expect(inner_params[:first]).to eq 'present'
-      expect(inner_params[:nested].keys).to eq [:fourth, :nested_nested]
+      expect(inner_params[:nested].keys).to eq [:fourth, :fifth, :nested_nested]
       expect(inner_params[:nested][:fourth]).to eq ''
-      expect(inner_params[:nested][:nested_nested].keys).to eq [:sixth]
+      expect(inner_params[:nested][:nested_nested].keys).to eq [:sixth, :seven]
       expect(inner_params[:nested][:nested_nested][:sixth]).to eq 'sixth'
     end
   end

metadata

@@ -1,293 +1,293 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rack-mount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: grape-entity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: rake
   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: maruku
   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: yard
   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-test
   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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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: 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'
 - !ruby/object:Gem::Dependency
   name: appraisal
   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.
@@ -297,12 +297,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .rubocop_todo.yml
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -399,7 +399,8 @@ files:
 - lib/grape/validations/validators/regexp.rb
 - lib/grape/validations/validators/values.rb
 - lib/grape/version.rb
-- spec/grape/api/helpers_spec.rb
+- spec/grape/api/nested_helpers_spec.rb
+- spec/grape/api/shared_helpers_spec.rb
 - spec/grape/api_spec.rb
 - spec/grape/dsl/callbacks_spec.rb
 - spec/grape/dsl/configuration_spec.rb
@@ -468,12 +469,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -483,7 +484,8 @@ 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/nested_helpers_spec.rb
+- spec/grape/api/shared_helpers_spec.rb
 - spec/grape/api_spec.rb
 - spec/grape/dsl/callbacks_spec.rb
 - spec/grape/dsl/configuration_spec.rb