airborne 0.0.21 → 0.0.22

data/lib/airborne/rest_client_requester.rb

@@ -1,26 +1,26 @@
 require 'rest_client'
 
 module Airborne
-	module RestClientRequester
-		def make_request(method, url, options = {})
-			headers = (options[:headers] || {}).merge({content_type: :json})
-			base_headers = Airborne.configuration.headers || {}
-			headers = base_headers.merge(headers)
-			res = if method == :post || method == :patch || method == :put
-				begin
-					RestClient.send(method, get_url(url), options[:body].nil? ? "" : options[:body].to_json, headers)
-				rescue RestClient::Exception => e
-					e.response
-				end
-			else
-				begin
-					RestClient.send(method, get_url(url), headers)
-				rescue RestClient::Exception => e
-					e.response
-				end
+  module RestClientRequester
+    def make_request(method, url, options = {})
+      headers = (options[:headers] || {}).merge({content_type: :json})
+      base_headers = Airborne.configuration.headers || {}
+      headers = base_headers.merge(headers)
+      res = if method == :post || method == :patch || method == :put
+        begin
+          RestClient.send(method, get_url(url), options[:body].nil? ? "" : options[:body].to_json, headers)
+        rescue RestClient::Exception => e
+          e.response
+        end
+      else
+        begin
+          RestClient.send(method, get_url(url), headers)
+        rescue RestClient::Exception => e
+          e.response
+        end
 
-			end
-			res
-		end
-	end
+      end
+      res
+    end
+  end
 end

data/spec/airborne/base_spec.rb

@@ -1,54 +1,54 @@
 require 'spec_helper'
 
 describe 'base spec' do
-	it 'when request is made response should be set' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect(response).to_not be(nil)
-	end
-
-	it 'when request is made headers should be set' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect(headers).to_not be(nil)		
-	end
-
-	it 'when request is made headers should be hash with indifferent access' do
-		mock_get('simple_get', {'Content-Type' => 'application/json'})
-		get '/simple_get'
-		expect(headers).to be_kind_of(Hash)
-		expect(headers[:content_type]).to eq('application/json')
-		expect(headers['content_type']).to eq('application/json')
-	end	
-
-	it 'when request is made body should be set' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect(body).to_not be(nil)		
-	end
-
-	it 'when request is made json body should be symbolized hash' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect(json_body).to be_kind_of(Hash)
-		expect(json_body.first[0]).to be_kind_of(Symbol)		
-	end
-
-	it 'should not error on invalid JSON' do
-		mock_get('invalid_get')
-		get '/invalid_get'
-		expect(json_body).to be(nil)
-	end
-
-	it 'should handle a 500 error on get' do
-		mock_get('simple_get', {}, [500, "Internal Server Error"])
-		get '/simple_get'
-		expect(json_body).to_not be(nil)
-	end
-
-	it 'should handle a 500 error on post' do
-		mock_post('simple_post', {}, [500, "Internal Server Error"])
-		post '/simple_post', {}
-		expect(json_body).to_not be(nil)
-	end
+  it 'when request is made response should be set' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect(response).to_not be(nil)
+  end
+
+  it 'when request is made headers should be set' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect(headers).to_not be(nil)    
+  end
+
+  it 'when request is made headers should be hash with indifferent access' do
+    mock_get('simple_get', {'Content-Type' => 'application/json'})
+    get '/simple_get'
+    expect(headers).to be_kind_of(Hash)
+    expect(headers[:content_type]).to eq('application/json')
+    expect(headers['content_type']).to eq('application/json')
+  end 
+
+  it 'when request is made body should be set' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect(body).to_not be(nil)   
+  end
+
+  it 'when request is made json body should be symbolized hash' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect(json_body).to be_kind_of(Hash)
+    expect(json_body.first[0]).to be_kind_of(Symbol)    
+  end
+
+  it 'should not error on invalid JSON' do
+    mock_get('invalid_get')
+    get '/invalid_get'
+    expect(json_body).to be(nil)
+  end
+
+  it 'should handle a 500 error on get' do
+    mock_get('simple_get', {}, [500, "Internal Server Error"])
+    get '/simple_get'
+    expect(json_body).to_not be(nil)
+  end
+
+  it 'should handle a 500 error on post' do
+    mock_post('simple_post', {}, [500, "Internal Server Error"])
+    post '/simple_post', {}
+    expect(json_body).to_not be(nil)
+  end
 end

