airborne 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f321e27151ecffef06e9faa916d6f4fdae6819be
-  data.tar.gz: 9e082aa7e51fcc2bfefd85e7eea05f7e9c8c9b1b
+  metadata.gz: 9029133bcf1f37e86472d7066159149ccf633423
+  data.tar.gz: 3490ccda6ffafc06a41173f5ba7767c249e589c3
 SHA512:
-  metadata.gz: c51351a2c990fe2d5afb9ea7b5b199e5a08bda503d4c8af82c529348a7ef74d9360ade5ad0e2da1d892ecaea5bb8c4b7d48f5627399f9d5d02066228242306db
-  data.tar.gz: 4cbb58e4c071e2054b005b67afac6757fe81d7c26092a771d73040bcf63b084632b3fadc92e834aa533bf6cd22459f1a85919d74ff1123d0ee5b8f6d0a6f5f02
+  metadata.gz: efad782993756790afe2fb8cc09503f891f9e4ade418ff70ede1d1811c0d6d4815d64485a13289e7bb55dd51827081376e8c6a5fad90bcd6681bb9c2ddb2808f
+  data.tar.gz: 4f0b6884c93854ea614bc58680c5185a06d7295083ab6d1f61e570284e799ac44b0cd06cbc8c731f4fb959ef0bd746f6b4cb9e446259e32d05033d57e891e685

data/README.md

