grape 0.9.0 → 0.10.0

data/spec/shared/versioning_examples.rb

@@ -6,7 +6,7 @@ shared_examples_for 'versioning' do
       "Version: #{request.env['api.version'] }"
     end
     versioned_get '/hello', 'v1', macro_options
-    expect(last_response.body).to eql "Version: v1"
+    expect(last_response.body).to eql 'Version: v1'
   end
 
   it 'adds the prefix before the API version' do
@@ -17,18 +17,18 @@ shared_examples_for 'versioning' do
       "Version: #{request.env['api.version'] }"
     end
     versioned_get '/hello', 'v1', macro_options.merge(prefix: 'api')
-    expect(last_response.body).to eql "Version: v1"
+    expect(last_response.body).to eql 'Version: v1'
   end
 
   it 'is able to specify version as a nesting' do
     subject.version 'v2', macro_options
     subject.get '/awesome' do
-      "Radical"
+      'Radical'
     end
 
     subject.version 'v1', macro_options do
       get '/legacy' do
-        "Totally"
+        'Totally'
       end
     end
 
@@ -46,7 +46,7 @@ shared_examples_for 'versioning' do
   it 'is able to specify multiple versions' do
     subject.version 'v1', 'v2', macro_options
     subject.get 'awesome' do
-      "I exist"
+      'I exist'
     end
 
     versioned_get '/awesome', 'v1', macro_options
@@ -68,7 +68,7 @@ shared_examples_for 'versioning' do
 
         subject.version 'v1', macro_options do
           get 'version' do
-            "version " + request.env['api.version']
+            'version ' + request.env['api.version']
           end
         end
 
@@ -92,7 +92,7 @@ shared_examples_for 'versioning' do
 
         subject.version 'v1', macro_options do
           get 'version' do
-            "version " + request.env['api.version']
+            'version ' + request.env['api.version']
           end
         end
 
@@ -117,5 +117,4 @@ shared_examples_for 'versioning' do
     versioned_get '/api_version_with_version_param?version=1', 'v1', macro_options
     expect(last_response.body).to eql '1'
   end
-
 end

data/spec/spec_helper.rb

@@ -24,4 +24,6 @@ I18n.enforce_available_locales = false
 RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.raise_errors_for_deprecations!
+
+  config.before(:each) { Grape::Util::InheritableSetting.reset_global! }
 end

data/spec/support/basic_auth_encode_helpers.rb

@@ -1,3 +1,3 @@
 def encode_basic_auth(username, password)
-  "Basic " + Base64.encode64("#{username}:#{password}")
+  'Basic ' + Base64.encode64("#{username}:#{password}")
 end

data/spec/support/content_type_helpers.rb

@@ -2,7 +2,7 @@ module ContentTypeHelpers
   %w(put patch post delete).each do |method|
     define_method :"#{method}_with_json" do |uri, params = {}, env = {}, &block|
       params = params.to_json
-      env["CONTENT_TYPE"] ||= "application/json"
+      env['CONTENT_TYPE'] ||= 'application/json'
       send(method, uri, params, env, &block)
     end
   end

data/spec/support/versioned_helpers.rb

@@ -13,7 +13,7 @@ def versioned_path(options = {})
   when :accept_version_header
     File.join('/', options[:prefix] || '', options[:path])
   else
-    raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
+    fail ArgumentError.new("unknown versioning strategy: #{options[:using]}")
   end
 end
 
@@ -28,14 +28,14 @@ def versioned_headers(options)
       'HTTP_ACCEPT' => [
         "application/vnd.#{options[:vendor] }-#{options[:version] }",
         options[:format]
-     ].compact.join("+")
+     ].compact.join('+')
     }
   when :accept_version_header
     {
       'HTTP_ACCEPT_VERSION' => "#{options[:version] }"
     }
   else
-    raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
+    fail ArgumentError.new("unknown versioning strategy: #{options[:using]}")
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -276,6 +276,20 @@ dependencies:
     - - '>='
       - !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.
 email:
 - michael@intridea.com
@@ -289,6 +303,7 @@ files:
 - .rubocop_todo.yml
 - .travis.yml
 - .yardopts
+- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -298,12 +313,17 @@ files:
 - RELEASING.md
 - Rakefile
 - UPGRADING.md
+- gemfiles/rails_3.gemfile
+- gemfiles/rails_4.gemfile
 - grape.gemspec
 - grape.png
+- lib/backports/active_support/deep_dup.rb
+- lib/backports/active_support/duplicable.rb
 - lib/grape.rb
 - lib/grape/api.rb
 - lib/grape/api/helpers.rb
 - lib/grape/cookies.rb
+- lib/grape/dsl/api.rb
 - lib/grape/dsl/callbacks.rb
 - lib/grape/dsl/configuration.rb
 - lib/grape/dsl/helpers.rb
@@ -312,6 +332,7 @@ files:
 - lib/grape/dsl/parameters.rb
 - lib/grape/dsl/request_response.rb
 - lib/grape/dsl/routing.rb
+- lib/grape/dsl/settings.rb
 - lib/grape/dsl/validations.rb
 - lib/grape/endpoint.rb
 - lib/grape/error_formatter/base.rb
