airborne 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e009399096d82e3b30b22f4c8f6fc7255e11699f
-  data.tar.gz: 32d38638f1dac42754cc53750ad2a6599be88674
+  metadata.gz: 2db47b8f533a4c04a03ab8fd64258bac9eb6c943
+  data.tar.gz: 46ec329525c710f2264396853ec4ae26d9d52081
 SHA512:
-  metadata.gz: 35ac6a72835f11646301b47fbd8ee40134a3f6063e173999866bb4726cadebbd7777194d1aed4a3663b9baa46fdb5c3fff1bc75483b9fa336ae9cc167d2e532f
-  data.tar.gz: 5a574890b43ad0d9e2953055912bbb86ca74c68b7f0b7ceb6e2346ef8e302a59f5b8890ec4c2cd8bc9423ca4af951b97666b0f854262eee6b3e5dfdcf9833e16
+  metadata.gz: d4a8397f77c164291b8a72b567e40d1100d45d3bef5f8a76e1158c2ee97d0b6824de5ec6acae5eadb1bcd4cb443b51058fb72171e79d99fc54d1efa055c47ade
+  data.tar.gz: 18c6eb65f280e579efdf1347fcc94b1b36fbb9bcf7c96b76586840ec189556a0b616f8cfce767eb5bb4d3edf35cf271286167fa518397125b6fb132775ca8b90

data/.gitignore

@@ -32,5 +32,5 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
-
+.idea
 .DS_store

data/airborne.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'airborne'
-  s.version     = '0.0.22'
+  s.version     = '0.0.23'
   s.date        = '2014-09-12'
   s.summary = "RSpec driven API testing framework"
   s.authors     = ["Alex Friedman", "Seth Pollack"]

data/lib/airborne/path_matcher.rb

@@ -1,45 +1,97 @@
 module Airborne
   module PathMatcher
+
     def get_by_path(path, json, &block)
       type = false
       parts = path.split('.')
       parts.each_with_index do |part, index|
         if part == '*' || part == '?'
+          ensure_array(path, json)
           type = part
-          raise "Expected #{path} to be array got #{json.class} from JSON response" unless json.class == Array
           if index < parts.length.pred
-            json.each do |element|
-              sub_path = parts[(index.next)...(parts.length)].join('.')
-              get_by_path(sub_path, element, &block)
-            end
+            walk_with_path(type, index, path, parts, json, &block)
             return
           end
           next
         end
-        if /^[\d]+(\.[\d]+){0,1}$/ === part
-          part = part.to_i
-          json = json[part]
-        else
-          json = json[part.to_sym]
-          raise "Expected #{path} to be object or array got #{json.class} from JSON response" unless [Array, Hash, NilClass].include?(json.class)
-        end
+        json = process_json(part, json)
       end
       if type == '*'
-        json.each{|part| yield part}
+        expect_all(json, &block)
       elsif type == '?'
-        item_count = json.length
-        error_count = 0
-        json.each do |part|
-          begin
-            yield part
-          rescue Exception => e
-            error_count += 1
-            raise "Expected one object in path #{path} to match provided JSON values" if item_count == error_count
-          end
-        end
+        expect_one(path, json, &block)
       else
         yield json
       end
     end
+
+    private
+
+    def walk_with_path(type, index, path, parts, json, &block)
+      last_error  = nil
+      item_count = json.length
+      error_count = 0
+      json.each do |element|
+        begin
+          sub_path = parts[(index.next)...(parts.length)].join('.')
+          get_by_path(sub_path, element, &block)
+        rescue Exception => e
+          last_error = e
+          error_count += 1
+        end
+        ensure_match_all(last_error) if type == '*'
+        ensure_match_one(path, item_count, error_count) if type == '?'
+      end
+    end
+
+    def process_json(part, json)
+      if is_index?(part)
+        part = part.to_i
+        json = json[part]
+      else
+        json = json[part.to_sym]
+      end
+      json
+    end
+
+    def is_index?(part)
+      part =~ /^\d+$/
+    end
+
+    def expect_one(path, json, &block)
+      item_count = json.length
+      error_count = 0
+      json.each do |part|
+        begin
+          yield part
+        rescue Exception => e
+          error_count += 1
+          ensure_match_one(path, item_count, error_count)
+        end
+      end
+    end
+
+    def expect_all(json, &block)
+      last_error = nil
+      begin
+        json.each{|part| yield part}
+      rescue Exception => e
+        last_error = e
+      end
+      ensure_match_all(last_error)
+    end
+
+    def ensure_match_one(path, item_count, error_count)
+      raise "Expected one object in path #{path} to match provided JSON values" if item_count == error_count
+    end
+
+    def ensure_match_all(error)
+      raise error unless error.nil?
+    end
+
+    def ensure_array(path, json)
+      raise "Expected #{path} to be array got #{json.class} from JSON response" unless json.class == Array
+    end
+
   end
 end