data/spec/airborne/delete_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe 'delete' do
-	it 'should allow testing on delete requests' do
-		mock_delete 'simple_delete'
-		delete '/simple_delete'
-		expect_status(200)
-	end
+  it 'should allow testing on delete requests' do
+    mock_delete 'simple_delete'
+    delete '/simple_delete'
+    expect_status(200)
+  end
 end

data/spec/airborne/expect_json_keys_spec.rb

@@ -1,21 +1,33 @@
 require 'spec_helper'
 
 describe 'expect_json_keys' do
-	it 'should fail when json keys are missing' do
-		mock_get('simple_json')
-		get '/simple_json', {}
-		expect{expect_json_keys([:foo, :bar, :baz, :bax])}.to raise_error
-	end
+  it 'should fail when json keys are missing' do
+    mock_get('simple_json')
+    get '/simple_json', {}
+    expect{expect_json_keys([:foo, :bar, :baz, :bax])}.to raise_error
+  end
 
-	it 'should ensure correct json keys' do
-		mock_get('simple_json')
-		get '/simple_json', {}
-		expect_json_keys([:foo, :bar, :baz])
-	end	
+  it 'should ensure correct json keys' do
+    mock_get('simple_json')
+    get '/simple_json', {}
+    expect_json_keys([:foo, :bar, :baz])
+  end 
 
-	it 'should ensure correct partial json keys' do
-		mock_get('simple_json')
-		get '/simple_json', {}
-		expect_json_keys([:foo, :bar])
-	end	
+  it 'should ensure correct partial json keys' do
+    mock_get('simple_json')
+    get '/simple_json', {}
+    expect_json_keys([:foo, :bar])
+  end
+
+  it 'should ensure json keys with path' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path', {}
+    expect_json_keys('address', [:street, :city])
+  end 
+
+  it 'should fail when keys are missing with path' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path', {}
+    expect{expect_json_keys('address', [:bad])}.to raise_error
+  end      
 end

data/spec/airborne/expect_json_spec.rb

@@ -1,65 +1,65 @@
 require 'spec_helper'
 
 describe 'expect_json' do
-	it 'should ensure correct json values' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect_json({name: "Alex", age: 32 })
-	end
+  it 'should ensure correct json values' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json({name: "Alex", age: 32 })
+  end
 
-	it 'should fail when incorrect json is tested' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect{expect_json({bad: "data"})}.to raise_error		
-	end
-	
-	it 'should allow simple path and verify only that path' do
-		mock_get('simple_path_get')
-		get '/simple_path_get'
-		expect_json('address', {street: "Area 51", city: "Roswell", state: "NM"})
-	end
-	
-	it 'should allow full object graph' do
-		mock_get('simple_path_get')
-		get '/simple_path_get'
-		expect_json({name: "Alex", address: {street: "Area 51", city: "Roswell", state: "NM"}})
-	end
+  it 'should fail when incorrect json is tested' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect{expect_json({bad: "data"})}.to raise_error   
+  end
+  
+  it 'should allow simple path and verify only that path' do
+    mock_get('simple_path_get')
+    get '/simple_path_get'
+    expect_json('address', {street: "Area 51", city: "Roswell", state: "NM"})
+  end
+  
+  it 'should allow full object graph' do
+    mock_get('simple_path_get')
+    get '/simple_path_get'
+    expect_json({name: "Alex", address: {street: "Area 51", city: "Roswell", state: "NM"}})
+  end
 
