Kouhei Sutou
null+****@clear*****
Fri Dec 9 17:29:02 JST 2016
Kouhei Sutou 2016-12-09 17:29:02 +0900 (Fri, 09 Dec 2016) New Revision: 6c2051793abcc5cd9850dcea609c417bc9d18b28 https://github.com/ranguba/groonga-client/commit/6c2051793abcc5cd9850dcea609c417bc9d18b28 Message: Define command name as class method Modified files: lib/groonga/client/request/base.rb lib/groonga/client/request/select.rb Modified: lib/groonga/client/request/base.rb (+3 -4) =================================================================== --- lib/groonga/client/request/base.rb 2016-12-09 17:03:25 +0900 (5a9dc41) +++ lib/groonga/client/request/base.rb 2016-12-09 17:29:02 +0900 (843d9e9) @@ -18,8 +18,7 @@ module Groonga class Client module Request class Base - def initialize(command_name, parameters=nil, extensions=[]) - @command_name = command_name + def initialize(parameters=nil, extensions=[]) @parameters = parameters @extensions = extensions unles****@exten*****? @@ -60,12 +59,12 @@ module Groonga end def create_request(parameters, extensions) - self.class.new(@command_name, parameters, extensions) + self.class.new(parameters, extensions) end def create_response open_client do |client| - response = client.execute(@command_name, to_parameters) + response = client.execute(self.class.command_name, to_parameters) raise ErrorResponse.new(response) unless response.success? response end Modified: lib/groonga/client/request/select.rb (+8 -6) =================================================================== --- lib/groonga/client/request/select.rb 2016-12-09 17:03:25 +0900 (c0dfa99) +++ lib/groonga/client/request/select.rb 2016-12-09 17:29:02 +0900 (3669717) @@ -18,14 +18,20 @@ module Groonga class Client module Request class Select < Base - def initialize(table_or_parameters) + class << self + def command_name + "select" + end + end + + def initialize(table_or_parameters, extensions=[]) if table_or_parameters.respond_to?(:to_parameters) parameters = table_or_parameters else table_name = table_or_parameters parameters = RequestParameter.new(:table, table_name) end - super("select", parameters) + super(parameters, extensions) end def match_columns(value) @@ -75,10 +81,6 @@ module Groonga end private - def create_request(parameters) - self.class.new(parameters) - end - def create_response response = super if paginated? and defined?(Kaminari) -------------- next part -------------- HTML����������������������������...Download