airborne 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76d1f2d5892782be324dedfac91cce34f4afe075
-  data.tar.gz: 30a16b7055de4ac3662454d05caacf645640cb0b
+  metadata.gz: 9a17018ee960799abaabe77e8e53cd7933b1c256
+  data.tar.gz: 5ffee8561f16813ed64b2d58feabc054a0c7e27a
 SHA512:
-  metadata.gz: 530db301f9293ce05f59531e758d1f5da77a53e584f041d391c99866c917c192a188773b81dfc9505240ab03539eea51292e90a12445e760af48d4ac588ee3db
-  data.tar.gz: 96d100dfeb6c6a5086a1787acbfba797281d81d6b2b68bce4fea8a2665ed466b4e464a665d8f83ca779a1f813abcb44fb5afff8e8781f18495c90a4a1605c05d
+  metadata.gz: 391e4cc6d0a84acbd86b88aeece81812a29e6beb045512973d2b7fb7d65dcbc8cd2a79ce338252e9a4ea91e3214d7ef5fd93d4c2fb88cfea92076e97cbd1f196
+  data.tar.gz: 37babe87aaa640f11b246b8b7177baa2e230a1fc1189d6d6bb447a6ba49b6396be9ebd50c46c0befbdce51dc3253d452833467d6caa7886f260fdc1abc5a8c2f

data/airborne.gemspec

@@ -2,11 +2,11 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'airborne'
-  s.version     = '0.2.10'
+  s.version     = '0.2.11'
   s.date        = Date.today.to_s
   s.summary = 'RSpec driven API testing framework'
   s.authors     = ['Alex Friedman', 'Seth Pollack']
-  s.email       = ['a.friedman07@gmail.com', 'teampollack@gmail.com']
+  s.email       = ['a.friedman07@gmail.com', 'seth@sethpollack.net']
   s.require_paths = ['lib']
   s.files = `git ls-files`.split("\n")
   s.license     = 'MIT'

data/lib/airborne/request_expectations.rb

@@ -103,7 +103,7 @@ module Airborne
 
       actual = convert_to_date(actual) if expected == :date
 
-      return expect_type(expected, actual.class) if expected.is_a?(Symbol)
+      return expect_type(expected, actual) if expected.is_a?(Symbol)
       return expected.call(actual) if expected.is_a?(Proc)
 
       keys = []
@@ -120,14 +120,12 @@ module Airborne
         next expect_json_types_impl(type, value) if hash?(type)
         next type.call(value) if type.is_a?(Proc)
 
-        val_class = value.class
-
         type_string = type.to_s
 
         if type_string.include?('array_of') && !(type_string.include?('or_null') && value.nil?)
-          check_array_types(value, val_class, prop, type)
+          check_array_types(value, prop, type)
         else
-          expect_type(type, val_class, prop)
+          expect_type(type, value, prop)
         end
       end
     end
@@ -168,13 +166,13 @@ module Airborne
       end
     end
 
-    def expect_type(expected_type, value_class, prop_name = nil)
+    def expect_type(expected_type, value, prop_name = nil)
       fail ExpectationError, "Expected type #{expected_type}\nis an invalid type" if @mapper[expected_type].nil?
 
       insert = prop_name.nil? ? '' : "#{prop_name} to be of type"
-      message = "Expected #{insert} #{expected_type}\n got #{value_class} instead"
+      message = "Expected #{insert} #{expected_type}\n got #{value.class} instead"
 
-      expect(@mapper[expected_type].include?(value_class)).to eq(true), message
+      expect(@mapper[expected_type].any?{|type| value.is_a?(type)}).to eq(true), message
     end
 
     def convert_to_date(value)
@@ -184,10 +182,10 @@ module Airborne
       end
     end
 
-    def check_array_types(value, value_class, prop_name, expected_type)
-      expect_array(value_class, prop_name, expected_type)
+    def check_array_types(value, prop_name, expected_type)
+      expect_array(value, prop_name, expected_type)
       value.each do |val|
-        expect_type(expected_type, val.class, prop_name)
+        expect_type(expected_type, val, prop_name)
       end
     end
 
@@ -199,8 +197,8 @@ module Airborne
       hash.is_a?(Hash) || hash.is_a?(Airborne::OptionalHashTypeExpectations)
     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"
+    def expect_array(value, 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"
     end
 
     def convert_expectations_for_json_sizes(old_expectations)
@@ -230,18 +228,18 @@ module Airborne
       end
     end
 
-    def property?(expectations)
-      [String, Regexp, Float, *integer_types, TrueClass, FalseClass, NilClass, Array].include?(expectations.class)
+    def property?(expectation)
+      [String, Regexp, Float, Integer, TrueClass, FalseClass, NilClass, Array].any?{|type| expectation.is_a?(type)}
     end
 
     def get_mapper
       base_mapper = {
-        integer: integer_types,
-        array_of_integers: integer_types,
-        int: integer_types,
-        array_of_ints: integer_types,
-        float: [Float, *integer_types],
-        array_of_floats: [Float, *integer_types],
+        integer: [Integer],
+        array_of_integers: [Integer],
+        int: [Integer],
+        array_of_ints: [Integer],
+        float: [Float, Integer],
+        array_of_floats: [Float, Integer],
         string: [String],
         array_of_strings: [String],
         boolean: [TrueClass, FalseClass],
@@ -283,13 +281,5 @@ module Airborne
     def match_expected?
       Airborne.configuration.match_expected?
     end
-
-    def integer_types
-      if 0.class == Integer
-        [Integer]
-      else
-        [Fixnum, Bignum]
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airborne
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Alex Friedman
@@ -110,7 +110,7 @@ dependencies:
 description: 
 email:
 - a.friedman07@gmail.com
-- teampollack@gmail.com
+- seth@sethpollack.net
 executables: []
 extensions: []
 extra_rdoc_files: []