lib/cfer/core/fn.rb in cfer-0.2.0 vs lib/cfer/core/fn.rb in cfer-0.3.0

@@ -26,27 +26,27 @@
 
     def condition(cond)
       {"Condition" => cond}
     end
 
-    def and(conds)
-      {"Fn::And" => [conds]}
+    def and(*conds)
+      {"Fn::And" => conds}
     end
 
+    def or(*conds)
+      {"Fn::Or" => conds}
+    end
+
     def equals(a, b)
       {"Fn::Equals" => [a, b]}
     end
 
     def if(cond, t, f)
       {"Fn::If" => [cond, t, f]}
     end
 
     def not(cond)
-      {"Fn::Not" => cond}
-    end
-
-    def or(conds)
-      {"Fn::Or" => conds}
+      {"Fn::Not" => [cond]}
     end
 
     def get_azs(region)
       {"Fn::GetAZs" => region}
     end