YUKI Hiroshi
null+****@clear*****
Thu Feb 13 10:45:41 JST 2014
YUKI Hiroshi 2014-02-13 10:45:41 +0900 (Thu, 13 Feb 2014) New Revision: f1468e69c4db54ad3e996f40e5e2a0c1825bf3a5 https://github.com/droonga/fluent-plugin-droonga/commit/f1468e69c4db54ad3e996f40e5e2a0c1825bf3a5 Message: Validate farms at first Modified files: lib/droonga/catalog/base.rb Modified: lib/droonga/catalog/base.rb (+13 -13) =================================================================== --- lib/droonga/catalog/base.rb 2014-02-12 19:46:58 +0900 (39929df) +++ lib/droonga/catalog/base.rb 2014-02-13 10:45:41 +0900 (5d3f302) @@ -153,10 +153,10 @@ module Droonga 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 @@ module Droonga 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 @@ module Droonga 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"] -------------- next part -------------- HTML����������������������������...Download