activegroonga 0.0.2 → 0.0.6

data/test-unit/lib/test/unit/ui/console/testrunner.rb

@@ -185,10 +185,13 @@ module Test
 
           def guess_color_availability
             return false unless @output.tty?
-            term = ENV["TERM"]
-            return true if term and (/term\z/ =~ term or term == "screen")
-            return true if ENV["EMACS"] == "t"
-            false
+            case ENV["TERM"]
+            when /term(?:-color)?\z/, "screen"
+              true
+            else
+              return true if ENV["EMACS"] == "t"
+              false
+            end
           end
 
           def guess_progress_row_max

data/test-unit/test/{test_testcase.rb → test-testcase.rb}

@@ -6,7 +6,7 @@ require 'test/unit'
 
 module Test
   module Unit
-    class TC_TestCase < TestCase
+    class TestTestCase < TestCase
       def test_creation
         tc = Class.new(TestCase) do
           def test_with_arguments(arg1, arg2)
@@ -468,11 +468,40 @@ module Test
         end
       end
 
+      def test_defined_order
+        keep_test_order do
+          test_case = Class.new(Test::Unit::TestCase) do
+            def test_z
+            end
+
+            def test_1
+            end
+
+            def test_a
+            end
+          end
+
+          assert_equal(["test_1", "test_a", "test_z"],
+                       test_case.suite.tests.collect {|test| test.method_name})
+
+          test_case.test_order = :defined
+          assert_equal(["test_z", "test_1", "test_a"],
+                       test_case.suite.tests.collect {|test| test.method_name})
+        end
+      end
+
       private
       def check(message, passed)
         add_assertion
         raise AssertionFailedError.new(message) unless passed
       end
+
+      def keep_test_order
+        order = TestCase.test_order
+        yield
+      ensure
+        TestCase.test_order = order
+      end
     end
   end
 end

data/test-unit/test/test_assertions.rb

@@ -428,7 +428,7 @@ EOM
 
         different_error_class = Class.new(StandardError)
         message = <<-EOM
-<\#<Class:0x[a-f\\d]+>\\("Error"\\)> exception expected but was
+<\#<Class:[xa-f\\d]+>\\("Error"\\)> exception expected but was
 Class: <RuntimeError>
 Message: <"Error">
 EOM

data/test/active-groonga-test-utils.rb

@@ -78,37 +78,39 @@ module ActiveGroongaTestUtils
 
   def setup_users_table
     @users_path = @tables_dir + "users.groonga"
-    @users = Groonga::Array.create(:name => "<table:users>",
-                                   :path => @users_path.to_s)
+    @users = Groonga::Array.create(:name => "users",
+                                   :path => @users_path.to_s,
+                                   :sub_records => true)
 
     columns_dir = @tables_dir + "users" + "columns"
     columns_dir.mkpath
 
     @name_column_path = columns_dir + "name.groonga"