-	it 'should allow nested paths' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json('address.coordinates', {lattitude: 33.3872, longitutde: 104.5281} )		
-	end
+  it 'should allow nested paths' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json('address.coordinates', {lattitude: 33.3872, longitutde: 104.5281} )   
+  end
 
-	it 'should index into array and test against specific element' do 
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json('cars.0', {make: "Tesla", model: "Model S"})
-	end
-	
-	it 'should test against all elements in the array' do 
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json('cars.?', {make: "Tesla", model: "Model S"})
-		expect_json('cars.?', {make: "Lamborghini", model: "Aventador"})
-	end
+  it 'should index into array and test against specific element' do 
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json('cars.0', {make: "Tesla", model: "Model S"})
+  end
+  
+  it 'should test against all elements in the array' do 
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json('cars.?', {make: "Tesla", model: "Model S"})
+    expect_json('cars.?', {make: "Lamborghini", model: "Aventador"})
+  end
 
-	it 'should invoke proc passed in' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect_json({name: -> (name){expect(name.length).to eq(4)}})
-	end
+  it 'should invoke proc passed in' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json({name: -> (name){expect(name.length).to eq(4)}})
+  end
 
-	it 'should test against regex' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect_json({name: regex("^A")})
-	end
+  it 'should test against regex' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json({name: regex("^A")})
+  end
 
-	it 'should raise an error if regex does not match' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect{expect_json({name: regex("^B")})}.to raise_error
-	end
+  it 'should raise an error if regex does not match' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect{expect_json({name: regex("^B")})}.to raise_error
+  end
 
 end

data/spec/airborne/expect_json_types_spec.rb

@@ -1,111 +1,111 @@
 require 'spec_helper'
 
 describe 'expect_json_types' do