@@ -7,7 +7,7 @@
 [![airbore gem downloads](http://img.shields.io/gem/dt/airborne.svg?style=flat-square)](http://rubygems.org/gems/airborne)
 [![airborne gem stable downloads](http://img.shields.io/gem/dv/airborne/stable.svg?style=flat-square)](http://rubygems.org/gems/airborne)
 
-RSpec driven API testing framework inspired by [frisby.js](https://github.com/vlucas/frisby)
+RSpec driven API testing framework
 
 ## Installation
 
@@ -360,6 +360,9 @@ end
 
 ## Contributors
 https://github.com/brooklynDev/airborne/graphs/contributors
+
+Inspired by [frisby.js](https://github.com/vlucas/frisby)
+
 ## License
 
 The MIT License

data/airborne.gemspec

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

data/lib/airborne/path_matcher.rb

@@ -1,7 +1,9 @@
 module Airborne
+  class PathError < StandardError; end
   module PathMatcher
 
     def get_by_path(path, json, &block)
+      raise PathError, "Ivalid Path, contains '..'" if /\.\./ =~ path
       type = false
       parts = path.split('.')
       parts.each_with_index do |part, index|
@@ -14,7 +16,11 @@ module Airborne
           end
           next
         end
-        json = process_json(part, json)
+        begin
+          json = process_json(part, json)
+        rescue
+          raise PathError, "Expected #{json.class}\nto to be an object with property #{part}"
+        end
       end
       if type == '*'
         expect_all(json, &block)
@@ -64,7 +70,7 @@ module Airborne
       json.each do |part|
         begin
           yield part
-        rescue Exception => e
+        rescue Exception
           error_count += 1
           ensure_match_one(path, item_count, error_count)
         end

data/lib/airborne/request_expectations.rb

@@ -2,6 +2,7 @@ require 'rspec'
 require 'date'
 
 module Airborne
+  class ExpectationError < StandardError; end
   module RequestExpectations
     include RSpec
     include PathMatcher
@@ -130,7 +131,9 @@ module Airborne
       return expectations.call(hash_or_value) if expectations.class == Proc
 
       expectations.each do |prop_name, expected_type|
-        value = expected_type == :date ? convert_to_date(hash_or_value[prop_name]) : hash_or_value[prop_name]
+        value =  ensure_hash_contains_prop(prop_name, hash_or_value) do
+          expected_type == :date ? convert_to_date(hash_or_value[prop_name]) : hash_or_value[prop_name]
+        end
         expected_class = expected_type.class
         value_class = value.class
 
@@ -165,7 +168,7 @@ module Airborne
 
     def expect_type(expected_type, value_class, prop_name = nil)
       insert = prop_name.nil? ? "" : "#{prop_name} to be of type"
-      msg = "Expected #{insert} #{expected_type}\n, got #{value_class} instead"
+      msg = "Expected #{insert} #{expected_type}\n got #{value_class} instead"
       expect(@mapper[expected_type].include?(value_class)).to eq(true), msg
     end
 
@@ -174,14 +177,14 @@ module Airborne
     end
 
     def expect_array(value_class, prop_name, expected_type)
-      expect(value_class).to eq(Array), "Expected #{prop_name}\n to be of type #{expected_type}\n, got #{value_class} instead"
+      expect(value_class).to eq(Array), "Expected #{prop_name}\n to be of type #{expected_type}\n got #{value_class} instead"
     end
 
     def expect_json_impl(expectations, hash)
       hash = hash.to_s if expectations.class == Regexp
       return expect(hash).to match(expectations) if is_property?(expectations)
       expectations.each do |prop_name, expected_value|
-        actual_value = hash[prop_name]
+        actual_value = ensure_hash_contains_prop(prop_name, hash) {hash[prop_name]}
         expected_class = expected_value.class
         next expect_json_impl(expected_value, actual_value) if expected_class == Hash
         next expected_value.call(actual_value) if expected_class == Proc
@@ -190,6 +193,14 @@ module Airborne
       end
     end
 
+    def ensure_hash_contains_prop(prop_name, hash)
+      begin
+        yield
+      rescue
+        raise ExpectationError, "Expected #{hash.class} #{hash}\nto be an object with property #{prop_name}"
+      end
+    end
+
     # Convert integers in `old_expectations` to proc
     #
     # @param old_expectations [Hash]

data/spec/airborne/expectations/expect_json_path_spec.rb

@@ -99,4 +99,11 @@ describe 'expect_json with path' do
 		expect_json('age', 32 )
 	end
 
+	it "should raise ExpectationError when expectation expects an object instead of value" do 
+		mock_get('array_with_index')
+		get '/array_with_index'
+		expect do
+			expect_json('cars.0.make', {make: "Tesla"})
+		end.to raise_error(Airborne::ExpectationError, "Expected String Tesla\nto be an object with property make")
+	end
 end

data/spec/airborne/expectations/expect_json_types_path_spec.rb

@@ -56,4 +56,12 @@ describe 'expect_json_types wih path' do
 		expect{expect_json_types('cars.*.owners.*', {name: :string})}.to raise_error
 	end
 
+	it "should raise ExpectationError when expectation expects an object instead of type" do
+		mock_get('array_with_index')
+		get '/array_with_index'
+		expect do
+			expect_json_types('cars.0.make', {make: :string})
+		end.to raise_error(Airborne::ExpectationError, "Expected String Tesla\nto be an object with property make")
+	end
+
 end

data/spec/airborne/path_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'expect path' do 
+
+	before :each do
+		mock_get('array_with_index')
+		get '/array_with_index'
+	end
+
+	it "should raise PathError when incorrect path containing .. is used" do 
+		expect do
+			expect_json('cars..make', "Tesla")
+		end.to raise_error(Airborne::PathError, "Ivalid Path, contains '..'")
+	end
+
+	it "should raise PathError when trying to call property on an array" do
+		expect do
+			expect_json('cars.make', "Tesla")
+		end.to raise_error(Airborne::PathError, "Expected Array\nto to be an object with property make")
+	end
+end

data/spec/airborne/post_spec.rb

@@ -9,9 +9,9 @@ describe 'post' do
   end
 
   it 'should allow testing on post requests' do
-  	url = 'http://www.example.com/simple_post'
+    url = 'http://www.example.com/simple_post'
     stub_request(:post, url)
     post '/simple_post', 'hello', {content_type: "text/plain"}
     expect(WebMock).to have_requested(:post, url).with(:body => "hello", :headers => {'Content-Type' => 'text/plain'})
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airborne
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Alex Friedman
@@ -142,6 +142,7 @@ files:
 - spec/airborne/head_spec.rb
 - spec/airborne/options_spec.rb
 - spec/airborne/patch_spec.rb
+- spec/airborne/path_spec.rb
 - spec/airborne/post_spec.rb
 - spec/airborne/put_spec.rb
 - spec/airborne/rack/rack_sinatra_spec.rb
@@ -181,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RSpec driven API testing framework