-    @name_column = @users.define_column("name", "<shorttext>",
+    @name_column = @users.define_column("name", "ShortText",
                                         :path => @name_column_path.to_s)
   end
 
   def setup_bookmarks_table
     @bookmarks_path = @tables_dir + "bookmarks.groonga"
-    @bookmarks = Groonga::Array.create(:name => "<table:bookmarks>",
-                                       :path => @bookmarks_path.to_s)
+    @bookmarks = Groonga::Array.create(:name => "bookmarks",
+                                       :path => @bookmarks_path.to_s,
+                                       :sub_records => true)
 
     columns_dir = @tables_dir + "bookmarks" + "columns"
     columns_dir.mkpath
 
     @uri_column_path = columns_dir + "uri.groonga"
-    @uri_column = @bookmarks.define_column("uri", "<shorttext>",
+    @uri_column = @bookmarks.define_column("uri", "ShortText",
                                            :path => @uri_column_path.to_s)
 
     @comment_column_path = columns_dir + "comment.groonga"
     @comment_column =
-      @bookmarks.define_column("comment", "<text>",
+      @bookmarks.define_column("comment", "Text",
                                :path => @comment_column_path.to_s)
 
     @content_column_path = columns_dir + "content.groonga"
     @content_column =
-      @bookmarks.define_column("content", "<longtext>",
+      @bookmarks.define_column("content", "LongText",
                                :path => @content_column_path.to_s)
 
     @user_column_path = columns_dir + "user.groonga"
@@ -121,51 +123,48 @@ module ActiveGroongaTestUtils
 
   def define_timestamp(table, columns_dir)
     created_at_column_path = columns_dir + "created_at.groonga"
-    table.define_column("created_at", "<time>",
+    table.define_column("created_at", "Time",
                         :path => created_at_column_path.to_s)
 
     updated_at_column_path = columns_dir + "updated_at.groonga"
-    table.define_column("updated_at", "<time>",
+    table.define_column("updated_at", "Time",
                         :path => updated_at_column_path.to_s)
   end
 
   def setup_bookmarks_index_tables
-    @index = @context["<metadata:index>"]
-
-    setup_bookmarks_content_index_table
-  end
-
-  def setup_bookmarks_content_index_table
-    bookmarks_index_dir = @metadata_dir + "index" + "bookmarks"
+    @terms_path = @tables_dir + "terms.groonga"
+    @terms = Groonga::PatriciaTrie.create(:name => "terms",
+                                          :key_type => "ShortText",
+                                          :path => @terms_path.to_s,
+                                          :default_tokenizer => "TokenBigram")
+
+    columns_dir = @tables_dir + "terms" + "columns"
+    bookmarks_index_dir = columns_dir + "bookmarks"
     bookmarks_index_dir.mkpath
 
     @bookmarks_content_index_column_path =
       bookmarks_index_dir + "content.groonga"
     path = @bookmarks_content_index_column_path.to_s
     @bookmarks_content_index_column =
-      @index.define_index_column("bookmarks/content", @bookmarks,
+      @terms.define_index_column("bookmarks/content", @bookmarks,
                                  :with_section => true,
                                  :with_weight => true,
                                  :with_position => true,
                                  :path => path)
     @bookmarks_content_index_column.source = @content_column
-
-    record = ActiveGroonga::Schema.index_management_table.add
-    record["table"] = @bookmarks.name
-    record["column"] = "content"
-    record["index"] = @index.name
   end
 
   def setup_tasks_table
     @tasks_path = @tables_dir + "tasks.groonga"
-    @tasks = Groonga::Array.create(:name => "<table:tasks>",
-                                   :path => @tasks_path.to_s)
+    @tasks = Groonga::Array.create(:name => "tasks",
+                                   :path => @tasks_path.to_s,
+                                   :sub_records => true)
 
     columns_dir = @tables_dir + "tasks" + "columns"
     columns_dir.mkpath
 
     @name_column_path = columns_dir + "name.groonga"
-    @name_column = @tasks.define_column("name", "<shorttext>",
+    @name_column = @tasks.define_column("name", "ShortText",
                                         :path => @name_column_path.to_s)
   end
 

data/test/test-base.rb

@@ -14,7 +14,7 @@
 # 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 BaseTest < Test::Unit::TestCase
+class TestBase < Test::Unit::TestCase
   include ActiveGroongaTestUtils
 
   def test_find
@@ -128,16 +128,16 @@ class BaseTest < Test::Unit::TestCase
     }
     google.save!
 
-    bookmarks = Bookmark.find_all_by_content("Google")
+    bookmarks = Bookmark.find(:all) {|record| record["content"] =~ "Google"}
     assert_equal([google], bookmarks)
 
     google.content = "<html><body>...Empty...</body></html>"
     google.save!
 
-    bookmarks = Bookmark.find_all_by_content("Google")
+    bookmarks = Bookmark.find(:all) {|record| record["content"] =~ "Google"}
     assert_equal([], bookmarks)
 
-    bookmarks = Bookmark.find_all_by_content("Empty")
+    bookmarks = Bookmark.find(:all) {|record| record["content"] =~ "Empty"}
     assert_equal([google], bookmarks)
   end
 
@@ -167,8 +167,8 @@ class BaseTest < Test::Unit::TestCase
                              "comment" => "a search engine",
                              "content" => "<html><body>...Google...</body></html>")
 
-
-    assert_equal([google], Bookmark.find_all_by_content("Google"))
+    assert_equal([google],
+                 Bookmark.find(:all) {|record| record["content"] =~ "Google"})
   end
 
   def test_find_by_model
@@ -191,4 +191,14 @@ class BaseTest < Test::Unit::TestCase
     groonga.reload
     assert_equal("fulltext search engine", groonga.comment)
   end
+
+  def test_find_column_access_by_method
+    google = Bookmark.create("uri" => "http://google.com/",
+                             "comment" => "a search engine",
+                             "content" => "<html><body>Google</body></html>")
+
+
+    assert_equal([google],
+                 Bookmark.find(:all) {|record| record.content =~ "Google"})
+  end
 end

data/test/test-schema-dumper.rb

@@ -0,0 +1,48 @@
+# Copyright (C) 2009  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.
+#
+# 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 TestSchemaDumper < Test::Unit::TestCase
+  include ActiveGroongaTestUtils
+
+  def setup
+    @output = StringIO.new
+  end
+
+  def test_dump
+    ActiveGroonga::SchemaDumper.dump(@output)
+    assert_equal(<<-EOS, @output.string.gsub(/^\s*(?:#.*)?\n/, ''))
+ActiveGroonga::Schema.define(:version => 0) do
+  create_table "bookmarks", :force => true do |t|
+    t.string "uri"
+    t.time "updated_at"
+    t.time "created_at"
+    t.text "content"
+    t.text "comment"
+  end
+  create_table "tasks", :force => true do |t|
+    t.string "name"
+  end
+  create_table "terms", :force => true, :type => :patricia_trie, :key_type => "ShortText", :default_tokenizer => "TokenBigram" do |t|
+  end
+  create_table "users", :force => true do |t|
+    t.string "name"
+  end
+  add_column "bookmarks", "user", "users"
+  add_index_column "terms", "bookmarks", "content", :name => "bookmarks/content"
+end
+EOS
+  end
+end

data/test/test-schema.rb

@@ -14,7 +14,7 @@
 # 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 SchemaTest < Test::Unit::TestCase
+class TestSchema < Test::Unit::TestCase
   include ActiveGroongaTestUtils
 
   def test_create_table
@@ -34,14 +34,30 @@ class SchemaTest < Test::Unit::TestCase
     assert_predicate(column_file, :exist?)
   end
 
+  def test_reference_column
+    ActiveGroonga::Schema.create_table(:categories) do |table|
+      table.string :name
+    end
+
+    column_file = @tables_dir + "posts" + "columns" + "category.groonga"
+    assert_not_predicate(column_file, :exist?)
+    ActiveGroonga::Schema.create_table(:posts) do |table|
+      table.reference :category
+    end
+    assert_predicate(column_file, :exist?)
+  end
+
   def test_add_index
-    base_dir = @metadata_dir + "index" + "posts"
-    index_file = base_dir + "content.groonga"
+    columns_dir = @tables_dir + "words" + "columns" + "posts"
+    index_file = columns_dir + "posts_content.groonga"
     assert_not_predicate(index_file, :exist?)
 
     ActiveGroonga::Schema.create_table(:posts) do |table|
       table.string :content
-      table.index :content
+    end
+
+    ActiveGroonga::Schema.create_table(:words) do |table|
+      table.index :posts, :content
     end
 
     assert_predicate(index_file, :exist?)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activegroonga
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 +09:00
+date: 2009-08-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.0.2
+        version: 0.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -44,10 +44,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- NEWS.ja.rdoc
-- NEWS.rdoc
 - README.rdoc
+- NEWS.ja.rdoc
 - README.ja.rdoc
+- NEWS.rdoc
 files: 
 - AUTHORS
 - NEWS.ja.rdoc
@@ -63,6 +63,7 @@ files:
 - lib/active_groonga/base.rb
 - lib/active_groonga/column.rb
 - lib/active_groonga/dirty.rb
+- lib/active_groonga/dynamic_record_expression_builder.rb
 - lib/active_groonga/fixtures.rb
 - lib/active_groonga/migration.rb
 - lib/active_groonga/rails_support.rb
@@ -79,6 +80,12 @@ files:
 - license/LGPL
 - rails/README
 - rails/init.rb
+- rails_generators/index_table_groonga/USAGE
+- rails_generators/index_table_groonga/index_table_groonga_generator.rb
+- rails_generators/index_table_groonga/templates/migration.rb
+- rails_generators/migration_groonga/USAGE
+- rails_generators/migration_groonga/migration_groonga_generator.rb
+- rails_generators/migration_groonga/templates/migration.rb
 - rails_generators/model_groonga/USAGE
 - rails_generators/model_groonga/model_groonga_generator.rb
 - rails_generators/model_groonga/templates/fixtures.yml
@@ -149,10 +156,10 @@ files:
 - test-unit/test/test-omission.rb
 - test-unit/test/test-pending.rb
 - test-unit/test/test-priority.rb
+- test-unit/test/test-testcase.rb
 - test-unit/test/test_assertions.rb
 - test-unit/test/test_error.rb
 - test-unit/test/test_failure.rb
-- test-unit/test/test_testcase.rb
 - test-unit/test/test_testresult.rb
 - test-unit/test/test_testsuite.rb
 - test-unit/test/testunit-test-util.rb
@@ -168,7 +175,12 @@ files:
 - test/run-test.rb
 - test/test-associations.rb
 - test/test-base.rb
+- test/test-schema-dumper.rb
 - test/test-schema.rb
+- test/tmp/database/database.groonga
+- test/tmp/database/database.groonga.0000000
+- test/tmp/database/database.groonga.0000100
+- test/tmp/database/database.groonga.0000101
 has_rdoc: true
 homepage: http://groonga.rubyforge.org/
 licenses: []
@@ -194,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: groonga
-rubygems_version: 1.3.3
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: A library to use groonga with ActiveRecord like API.