groonga-client 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 085dda6ce4c3f7375c8960739d2afc0ea48c022f
-  data.tar.gz: d276c04e190b17811dc17eeb463642bbcef6dae4
+  metadata.gz: 730d0d465dfa172d63dc072c41da07393bac121c
+  data.tar.gz: 2feb754e982010f661b038ba7dbfc24c65391ce1
 SHA512:
-  metadata.gz: 2bdec00ae8c07fe0ff8194277358176170d96b409cb9b32e73777be5cb3fa305b17a6c9067d56f0c952837b2d4f7807aa9260710b8834f39ee7c5ca9fb7789dd
-  data.tar.gz: dde1e186a36cb02738cf9321130a3ec369116f14848db580df3cffff0a008bca80f2df98529ee08c082eeebc006f7244da06280ae56717fd80ad8f442fecded8
+  metadata.gz: 82f16e4c99ff5d2df6bb359502ef877cbe7d8366d086303c8af17af1eec5742119812f06e75f23fcf01852bf1ada1ead65d572949bcf4467150b41fcfe3097f1
+  data.tar.gz: 44e907e66266757ca60262b32ebca650e361c40930aee2bd53881c54909faa7c0bc4354a4167627f6bcf721be49e2c36c95493da4171700d7fe5fde61a4468e8

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # NEWS
 
+## 0.1.7 - 2015-07-08
+
+### Improvements
+
+  * select: Avoided response value isn't accessible by response column
+    name duplication. Data access key for duplicated column name has
+    `2`, `3`, ... suffix such as `html_escape2` and `html_escape3`.
+    [groonga-dev,03348][Reported by Hiroyuki Sato]
+
+### Thanks
+
+  * Hiroyuki Sato
+
 ## 0.1.6 - 2015-06-10
 
 ### Fixes

data/lib/groonga/client/response/select.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2015  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 #
 # This library is free software; you can redistribute it and/or
@@ -43,7 +43,17 @@ module Groonga
 
         def parse_result(raw_result)
           n_hits = raw_result.first.first
-          properties = raw_result[1]
+          column_names = {}
+          properties = raw_result[1].collect do |column_name, column_type|
+            base_column_name = column_name
+            suffix = 2
+            while column_names.key?(column_name)
+              column_name = "#{base_column_name}#{suffix}"
+              suffix += 1
+            end
+            column_names[column_name] = true
+            [column_name, column_type]
+          end
           infos = raw_result[2..-1] || []
           items = infos.collect do |info|
             item = {}

data/lib/groonga/client/version.rb

@@ -18,6 +18,6 @@
 
 module Groonga
   class Client
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

data/test/response/test-select.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2013-2015  Kouhei Sutou <kou@clear-code.com>
 # Copyright (C) 2013  Kosuke Asami
 #
 # This library is free software; you can redistribute it and/or
@@ -54,6 +54,31 @@ class TestResponseSelect < Test::Unit::TestCase
                      records([[[1], [["updated_at", "Time"]], [updated_at]]]))
       end
 
+      def test_duplicated_column_name
+        assert_equal([
+                       {
+                         "html_escape"  => "content1",
+                         "html_escape2" => "content2",
+                         "html_escape3" => "content3",
+                       }
+                     ],
+                     records([
+                               [
+                                 [1],
+                                 [
+                                   ["html_escape", nil],
+                                   ["html_escape", nil],
+                                   ["html_escape", nil],
+                                 ],
+                                 [
+                                   "content1",
+                                   "content2",
+                                   "content3",
+                                 ],
+                               ]
+                             ]))
+      end
+
       private
       def records(body)
         create_response(body).records

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groonga-client
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Haruka Yoshihara
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gqtp
@@ -233,18 +233,18 @@ specification_version: 4
 summary: Groonga-client is a client for groonga (http://groonga.org/) implemented
   with pure ruby.
 test_files:
-- test/protocol/test-http.rb
-- test/protocol/test-gqtp.rb
-- test/response/test-error.rb
-- test/response/test-select.rb
-- test/response/test-table-list.rb
-- test/response/test-column-list.rb
-- test/response/helper.rb
-- test/response/test-base.rb
-- test/response/test-status.rb
 - test/results/test-table-list.rb
 - test/results/test-column-list.rb
 - test/test-command.rb
 - test/run-test.rb
 - test/test-client.rb
+- test/protocol/test-gqtp.rb
+- test/protocol/test-http.rb
+- test/response/test-table-list.rb
+- test/response/test-error.rb
+- test/response/test-base.rb
+- test/response/test-status.rb
+- test/response/test-select.rb
+- test/response/helper.rb
+- test/response/test-column-list.rb
 has_rdoc: