awspec 0.55.0 → 0.56.0

data/lib/awspec/type/ses_identity.rb

@@ -1,14 +1,16 @@
 module Awspec::Type
   class SesIdentity < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_ses_identity(id)
-      @id = @resource_via_client if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_ses_identity(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client if resource_via_client
     end
 
     def has_identity_policy?(name)
       res = ses_client.list_identity_policies({
-                                                identity: @id
+                                                identity: id
                                               })
       res.policy_names.find do |policy_name|
         policy_name == name
@@ -23,17 +25,17 @@ module Awspec::Type
     dkim_attributes.each do |attribute|
       define_method attribute do
         res = ses_client.get_identity_dkim_attributes({
-                                                        identities: [@id]
+                                                        identities: [id]
                                                       })
-        res.dkim_attributes[@id][attribute.to_sym]
+        res.dkim_attributes[id][attribute.to_sym]
       end
     end
 
     def has_dkim_tokens?(token)
       res = ses_client.get_identity_dkim_attributes({
-                                                      identities: [@id]
+                                                      identities: [id]
                                                     })
-      res.dkim_attributes[@id][:tokens].include?(token)
+      res.dkim_attributes[id][:tokens].include?(token)
     end
 
     # notification_attributes
@@ -45,9 +47,9 @@ module Awspec::Type
     notification_attributes.each do |attribute|
       define_method attribute do
         res = ses_client.get_identity_notification_attributes({
-                                                                identities: [@id]
+                                                                identities: [id]
                                                               })
-        res.notification_attributes[@id][attribute.to_sym]
+        res.notification_attributes[id][attribute.to_sym]
       end
     end
 
@@ -59,9 +61,9 @@ module Awspec::Type
     verification_attributes.each do |attribute|
       define_method attribute do
         res = ses_client.get_identity_verification_attributes({
-                                                                identities: [@id]
+                                                                identities: [id]
                                                               })
-        res.verification_attributes[@id][attribute.to_sym]
+        res.verification_attributes[id][attribute.to_sym]
       end
     end
   end

data/lib/awspec/type/subnet.rb

@@ -3,10 +3,12 @@ module Awspec::Type
     aws_resource Aws::EC2::Subnet
     tags_allowed
 
-    def initialize(id)
-      super
-      @resource_via_client = find_subnet(id)
-      @id = @resource_via_client.subnet_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_subnet(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.subnet_id if resource_via_client
     end
 
     STATES = %w(
@@ -15,7 +17,7 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource_via_client.state == state
+        resource_via_client.state == state
       end
     end
   end

data/lib/awspec/type/vpc.rb

@@ -3,10 +3,12 @@ module Awspec::Type
     aws_resource Aws::EC2::Vpc
     tags_allowed
 
-    def initialize(id)
-      super
-      @resource_via_client = find_vpc(id)
-      @id = @resource_via_client.vpc_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_vpc(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.vpc_id if resource_via_client
     end
 
     STATES = %w(
@@ -15,20 +17,20 @@ module Awspec::Type
 
     STATES.each do |state|
       define_method state + '?' do
-        @resource_via_client.state == state
+        resource_via_client.state == state
       end
     end
 
-    def has_route_table?(id)
-      route_table = find_route_table(id)
+    def has_route_table?(table_id)
+      route_table = find_route_table(table_id)
       return false unless route_table
-      route_table.vpc_id == @id
+      route_table.vpc_id == id
     end
 
-    def has_network_acl?(id)
-      n = find_network_acl(id)
+    def has_network_acl?(table_id)
+      n = find_network_acl(table_id)
       return false unless n
-      n.vpc_id == @id
+      n.vpc_id == id
     end
   end
 end

data/lib/awspec/type/waf_web_acl.rb

@@ -1,17 +1,19 @@
 module Awspec::Type
   class WafWebAcl < Base
-    def initialize(id)
-      super
-      @resource_via_client = find_waf_web_acl(id)
-      @id = @resource_via_client.web_acl_id if @resource_via_client
+    def resource_via_client
+      @resource_via_client ||= find_waf_web_acl(@display_name)
+    end
+
+    def id
+      @id ||= resource_via_client.web_acl_id if resource_via_client
     end
 
     def default_action
-      @resource_via_client.default_action.type
+      resource_via_client.default_action.type
     end
 
     def has_rule?(rule_id, priority = nil, action = nil)
-      @resource_via_client.rules.find do |rule|
+      resource_via_client.rules.find do |rule|
         next false if !priority.nil? && rule.priority != priority
         next false if !action.nil? && rule.action.type != action
         next true if rule.rule_id == rule_id

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.55.0'
+  VERSION = '0.56.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.55.0
+  version: 0.56.0
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -364,6 +364,7 @@ files:
 - lib/awspec/matcher/have_tag.rb
 - lib/awspec/resource_reader.rb
 - lib/awspec/setup.rb
+- lib/awspec/shared_context.rb
 - lib/awspec/stub.rb
 - lib/awspec/stub/ami.rb
 - lib/awspec/stub/autoscaling_group.rb