Consolidated updates onto 1 branch to PR

awspec.gemspec

@@ -5,15 +5,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'awspec/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'awspec-api_gateway_extended'
-  spec.version       =  '1.2.4'
-  spec.authors       = ['cthies']
+  spec.name          = 'awspec'
+  spec.version       = Awspec::VERSION
+  spec.authors       = ['k1LoW']
+  spec.email         = ['k1lowxb@gmail.com']
 
-  spec.summary       = 'Forked version of Awspec with extended API Gateway testing'
-  spec.description   = 'Forked version of Awspec with extended API Gateway testing.
-  Can view examples of features here: https://github.com/ckthiessen/awspec/blob/master/spec/type/apigateway_spec.rb
-  All credit to the owners of the Awspec repository at https://github.com/k1LoW/awspec'
-  spec.homepage      = 'https://github.com/ckthiessen/awspec'
+  spec.summary       = 'RSpec tests for your AWS resources.'
+  spec.description   = 'RSpec tests for your AWS resources.'
+  spec.homepage      = 'https://github.com/k1LoW/awspec'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

doc/resource_types.md

@@ -3389,7 +3389,7 @@ end
 ```
 
 
-### its(:name), its(:type), its(:key_id), its(:last_modified_date), its(:last_modified_user), its(:description), its(:allowed_pattern), its(:version), its(:tier), its(:policies)
+### its(:name), its(:type), its(:key_id), its(:last_modified_date), its(:last_modified_user), its(:description), its(:allowed_pattern), its(:version), its(:tier), its(:policies), its(:data_type)
 ### :unlock: Advanced use
 
 ```ruby
@@ -3433,7 +3433,7 @@ end
 ```
 
 
-### its(:availability_zone), its(:availability_zone_id), its(:available_ip_address_count), its(:cidr_block), its(:default_for_az), its(:map_public_ip_on_launch), its(:state), its(:subnet_id), its(:vpc_id), its(:owner_id), its(:assign_ipv_6_address_on_creation), its(:ipv_6_cidr_block_association_set), its(:subnet_arn), its(:outpost_arn)
+### its(:availability_zone), its(:availability_zone_id), its(:available_ip_address_count), its(:cidr_block), its(:default_for_az), its(:map_public_ip_on_launch), its(:map_customer_owned_ip_on_launch), its(:customer_owned_ipv_4_pool), its(:state), its(:subnet_id), its(:vpc_id), its(:owner_id), its(:assign_ipv_6_address_on_creation), its(:ipv_6_cidr_block_association_set), its(:subnet_arn), its(:outpost_arn)
 ### :unlock: Advanced use
 
 `subnet` can use `Aws::EC2::Subnet` resource (see http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/Subnet.html).

lib/awspec/type/apigateway.rb

@@ -32,7 +32,7 @@ def has_integration_path?(path)
         next if resource.resource_methods.nil?
         resource.resource_methods.each do |_, method|
           if method.method_integration.http_method == 'AWS'
-            aws_path = method.method_integration.uri.match(%r{(\/[^\?]+)\??.*$}).captures[0]
+            aws_path = method.method_integration.uri.match(%r{(\/[^\?]+)\??.*$}).captures[0] # Matches for ARN type path
             return resource if aws_path == path
           end
           uri = Addressable::URI.parse(method.method_integration.uri)