YUKI Hiroshi
null+****@clear*****
Thu Feb 13 10:59:16 JST 2014
YUKI Hiroshi 2014-02-13 10:59:16 +0900 (Thu, 13 Feb 2014) New Revision: 903527f6d11120a77e6c4023b42c33ee57aba381 https://github.com/droonga/fluent-plugin-droonga/commit/903527f6d11120a77e6c4023b42c33ee57aba381 Message: Accept nested zones Modified files: lib/droonga/catalog/base.rb Modified: lib/droonga/catalog/base.rb (+13 -2) =================================================================== --- lib/droonga/catalog/base.rb 2014-02-13 10:55:24 +0900 (d21542b) +++ lib/droonga/catalog/base.rb 2014-02-13 10:59:16 +0900 (4cd61d5) @@ -257,8 +257,19 @@ module Droonga 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}]") + validate_zone(zones, "zones") + end + + def validate_zone(zone, name) + case value + when String + return + when Array + zone.each_with_index do |sub_zone, index| + validate_zone(sub_zone, "#{name}[#{index}]") + end + else + validate_parameter_type([String, Array], value, name) end end -------------- next part -------------- HTML����������������������������...Download