swirl 1.7.3 → 1.7.4

data/lib/swirl/aws.rb

@@ -108,6 +108,9 @@ module Swirl
     end
 
     def call!(action, query={}, &blk)
+      log "Action: #{action}"
+      log "Query:  #{query.inspect}"
+
       # Hard coding this here until otherwise needed
       method = "POST"
 
@@ -122,9 +125,8 @@ module Swirl
       body += "&" + ["Signature", compile_signature(method, body)].join("=")
 
       post(body) do |code, xml|
-        if ENV["SWIRL_LOG"]
-          puts response.body
-        end
+        log "HTTP Response Code: #{code}"
+        log xml.gsub("\n", "\n[swirl] ")
 
         data = Crack::XML.parse(xml)
         blk.call(code, data)
@@ -149,6 +151,12 @@ module Swirl
       "<#{self.class.name} version: #{@version} url: #{@url} aws_access_key_id: #{@aws_access_key_id}>"
     end
 
+    def log(msg)
+      if ENV["SWIRL_LOG"]
+        $stderr.puts "[swirl] #{msg}"
+      end
+    end
+
   end
 
 end

data/lib/swirl/helpers.rb

@@ -5,30 +5,35 @@ module Swirl
     module Compactor
 
       def compact(response)
-        root_key = response.keys.first
-        base = response[root_key]
-        compact!(base)
+        compact!(response.shift.last)
       end
       module_function :compact
 
-      def compact!(data)
-        data.inject({}) do |com, (key, value)|
-          if value.is_a?(Hash)
-            converted = if value.has_key?("item") || value.has_key?("member")
-              items = value["item"] || value ["member"]
-              items ||= []
-              items = items.is_a?(Array) ? items : [items]
-              items.map {|item| compact!(item) }
-            else
+      def compact!(value)
+        case value 
+        when Hash
+          # We don't need to stink'n xmlns!
+          value.delete("xmlns")
+
+          if value.has_key?("member") || value.has_key?("item")
+            value = value["member"] || value["item"]
+
+            if value == nil
               []
+            else
+              value = compact!(value)
+              # Can't use Array() here. :(
+              value.is_a?(Array) ? value : [value]
             end
-            com[key] = converted
-          elsif key == "xmlns"
-            next(com)
           else
-            com[key] = value
+            value.inject({}) do |m, (k, v)|
+              m[k] = compact!(v) ; m
+            end
           end
-          com
+        when Array
+          value.map {|v| compact!(v) }
+        else
+          value
         end
       end
       module_function :compact!

data/test/compactor_test.rb

@@ -48,12 +48,14 @@ class CompactorTest < Test::Unit::TestCase
 
   test "traverses list values and compacts" do
     response = {
-      "Foo" => {
-        "groupSet" => {
-          "item" => {
-            "ipPermissions" => {
-              "item" => {
-                "proto" => "tcp"
+      "Bar" => {
+        "Foo" => {
+          "groupSet" => {
+            "item" => {
+              "ipPermissions" => {
+                "item" => {
+                  "proto" => "tcp"
+                }
               }
             }
           }
@@ -62,9 +64,11 @@ class CompactorTest < Test::Unit::TestCase
     }
 
     expected = {
-      "groupSet" => [
-        { "ipPermissions" => [ { "proto" => "tcp" } ] }
-      ]
+      "Foo" => {
+        "groupSet" => [
+          { "ipPermissions" => [ { "proto" => "tcp" } ] }
+        ]
+      }
     }
 
     assert_equal expected, Compactor.compact(response)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: swirl
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 7
-  - 3
-  version: 1.7.3
+  - 4
+  version: 1.7.4
 platform: ruby
 authors: 
 - Blake Mizerany