data/lib/airborne/request_expectations.rb

@@ -6,33 +6,28 @@ module Airborne
     include PathMatcher
 
     def expect_json_types(*args)
-      set_response(@response) if @json_body.nil?
       call_with_path(args) do |param, body|
         expect_json_types_impl(param, body)
       end
     end
 
     def expect_json(*args)
-      set_response(@response) if @json_body.nil?
       call_with_path(args) do |param, body|
         expect_json_impl(param, body)
       end
     end
 
     def expect_json_keys(*args)
-      set_response(@response) if @json_body.nil?
       call_with_path(args) do |param, body|
         expect(body.keys).to include(*param)
       end
     end
 
     def expect_status(code)
-      set_response(@response) if @json_body.nil?
       expect(response.code).to eq(code)
     end
 
     def expect_header(key, content)
-      set_response(@response) if @json_body.nil?
       header = headers[key]
       if header
         expect(header.downcase).to eq(content.downcase)
@@ -42,7 +37,6 @@ module Airborne
     end
 
     def expect_header_contains(key, content)
-      set_response(@response) if @json_body.nil?
       header = headers[key]
       if header
         expect(header.downcase).to include(content.downcase)
@@ -59,8 +53,20 @@ module Airborne
       Regexp.new(reg)
     end
 
+    [:expect_json_types, :expect_json, :expect_json_keys, :expect_status, :expect_header, :expect_header_contains].each do |method_name|
+      method = instance_method(method_name)
+      define_method(method_name) do |*args, &block|
+        set_rails_response
+        method.bind(self).(*args, &block)
+      end
+    end
+
     private
 
+    def set_rails_response
+      set_response(@response) if @json_body.nil?
+    end
+
     def call_with_path(args)
       if args.length == 2
         get_by_path(args[0], json_body) do|json_chunk|
@@ -101,6 +107,7 @@ module Airborne
     def expect_json_types_impl(expectations, hash)
       return if expectations.class == Airborne::OptionalHashTypeExpectations && hash.nil?
       @mapper ||= get_mapper
+      return expect(@mapper[expectations].include?(hash.class)).to eq(true) if expectations.class == Symbol
       expectations.each do |prop_name, expected_type|
         value = hash[prop_name]
         if expected_type.class == Hash || expected_type.class ==  Airborne::OptionalHashTypeExpectations
@@ -110,7 +117,7 @@ module Airborne
         elsif expected_type.to_s.include?("array_of")
           expect(value.class).to eq(Array), "Expected #{prop_name} to be of type #{expected_type}, got #{value.class} instead"
           value.each do |val|
-            expect(@mapper[expected_type].include?(val.class)).to eq(true), "Expected #{prop_name} to be of type #{expected_type}, got #{val.class} instead"  
+            expect(@mapper[expected_type].include?(val.class)).to eq(true), "Expected #{prop_name} to be of type #{expected_type}, got #{val.class} instead"
           end
         else
           expect(@mapper[expected_type].include?(value.class)).to eq(true), "Expected #{prop_name} to be of type #{expected_type}, got #{value.class} instead"
@@ -119,6 +126,8 @@ module Airborne
     end
 
     def expect_json_impl(expectations, hash)
+      hash = hash.to_s if expectations.class == Regexp
+      return expect(hash).to match(expectations) if [String, Regexp, Float, Fixnum, Bignum].include?(expectations.class)
       expectations.each do |prop_name, expected_value|
         actual_value = hash[prop_name]
         if expected_value.class == Hash
@@ -126,11 +135,11 @@ module Airborne
         elsif expected_value.class == Proc
           expected_value.call(actual_value)
         elsif expected_value.class == Regexp
-          expect(actual_value).to match(expected_value)
+          expect(actual_value.to_s).to match(expected_value)
         else
           expect(actual_value).to eq(expected_value)
         end
       end
     end
   end
-end
+end

data/spec/airborne/{headers_spec.rb → expectations/expect_header_contains_spec.rb}

@@ -1,20 +1,7 @@
 require 'spec_helper'
 
