Kouhei Sutou
null+****@clear*****
Thu Dec 8 21:36:48 JST 2016
Kouhei Sutou 2016-12-08 21:36:48 +0900 (Thu, 08 Dec 2016) New Revision: dfd6fb48eaee4ade9db049a855bc15561e77c7e7 https://github.com/groonga/groonga-command/commit/dfd6fb48eaee4ade9db049a855bc15561e77c7e7 Message: Introduce flags_value for flags value Modified files: lib/groonga/command/base.rb lib/groonga/command/column-create.rb lib/groonga/command/normalize.rb lib/groonga/command/query-expand.rb lib/groonga/command/table-tokenize.rb lib/groonga/command/tokenize.rb Modified: lib/groonga/command/base.rb (+9 -0) =================================================================== --- lib/groonga/command/base.rb 2016-12-08 18:45:27 +0900 (fb44e0e) +++ lib/groonga/command/base.rb 2016-12-08 21:36:48 +0900 (3dac2cf) @@ -206,6 +206,15 @@ module Groonga return nil if value.nil? value.strip.split(/\s*,\s*/) end + + def flags_value(name) + parse_flags_value(self[name] || "") + end + + def parse_flags_value(value) + return nil if value.nil? + value.strip.split(/\s*[| ]\s*/) + end end end end Modified: lib/groonga/command/column-create.rb (+1 -1) =================================================================== --- lib/groonga/command/column-create.rb 2016-12-08 18:45:27 +0900 (698664d) +++ lib/groonga/command/column-create.rb 2016-12-08 21:36:48 +0900 (a55e504) @@ -51,7 +51,7 @@ module Groonga end def flags - @flags ||= (self[:flags] || "").split(/\s*\|\s*/) + @flags ||= flags_value(:flags) end # @return [String] value type name of the column. Modified: lib/groonga/command/normalize.rb (+1 -1) =================================================================== --- lib/groonga/command/normalize.rb 2016-12-08 18:45:27 +0900 (b924a5b) +++ lib/groonga/command/normalize.rb 2016-12-08 21:36:48 +0900 (e16b3db) @@ -59,7 +59,7 @@ module Groonga # # @since 1.0.6 def flags - @flags ||= (self[:flags] || "").split(/\s*[| ]\s*/) + @flags ||= flags_value(:flags) end end end Modified: lib/groonga/command/query-expand.rb (+1 -1) =================================================================== --- lib/groonga/command/query-expand.rb 2016-12-08 18:45:27 +0900 (67f14b0) +++ lib/groonga/command/query-expand.rb 2016-12-08 21:36:48 +0900 (665b7eb) @@ -56,7 +56,7 @@ module Groonga # # @since 1.2.1 def flags - @flags ||= (self[:flags] || "").split(/(?:\s*\|\s*)|(?:\s+)/) + @flags ||= flags_value(:flags) end # @return [Boolean] `true` if `"ALLOW_PRAGMA"` is specified in Modified: lib/groonga/command/table-tokenize.rb (+1 -1) =================================================================== --- lib/groonga/command/table-tokenize.rb 2016-12-08 18:45:27 +0900 (1700b7f) +++ lib/groonga/command/table-tokenize.rb 2016-12-08 21:36:48 +0900 (8b875c0) @@ -60,7 +60,7 @@ module Groonga # # @since 1.1.0 def flags - @flags ||= (self[:flags] || "").split(/\s*[| ]\s*/) + @flags ||= flags_value(:flags) end # @return [String] `mode` parameter value. Modified: lib/groonga/command/tokenize.rb (+1 -1) =================================================================== --- lib/groonga/command/tokenize.rb 2016-12-08 18:45:27 +0900 (577792b) +++ lib/groonga/command/tokenize.rb 2016-12-08 21:36:48 +0900 (4c53937) @@ -68,7 +68,7 @@ module Groonga # # @since 1.0.6 def flags - @flags ||= (self[:flags] || "").split(/\s*[| ]\s*/) + @flags ||= flags_value(:flags) end # @return [String] `mode` parameter value. -------------- next part -------------- HTML����������������������������...下载
