airborne 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd09f18a54b952fe79859870e2dcc41e730b3ced
-  data.tar.gz: dfb9931317cc0d4a1203aa74fcf13ec3c8ca3642
+  metadata.gz: 9c7bde2a0ccea50067ac3b6ab6b6617740635723
+  data.tar.gz: e571199b5670fc0fa9a3546bcd1beacbce558a1b
 SHA512:
-  metadata.gz: 802fc7d6f03cdba23dbe2bb5526130a6af730b303b778c61111194d20b77f89ecbc725042a827594ac3518e9028d3d30a7180db24031904c2654cd39a91cab7d
-  data.tar.gz: 06a7392ddedf4a48fa7631958914878d54b18e7277591aa75cf4dfc32193fb157669cad93f0818928d7fef2ad9b51772fd3ab583bc14a4afe1850da993146921
+  metadata.gz: c6e80018eaa3dd6c7ec967e178e56152011bf1c6e16f4a817c8259cea6fdd03ebda738c26b2a0d48a110e05025374b4aebe3bba14521b7ccb08ee6ded500f169
+  data.tar.gz: 3015da91709bf605a169efbef8032841ef6470e40918c9cc9f24db5d8f1a3f8f080ba40e44d8fcb0f5578feb7cbcfa502ea8ccb5e090b6041d08f330c2ab2c93

data/airborne.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'airborne'
-  s.version     = '0.1.12'
-  s.date        = '2015-02-28'
+  s.version     = '0.1.13'
+  s.date        = '2015-03-01'
   s.summary = "RSpec driven API testing framework"
   s.authors     = ["Alex Friedman", "Seth Pollack"]
   s.email       = ['a.friedman07@gmail.com', 'teampollack@gmail.com']

data/lib/airborne/base.rb

@@ -2,8 +2,8 @@ require 'json'
 require 'active_support/hash_with_indifferent_access'
 
 module Airborne
+  class InvalidJsonError < StandardError; end
   include RequestExpectations
-
   def self.configure
     RSpec.configure do |config|
       yield config
@@ -65,6 +65,7 @@ module Airborne
   end
 
   def json_body
+    raise InvalidJsonError, "Api request returned invalid json" unless @json_body
     @json_body
   end
 

data/lib/airborne/request_expectations.rb

@@ -201,9 +201,6 @@ module Airborne
       end
     end
 
-    # Convert integers in `old_expectations` to proc
-    #
-    # @param old_expectations [Hash]
     def convert_expectations_for_json_sizes(old_expectations)
       unless old_expectations.is_a?(Hash)
         return convert_expectation_for_json_sizes(old_expectations)
@@ -219,8 +216,6 @@ module Airborne
       end
     end
 
-    # @param expected_size [Integer]
-    # @return [Proc]
     def convert_expectation_for_json_sizes(expected_size)
       ->(data) { expect(data.size).to eq(expected_size) }
     end

data/spec/airborne/base_spec.rb

@@ -13,6 +13,13 @@ describe 'base spec' do
     expect(headers).to_not be(nil)    
   end
 
+  it 'should throw an InvalidJsonError when accessing json_body on invalid json' do
+    mock_get('invalid_json')
+    get '/invalid_json'
+    expect(body).to eq("1234")
+    expect{json_body}.to raise_error
+  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'
@@ -34,12 +41,6 @@ describe 'base spec' do
     expect(json_body.first[0]).to be_kind_of(Symbol)    
   end
 
-  it 'should set json_body to nil 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'

data/spec/airborne/head_spec.rb

@@ -6,6 +6,5 @@ describe 'head' do
     head '/simple_head', {}
     expect_status(200)
     expect_header('foo', 'foo')
-    expect(json_body).to be(nil)
   end
 end

data/spec/test_responses/invalid_json.json

@@ -0,0 +1 @@
+1234

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airborne
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Alex Friedman
@@ -9,94 +9,94 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   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: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !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,10 +107,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -155,6 +155,7 @@ files:
 - spec/test_responses/array_with_nested_bad_data.json
 - spec/test_responses/date_response.json
 - spec/test_responses/invalid_get.json
+- spec/test_responses/invalid_json.json
 - spec/test_responses/numeric_property.json
 - spec/test_responses/simple_get.json
 - spec/test_responses/simple_json.json
@@ -173,17 +174,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