-describe 'expect header' do
-  it 'should find exact match for header content' do
-    mock_get('simple_get', {'Content-Type' => 'application/json'})
-    get '/simple_get'
-    expect_header(:content_type, 'application/json')
-  end
-
-  it 'should ensure correct headers are present' do
-    mock_get('simple_get', {'Content-Type' => 'application/json'})
-    get '/simple_get'
-    expect{expect_header(:foo, 'bar')}.to raise_error
-  end
-end
-
 describe 'expect header contains' do
+
   it 'should ensure partial header match exists' do
     mock_get('simple_get', {'Content-Type' => 'application/json'})
     get '/simple_get'
@@ -32,4 +19,5 @@ describe 'expect header contains' do
     get '/simple_get'
     expect{expect_header_contains(:content_type, 'bar')}.to raise_error
   end
+  
 end

data/spec/airborne/expectations/expect_header_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'expect header' do
+
+  it 'should find exact match for header content' do
+    mock_get('simple_get', {'Content-Type' => 'application/json'})
+    get '/simple_get'
+    expect_header(:content_type, 'application/json')
+  end
+
+  it 'should find exact match for header content' do
+    mock_get('simple_get', {'Content-Type' => 'json'})
+    get '/simple_get'
+    expect{expect_header(:content_type, 'application/json')}.to raise_error
+  end
+
+  it 'should ensure correct headers are present' do
+    mock_get('simple_get', {'Content-Type' => 'application/json'})
+    get '/simple_get'
+    expect{expect_header(:foo, 'bar')}.to raise_error
+  end
+
+end
+

data/spec/airborne/expectations/expect_json_keys_path_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'expect_json_keys with path' do
+
+  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_keys_spec.rb → expectations/expect_json_keys_spec.rb}

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe 'expect_json_keys' do
+  
   it 'should fail when json keys are missing' do
     mock_get('simple_json')
     get '/simple_json', {}
@@ -18,16 +19,5 @@ describe 'expect_json_keys' do
     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/expectations/expect_json_lambda_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'expect_json lambda' do
+
+  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
+  
+end

data/spec/airborne/expectations/expect_json_path_spec.rb

@@ -0,0 +1,102 @@
+require 'spec_helper'
+
+describe 'expect_json with path' do
+
+	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 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 test against properties in the array' do
+		mock_get('array_with_index')
+		get '/array_with_index'
+		expect_json('cars.?.make', "Tesla")
+	end
+
+	it 'should ensure at least one match' do
+		mock_get('array_with_index')
+		get '/array_with_index'
+		expect{expect_json('cars.?.make', "Teslas")}.to raise_error
+	end
+
+	it 'should check for at least one match' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect_json('cars.?.owners.?', {name: "Bart Simpson"})
+  end
+
+  it 'should ensure at least one match' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect{expect_json('cars.?.owners.?', {name: "Bart Simpsons"})}.to raise_error
+  end
+
+  it 'should check for one match that matches all ' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect_json('cars.?.owners.*', {name: "Bart Simpson"})
+  end
+
+  it 'should check for one match that matches all with lambda' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect_json('cars.?.owners.*', {name: -> (name){expect(name).to eq("Bart Simpson")}})
+  end
+
+  it 'should ensure one match that matches all with lambda' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect{expect_json('cars.?.owners.*', {name: -> (name){expect(name).to eq("Bart Simpsons")}})}.to raise_error
+  end
+
+  it 'should ensure one match that matches all' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect{expect_json('cars.?.owners.*', {name: "Bart Simpsons"})}.to raise_error
+  end
+
+	it 'should allow indexing' do
+    mock_get('array_with_nested')
+    get '/array_with_nested'
+    expect_json('cars.0.owners.0', {name: "Bart Simpson"})
+  end
+
+	it 'should allow strings (String) to be tested against a path' do
+		mock_get('simple_nested_path')
+		get '/simple_nested_path'
+		expect_json('address.city', "Roswell" )
+	end
+
+	it 'should allow floats (Float) to be tested against a path' do
+		mock_get('simple_nested_path')
+		get '/simple_nested_path'
+		expect_json('address.coordinates.lattitude', 33.3872 )
+	end
+
+	it 'should allow integers (Fixnum, Bignum) to be tested against a path' do
+		mock_get('simple_get')
+		get '/simple_get'
+		expect_json('age', 32 )
+	end
+
+end

