swirl 1.0 → 1.1

data/README.md

@@ -18,6 +18,14 @@ is `expand`ed to:
 
     { "InstanceId.0" => "i-123k2h1", "InstanceId.1" => "i-0234d3" }
 
+in the case that `.n` isn't at the end of the key:
+
+    { "Foo.#.Bar" => ["a", "b"] }
+
+is `expand`ed to:
+
+    { "Foo.0.Bar" => "a", "Foo.1.Bar" => "b" }
+
 and
 
     # Output

data/lib/swirl/helpers.rb

@@ -66,8 +66,9 @@ module Swirl
 
           case value
           when Array
+            key = "#{key}.#" if key !~ /#/
             value.each_with_index do |val, n|
-              exp["#{key}.#{n}"] = val
+              exp[key.gsub("#", n.to_s)] = val
             end
           when Range
             exp["From#{key}"] = value.min

data/test/expander_test.rb

@@ -29,6 +29,18 @@ class ExpanderTest < Test::Unit::TestCase
     assert_equal expected, Expander.expand(request)
   end
 
+  test "expands keys with # and Array values to .n. key-values" do
+    request = { "foo.#.bar" => ["foo", "bar", "baz"] }
+
+    expected = {
+      "foo.0.bar" => "foo",
+      "foo.1.bar" => "bar",
+      "foo.2.bar" => "baz"
+    }
+
+    assert_equal expected, Expander.expand(request)
+  end
+
   test "ignores empty Array values" do
     request = { "group" => [] }
     expected = {}

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: swirl
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -14,34 +18,46 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 4
         version: 0.1.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 2
         version: 0.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: contest
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 2
         version: 0.1.2
-    version: 
+  type: :development
+  version_requirements: *id003
 description: A version agnostic EC2 ruby driver
 email: 
 executables: 
@@ -80,18 +96,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: swirl
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: A version agnostic EC2 ruby driver