grape 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f90062d2ff701a0d5a85be85c6658ba4f586849b
-  data.tar.gz: f43b46740851eb22a55e1fae15c8173875d5da9f
+SHA256:
+  metadata.gz: 22167fc7407088f03f9c85cc9e9ab6f63186e30a9c41cff89ca042a71a7dbdf7
+  data.tar.gz: 9ba03eae4067052f0d10dcefb032bc15f8844221e31397ed03398b4a4dbcda5d
 SHA512:
-  metadata.gz: c3385b8c8c88db4eefd090030a8b73af0cd00b7b5ff5a247221a21fddfb3956d0268a7b2ed40ef74e222dee81fc4c5b3e99065501d5b044297e50edfc3c32054
-  data.tar.gz: 7cd058957cf3f3d8e770db3887a016e9a0dfa000985487973afb399203a1fda0a0a95a94e2e4a3541a2641008197d94c182ef4d92a85ffde0def8440099184bc
+  metadata.gz: a206dba0bd582138f92d3020c98b4019095175d3c4412d650b4a994f3b2881a2f24867a32c6c7163c5fd589a3b2ccbfdef9453ca3d70b726c62bcdf094a463f7
+  data.tar.gz: 92c1e9d3c7d89a93c5ce8c9bb9a28baed795f99de0d495dfac9968dabd810621665162d78fdcd0ed846f0a9b83bd02b163de768bc7059843d0bea67fd65d6502

data/Appraisals

@@ -1,6 +1,6 @@
 appraise 'rails-3' do
   gem 'rails', '3.2.19'