@@ -358,17 +379,25 @@ files:
 - lib/grape/path.rb
 - lib/grape/route.rb
 - lib/grape/util/content_types.rb
-- lib/grape/util/deep_merge.rb
-- lib/grape/util/hash_stack.rb
+- lib/grape/util/inheritable_setting.rb
+- lib/grape/util/inheritable_values.rb
+- lib/grape/util/stackable_values.rb
+- lib/grape/util/strict_hash_configuration.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
-- lib/grape/validations/mutual_exclusion.rb
-- lib/grape/validations/presence.rb
-- lib/grape/validations/regexp.rb
-- lib/grape/validations/values.rb
+- lib/grape/validations/attributes_iterator.rb
+- lib/grape/validations/params_scope.rb
+- lib/grape/validations/validators/all_or_none.rb
+- lib/grape/validations/validators/allow_blank.rb
+- lib/grape/validations/validators/at_least_one_of.rb
+- lib/grape/validations/validators/base.rb
+- lib/grape/validations/validators/coerce.rb
+- lib/grape/validations/validators/default.rb
+- lib/grape/validations/validators/exactly_one_of.rb
+- lib/grape/validations/validators/multiple_params_base.rb
+- lib/grape/validations/validators/mutual_exclusion.rb
+- lib/grape/validations/validators/presence.rb
+- 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_spec.rb
@@ -380,6 +409,7 @@ files:
 - spec/grape/dsl/parameters_spec.rb
 - spec/grape/dsl/request_response_spec.rb
 - spec/grape/dsl/routing_spec.rb
+- spec/grape/dsl/settings_spec.rb
 - spec/grape/dsl/validations_spec.rb
 - spec/grape/endpoint_spec.rb
 - spec/grape/entity_spec.rb
@@ -390,6 +420,7 @@ files:
 - spec/grape/exceptions/unknown_options_spec.rb
 - spec/grape/exceptions/unknown_validator_spec.rb
 - spec/grape/exceptions/validation_errors_spec.rb
+- spec/grape/loading_spec.rb
 - spec/grape/middleware/auth/base_spec.rb
 - spec/grape/middleware/auth/dsl_spec.rb
 - spec/grape/middleware/auth/strategies_spec.rb
@@ -403,16 +434,23 @@ files:
 - spec/grape/middleware/versioner/path_spec.rb
 - 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
-- spec/grape/validations/mutual_exclusion_spec.rb
-- spec/grape/validations/presence_spec.rb
-- spec/grape/validations/regexp_spec.rb
-- spec/grape/validations/values_spec.rb
-- spec/grape/validations/zh-CN.yml
+- spec/grape/util/inheritable_setting_spec.rb
+- spec/grape/util/inheritable_values_spec.rb
+- spec/grape/util/stackable_values_spec.rb
+- spec/grape/util/strict_hash_configuration_spec.rb
+- spec/grape/validations/attributes_iterator_spec.rb
+- spec/grape/validations/params_scope_spec.rb
+- spec/grape/validations/validators/all_or_none_spec.rb
+- spec/grape/validations/validators/allow_blank_spec.rb
+- spec/grape/validations/validators/at_least_one_of_spec.rb
+- spec/grape/validations/validators/coerce_spec.rb
+- spec/grape/validations/validators/default_spec.rb
+- spec/grape/validations/validators/exactly_one_of_spec.rb
+- spec/grape/validations/validators/mutual_exclusion_spec.rb
+- spec/grape/validations/validators/presence_spec.rb
+- spec/grape/validations/validators/regexp_spec.rb
+- spec/grape/validations/validators/values_spec.rb
+- spec/grape/validations/validators/zh-CN.yml
 - spec/grape/validations_spec.rb
 - spec/shared/versioning_examples.rb
 - spec/spec_helper.rb
@@ -440,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: grape
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
@@ -455,6 +493,7 @@ test_files:
 - spec/grape/dsl/parameters_spec.rb
 - spec/grape/dsl/request_response_spec.rb
 - spec/grape/dsl/routing_spec.rb
+- spec/grape/dsl/settings_spec.rb
 - spec/grape/dsl/validations_spec.rb
 - spec/grape/endpoint_spec.rb
 - spec/grape/entity_spec.rb
@@ -465,6 +504,7 @@ 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/loading_spec.rb
 - spec/grape/middleware/auth/base_spec.rb
 - spec/grape/middleware/auth/dsl_spec.rb
 - spec/grape/middleware/auth/strategies_spec.rb
@@ -478,16 +518,23 @@ test_files:
 - spec/grape/middleware/versioner/path_spec.rb
 - 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
