grape 1.0.1 → 1.0.2

data/Rakefile

@@ -22,49 +22,4 @@ require 'rainbow/ext/string' unless String.respond_to?(:color)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
-task default: [:rubocop, :spec]
-
-begin
-  require 'yard'
-  DOC_FILES = ['lib/**/*.rb', 'README.md'].freeze
-
-  YARD::Rake::YardocTask.new(:doc) do |t|
-    t.files = DOC_FILES
-  end
-
-  namespace :doc do
-    YARD::Rake::YardocTask.new(:pages) do |t|
-      t.files   = DOC_FILES
-      t.options = ['-o', '../grape.doc/docs']
-    end
-
-    namespace :pages do
-      desc 'Check out gh-pages.'
-      task :checkout do
-        dir = File.dirname(__FILE__) + '/../grape.doc'
-        unless Dir.exist?(dir)
-          Dir.mkdir(dir)
-          Dir.chdir(dir) do
-            system('git init')
-            system('git remote add origin git@github.com:ruby-grape/grape.git')
-            system('git pull')
-            system('git checkout gh-pages')
-          end
-        end
-      end
-
-      desc 'Generate and publish YARD docs to GitHub pages.'
-      task publish: ['doc:pages:checkout', 'doc:pages'] do
-        Dir.chdir(File.dirname(__FILE__) + '/../grape.doc') do
-          system('git checkout gh-pages')
-          system('git add .')
-          system('git add -u')
-          system("git commit -m 'Generating docs for version #{Grape::VERSION}.'")
-          system('git push origin gh-pages')
-        end
-      end
-    end
-  end
-rescue LoadError # rubocop:disable Lint/HandleExceptions
-  # ignore
-end
+task default: %i[rubocop spec]

data/gemfiles/multi_json.gemfile

@@ -6,31 +6,30 @@ gem 'multi_json', require: 'multi_json'
 
 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
 
 gemspec path: '../'

data/gemfiles/multi_xml.gemfile

@@ -6,31 +6,30 @@ gem 'multi_xml', require: 'multi_xml'
 
 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
 
 gemspec path: '../'

data/gemfiles/rack_1.5.2.gemfile

@@ -6,31 +6,30 @@ gem 'rack', '1.5.2'
 
 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
 
 gemspec path: '../'

data/gemfiles/rack_edge.gemfile

@@ -6,31 +6,30 @@ gem 'rack', github: 'rack/rack'
 
 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
 
 gemspec path: '../'

data/gemfiles/rails_3.gemfile

@@ -7,31 +7,30 @@ gem 'rack-cache', '<= 1.2'
 
 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
 
 gemspec path: '../'

data/gemfiles/rails_4.gemfile

@@ -6,31 +6,30 @@ gem 'rails', '4.1.6'
 
 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
 
 gemspec path: '../'

data/gemfiles/rails_5.gemfile

@@ -6,31 +6,30 @@ gem 'rails', '5.0.0'
 
 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
 
 gemspec path: '../'

data/gemfiles/rails_edge.gemfile

@@ -6,31 +6,30 @@ gem 'arel', github: 'rails/arel'
 
 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
 
 gemspec path: '../'

data/grape.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
   s.description = 'A Ruby framework for rapid API development with great conventions.'
   s.license     = 'MIT'
 
-  s.add_runtime_dependency 'rack', '>= 1.3.0'
+  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency 'builder'
   s.add_runtime_dependency 'mustermann-grape', '~> 1.0.0'
+  s.add_runtime_dependency 'rack', '>= 1.3.0'
   s.add_runtime_dependency 'rack-accept'
-  s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'virtus', '>= 1.0.0'
-  s.add_runtime_dependency 'builder'
 
   s.files         = Dir['**/*'].keep_if { |file| File.file?(file) }
   s.test_files    = Dir['spec/**/*']

data/lib/grape/api.rb

@@ -161,7 +161,7 @@ module Grape
           route_settings[:endpoint] = route.app
 
           # using the :any shorthand produces [nil] for route methods, substitute all manually
-          route_settings[:methods] = %w(GET PUT POST DELETE PATCH HEAD OPTIONS) if route_settings[:methods].include?('*')
+          route_settings[:methods] = %w[GET PUT POST DELETE PATCH HEAD OPTIONS] if route_settings[:methods].include?('*')
         end
       end
 
@@ -195,7 +195,7 @@ module Grape
     # Generate a route that returns an HTTP 405 response for a user defined
     # path on methods not specified
     def generate_not_allowed_method(pattern, allowed_methods: [], **attributes)
-      not_allowed_methods = %w(GET PUT POST DELETE PATCH HEAD) - allowed_methods
+      not_allowed_methods = %w[GET PUT POST DELETE PATCH HEAD] - allowed_methods
       not_allowed_methods << Grape::Http::Headers::OPTIONS if self.class.namespace_inheritable(:do_not_route_options)
 
       return if not_allowed_methods.empty?

data/lib/grape/dsl/inside_route.rb

@@ -47,9 +47,20 @@ module Grape
 
         def declared_hash(passed_params, options, declared_params)
           declared_params.each_with_object(passed_params.class.new) do |declared_param, memo|
-            # If it is not a Hash then it does not have children.
-            # Find its value or set it to nil.
-            if !declared_param.is_a?(Hash)
+            if declared_param.is_a?(Hash)
+              declared_param.each_pair do |declared_parent_param, declared_children_params|
+                next unless options[:include_missing] || passed_params.key?(declared_parent_param)
+
+                passed_children_params = passed_params[declared_parent_param] || passed_params.class.new
+                memo_key = optioned_param_key(declared_parent_param, options)
+
+                memo[memo_key] = handle_passed_param(declared_parent_param, passed_children_params) do
+                  declared(passed_children_params, options, declared_children_params)
+                end
+              end
+            else
+              # If it is not a Hash then it does not have children.
+              # Find its value or set it to nil.
               has_alias = route_setting(:aliased_params) && route_setting(:aliased_params).find { |current| current[declared_param] }
               param_alias = has_alias[declared_param] if has_alias
 
@@ -60,17 +71,26 @@ module Grape
               else
                 memo[optioned_param_key(declared_param, options)] = passed_params[declared_param]
               end
-            else
-              declared_param.each_pair do |declared_parent_param, declared_children_params|
-                next unless options[:include_missing] || passed_params.key?(declared_parent_param)
-
-                passed_children_params = passed_params[declared_parent_param] || passed_params.class.new
-                memo[optioned_param_key(declared_parent_param, options)] = declared(passed_children_params, options, declared_children_params)
-              end
             end
           end
         end
 
+        def handle_passed_param(declared_param, passed_children_params, &_block)
+          should_be_empty_array?(declared_param, passed_children_params) ? [] : yield
+        end
+
+        def should_be_empty_array?(declared_param, passed_children_params)
+          declared_param_is_array?(declared_param) && passed_children_params.empty?
+        end
+
+        def declared_param_is_array?(declared_param)
+          route_options_params[declared_param.to_s] && route_options_params[declared_param.to_s][:type] == 'Array'
+        end
+
+        def route_options_params
+          options[:route_options][:params] || {}
+        end
+
         def optioned_param_key(declared_param, options)
           options[:stringify] ? declared_param.to_s : declared_param.to_sym
         end