SHIMODA Piro Hiroshi
null+****@clear*****
Sat Oct 4 19:27:57 JST 2014
SHIMODA "Piro" Hiroshi 2014-10-04 19:27:57 +0900 (Sat, 04 Oct 2014) New Revision: 3644d48ceade338d4d22263b3827d5f9b067da02 https://github.com/droonga/drnbench/commit/3644d48ceade338d4d22263b3827d5f9b067da02 Message: Detect patterns more correctly Modified files: lib/drnbench/request-response/request-pattern.rb Modified: lib/drnbench/request-response/request-pattern.rb (+20 -9) =================================================================== --- lib/drnbench/request-response/request-pattern.rb 2014-10-04 19:27:24 +0900 (4a23cbd) +++ lib/drnbench/request-response/request-pattern.rb 2014-10-04 19:27:57 +0900 (ecca62d) @@ -36,12 +36,6 @@ module Drnbench private def prepare_groups - if****@sourc*****_a?(Hash) - retur****@sourc***** do |group| - PatternsGroup.new(group, self) - end - end - if****@sourc*****_a?(Array) if PatternsGroup.valid_source?(@source.first) retur****@sourc***** do |group| @@ -53,6 +47,15 @@ module Drnbench PatternsGroup.new(@source, self), ] end + elsif****@sourc*****_a?(Hash) + if PatternsGroup.valid_source?(@source) + return [ + PatternsGroup.new(@source, self), + ] + end + retur****@sourc***** do |group| + PatternsGroup.new(group, self) + end end [] @@ -80,7 +83,7 @@ module Drnbench if source.is_a?(Hash) return source.has_key?("patterns") end - raise "invalid group: #{JSON.stringify(source)}" + false end end @@ -148,17 +151,25 @@ module Drnbench return true if source.is_a?(String) return false if source.is_a?(Array) return !source.has_key?("patterns") if source.is_a?(Hash) - raise "invalid pattern: #{JSON.stringify(source)}" + false end end - attr_reader :group + attr_reader :source, :group def initialize(source, group) @source = source @group = group end + def path + if****@sourc*****_a?(String) + @source + else + @source["path"] + end + end + def to_request @populated ||= populate end -------------- next part -------------- HTML����������������������������...Télécharger
