addresses comments, adds rakc ~> 2 gemfile

Author: LeFnord

.rubocop.yml

@@ -9,3 +9,12 @@ AllCops:
     - bin/**/*
 
 inherit_from: .rubocop_todo.yml
+
+Style/Documentation:
+  Enabled: false
+
+Style/MultilineIfModifier:
+  Enabled: false
+
+Style/RaiseArgs:
+  Enabled: false

.rubocop_todo.yml

@@ -50,13 +50,6 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 14
 
-# Offense count: 114
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 16
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: compact, exploded
-Style/RaiseArgs:
-  Enabled: false
+Style/MethodMissing:
+  Exclude:
+    - 'lib/grape/router/attribute_translator.rb'

.travis.yml

@@ -9,6 +9,8 @@ matrix:
         - bundle exec danger
     - rvm: 2.3.3
       gemfile: Gemfile
+    - rvm: 2.3.3
+      gemfile: gemfiles/rack_edge.gemfile
     - rvm: 2.3.3
       gemfile: gemfiles/rack_1.5.2.gemfile
     - rvm: 2.3.3

gemfiles/rack_edge.gemfile

@@ -0,0 +1,34 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'rack', github: 'rack/rack'
+
+group :development, :test do
+  gem 'bundler'
+  gem 'rake'
+  gem 'rubocop', '~> 0.45.0'
+end
+
+group :development do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+  gem 'yard'
+  gem 'appraisal'
+  gem 'benchmark-ips'
+  gem 'redcarpet'
+end
+
+group :test do
+  gem 'grape-entity', '~> 0.6'
+  gem 'maruku'
+  gem 'rack-test'
+  gem 'rspec', '~> 3.0'
+  gem 'cookiejar'
+  gem 'rack-jsonp', require: 'rack/jsonp'
+  gem 'mime-types', '~> 3.0'
+  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+end
+
+gemspec path: '../'

gemfiles/rails_edge.gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', '~> 5.0.0'
+gem 'rails', github: 'rails/rails'
 
 group :development, :test do
   gem 'bundler'

lib/grape/dsl/helpers.rb

@@ -31,11 +31,10 @@ def helpers(new_mod = nil, &block)
             mod = new_mod || Module.new
             define_boolean_in_mod(mod)
             inject_api_helpers_to_mod(mod) if new_mod
-            if block_given?
-              inject_api_helpers_to_mod(mod) do
-                mod.class_eval(&block)
-              end
-            end
+
+            inject_api_helpers_to_mod(mod) do
+              mod.class_eval(&block)
+            end if block_given?
 
             namespace_stackable(:helpers, mod)
           else

lib/grape/dsl/routing.rb

@@ -200,17 +200,15 @@ def reset_endpoints!
         # @option options [Regexp] You may supply a regular expression that the declared parameter must meet.
         def route_param(param, options = {}, &block)
           options = options.dup
-          if options[:requirements].is_a?(Regexp)
-            options[:requirements] = {
-              param.to_sym => options[:requirements]
-            }
-          end
 
-          if options.key?(:type)
-            Grape::Validations::ParamsScope.new(api: self) do
-              requires param, type: options[:type]
-            end
-          end
+          options[:requirements] = {
+            param.to_sym => options[:requirements]
+          } if options[:requirements].is_a?(Regexp)
+
+          Grape::Validations::ParamsScope.new(api: self) do
+            requires param, type: options[:type]
+          end if options.key?(:type)
+
           namespace(":#{param}", options, &block)
         end
 

lib/grape/error_formatter/base.rb

@@ -15,11 +15,10 @@ def present(message, env)
           # env['api.endpoint'].route does not work when the error occurs within a middleware
           # the Endpoint does not have a valid env at this moment
           http_codes = env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info].http_codes || []
-          if env[Grape::Env::API_ENDPOINT].request
-            found_code = http_codes.find do |http_code|
-              (http_code[0].to_i == env[Grape::Env::API_ENDPOINT].status) && http_code[2].respond_to?(:represent)
-            end
-          end
+
+          found_code = http_codes.find do |http_code|
+            (http_code[0].to_i == env[Grape::Env::API_ENDPOINT].status) && http_code[2].respond_to?(:represent)
+          end if env[Grape::Env::API_ENDPOINT].request
 
           presenter = found_code[2] if found_code
         end

lib/grape/router.rb

@@ -97,13 +97,11 @@ def transaction(env)
 
       # If neighbor exists and request method is OPTIONS,
       # return response by using #call_with_allow_headers.
-      if neighbor && method == 'OPTIONS' && !cascade
-        return call_with_allow_headers(
-          env,
-          neighbor.allow_header,
-          neighbor.endpoint
-        )
-      end
+      return call_with_allow_headers(
+        env,
+        neighbor.allow_header,
+        neighbor.endpoint
+      ) if neighbor && method == 'OPTIONS' && !cascade
 
       route = match?(input, '*')
       if route

lib/grape/router/attribute_translator.rb

@@ -15,8 +15,6 @@ def method_missing(m, *args)
           @attributes[m[0..-1]] = *args
         elsif m[-1] != '='
           @attributes[m]
-        else
-          super
         end
       end
 

lib/grape/router/pattern.rb

@@ -39,11 +39,11 @@ def build_path(pattern, anchor: false, suffix: nil, **_options)
           pattern << '/' unless pattern.end_with?('/')
           pattern << '*path'
         end
-        if pattern.end_with?('*path')
-          pattern = pattern.split('/').tap do |parts|
-            parts[parts.length - 1] = '?' + parts.last
-          end.join('/')
-        end
+
+        pattern = pattern.split('/').tap do |parts|
+          parts[parts.length - 1] = '?' + parts.last
+        end.join('/') if pattern.end_with?('*path')
+
         pattern + suffix.to_s
       end
 

lib/grape/validations/params_scope.rb

@@ -42,17 +42,15 @@ def should_validate?(parameters)
         return false if @optional && (params(parameters).blank? ||
                                        any_element_blank?(parameters))
 
-        if @dependent_on
-          @dependent_on.each do |dependency|
-            if dependency.is_a?(Hash)
-              dependency_key = dependency.keys[0]
-              proc = dependency.values[0]
-              return false unless proc.call(params(parameters).try(:[], dependency_key))
-            elsif params(parameters).try(:[], dependency).blank?
-              return false
-            end
+        @dependent_on.each do |dependency|
+          if dependency.is_a?(Hash)
+            dependency_key = dependency.keys[0]
+            proc = dependency.values[0]
+            return false unless proc.call(params(parameters).try(:[], dependency_key))
+          elsif params(parameters).try(:[], dependency).blank?
+            return false
           end
-        end
+        end if @dependent_on
 
         return true if parent.nil?
         parent.should_validate?(parameters)