0
@@ -131,24 +131,30 @@ module Waves
0
 
0
       private
0
 
0
-      def destructure(hash)
0
-        rval = {}
0
-        hash.keys.map{ |key|key.split('.') }.each do |keys|
0
-          destructure_with_array_keys(hash,'',keys,rval)
0
+      def destructure( hash )
0
+        destructured = {}
0
+        hash.keys.map { |key| key.split('.') }.each do |keys|
0
+          destructure_with_array_keys(hash, '', keys, destructured)
0
         end
0
-        rval
0
+        destructured
0
       end
0
 
0
-      def destructure_with_array_keys(hash,prefix,keys,rval)
0
+      def destructure_with_array_keys( hash, prefix, keys, destructured )
0
         if keys.length == 1
0
-          val = hash[prefix+keys.first]
0
-          rval[keys.first.intern] = case val
0
-          when String then val.strip
0
-          when Hash then val
0
+          key = "#{prefix}#{keys.first}"
0
+          val = hash[key]
0
+          destructured[keys.first.intern] = case val
0
+          when String
0
+            val.strip
0
+          when Hash
0
+            val
0
+          when nil
0
+            raise key.inspect
0
           end
0
         else
0
-          rval = ( rval[keys.first.intern] ||= {} )
0
-          destructure_with_array_keys(hash,(keys.shift<<'.'),keys,rval)
0
+          destructured = ( destructured[keys.first.intern] ||= {} )
0
+          new_prefix = "#{prefix}#{keys.shift}."
0
+          destructure_with_array_keys( hash, new_prefix, keys, destructured )
0
         end
0
       end
0
 

0
@@ -16,10 +16,13 @@ describe "A Waves controller" do
0
   it "can access a destructured version of the request params" do
0
     request_hash =      { 'beer.name' => 'Pale Rye Ale', 
0
                           'beer.brew.kind' => 'mini-mash', 
0
-                          'beer.brew.yeast' => 'White Labs British Ale' }
0
+                          'beer.brew.yeast' => 'White Labs British Ale' ,
0
+                          'beer.brew.hops.variety' => 'Fuggles' }
0
     destructured_hash = { :beer =>  
0
                             { :name => 'Pale Rye Ale', 
0
-                              :brew => { :kind => 'mini-mash', :yeast => 'White Labs British Ale'}}}
0
+                              :brew => {  :kind => 'mini-mash', 
0
+                                          :yeast => 'White Labs British Ale',
0
+                                          :hops => { :variety => 'Fuggles' }}}}
0
                               
0
     @request.should.receive(:params).and_return(request_hash)
0
     @dc.params.should == destructured_hash