activegroonga 0.0.2 → 0.0.6

data/lib/active_groonga/tasks/groonga.rake

@@ -150,6 +150,8 @@ namespace :groonga do
     task :purge => :environment do
       ActiveGroonga::Base.setup_database(:test)
       ActiveGroonga::Base.database.remove
+      rm_rf(ActiveGroonga::Base.database_directory)
+      # FIXME: groonga isn't fully implemented remove for database.
     end
 
     desc 'Check for pending migrations and load the test schema'

data/lib/active_groonga/version.rb

@@ -17,7 +17,7 @@ module ActiveGroonga
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join(".")
   end

data/rails_generators/index_table_groonga/USAGE

@@ -0,0 +1,23 @@
+Description:
+    Stubs out a new index table migration. Pass the index table name
+    and an optional tokenizer as an argument.
+
+    A migration class is generated in db/groonga/migrate prefixed by a timestamp of the current date and time.
+
+Example:
+    `./script/generate index_table_groonga terms`
+
+    If the current date is May 14, 2008 and the current time 09:09:12, this creates the CreateTerms migration
+    db/groonga/migrate/20080514090912_create_terms.rb
+
+    `./script/generate index_table_groonga terms TokenMeCab`
+
+    This will create the CreateTerms in db/groonga/migrate/20080514090912_create_terms.rb with
+    this in the Up migration:
+
+      create_table :terms, :default_tokenizer => "TokenMeCab" do |t|
+      end
+
+    And this in the Down migration:
+
+      drop_table :terms

data/rails_generators/index_table_groonga/index_table_groonga_generator.rb

@@ -0,0 +1,44 @@
+class IndexTableGroongaGenerator < Rails::Generator::NamedBase
+  default_options :type => nil, :tokenizer => nil
+
+  def manifest
+    record do |m|
+      m.migration_template 'migration.rb', 'db/groonga/migrate', :assigns => {
+        :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}",
+        :type => (options[:type] || :patricia_trie).inspect,
+        :default_tokenizer_name => (options[:tokenizer] || "TokenBigram").inspect,
+      }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+    end
+  end
+
+  private
+  def banner
+    "Usage: #{$0} #{spec.name} index_table_name\n" +
+    " e.g.: #{$0} #{spec.name} terms"
+  end
+
+  def add_options!(opt)
+    opt.separator ''
+    opt.separator 'Options:'
+    opt.on("--type=TYPE", %w(array patricia_trie hash),
+           "Use TYPE as a table type") do |value|
+      options[:type] = value
+    end
+
+    opt.on("--tokenizer=TOKENIZER", %w(unigram bigram trigram mecab),
+           "Use TOKENIZER as a default tokenizer") do |value|
+      case value
+      when "unigram"
+        options[:tokenizer] = "TokenUnigram"
+      when "bigram"
+        options[:tokenizer] = "TokenBigram"
+      when "trigram"
+        options[:tokenizer] = "TokenTrigram"
+      when "mecab"
+        options[:tokenizer] = "TokenMacab"
+      else
+        options[:tokenizer] = value
+      end
+    end
+  end
+end

data/rails_generators/index_table_groonga/templates/migration.rb

@@ -0,0 +1,12 @@
+class <%= migration_name %> < ActiveGroonga::Migration
+  def self.up
+    create_table :<%= table_name %>,
+                 :type => <%= type %>,
+                 :default_tokenizer => <%= default_tokenizer_name %> do |t|
+    end
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

data/rails_generators/migration_groonga/USAGE

@@ -0,0 +1,29 @@
+Description:
+    Stubs out a new database migration. Pass the migration name, either
+    CamelCased or under_scored, and an optional list of attribute pairs as arguments.
+
+    A migration class is generated in db/groonga/migrate prefixed by a timestamp of the current date and time.
+
+    You can name your migration in either of these formats to generate add/remove
+    column lines from supplied attributes: AddColumnsToTable or RemoveColumnsFromTable
+
+Example:
+    `./script/generate migration_groonga AddSslFlag`
+
+    If the current date is May 14, 2008 and the current time 09:09:12, this creates the AddSslFlag migration
+    db/groonga/migrate/20080514090912_add_ssl_flag.rb
+
+    `./script/generate migration_groonga AddTitleBodyToPost title:string body:text published:boolean`
+    
+    This will create the AddTitleBodyToPost in db/groonga/migrate/20080514090912_add_title_body_to_post.rb with
+    this in the Up migration:
+
+      add_column :posts, :title, :string  
+      add_column :posts, :body, :text  
+      add_column :posts, :published, :boolean
+
+    And this in the Down migration:
+    
+      remove_column :posts, :published  
+      remove_column :posts, :body  
+      remove_column :posts, :title

data/rails_generators/migration_groonga/migration_groonga_generator.rb

