Kouhei Sutou
null+****@clear*****
Fri Dec 9 17:03:25 JST 2016
Kouhei Sutou 2016-12-09 17:03:25 +0900 (Fri, 09 Dec 2016) New Revision: bfe6f475feb82bc55a0792402cea70d81aa9b053 https://github.com/ranguba/groonga-client/commit/bfe6f475feb82bc55a0792402cea70d81aa9b053 Message: Support extending request Added files: test/request/test-base.rb Removed files: test/request/test-select.rb Modified files: lib/groonga/client/request/base.rb Modified: lib/groonga/client/request/base.rb (+17 -4) =================================================================== --- lib/groonga/client/request/base.rb 2016-12-09 16:37:24 +0900 (4bf8688) +++ lib/groonga/client/request/base.rb 2016-12-09 17:03:25 +0900 (5a9dc41) @@ -18,9 +18,13 @@ module Groonga class Client module Request class Base - def initialize(command_name, parameters=nil) + def initialize(command_name, parameters=nil, extensions=[]) @command_name = command_name @parameters = parameters + @extensions = extensions + unles****@exten*****? + Object.instance_method(:extend).bind(self).call(*@extensions) + end end def response @@ -40,14 +44,23 @@ module Groonga end end + def extend(*modules, &block) + modules << Module.new(&block) if block + if modules.empty? + self + else + create_request(@parameters, @extensions | modules) + end + end + private def add_parameter(merger_class, parameter) merger = merger_class.new(@parameters, parameter) - create_request(merger) + create_request(merger, @extensions) end - def create_request(parameters) - self.class.new(@command_name, parameters) + def create_request(parameters, extensions) + self.class.new(@command_name, parameters, extensions) end def create_response Added: test/request/test-base.rb (+50 -0) 100644 =================================================================== --- /dev/null +++ test/request/test-base.rb 2016-12-09 17:03:25 +0900 (e61aeb5) @@ -0,0 +1,50 @@ +# Copyright (C) 2016 Kouhei Sutou <kou �� clear-code.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +class TestRequestBase < Test::Unit::TestCase + sub_test_case "#extend" do + setup do + @request = Groonga::Client::Request::Base.new("status") + end + + test "Module" do + assert do + not****@reque*****_to?(:new_method) + end + extension = Module.new do + def new_method + end + end + extended_request =****@reque*****(extension) + assert do + extended_request.respond_to?(:new_method) + end + end + + test "block" do + assert do + not****@reque*****_to?(:new_method) + end + extended_request =****@reque***** do + def new_method + end + end + assert do + extended_request.respond_to?(:new_method) + end + end + end +end Deleted: test/request/test-select.rb (+0 -494) 100644 =================================================================== --- test/request/test-select.rb 2016-12-09 16:37:24 +0900 (1448dd7) +++ /dev/null @@ -1,494 +0,0 @@ -# Copyright (C) 2016 Kouhei Sutou <kou �� clear-code.com> -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -class TestSelectResponse < Test::Unit::TestCase - module ClientFixture - class << self - def included(base) - super - base.class_eval do - setup :setup_client - teardown :teardown_client - end - end - end - - def setup_client - @client = nil - end - - def teardown_client - @client.close if @client - end - end - - module Utils - def client - @client ||= open_client - end - - def open_options - url = "#{@protocol}://" - if @user and @password - url << URI.encode_www_form_component(@user) - url << ":" - url << URI.encode_www_form_component(@password) - url << "@" - end - url << "#{@address}:#{@port}" - {:url => url} - end - - def open_client(&block) - Groonga::Client.open(open_options, &block) - end - - def stub_response(body, output_type=:json) - @response_body = body - @response_output_type = output_type - end - end - - module Assertions - NORMALIZED_START_TIME = Time.parse("2013-05-23T16:43:39+09:00").to_i - NORMALIZED_ELAPSED_TIME = 29 - def normalize_header(header) - normalized_header = header.dup - start_time = header[1] - if start_time.is_a?(Numeric) - normalized_header[1] = NORMALIZED_START_TIME - end - elapsed_time = header[2] - if elapsed_time.is_a?(Numeric) - normalized_header[2] = NORMALIZED_ELAPSED_TIME - end - normalized_header - end - - def assert_header(response) - normalized_header = normalize_header(response.header) - assert_equal([0, NORMALIZED_START_TIME, NORMALIZED_ELAPSED_TIME], - normalized_header) - end - - def assert_response(expected_body, response) - if @response_output_type == :none - expected_header = nil - actual_header = response.header - else - expected_header = [ - 0, - NORMALIZED_START_TIME, - NORMALIZED_ELAPSED_TIME, - ] - actual_header = normalize_header(response.header) - end - actual_body = response.body - actual_body = yield(actual_body) if block_given? - assert_equal({ - :header => expected_header, - :body => expected_body, - }, - { - :header => actual_header, - :body => actual_body, - }) - end - end - - module OutputTypeTests - def test_dump - dumped_commands = "table_create TEST_TABLE TABLE_NO_KEY" - stub_response(dumped_commands, :none) - response = client.dump - assert_response(dumped_commands, response) - end - - def test_xml - stub_response(<<-XML, :xml) -<TABLE_LIST> -<HEADER> -<PROPERTY> -<TEXT>id</TEXT> -<TEXT>UInt32</TEXT></PROPERTY> -<PROPERTY> -<TEXT>name</TEXT> -<TEXT>ShortText</TEXT></PROPERTY> -<PROPERTY> -<TEXT>path</TEXT> -<TEXT>ShortText</TEXT></PROPERTY> -<PROPERTY> -<TEXT>flags</TEXT> -<TEXT>ShortText</TEXT></PROPERTY> -<PROPERTY> -<TEXT>domain</TEXT> -<TEXT>ShortText</TEXT></PROPERTY> -<PROPERTY> -<TEXT>range</TEXT> -<TEXT>ShortText</TEXT></PROPERTY> -<PROPERTY> -<TEXT>default_tokenizer</TEXT> -<TEXT>ShortText</TEXT></PROPERTY> -<PROPERTY> -<TEXT>normalizer</TEXT> -<TEXT>ShortText</TEXT></PROPERTY></HEADER> -<TABLE> -<INT>256</INT> -<TEXT>Users</TEXT> -<TEXT>/tmp/db/db.0000100</TEXT> -<TEXT>TABLE_HASH_KEY|PERSISTENT</TEXT> -<NULL/> -<NULL/> -<NULL/> -<NULL/></TABLE></TABLE_LIST> - XML - response = client.table_list(:output_type => :xml) - expected_body = [ - [ - ["id", "UInt32"], - ["name", "ShortText"], - ["path", "ShortText"], - ["flags", "ShortText"], - ["domain", "ShortText"], - ["range", "ShortText"], - ["default_tokenizer", "ShortText"], - ["normalizer", "ShortText"], - ], - [ - 256, - "Users", - "/tmp/db/db.0000100", - "TABLE_HASH_KEY|PERSISTENT", - nil, - nil, - nil, - nil, - ], - ] - assert_response(expected_body, response) - end - end - - module ColumnsTests - def test_not_exist - stub_response('{"key":"value"}') - response = client.status - assert_response({"key" => "value"}, response) - end - - def disabled_test_exist - stub_response(<<-JSON) -[[["name","ShortText"], -["age","UInt32"]], -["Alice",32], -["Bob",21]] -JSON - expected_table_infos = [ - {:name => "Alice", :age => 32}, - {:name => "Bob", :age => 21} - ] - response = client.table_list - assert_response(expected_table_infos, response) do |actual_body| - actual_body.collect do |value| - value.table_info - end - end - end - end - - module ParametersTests - def test_integer - stub_response("100") - response = client.cache_limit(:max => 4) - assert_response(100, response) - end - end - - module OpenTests - def test_return_value - stub_response("['not-used']") - response = open_client do |client| - "response" - end - assert_equal("response", response) - end - - def test_open_components - stub_response("[29]") - options = { - :host => @address, - :port => @port, - :protocol => @protocol, - } - response = Groonga::Client.open(options) do |client| - client.status - end - assert_equal([29], response.body) - end - end - - module LoadTests - def test_load_json - values = [ - {"content" => "1st content"}, - {"content" => "2nd content"}, - {"content" => "3rd content"}, - ] - stub_response("[#{values.size}]") - response = client.load(:table => "Memos", - :values => JSON.generate(values)) - assert_equal([values.size], response.body) - assert_equal([values], - @actual_commands.collect(&:values)) - end - - def test_load_array - values = [ - {"content" => "1st content"}, - {"content" => "2nd content"}, - {"content" => "3rd content"}, - ] - stub_response("[#{values.size}]") - response = client.load(:table => "Memos", - :values => values) - assert_equal([values.size], response.body) - assert_equal([values], - @actual_commands.collect(&:values)) - end - end - - module DefaultOptionsTests - def test_default_options - change_default_options(open_options) do - expected_response = {"key" => "value"} - stub_response(expected_response.to_json) - response = Groonga::Client.open do |client| - client.status - end - assert_equal(expected_response, response.body) - end - end - - def change_default_options(options) - default_options = Groonga::Client.default_options - begin - Groonga::Client.default_options = options - yield - ensure - Groonga::Client.default_options = default_options - end - end - end - - module Tests - include Utils - include Assertions - - include OutputTypeTests - include ColumnsTests - include ParametersTests - include OpenTests - include LoadTests - include DefaultOptionsTests - end - - class TestGQTP < self - include Tests - include ClientFixture - - def setup - @address = "127.0.0.1" - @server = TCPServer.new(@address, 0) - @port =****@serve*****[1] - @protocol = :gqtp - - @user = nil - @password = nil - @actual_commands = [] - @response_body = nil - @thread = Thread.new do - client =****@serve***** - @server.close - - loop do - raw_header = client.read(GQTP::Header.size) - break if raw_header.nil? - - header = GQTP::Header.parse(raw_header) - body = client.read(header.size) - @actual_commands << Groonga::Command::Parser.parse(body) - - response_header = GQTP::Header.new - response_header.size = @response_body.bytesize - - client.write(response_header.pack) - client.write(@response_body) - end - - client.close - end - end - - def teardown - @thread.kill - end - end - - class TestHTTP < self - include Tests - include ClientFixture - - def setup - @address = "127.0.0.1" - @server = TCPServer.new(@address, 0) - @port =****@serve*****[1] - @protocol = :http - - setup_authentication - @request_headers = {} - @request_path = nil - @actual_commands = [] - @response_body = nil - @thread = Thread.new do - client =****@serve***** - first_line = client.gets - if /\A([\w]+) ([^ ]+) HTTP/ =~ first_line - # http_method = $1 - @request_path = $2 - headers = {} - client.each_line do |line| - case line - when "\r\n" - break - else - name, value = line.strip.split(/: */, 2) - headers[name.downcase] = value - end - end - @request_headers = headers - content_length = headers["content-length"] - if content_length - body = client.read(Integer(content_length)) - else - body = nil - end - command = Groonga::Command::Parser.parse(@request_path) - command[:values] = body if body - @actual_commands << command - end - @server.close - - status = 0 - start = Time.now.to_f - elapsed = rand - case @response_output_type - when :json - header = "[#{status},#{start},#{elapsed}]" - body = "[#{header},#{@response_body}]" - when :xml - body = <<-XML -<RESULT CODE="#{status}" UP="#{start}" ELAPSED="#{elapsed}"> -#{@response_body} -</RESULT> - XML - else - body = @response_body - end - header = <<-EOH -HTTP/1.1 200 OK -Connection: close -Content-Type: application/json -Content-Length: #{body.bytesize} - -EOH - client.write(header) - client.write(body) - client.close - end - end - - def setup_authentication - @user = nil - @password = nil - end - - class TestLoad < self - def test_path - stub_response("[]") - client.load(:table => "Memos", :values => []) - assert_equal("/d/load?table=Memos", @request_path) - end - end - - class TestBasicAuthentication < self - def setup_authentication - @user = "Aladdin" - @password = "open sesame" - end - - def test_request_header - stub_response("[]") - client.status - assert_equal("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==", - @request_headers["authorization"]) - end - - def test_open_components - stub_response("[]") - options = { - :host => @address, - :port => @port, - :protocol => @protocol, - :user => @user, - :password => @password, - } - Groonga::Client.open(options) do |client| - client.status - end - assert_equal("Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==", - @request_headers["authorization"]) - end - end - - class TestPath < self - def component_based_open_options - { - :protocol => @protocol, - :host => @address, - :port => @port, - } - end - - def test_with_trailing_slash - stub_response("[]") - options = component_based_open_options.merge(:path => "/sub_path/") - Groonga::Client.open(options) do |client| - client.status - end - assert_equal("/sub_path/d/status", @request_path) - end - - def test_without_trailing_slash - stub_response("[]") - options = component_based_open_options.merge(:path => "/sub_path") - Groonga::Client.open(options) do |client| - client.status - end - assert_equal("/sub_path/d/status", @request_path) - end - end - end -end -------------- next part -------------- HTML����������������������������...Télécharger