-	it 'should detect current type' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect_json_types({name: :string, age: :int})
-	end
-
-	it 'should fail when incorrect json types tested' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect{expect_json_types({bad: :bool})}.to raise_error
-	end
-
-	it 'should not fail when optional property is not present' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect_json_types({name: :string, age: :int, optional: :bool_or_null })
-	end
-
-	it 'should allow simple path and verify only that path' do
-		mock_get('simple_path_get')
-		get '/simple_path_get'
-		expect_json_types('address', {street: :string, city: :string, state: :string})
-	end
-
-	it 'should allow full object graph' do
-		mock_get('simple_path_get')
-		get '/simple_path_get'
-		expect_json_types({name: :string, address: {street: :string, city: :string, state: :string}})
-	end
-
-	it 'should allow nested paths' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json_types('address.coordinates', {lattitude: :float, longitutde: :float} )		
-	end
-
-	it 'should index into array and test against specific element' do 
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json_types('cars.0', {make: :string, model: :string})
-	end
-
-	it 'should test against all elements in the array' do 
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect_json_types('cars.*', {make: :string, model: :string})
-	end
-
-	it 'should ensure all elements of array are valid' do 
-		mock_get('array_with_index')
-		get '/array_with_index'
-		expect{expect_json_types('cars.*', {make: :string, model: :int})}.to raise_error
-	end	
-
-	it 'should check all nested arrays for specified elements' do
-		mock_get('array_with_nested')
-		get '/array_with_nested'
-		expect_json_types('cars.*.owners.*', {name: :string})
-	end
-
-	it 'should ensure all nested arrays contain correct data' do
-		mock_get('array_with_nested_bad_data')
-		get '/array_with_nested_bad_data'
-		expect{expect_json_types('cars.*.owners.*', {name: :string})}.to raise_error
-	end
-
-	it 'should check all types in a simple array' do
-		mock_get('array_of_values')
-		get '/array_of_values'
-		expect_json_types({grades: :array_of_ints})
-	end
-
-	it 'should ensure all valid types in a simple array' do
-		mock_get('array_of_values')
-		get '/array_of_values'
-		expect{expect_json_types({bad: :array_of_ints})}.to raise_error
-	end
-
-	it 'should deep symbolize array responses' do
-		mock_get('array_response')
-		get '/array_response'
-		expect_json_types("*", {name: :string})
-	end
-
-	it 'should allow empty array' do
-		mock_get('array_of_values')
-		get '/array_of_values'
-		expect_json_types({emptyArray: :array_of_ints})
-	end	
-
-	it 'should test optional nested hash when exists' do
-		mock_get('simple_nested_path')
-		get '/simple_nested_path'
-		expect_json_types("address.coordinates", optional({lattitude: :float, longitutde: :float}))
-	end
-
-	it 'should allow optional nested hash' do
-		mock_get('simple_path_get')
-		get '/simple_path_get'
-		expect_json_types("address.coordinates", optional({lattitude: :float, longitutde: :float}))
-	end
-
-	it 'should invoke proc passed in' do
-		mock_get('simple_get')
-		get '/simple_get'
-		expect_json_types({name: -> (name){expect(name.length).to eq(4)}})
-	end
+  it 'should detect current type' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json_types({name: :string, age: :int})
+  end
+
+  it 'should fail when incorrect json types tested' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect{expect_json_types({bad: :bool})}.to raise_error
+  end
+
+  it 'should not fail when optional property is not present' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json_types({name: :string, age: :int, optional: :bool_or_null })
+  end
+
+  it 'should allow simple path and verify only that path' do
+    mock_get('simple_path_get')
+    get '/simple_path_get'
+    expect_json_types('address', {street: :string, city: :string, state: :string})
+  end
+
+  it 'should allow full object graph' do
+    mock_get('simple_path_get')
+    get '/simple_path_get'
+    expect_json_types({name: :string, address: {street: :string, city: :string, state: :string}})
+  end
+
+  it 'should allow nested paths' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json_types('address.coordinates', {lattitude: :float, longitutde: :float} )    
+  end
+
+  it 'should index into array and test against specific element' do 
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json_types('cars.0', {make: :string, model: :string})
+  end
+
+  it 'should test against all elements in the array' do 
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect_json_types('cars.*', {make: :string, model: :string})
+  end
+
+  it 'should ensure all elements of array are valid' do 
+    mock_get('array_with_index')
+    get '/array_with_index'
+    expect{expect_json_types('cars.*', {make: :string, model: :int})}.to raise_error
+  end 
+
+  it 'should check all nested arrays for specified elements' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect_json_types('cars.*.owners.*', {name: :string})
+  end
+
+  it 'should ensure all nested arrays contain correct data' do
+    mock_get('array_with_nested_bad_data')
+    get '/array_with_nested_bad_data'
+    expect{expect_json_types('cars.*.owners.*', {name: :string})}.to raise_error
+  end
+
+  it 'should check all types in a simple array' do
+    mock_get('array_of_values')
+    get '/array_of_values'
+    expect_json_types({grades: :array_of_ints})
+  end
+
+  it 'should ensure all valid types in a simple array' do
+    mock_get('array_of_values')
+    get '/array_of_values'
+    expect{expect_json_types({bad: :array_of_ints})}.to raise_error
+  end
+
+  it 'should deep symbolize array responses' do
+    mock_get('array_response')
+    get '/array_response'
+    expect_json_types("*", {name: :string})
+  end
+
+  it 'should allow empty array' do
+    mock_get('array_of_values')
+    get '/array_of_values'
+    expect_json_types({emptyArray: :array_of_ints})
+  end 
+
+  it 'should test optional nested hash when exists' do
+    mock_get('simple_nested_path')
+    get '/simple_nested_path'
+    expect_json_types("address.coordinates", optional({lattitude: :float, longitutde: :float}))
+  end
+
+  it 'should allow optional nested hash' do
+    mock_get('simple_path_get')
+    get '/simple_path_get'
+    expect_json_types("address.coordinates", optional({lattitude: :float, longitutde: :float}))
+  end
+
+  it 'should invoke proc passed in' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_json_types({name: -> (name){expect(name.length).to eq(4)}})
+  end
 end