swirl 1.7.0 → 1.7.1

data/lib/swirl/helpers.rb

@@ -4,30 +4,6 @@ module Swirl
 
     module Compactor
 
-      Lists = [
-        "keySet",
-        "groupSet",
-        "blockDeviceMapping",
-        "instancesSet",
-        "reservationSet",
-        "imagesSet",
-        "ownersSet",
-        "executableBySet",
-        "securityGroupSet",
-        "ipPermissions",
-        "ipRanges",
-        "groups",
-        "securityGroupInfo",
-        "add",
-        "remove",
-        "launchPermission",
-        "productCodes",
-        "availabilityZoneSet",
-        "availabilityZoneInfo",
-        "publicIpsSet",
-        "addressesSet"
-      ]
-
       def compact(response)
         root_key = response.keys.first
         base = response[root_key]
@@ -38,8 +14,8 @@ module Swirl
       def compact!(data)
         data.inject({}) do |com, (key, value)|
           if value.is_a?(Hash)
-            converted = if value.has_key?("item")
-              items = value["item"]
+            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) }

data/test/compactor_test.rb

@@ -25,6 +25,13 @@ class CompactorTest < Test::Unit::TestCase
     assert_equal expected, Compactor.compact(response)
   end
 
+  test "pivots list keys on member" do
+    response = { "Foo" => { "groupSet" => { "member" => [{ "foo" => "bar" }] } } }
+    expected = { "groupSet" =>  [ { "foo" => "bar" } ] }
+
+    assert_equal expected, Compactor.compact(response)
+  end
+
   test "pivots list keys item and converts to Array not already an Array" do
     response = { "Foo" => { "groupSet" => { "item" => { "foo" => "bar" } } } }
     expected = { "groupSet" =>  [ { "foo" => "bar" } ] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: swirl
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 7
-  - 0
-  version: 1.7.0
+  - 1
+  version: 1.7.1
 platform: ruby
 authors: 
 - Blake Mizerany