rroonga 3.0.5-x86-mingw32 → 3.0.6-x86-mingw32

data/test/test-table-key-support.rb

@@ -0,0 +1,78 @@
+# Copyright (C) 2013  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 version 2.1 as published by the Free Software Foundation.
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+class TableKeySupportTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  setup :setup_database
+
+  class TypeTest < self
+    def test_int8
+      key = -1
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "Int8")
+      id = ids.add(key)
+      assert_equal(key, id.key)
+    end
+
+    def test_uint8
+      key = 1
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "UInt8")
+      id = ids.add(key)
+      assert_equal(key, id.key)
+    end
+
+    def test_int16
+      key = -(2 ** 8)
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "Int16")
+      id = ids.add(key)
+      assert_equal(key, id.key)
+    end
+
+    def test_uint16
+      key = 2 ** 8
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "UInt16")
+      id = ids.add(key)
+      assert_equal(key, id.key)
+    end
+
+    def test_int32
+      key = -(2 ** 16)
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "Int32")
+      id = ids.add(key)
+      assert_equal(key, id.key)
+    end
+
+    def test_uint32
+      key = 2 ** 16
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "UInt32")
+      id = ids.add(key)
+      assert_equal(key, id.key)
+    end
+
+    def test_int64
+      key = -(2 ** 32)
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "Int64")
+      id = ids.add(key)
+      assert_equal(key, id.key)
+    end
+
+    def test_uint64
+      key = 2 ** 32
+      ids = Groonga::Hash.create(:name => "IDs", :key_type => "UInt64")
+      id = ids.add(key)
+      assert_equal(key, id.key)
+    end
+  end
+end

data/test/test-table.rb

@@ -423,57 +423,6 @@ class TableTest < Test::Unit::TestCase
                  sorted_bookmarks.collect(&:value))
   end
 
-  def test_group
-    bookmarks = Groonga::Hash.create(:name => "Bookmarks")
-    bookmarks.define_column("title", "Text")
-    comments = Groonga::Array.create(:name => "Comments")
-    comments.define_column("bookmark", bookmarks)
-    comments.define_column("content", "Text")
-    comments.define_column("issued", "Int32")
-
-    groonga = bookmarks.add("http://groonga.org/", :title => "groonga")
-    ruby = bookmarks.add("http://ruby-lang.org/", :title => "Ruby")
-
-    now = Time.now.to_i
-    comments.add(:bookmark => groonga,
-                 :content => "full-text search",
-                 :issued => now)
-    comments.add(:bookmark => groonga,
-                 :content => "column store",
-                 :issued => now)
-    comments.add(:bookmark => ruby,
-                 :content => "object oriented script language",
-                 :issued => now)
-
-    records = comments.select do |record|
-      record["issued"] > 0
-    end
-    assert_equal([[2, "groonga", "http://groonga.org/"],
-                  [1, "Ruby", "http://ruby-lang.org/"]],
-                 records.group(".bookmark").collect do |record|
-                   bookmark = record.key
-                   [record.n_sub_records,
-                    bookmark["title"],
-                    bookmark.key]
-                 end)
-    assert_equal([[2, "groonga", "http://groonga.org/"],
-                  [1, "Ruby", "http://ruby-lang.org/"]],
-                 records.group(%w".bookmark").collect do |record|
-                   bookmark = record.key
-                   [record.n_sub_records,
-                    bookmark["title"],
-                    bookmark.key]
-                 end)
-  end
-
-  def test_group_with_unknown_key
-    bookmarks = Groonga::Hash.create(:name => "Bookmarks")
-    message = "unknown group key: <\"nonexistent\">: <#{bookmarks.inspect}>"
-    assert_raise(ArgumentError.new(message)) do
-      bookmarks.group("nonexistent")
-    end
-  end
-
   def test_union!
     bookmarks = Groonga::Hash.create(:name => "Bookmarks")
     bookmarks.define_column("title", "ShortText")
@@ -783,6 +732,84 @@ class TableTest < Test::Unit::TestCase
                      groups)
       end
     end
+
+    class KeyTest < self
+      setup
+      def setup_schema
+        Groonga::Schema.define do |schema|
+          schema.create_table("Bookmarks", :type => :hash) do |table|
+            table.text("title")
+          end
+
+          schema.create_table("Comments", :type => :array) do |table|
+            table.reference("bookmark")
+            table.text("content")
+            table.int32("rank")
+          end
+        end
+      end
+
+      setup
+      def setup_data
+        setup_bookmarks
+        setup_comments
+      end
+
+      def setup_bookmarks
+        @bookmarks = Groonga["Bookmarks"]
+        @groonga = @bookmarks.add("http://groonga.org/", :title => "groonga")
+        @ruby = @bookmarks.add("http://ruby-lang.org/", :title => "Ruby")
+      end
+
+      def setup_comments
+        @comments = Groonga["Comments"]
+        @comments.add(:bookmark => @groonga,
+                      :content => "full-text search")
+        @comments.add(:bookmark => @groonga,
+                      :content => "column store")
+        @comments.add(:bookmark => @ruby,
+                      :content => "object oriented script language")
+      end
+
+      def test_string
+        grouped_records = @comments.group("bookmark").collect do |record|
+          bookmark = record.key
+          [
+            record.n_sub_records,
+            bookmark["title"],
+            bookmark.key,
+          ]
+        end
+        assert_equal([
+                       [2, "groonga", "http://groonga.org/"],
+                       [1, "Ruby", "http://ruby-lang.org/"],
+                     ],
+                     grouped_records)
+      end
+
+      def test_array
+        grouped_records = @comments.group(["bookmark"]).collect do |record|
+          bookmark = record.key
+          [
+            record.n_sub_records,
+            bookmark["title"],
+            bookmark.key,
+          ]
+        end
+        assert_equal([
+                       [2, "groonga", "http://groonga.org/"],
+                       [1, "Ruby", "http://ruby-lang.org/"],
+                     ],
+                     grouped_records)
+      end
+
+      def test_nonexistent
+        message = "unknown group key: <\"nonexistent\">: <#{@comments.inspect}>"
+        assert_raise(ArgumentError.new(message)) do
+          @comments.group("nonexistent")
+        end
+      end
+    end
   end
 
   class OtherProcessTest < self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -212,6 +212,10 @@ extensions: []
 extra_rdoc_files:
 - README.textile
 files:
+- README.textile
+- AUTHORS
+- Rakefile
+- Gemfile
 - doc/text/tutorial.textile
 - doc/text/news.textile
 - rroonga.gemspec
@@ -304,6 +308,7 @@ files:
 - test/test-encoding.rb
 - test/test-schema-create-table.rb
 - test/test-type.rb
+- test/test-table-key-support.rb
 - test/test-database.rb
 - test/test-variable.rb
 - test/test-table-select.rb
@@ -341,7 +346,6 @@ files:
 - bin/grntest-log-analyze
 - bin/groonga-index-dump
 - bin/grndump
-- README.textile
 - lib/1.9/groonga.so
 - lib/2.0/groonga.so
 - vendor/local/bin/groonga-benchmark.exe
@@ -1217,6 +1221,7 @@ test_files:
 - test/test-encoding.rb
 - test/test-schema-create-table.rb
 - test/test-type.rb
+- test/test-table-key-support.rb
 - test/test-database.rb
 - test/test-variable.rb
 - test/test-table-select.rb