@@ -0,0 +1,19 @@
+class MigrationGroongaGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      m.migration_template 'migration.rb', 'db/groonga/migrate', :assigns => get_local_assigns
+    end
+  end
+
+  private
+  def get_local_assigns
+    returning(assigns = {}) do
+      if class_name.underscore =~ /^(add|remove)_.*_(?:to|from)_(.*)/
+        assigns[:migration_action] = $1
+        assigns[:table_name]       = $2.pluralize
+      else
+        assigns[:attributes] = []
+      end
+    end
+  end
+end

data/rails_generators/migration_groonga/templates/migration.rb

@@ -0,0 +1,11 @@
+class <%= class_name.underscore.camelize %> < ActiveGroonga::Migration
+  def self.up<% attributes.each do |attribute| %>
+    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end -%>
+  <%- end %>
+  end
+
+  def self.down<% attributes.reverse.each do |attribute| %>
+    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end -%>
+  <%- end %>
+  end
+end

data/test-unit/Rakefile

@@ -1,12 +1,17 @@
 # -*- ruby -*-
 
 require 'rubygems'
+gem 'rdoc'
 require 'hoe'
 require './lib/test/unit/version.rb'
 
+ENV["NODOT"] = "yes"
+
 version = Test::Unit::VERSION
 ENV["VERSION"] = version
-Hoe.new('test-unit', version) do |p|
+Hoe.spec('test-unit') do |p|
+  Hoe::Test::SUPPORTED_TEST_FRAMEWORKS[:testunit2] = "test/run-test.rb"
+  p.version = version
   p.developer('Kouhei Sutou', 'kou@cozmixng.org')
   p.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
 

data/test-unit/lib/test/unit/autorunner.rb

@@ -203,6 +203,13 @@ module Test
             end
           end
 
+          o.on("--default-priority=PRIORITY",
+               Priority.available_values,
+               "Uses PRIORITY as default priority",
+               "(#{keyword_display(Priority.available_values)})") do |priority|
+            Priority.default = priority
+          end
+
           o.on('-I', "--load-path=DIR[#{File::PATH_SEPARATOR}DIR...]",
                "Appends directory list to $LOAD_PATH.") do |dirs|
             $LOAD_PATH.concat(dirs.split(File::PATH_SEPARATOR))
@@ -220,6 +227,12 @@ module Test
             load_config(file)
           end
 
+          o.on("--order=ORDER", TestCase::AVAILABLE_ORDERS,
+               "Run tests in a test case in ORDER order.",
+               "(#{keyword_display(TestCase::AVAILABLE_ORDERS)})") do |order|
+            TestCase.test_order = order
+          end
+
           ADDITIONAL_OPTIONS.each do |option_builder|
             option_builder.call(self, o)
           end
@@ -251,10 +264,20 @@ module Test
       end
 
       def keyword_display(keywords)
-        keywords.collect do |keyword, _|
+        keywords = keywords.collect do |keyword, _|
           keyword.to_s