-- spec/grape/validations/mutual_exclusion_spec.rb
-- spec/grape/validations/presence_spec.rb
-- spec/grape/validations/regexp_spec.rb
-- spec/grape/validations/values_spec.rb
-- spec/grape/validations/zh-CN.yml
+- spec/grape/util/inheritable_setting_spec.rb
+- spec/grape/util/inheritable_values_spec.rb
+- spec/grape/util/stackable_values_spec.rb
+- spec/grape/util/strict_hash_configuration_spec.rb
+- spec/grape/validations/attributes_iterator_spec.rb
+- spec/grape/validations/params_scope_spec.rb
+- spec/grape/validations/validators/all_or_none_spec.rb
+- spec/grape/validations/validators/allow_blank_spec.rb
+- spec/grape/validations/validators/at_least_one_of_spec.rb
+- spec/grape/validations/validators/coerce_spec.rb
+- spec/grape/validations/validators/default_spec.rb
+- spec/grape/validations/validators/exactly_one_of_spec.rb
+- spec/grape/validations/validators/mutual_exclusion_spec.rb
+- spec/grape/validations/validators/presence_spec.rb
+- spec/grape/validations/validators/regexp_spec.rb
+- spec/grape/validations/validators/values_spec.rb
+- spec/grape/validations/validators/zh-CN.yml
 - spec/grape/validations_spec.rb
 - spec/shared/versioning_examples.rb
 - spec/spec_helper.rb

data/lib/grape/util/deep_merge.rb

@@ -1,23 +0,0 @@
-class Hash
-  # deep_merge from rails
-  # activesupport/lib/active_support/core_ext/hash/deep_merge.rb
-  # Returns a new hash with +self+ and +other_hash+ merged recursively.
-  #
-  #     h1 = {x: {y: [4,5,6]}, z: [7,8,9]}
-  #     h2 = {x: {y: [7,8,9]}, z: "xyz"}
-  #
-  #     h1.deep_merge(h2) #=> { x: {y: [7, 8, 9]}, z: "xyz" }
-  #     h2.deep_merge(h1) #=> { x: {y: [4, 5, 6]}, z: [7, 8, 9] }
-  def deep_merge(other_hash)
-    dup.deep_merge!(other_hash)
-  end
-
-  # Same as +deep_merge+, but modifies +self+.
-  def deep_merge!(other_hash)
-    other_hash.each_pair do |k, v|
-      tv = self[k]
-      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
-    end
-    self
-  end
-end

data/lib/grape/util/hash_stack.rb

@@ -1,120 +0,0 @@
-module Grape
-  module Util
-    # HashStack is a stack of hashes. When retrieving a value, keys of the top
-    # hash on the stack take precendent over the lower keys.
-    class HashStack
-      # Unmerged array of hashes to represent the stack.
-      # The top of the stack is the last element.
-      attr_reader :stack
-
-      # TODO: handle aggregates
-      def initialize
-        @stack = [{}]
-      end
-
-      # Returns the top hash on the stack
-      def peek
-        @stack.last
-      end
-
-      # Add a new hash to the top of the stack.
-      #
-      # @param hash [Hash] optional hash to be pushed. Defaults to empty hash
-      # @return [HashStack]
-      def push(hash = {})
-        @stack.push(hash)
-        self
-      end
-
-      def pop
-        @stack.pop
-      end
-
-      # Looks through the stack for the first frame that matches :key
-      #
-      # @param key [Symbol] key to look for in hash frames
-      # @return value of given key after merging the stack
-      def get(key)
-        (@stack.length - 1).downto(0).each do |i|
-          return @stack[i][key] if @stack[i].key? key
-        end
-        nil
-      end
-      alias_method :[], :get
-
-      # Looks through the stack for the first frame that matches :key
-      #
-      # @param key [Symbol] key to look for in hash frames
-      # @return true if key exists, false otherwise
-      def key?(key)
-        (@stack.length - 1).downto(0).each do |i|
-          return true if @stack[i].key? key
-        end
-        false
-      end
-
-      # Replace a value on the top hash of the stack.
-      #
-      # @param key [Symbol] The key to set.
-      # @param value [Object] The value to set.
-      def set(key, value)
-        peek[key.to_sym] = value
-      end
-      alias_method :[]=, :set
-
-      # Replace multiple values on the top hash of the stack.
-      #
-      # @param hash [Hash] Hash of values to be merged in.
-      def update(hash)
-        peek.merge!(hash)
-        self
-      end
-
-      # Adds addition value into the top hash of the stack
-      def imbue(key, value)
-        current = peek[key.to_sym]
-        if current.is_a?(Array)
-          current.concat(value)
-        elsif current.is_a?(Hash)
-          current.merge!(value)
-        else
-          set(key, value)
-        end
-      end
-
-      # Prepend another HashStack's to self
-      def prepend(hash_stack)
-        @stack.unshift(*hash_stack.stack)
-        self
-      end
-
-      # Concatenate another HashStack's to self
-      def concat(hash_stack)
-        @stack.concat hash_stack.stack
-        self
-      end
-
-      # Looks through the stack for all instances of a given key and returns
-      # them as a flat Array.
-      #
-      # @param key [Symbol] The key to gather
-      # @return [Array]
-      def gather(key)
-        stack.flat_map { |s| s[key] }.compact.uniq
-      end
-
-      def to_s
-        @stack.to_s
-      end
-
-      def clone
-        new_stack = HashStack.new
-        stack.each do |frame|
-          new_stack.push frame.clone
-        end
-        new_stack.stack.shift
-        new_stack
-      end
-    end
-  end
-end