Validate farms at first

droonga · Feb 13, 2014 · f1468e6 · f1468e6
1 parent f758a44
commit f1468e6
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/lib/droonga/catalog/base.rb b/lib/droonga/catalog/base.rb
@@ -153,10 +153,10 @@ def validate
           validate_effective_date
         end
         do_validation do
-          validate_zones
+          validate_farms
         end
         do_validation do
-          validate_farms
+          validate_zones
         end
         do_validation do
           validate_datasets
@@ -227,17 +227,6 @@ def validate_effective_date
         validate_valid_datetime(date, "effective_date")
       end
 
-      def validate_zones
-        zones = @data["zones"]
-
-        validate_required_parameter(zones, "zones")
-        validate_parameter_type(Array, zones, "zones")
-
-        zones.each_with_index do |value, index|
-          validate_parameter_type(String, value, "zones[#{index}]")
-        end
-      end
-
       def validate_farms
         farms = @data["farms"]
 
@@ -256,6 +245,17 @@ def validate_farm(farm, name)
         validate_parameter_type(String, farm["device"], "#{name}.device")
       end
 
+      def validate_zones
+        zones = @data["zones"]
+
+        validate_required_parameter(zones, "zones")
+        validate_parameter_type(Array, zones, "zones")
+
+        zones.each_with_index do |value, index|
+          validate_parameter_type(String, value, "zones[#{index}]")
+        end
+      end
+
       def validate_datasets
         datasets = @data["datasets"]