WashOut can now accept types at first level of definition (fixes #95)

Author: inossidabile

Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    wash_out (0.7.1)
+    wash_out (0.8.0)
       nori (>= 2.0.0)
 
 GEM

lib/wash_out/param.rb

@@ -133,7 +133,11 @@ def self.parse_def(definition)
       raise RuntimeError, "[] should not be used in your params. Use nil if you want to mark empty set." if definition == []
       return [] if definition == nil
 
-      if [Array, Symbol, Class].include?(definition.class)
+      if definition.is_a?(Class) && definition.ancestors.include?(WashOut::Type)
+        definition = definition.wash_out_param_map
+      end
+
+      if [Array, Symbol].include?(definition.class)
         definition = { :value => definition }
       end
 

lib/wash_out/version.rb

@@ -1,3 +1,3 @@
 module WashOut
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

spec/lib/wash_out/param_spec.rb

@@ -19,9 +19,8 @@ class Abraka2 < WashOut::Type
       map = WashOut::Param.parse_def Abraka2
 
       map.should be_a_kind_of(Array)
-      map[0].name.should == 'value'
-      map[0].map[0].name.should == 'foo'
-      map[0].map[0].map[0].name.should == 'test'
+      map[0].name.should == 'foo'
+      map[0].map[0].name.should == 'test'
     end
 
     it "respects camelization setting" do
@@ -30,9 +29,8 @@ class Abraka2 < WashOut::Type
       map = WashOut::Param.parse_def Abraka2
 
       map.should be_a_kind_of(Array)
-      map[0].name.should == 'Value'
-      map[0].map[0].name.should == 'Foo'
-      map[0].map[0].map[0].name.should == 'Test'
+      map[0].name.should == 'Foo'
+      map[0].map[0].name.should == 'Test'
     end
   end