-  gem 'rack-cache', '<= 1.2'  # Pin as next rack-cache version (1.3) removes Ruby1.9 support
+  gem 'rack-cache', '<= 1.2' # Pin as next rack-cache version (1.3) removes Ruby1.9 support
 end
 
 appraise 'rails-4' do

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+### 1.0.2 (1/10/2018)
+
+#### Features
+
+* [#1686](https://github.com/ruby-grape/grape/pull/1686): Avoid coercion of a value if it is valid - [@timothysu](https://github.com/timothysu).
+* [#1688](https://github.com/ruby-grape/grape/pull/1688): Removes yard docs - [@ramkumar-kr](https://github.com/ramkumar-kr).
+* [#1702](https://github.com/ruby-grape/grape/pull/1702): Added danger-toc, verify correct TOC in README - [@dblock](https://github.com/dblock).
+* [#1711](https://github.com/ruby-grape/grape/pull/1711): Automatically coerce arrays and sets of types that implement a `parse` method - [@dslh](https://github.com/dslh).
+
+#### Fixes
+
+* [#1710](https://github.com/ruby-grape/grape/pull/1710): Fix wrong transformation of empty Array in declared params - [@pablonahuelgomez](https://github.com/pablonahuelgomez).
+* [#1722](https://github.com/ruby-grape/grape/pull/1722): Fix catch-all hiding multiple versions of an endpoint after the first definition - [@zherr](https://github.com/zherr).
+* [#1724](https://github.com/ruby-grape/grape/pull/1724): Optional nested array validation - [@ericproulx](https://github.com/ericproulx).
+* [#1725](https://github.com/ruby-grape/grape/pull/1725): Fix `rescue_from :all` documentation - [@Jelkster](https://github.com/Jelkster).
+* [#1726](https://github.com/ruby-grape/grape/pull/1726): Improved startup performance during API method generation - [@jkowens](https://github.com/jkowens).
+* [#1727](https://github.com/ruby-grape/grape/pull/1727): Fix infinite loop when mounting endpoint with same superclass - [@jkowens](https://github.com/jkowens).
+
 ### 1.0.1 (9/8/2017)
 
 #### Features

data/Dangerfile

@@ -1 +1,2 @@
 danger.import_dangerfile(gem: 'ruby-grape-danger')
+toc.check

data/Gemfile

@@ -6,29 +6,28 @@ gemspec
 
 group :development, :test do
   gem 'bundler'
-  gem 'rake'
-  gem 'rubocop', '0.47.0'
   gem 'hashie'
+  gem 'rake'
+  gem 'rubocop', '0.51.0'
 end
 
 group :development do
+  gem 'appraisal'
+  gem 'benchmark-ips'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
-  gem 'yard'
-  gem 'appraisal'
-  gem 'benchmark-ips'
-  gem 'redcarpet'
 end
 
 group :test do
+  gem 'cookiejar'
+  gem 'coveralls', '~> 0.8.17', require: false
+  gem 'danger-toc', '~> 0.1.0'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
+  gem 'mime-types'
+  gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 0.6.3'
   gem 'rspec', '~> 3.0'
-  gem 'cookiejar'
-  gem 'rack-jsonp', require: 'rack/jsonp'
-  gem 'mime-types'
   gem 'ruby-grape-danger', '~> 0.1.0', require: false
-  gem 'coveralls', '~> 0.8.17', require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grape (1.0.1)
+    grape (1.0.2)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -65,6 +65,10 @@ GEM
       danger-plugin-api (~> 1.0)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
+    danger-toc (0.1.0)
+      activesupport
+      danger-plugin-api (~> 1.0)
+      kramdown
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
@@ -80,10 +84,10 @@ GEM
     grape-entity (0.6.1)
       activesupport (>= 5.0.0)
       multi_json (>= 1.3.2)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -97,23 +101,24 @@ GEM
     guard-rubocop (1.3.0)
       guard (~> 2.0)
       rubocop (~> 0.20)
-    hashie (3.5.6)
-    i18n (0.8.6)
+    hashie (3.5.7)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.1.0)
-    kramdown (1.14.0)
+    kramdown (1.16.2)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.12)
     maruku (0.7.3)
-    method_source (0.8.2)
+    method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    minitest (5.10.3)
-    multi_json (1.12.2)
+    minitest (5.11.1)
+    multi_json (1.13.1)
     multipart-post (2.0.0)
     mustermann (1.0.1)
     mustermann-grape (1.0.0)
@@ -123,17 +128,17 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.7.0)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     open4 (1.3.4)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parallel (1.12.1)
+    parser (2.4.0.2)
+      ast (~> 2.3)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (3.0.0)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.1)
     rack (2.0.3)
     rack-accept (0.4.5)
       rack (>= 0.4)
@@ -143,34 +148,34 @@ GEM
       rack (>= 1.0)
     rainbow (2.2.2)
       rake
-    rake (12.0.0)
+    rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    redcarpet (3.4.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.47.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    rubocop (0.51.0)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-grape-danger (0.1.1)
       danger (~> 4.0.1)
       danger-changelog (~> 0.2.0)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -181,15 +186,14 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    slop (3.6.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tins (1.15.0)
-    tzinfo (1.2.3)
+    tins (1.16.3)
+    tzinfo (1.2.4)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
     virtus (1.0.5)
@@ -197,7 +201,6 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    yard (0.9.9)
 
 PLATFORMS
   ruby
@@ -208,6 +211,7 @@ DEPENDENCIES
   bundler
   cookiejar
   coveralls (~> 0.8.17)
+  danger-toc (~> 0.1.0)
   grape!
   grape-entity (~> 0.6)
   guard
@@ -219,11 +223,9 @@ DEPENDENCIES
   rack-jsonp
   rack-test (~> 0.6.3)
   rake
-  redcarpet
   rspec (~> 3.0)
-  rubocop (= 0.47.0)
+  rubocop (= 0.51.0)
   ruby-grape-danger (~> 0.1.0)
-  yard
 
 BUNDLED WITH
-   1.15.3
+   1.16.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2017 Michael Bleigh and Intridea, Inc.
+Copyright (c) 2010-2018 Michael Bleigh, Intridea Inc. and Contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -31,6 +31,7 @@
 - [Parameters](#parameters)
   - [Params Class](#params-class)
   - [Declared](#declared)
+  - [Include Parent Namespaces](#include-parent-namespaces)
   - [Include Missing](#include-missing)
 - [Parameter Validation and Coercion](#parameter-validation-and-coercion)
   - [Supported Parameter Types](#supported-parameter-types)
@@ -44,12 +45,24 @@
   - [Group Options](#group-options)
   - [Alias](#alias)
   - [Built-in Validators](#built-in-validators)
+    - [`allow_blank`](#allowblank)
+    - [`values`](#values)
+    - [`except_values`](#exceptvalues)
+    - [`regexp`](#regexp)
+    - [`mutually_exclusive`](#mutuallyexclusive)
+    - [`exactly_one_of`](#exactlyoneof)
+    - [`at_least_one_of`](#atleastoneof)
+    - [`all_or_none_of`](#allornoneof)
+    - [Nested `mutually_exclusive`, `exactly_one_of`, `at_least_one_of`, `all_or_none_of`](#nested-mutuallyexclusive-exactlyoneof-atleastoneof-allornoneof)
   - [Namespace Validation and Coercion](#namespace-validation-and-coercion)
   - [Custom Validators](#custom-validators)
   - [Validation Errors](#validation-errors)
   - [I18n](#i18n)
-  - [Custom Validation Messages](#custom-validation-messages)
-- [Headers](#headers)
+  - [Custom Validation messages](#custom-validation-messages)
+    - [`presence`, `allow_blank`, `values`, `regexp`](#presence-allowblank-values-regexp)
+    - [`mutually_exclusive`](#mutuallyexclusive-1)
+    - [Overriding Attribute Names](#overriding-attribute-names)
+    - [With Default](#with-default)
 - [Routes](#routes)
 - [Helpers](#helpers)
 - [Path Helpers](#path-helpers)
@@ -63,6 +76,8 @@
   - [Default Error HTTP Status Code](#default-error-http-status-code)
   - [Handling 404](#handling-404)
 - [Exception Handling](#exception-handling)
+    - [Rescuing exceptions inside namespaces](#rescuing-exceptions-inside-namespaces)
+    - [Unrescuable Exceptions](#unrescuable-exceptions)
   - [Rails 3.x](#rails-3x)
 - [Logging](#logging)
 - [API Formats](#api-formats)
@@ -78,6 +93,8 @@
   - [Active Model Serializers](#active-model-serializers)
 - [Sending Raw or No Data](#sending-raw-or-no-data)
 - [Authentication](#authentication)
+  - [Basic and Digest Auth](#basic-and-digest-auth)
+  - [Register custom middleware for authentication](#register-custom-middleware-for-authentication)
 - [Describing and Inspecting an API](#describing-and-inspecting-an-api)
 - [Current Route and Endpoint](#current-route-and-endpoint)
 - [Before and After](#before-and-after)
@@ -88,13 +105,22 @@
   - [Remote IP](#remote-ip)
 - [Writing Tests](#writing-tests)
   - [Writing Tests with Rack](#writing-tests-with-rack)
+    - [RSpec](#rspec)
+    - [Airborne](#airborne)
+    - [MiniTest](#minitest)
   - [Writing Tests with Rails](#writing-tests-with-rails)
+    - [RSpec](#rspec-1)
+    - [MiniTest](#minitest-1)
   - [Stubbing Helpers](#stubbing-helpers)
 - [Reloading API Changes in Development](#reloading-api-changes-in-development)
   - [Reloading in Rack Applications](#reloading-in-rack-applications)
   - [Reloading in Rails Applications](#reloading-in-rails-applications)
 - [Performance Monitoring](#performance-monitoring)
   - [Active Support Instrumentation](#active-support-instrumentation)
+    - [endpoint_run.grape](#endpointrungrape)
+    - [endpoint_render.grape](#endpointrendergrape)
+    - [endpoint_run_filters.grape](#endpointrunfiltersgrape)
+    - [endpoint_run_validators.grape](#endpointrunvalidatorsgrape)
   - [Monitoring Products](#monitoring-products)
 - [Contributing to Grape](#contributing-to-grape)
 - [License](#license)
@@ -110,12 +136,13 @@ content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the stable release of Grape, 1.0.1.
+You're reading the documentation for the stable release of Grape, **1.0.2**.
 Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
 
 ## Project Resources
 
 * [Grape Website](http://www.ruby-grape.org)
+* [Documentation](http://www.rubydoc.info/gems/grape)
 * Need help? Try [Grape Google Group](http://groups.google.com/group/ruby-grape) or [Gitter](https://gitter.im/ruby-grape/grape)
 * [Follow us on Twitter](https://twitter.com/grapeframework)
 
@@ -294,13 +321,6 @@ Modify `config/routes`:
 mount Twitter::API => '/'
 ```
 
-Additionally, if the version of your Rails is 4.0+ and the application uses the default model layer of ActiveRecord, you will want to use the [hashie-forbidden_attributes gem](https://github.com/Maxim-Filimonov/hashie-forbidden_attributes). This gem disables the security feature of `strong_params` at the model layer, allowing you the use of Grape's own params validation instead.
-
-```ruby
-# Gemfile
-gem 'hashie-forbidden_attributes'
-```
-
 See [below](#reloading-api-changes-in-development) for additional code that enables reloading of API changes in development.
 
 ### Modules
@@ -643,7 +663,7 @@ curl -X GET -H "Content-Type: application/json" localhost:9292/parent/foo/bar
 }
 ````
 
-### Include missing
+### Include Missing
 
 By default `declared(params)` includes parameters that have `nil` values. If you want to return only the parameters that are not `nil`, you can use the `include_missing` option. By default, `include_missing` is set to `true`. Consider the following API:
 
@@ -868,7 +888,7 @@ get '/int' integers: { int: '45' }
 ### Custom Types and Coercions
 
 Aside from the default set of supported types listed above, any class can be
-used as a type so long as an explicit coercion method is supplied. If the type
+used as a type as long as an explicit coercion method is supplied. If the type
 implements a class-level `parse` method, Grape will use it automatically.
 This method must take one string argument and return an instance of the correct
 type, or raise an exception to indicate the value was invalid. E.g.,
@@ -886,10 +906,10 @@ class Color
   end
 end
 
-# ...
-
 params do
   requires :color, type: Color, default: Color.new('blue')
+  requires :more_colors, type: Array[Color] # Collections work
+  optional :unique_colors, type: Set[Color] # Duplicates discarded
 end
 
 get '/stuff' do
@@ -924,6 +944,26 @@ params do
 end
 ```
 
+Grape will assert that coerced values match the given `type`, and will reject the request
+if they do not. To override this behaviour, custom types may implement a `parsed?` method
+that should accept a single argument and return `true` if the value passes type validation.
+
+```ruby
+class SecureUri
+  def self.parse(value)
+    URI.parse value
+  end
+
+  def self.parsed?(value)
+    value.is_a? URI::HTTPS
+  end
+end
+
+params do
+  requires :secure_uri, type: SecureUri
+end
+```
+
 ### Multipart File Parameters
 
 Grape makes use of `Rack::Request`'s built-in support for multipart file parameters. Such parameters can be declared with `type: File`:
@@ -934,7 +974,7 @@ params do
 end
 post '/' do
   params[:avatar][:filename] # => 'avatar.png'
-  params[:avatar][:avatar] # => 'image/png'
+  params[:avatar][:type] # => 'image/png'
   params[:avatar][:tempfile] # => #<File>
 end
 ```
@@ -955,8 +995,6 @@ get '/' do
   params[:json].inspect
 end
 
-# ...
-
 client.get('/', json: '{"int":1}') # => "{:int=>1}"
 client.get('/', json: '[{"int":"1"}]') # => "[{:int=>1}]"
 
@@ -992,8 +1030,6 @@ get '/' do
   params[:status_code].inspect
 end
 
-# ...
-
 client.get('/', status_code: 'OK_GOOD') # => "OK_GOOD"
 client.get('/', status_code: 300) # => 300
 client.get('/', status_code: %w(404 NOT FOUND)) # => [404, "NOT", "FOUND"]
@@ -1010,15 +1046,13 @@ get '/' do
   params[:status_codes].inspect
 end
 
-# ...
-
 client.get('/', status_codes: %w(1 two)) # => [1, "two"]
 ```
 
 ### Validation of Nested Parameters
 
 Parameters can be nested using `group` or by calling `requires` or `optional` with a block.
-In the above example, this means `params[:media][:url]` is required along with `params[:id]`,
+In the [above example](#parameter-validation-and-coercion), this means `params[:media][:url]` is required along with `params[:id]`,
 and `params[:audio][:format]` is required only if `params[:audio]` is present.
 With a block, `group`, `requires` and `optional` accept an additional option `type` which can
 be either `Array` or `Hash`, and defaults to `Array`. Depending on the value, the nested
@@ -1055,7 +1089,7 @@ end
 
 In the example above Grape will use `blank?` to check whether the `shelf_id` param is present.
 
-Given also takes a `Proc` with custom code. Below, the param `description` is required only if the value of `category` is equal `foo`:
+`given` also takes a `Proc` with custom code. Below, the param `description` is required only if the value of `category` is equal `foo`:
 
 ```ruby
 params do
@@ -1264,6 +1298,8 @@ params do
 end
 ```
 
+Note that using `:default` with `mutually_exclusive` will cause multiple parameters to always have a default value and raise a `Grape::Exceptions::Validation` mutually exclusive exception.
+
 #### `at_least_one_of`
 
 Parameters can be defined as 'at_least_one_of', ensuring that at least one parameter gets selected.
@@ -1587,7 +1623,7 @@ en:
         name_required: 'must be present'
 ```
 
-#### `Overriding attribute names`
+#### Overriding Attribute Names
 
 You can also override attribute names.
 
@@ -1605,7 +1641,7 @@ en:
 ```
 Will produce 'Oops! Name must be present'
 
-#### `With Default`
+#### With Default
 
 You cannot set a custom message option for Default as it requires interpolation `%{option1}: %{value1} is incompatible with %{option2}: %{value2}`. You can change the default error message for Default by changing the `incompatible_option_values` message key inside [en.yml](lib/grape/locale/en.yml)
 
@@ -2034,7 +2070,7 @@ literally accepts every request.
 
 ## Exception Handling
 
-Grape can be told to rescue all exceptions and return them in the API format.
+Grape can be told to rescue all `StandardError` exceptions and return them in the API format.
 
 ```ruby
 class Twitter::API < Grape::API
@@ -2081,7 +2117,7 @@ Custom error formatters for existing and additional types can be defined with a
 
 ```ruby
 class Twitter::API < Grape::API
-  error_formatter :txt, ->(message, backtrace, options, env) {
+  error_formatter :txt, ->(message, backtrace, options, env, original_exception) {
     "error: #{message} from #{backtrace}"
   }
 end
@@ -2091,7 +2127,7 @@ You can also use a module or class.
 
 ```ruby
 module CustomFormatter
-  def self.call(message, backtrace, options, env)
+  def self.call(message, backtrace, options, env, original_exception)
     { message: message, backtrace: backtrace }
   end
 end
@@ -2140,8 +2176,8 @@ class Twitter::API < Grape::API
     error!("ArgumentError: #{e.message}")
   end
 
-  rescue_from NotImplementedError do |e|
-    error!("NotImplementedError: #{e.message}")
+  rescue_from NoMethodError do |e|
+    error!("NoMethodError: #{e.message}")
   end
 end
 ```
@@ -2280,7 +2316,6 @@ class API < Grape::API
     end
   end
   post '/statuses' do
-    # ...
     logger.info "#{current_user} has statused"
   end
 end
@@ -2923,9 +2958,7 @@ If a request for a resource is made that triggers the built-in `OPTIONS` handler
 only `before` and `after` callbacks will be executed.  The remaining callbacks will
 be bypassed.
 
-#### Examples
-
-Using a simple `before` block to set a header
+For example, using a simple `before` block to set a header.
 
 ```ruby
 before do
@@ -2961,7 +2994,7 @@ class MyAPI < Grape::API
 end
 ```
 
-The behaviour is then:
+The behavior is then:
 
 ```bash
 GET /           # 'root - '
@@ -2989,7 +3022,7 @@ class MyAPI < Grape::API
 end
 ```
 
-The behaviour is then:
+The behavior is then:
 
 ```bash
 GET /123        # 'Integer'
@@ -3024,7 +3057,7 @@ class Test < Grape::API
 end
 ```
 
-The behaviour is then:
+The behavior is then:
 
 ```bash
 GET /foo/v1       # 'v1-hello'
@@ -3049,7 +3082,7 @@ class MyAPI < Grape::API
 end
 ```
 
-The behaviour is then:
+The behavior is then:
 
 ```bash
 GET /greeting              # {"greeting":"Hello!"}
@@ -3337,7 +3370,7 @@ describe 'an endpoint that needs helpers stubbed' do
   end
 
   it 'stubs the helper' do
-    # ...
+
   end
 end
 ```
@@ -3374,6 +3407,22 @@ if Rails.env.development?
 end
 ```
 
+For Rails >= 5.1.4, change this:
+
+```ruby
+ActionDispatch::Callbacks.to_prepare do
+  api_reloader.execute_if_updated
+end
+```
+
+to this:
+
+```ruby
+ActiveSupport::Reloader.to_prepare do
+  api_reloader.execute_if_updated
+end
+```
+
 See [StackOverflow #3282655](http://stackoverflow.com/questions/3282655/ruby-on-rails-3-reload-lib-directory-for-each-request/4368838#4368838) for more information.
 
 ## Performance Monitoring
@@ -3434,4 +3483,4 @@ MIT License. See LICENSE for details.
 
 ## Copyright
 
-Copyright (c) 2010-2017 Michael Bleigh, and Intridea, Inc.
+Copyright (c) 2010-2018 Michael Bleigh, Intridea Inc. and Contributors.