aws-cache 0.0.03 → 0.0.04

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTJjMThiMGIzYzE3NDE0ZWI0OGU1ODM3Yjg0YTVmYmNiNTY1YzUxMQ==
+    NWExNjliYjZjZmViNDU2MmJiNmJlZDA4OGNmYTlkMWIyMWVjZDk0MQ==
   data.tar.gz: !binary |-
-    YThiMjI0NDdkNzdlMDUxMWYzNWQ2YThiZmJiMzZmOTgwZDQwZmZjOQ==
+    Njk1ZmYxMjgzYjQ5M2IyMWY0OGUxOTNkMzIzMGZkM2I1ZDcwMTFlZg==
 SHA512:
   metadata.gz: !binary |-
-    MjI2OWY4YTg5MDJlYThkNDAxZjk4Zjk1Zjc3ZjNmMDg5NDAyZDUyMTA0YWZl
-    NjdkMDllMDQ1YWEyZjlmOTkzZTIyNzJjY2E4ODI0NzE5ZGFiYjM1Zjg2Nzg0
-    NjQ2YTUyNDI3OWQ3ZmNmY2I3NGJiYThiMjdkNTBiZDc3ZjgxOGQ=
+    YzFjYzZiNzVlN2Y1NzhjZWQ1ZjE1MzE1M2MzMDk0MjIwNTAzZTBhMTZlNDBk
+    MmFkODAzYTY2MzAwZDMzOGUyYzkwNDcyYjBkYjI1ZWJlYjdhYzUwMGQ3Y2Mx
+    NGQxMDQ0YmU5MTYxYTI2ZDdhNjc0ZTc2YjAyYzE4MDJmZGI0ZmU=
   data.tar.gz: !binary |-
-    YjU2ZGIxNmY1ODExN2ZhNmJhOGUwMjUxODFkZDQ2NTMxNjkzN2E2Yzg5NzY5
-    NmRjM2NkZTE3MWM3MmZlMTQyZTc5ZTUwNzZjYWFlMGYwMWE4OGYwODI2Yjhh
-    Nzg3Y2JlNWNmMzhjYTM0NzUwYjBiZTIxOWFhMmYyNjQ4ZmEzOGY=
+    MGQzOTA1NjcyZWY2NDZmYmVlODgzYWE2OGZlNzcyODFhZDIxYjRiOWZkNjZh
+    OGJkZGNjNTg0ZDNhZGFjMGFkMjk1OTczYmY0NzIzMDRjYzY2ZGZkMGE1MTY4
+    ZTE4NjRhMzBkNjM2MWI5YjcyNjhmOWQxYjJkMjFlOTcyZDY3MDc=

data/lib/aws-cache.rb

@@ -2,6 +2,7 @@ require 'redis'
 require 'json'
 require 'aws-sdk'
 require 'yaml'
+require 'pry'
 
 class AwsCache
   # Please follow semantic versioning (semver.org).
@@ -43,7 +44,7 @@ class AwsCache
     instances = self.ec2_instances
     stack_instances = {}
     instances.each do |id, instance|
-      if stack_name == optional_element(instance, [':tags','StackName',':value'], '')
+      if stack_name == optional_element(instance, [:tags,'StackName',:value], '')
         stack_instances[id] = instance
       end
     end
@@ -75,7 +76,7 @@ class AwsCache
     groups = self.auto_scaling_groups
     stack_groups = {}
     groups.each do |name, group|
-      if stack_name == optional_element(group, [':tags','StackName',':value'], '')
+      if stack_name == optional_element(group, [:tags,'StackName',:value], '')
         stack_groups[name] = group
       end
     end
@@ -152,7 +153,7 @@ class AwsCache
   private
   def optional_element(hash, keys, default=nil)
     keys.each do |key|
-      if !hash.is_a?(Hash) || !hash.has_key?(key)
+      if !has_key?(hash, key)
 	return default
       end
       hash = hash[key]
@@ -160,6 +161,17 @@ class AwsCache
     return hash 
   end
 
+  def has_key?(hash_or_struct, key)
+    hos = hash_or_struct
+    if hos.is_a?(Hash) && hos.has_key?(key)
+      return true
+    end
+    if hos.is_a?(Struct) && hos.members.any? { |m| m == key }
+      return true
+    end
+    return false
+  end
+
   def cache_get(key, ttl)
     vkey = "#{key}_#{@keyspace}"
     hash = @redis.get(vkey)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cache
 version: !ruby/object:Gem::Version
-  version: 0.0.03
+  version: 0.0.04
 platform: ruby
 authors:
 - Stephen J. Smith