-        end.uniq.sort.collect do |keyword|
-          keyword.sub(/^(.)([A-Za-z]+)(?=\w*$)/, '\\1[\\2]')
+        end.uniq.sort
+
+        i = 0
+        keywords.collect do |keyword|
+          if (i > 0 and keyword[0] == keywords[i - 1][0]) or
+              ((i < keywords.size - 1) and (keyword[0] == keywords[i + 1][0]))
+            n = 2
+          else
+            n = 1
+          end
+          i += 1
+          keyword.sub(/^(.{#{n}})([A-Za-z]+)(?=\w*$)/, '\\1[\\2]')
         end.join(", ")
       end
 

data/test-unit/lib/test/unit/priority.rb

@@ -26,6 +26,19 @@ module Test
         def disable
           @@enabled = false
         end
+
+        @@default = :normal
+        def default
+          @@default || :normal
+        end
+
+        def default=(default)
+          @@default = default
+        end
+
+        def available_values
+          Checker.available_priorities
+        end
       end
 
       class Checker
@@ -36,7 +49,7 @@ module Test
           end
 
           def need_to_run?(test)
-            priority = test[:priority] || :normal
+            priority = test[:priority] || Priority.default
             if have_priority?(priority)
               send(priority_check_method_name(priority), test)
             else
@@ -44,6 +57,13 @@ module Test
             end
           end
 
+          def available_priorities
+            methods(false).collect do |name|
+              /\Arun_priority_(.+)\?\z/ =~ name.to_s
+              $1
+            end.compact
+          end
+
           def run_priority_must?(test)
             true
           end

data/test-unit/lib/test/unit/testcase.rb

@@ -1,7 +1,9 @@
 #--
 #
 # Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# Copyright::
+#   * Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+#   * Copyright (c) 2008-2009 Kouhei Sutou <tt><kou@clear-code.com></tt>
 # License:: Ruby license.
 
 require 'test/unit/attribute'
@@ -60,14 +62,14 @@ module Test
     #   end
     #
     # Here is a call order:
-    #  * startup
-    #  * setup
-    #  * test_my_method1
-    #  * teardown
-    #  * setup
-    #  * test_my_method2
-    #  * teardown
-    #  * shutdown
+    # * startup
+    # * setup
+    # * test_my_method1
+    # * teardown
+    # * setup
+    # * test_my_method2
+    # * teardown
+    # * shutdown
     class TestCase
       include Attribute
       include Fixture
@@ -81,24 +83,29 @@ module Test
       include Assertions
       include Util::BacktraceFilter
 
-      STARTED = name + "::STARTED"
-      FINISHED = name + "::FINISHED"
+      STARTED = name + "::STARTED" # :nodoc:
+      FINISHED = name + "::FINISHED" # :nodoc:
 
-      DESCENDANTS = []
+      DESCENDANTS = [] # :nodoc:
+      AVAILABLE_ORDERS = [:alphabetic, :random, :defined] # :nodoc:
 
       class << self
-        def inherited(sub_class)
+        def inherited(sub_class) # :nodoc:
           DESCENDANTS << sub_class
         end
 
+        @@added_methods = []
+        def method_added(name) # :nodoc:
+          super
+          @@added_methods << name.to_s
+        end
+
         # Rolls up all of the test* methods in the fixture into
         # one suite, creating a new instance of the fixture for
         # each method.
         def suite
-          method_names = public_instance_methods(true).collect {|name| name.to_s}
-          tests = method_names.delete_if {|method_name| method_name !~ /^test./}
           suite = TestSuite.new(name, self)
-          tests.sort.each do |test|
+          collect_test_names.each do |test|
             catch(:invalid_test) do
               suite << new(test)
             end
@@ -137,11 +144,11 @@ module Test
         #   end
         #
         # Here is a call order:
-        #   * startup
-        #   * setup
-        #   * test_my_class1 (or test_my_class2)
-        #   * setup
-        #   * test_my_class2 (or test_my_class1)
+        # * startup
+        # * setup
+        # * test_my_class1 (or test_my_class2)
+        # * setup
+        # * test_my_class2 (or test_my_class1)
         #
         # Note that you should not assume test order. Tests
         # should be worked in any order.
@@ -173,16 +180,74 @@ module Test
         #   end
         #
         # Here is a call order:
-        #   * test_my_class1 (or test_my_class2)
-        #   * teardown
-        #   * test_my_class2 (or test_my_class1)
-        #   * teardown
-        #   * shutdown
+        # * test_my_class1 (or test_my_class2)
+        # * teardown
+        # * test_my_class2 (or test_my_class1)
+        # * teardown
+        # * shutdown
         #
         # Note that you should not assume test order. Tests
         # should be worked in any order.
         def shutdown
         end
+
+        @@test_order = AVAILABLE_ORDERS.first
+
+        # Returns the current test order. This returns
+        # +:alphabetic+ by default.
+        def test_order
+          @@test_order
+        end
+
+        # Sets the current test order.
+        #
+        # Here are the available _order_:
+        # [:alphabetic]
+        #   Default. Tests are sorted in alphabetic order.
+        # [:random]
+        #   Tests are sorted in random order.
+        # [:defined]
+        #   Tests are sorted in defined order.
+        def test_order=(order)
+          @@test_order = order
+        end
+
+        # :stopdoc:
+        private
+        def collect_test_names
+          method_names = public_instance_methods(true).collect do |name|
+            name.to_s
+          end
+          test_names = method_names.find_all do |method_name|
+            method_name =~ /^test./
+          end
+          send("sort_test_names_in_#{test_order}_order", test_names)
+        end
+
+        def sort_test_names_in_alphabetic_order(test_names)
+          test_names.sort
+        end
+
+        def sort_test_names_in_random_order(test_names)
+          test_names.sort_by {rand(test_names.size)}
+        end
+
+        def sort_test_names_in_defined_order(test_names)
+          test_names.sort do |test1, test2|
+            test1_defined_order = @@added_methods.index(test1)
+            test2_defined_order = @@added_methods.index(test2)
+            if test1_defined_order and test2_defined_order
+              test1_defined_order <=> test2_defined_order
+            elsif test1_defined_order
+              1
+            elsif test2_defined_order
+              -1
+            else
+              test1 <=> test2
+            end
+          end
+        end
+        # :startdoc:
       end
 
       attr_reader :method_name
@@ -225,7 +290,7 @@ module Test
           result.add_run
           yield(FINISHED, name)
         ensure
-          @_result = nil
+          # @_result = nil # For test-spec's after_all :<
         end
       end
 
@@ -255,10 +320,10 @@ module Test
       #   end
       #
       # Here is a call order:
-      #   * setup
-      #   * my_setup1
-      #   * my_setup2
-      #   * test_my_class
+      # * setup
+      # * my_setup1
+      # * my_setup2
+      # * test_my_class
       def setup
       end
 
@@ -288,13 +353,13 @@ module Test
       #   end
       #
       # Here is a call order:
-      #   * test_my_class
-      #   * my_teardown2
-      #   * my_teardown1
-      #   * teardown
+      # * test_my_class
+      # * my_teardown2
+      # * my_teardown1
+      # * teardown
       def teardown
       end
-      
+
       def default_test
         flunk("No tests were specified")
       end