data/spec/airborne/expectations/expect_json_regex_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe 'expect_json regex' do
+
+	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 allow regex(Regexp) to be tested against a path' do
+		mock_get('simple_nested_path')
+		get '/simple_nested_path'
+		expect_json('address.city', regex("^R") )
+	end
+
+	it 'should allow testing regex against numbers directly' do
+		mock_get('simple_nested_path')
+		get '/simple_nested_path'
+		expect_json('address.coordinates.lattitude', regex("^3") )
+	end
+
+	it 'should allow testing regex against numbers in the hash' do
+		mock_get('simple_nested_path')
+		get '/simple_nested_path'
+		expect_json('address.coordinates', {lattitude: regex("^3")} )
+	end
+	
+end

data/spec/airborne/expectations/expect_json_spec.rb

@@ -0,0 +1,23 @@
+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 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 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
+
+end

data/spec/airborne/expectations/expect_json_types_lambda_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'expect_json_types lambda' do
+
+	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

data/spec/airborne/expectations/expect_json_types_optional_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'expect_json_types optional' do
+
+	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
+	
+end

data/spec/airborne/expectations/expect_json_types_path_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe 'expect_json_types wih path' do
+
+	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 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 allow properties to be tested against a path' do
+		mock_get('array_with_index')
+		get '/array_with_index'
+		expect_json_types('cars.0.make', :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 deep symbolize array responses' do
+		mock_get('array_response')
+		get '/array_response'
+		expect_json_types("*", {name: :string})
+	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
+
+end

data/spec/airborne/expectations/expect_json_types_spec.rb

@@ -0,0 +1,47 @@
+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 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 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 allow empty array' do
+    mock_get('array_of_values')
+    get '/array_of_values'
+    expect_json_types({emptyArray: :array_of_ints})
+  end
+
+end

data/spec/test_responses/array_with_nested.json

@@ -1,15 +1,16 @@
 {
-	"cars": [{
-		"make": "Tesla",
-		"model": "Model S",
-		"owners": [{
-			"name": "Bart Simpson"
-		}]
-	}, {
-		"make": "Lamborghini",
-		"model": "Aventador",
-		"owners": [{
-			"name": "Peter Griffin"
-		}]
-	}]
+    "cars": [{
+        "make": "Tesla",
+        "model": "Model S",
+        "owners": [
+            {"name": "Bart Simpson"}
+        ]
+    }, {
+        "make": "Lamborghini",
+        "model": "Aventador",
+        "owners": [
+            {"name": "Peter Griffin"}
+
+        ]
+    }]
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airborne
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Alex Friedman
@@ -15,88 +15,88 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: webmock
   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: 
@@ -107,9 +107,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -124,15 +124,23 @@ files:
 - lib/airborne/rest_client_requester.rb
 - spec/airborne/base_spec.rb
 - spec/airborne/delete_spec.rb
-- spec/airborne/expect_json_keys_spec.rb
-- spec/airborne/expect_json_spec.rb
-- spec/airborne/expect_json_types_spec.rb
-- spec/airborne/expect_status_spec.rb
-- spec/airborne/headers_spec.rb
+- spec/airborne/expectations/expect_header_contains_spec.rb
+- spec/airborne/expectations/expect_header_spec.rb
+- spec/airborne/expectations/expect_json_keys_path_spec.rb
+- spec/airborne/expectations/expect_json_keys_spec.rb
+- spec/airborne/expectations/expect_json_lambda_spec.rb
+- spec/airborne/expectations/expect_json_path_spec.rb
+- spec/airborne/expectations/expect_json_regex_spec.rb
+- spec/airborne/expectations/expect_json_spec.rb
+- spec/airborne/expectations/expect_json_types_lambda_spec.rb
+- spec/airborne/expectations/expect_json_types_optional_spec.rb
+- spec/airborne/expectations/expect_json_types_path_spec.rb
+- spec/airborne/expectations/expect_json_types_spec.rb
+- spec/airborne/expectations/expect_status_spec.rb
 - spec/airborne/patch_spec.rb
 - spec/airborne/post_spec.rb
 - spec/airborne/put_spec.rb
-- spec/airborne/rack_sinatra_spec.rb
+- spec/airborne/rack/rack_sinatra_spec.rb
 - spec/spec_helper.rb
 - spec/stub_helper.rb
 - spec/test_responses/array_of_values.json
@@ -158,17 +166,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: RSpec driven API testing framework

data/spec/airborne/expect_json_spec.rb

@@ -1,65 +0,0 @@
-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 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 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 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
-
-end

data/spec/airborne/expect_json_types_spec.rb

@@ -1,111 +0,0 @@
-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
-end