Merge pull request ruby-grape#117 from dblock/frontier-rbx

Fixes ruby-grape#113, build broken on Rubinius

Author: jch

.gitignore

@@ -27,4 +27,7 @@ pkg
 dist
 Gemfile.lock
 
+## Rubinius
+.rbx
+
 ## PROJECT::SPECIFIC

Gemfile

@@ -9,4 +9,5 @@ group :development, :test do
   gem 'guard-bundler'
   gem 'rb-fsevent'
   gem 'growl'
+  gem 'json'
 end

spec/grape/api_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'shared_versioning_examples'
+require 'shared/versioning_examples'
 
 describe Grape::API do
   subject { Class.new(Grape::API) }
@@ -448,7 +448,7 @@ def call(env)
       subject.get(:hello){ "Hello, world."}
       get '/hello'
       last_response.status.should eql 401
-      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic('allow','whatever')
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow','whatever')
       last_response.status.should eql 200
     end
 
@@ -476,7 +476,7 @@ def call(env)
       subject.get(:hello){ "Hello, world."}
       get '/hello'
       last_response.status.should eql 401
-      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic('allow','whatever')
+      get '/hello', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('allow','whatever')
       last_response.status.should eql 200
     end
   end

spec/grape/middleware/auth/basic_spec.rb

@@ -20,12 +20,12 @@ def app
   end
 
   it 'should authenticate if given valid creds' do
-    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic('admin','admin')
+    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin','admin')
     last_response.status.should == 200
   end
 
   it 'should throw a 401 is wrong auth is given' do
-    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic('admin','wrong')
+    get '/whatever', {}, 'HTTP_AUTHORIZATION' => encode_basic_auth('admin','wrong')
     last_response.status.should == 401
   end
 end

…ec/support/shared_versioning_examples.rb spec/shared/versioning_examples.rbspec/support/shared_versioning_examples.rb renamed to spec/shared/versioning_examples.rb spec/support/shared_versioning_examples.rb renamed to spec/shared/versioning_examples.rb

@@ -14,44 +14,14 @@
 require 'pry'
 
 require 'base64'
-def encode_basic(username, password)
-  "Basic " + Base64.encode64("#{username}:#{password}")
-end
+
+require 'hashie/hash'
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
 end
 
-# Versioning
-
-# Returns the path with options[:version] prefixed if options[:using] is :path.
-# Returns normal path otherwise.
-def versioned_path(options = {})
-  case options[:using]
-  when :path
-    File.join('/', options[:prefix] || '', options[:version], options[:path])
-  when :header
-    File.join('/', options[:prefix] || '', options[:path])
-  else
-    raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
-  end
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
+  require file
 end
 
-def versioned_headers(options)
-  case options[:using]
-  when :path
-    {}  # no-op
-  when :header
-    {
-      'HTTP_ACCEPT' => "application/vnd.#{options[:vendor]}-#{options[:version]}+#{options[:format]}"
-    }
-  else
-    raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
-  end
-end
-
-def versioned_get(path, version_name, version_options = {})
-  path    = versioned_path(version_options.merge(:version => version_name, :path => path))
-  headers = versioned_headers(version_options.merge(:version => version_name))
-  get path, {}, headers
-end

spec/spec_helper.rb

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

spec/support/basic_auth_encode_helpers.rb

@@ -0,0 +1,34 @@
+# Versioning
+
+# Returns the path with options[:version] prefixed if options[:using] is :path.
+# Returns normal path otherwise.
+def versioned_path(options = {})
+  case options[:using]
+  when :path
+    File.join('/', options[:prefix] || '', options[:version], options[:path])
+  when :header
+    File.join('/', options[:prefix] || '', options[:path])
+  else
+    raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
+  end
+end
+
+def versioned_headers(options)
+  case options[:using]
+  when :path
+    {}  # no-op
+  when :header
+    {
+      'HTTP_ACCEPT' => "application/vnd.#{options[:vendor]}-#{options[:version]}+#{options[:format]}"
+    }
+  else
+    raise ArgumentError.new("unknown versioning strategy: #{options[:using]}")
+  end
+end
+
+def versioned_get(path, version_name, version_options = {})
+  path    = versioned_path(version_options.merge(:version => version_name, :path => path))
+  headers = versioned_headers(version_options.merge(:version => version_name))
+  get path, {}, headers
+end
+