lib/heirloom/archive/reader.rb in heirloom-0.2.0 vs lib/heirloom/archive/reader.rb in heirloom-0.3.0.rc1

@@ -19,10 +19,17 @@
         @logger.debug "Entry for #{id} not found in SimpleDB."
         false
       end
     end
 
+    def regions
+      data = show.keys.map do |key|
+        key.gsub('-s3-url', '') if key =~ /-s3-url$/
+      end
+      data.compact
+    end
+
     def get_bucket(args)
       @logger.debug "Looking for bucket in #{args[:region]} for #{id}"
       url = get_url(args)
       if url
         bucket = url.gsub('s3://', '').split('/').first
@@ -45,22 +52,27 @@
         nil
       end
     end
 
     def show
-      items = sdb.select "select * from #{name} where itemName() = '#{id}'"
-      items[id] ? items[id] : {}
+      query = sdb.select "select * from #{name} where itemName() = '#{id}'"
+      items = query[id] ? query[id] : {}
+      r = {}
+      items.each_pair.map do |key,value|
+        r[key] = value.first
+      end
+      r
     end
 
     private
 
     def get_url(args)
       return nil unless exists?
       @logger.debug "Looking for #{args[:region]} endpoint for #{id}"
       url = "#{args[:region]}-s3-url"
       if show[url]
         @logger.debug "Found #{url} for #{id}."
-        show[url].first
+        show[url]
       else
         @logger.debug "#{args[:region]} endpoint for #{id} not found."
         nil
       end
     end