rroonga 0.9.4 → 0.9.5

data/lib/groonga/pagination.rb

@@ -0,0 +1,143 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2010  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
+
+module Groonga
+  class TooSmallPage < Error
+    attr_reader :page, :available_pages
+    def initialize(page, available_pages)
+      @page = page
+      @available_pages = available_pages
+      super("too small page: #{@page}: " +
+            "available pages: #{@available_pages.inspect}")
+    end
+  end
+
+  class TooLargePage < Error
+    attr_reader :page, :available_pages
+    def initialize(page, available_pages)
+      @page = page
+      @available_pages = available_pages
+      super("too large page: #{@page}: " +
+            "available pages: #{@available_pages.inspect}")
+    end
+  end
+
+  class TooSmallPageSize < Error
+    attr_reader :page_size, :available_page_sizes
+    def initialize(page_size, available_page_sizes)
+      @page_size = page_size
+      @available_page_sizes = available_page_sizes
+      super("too small page size: #{@page_size}: " +
+            "available page sizes: #{@available_page_sizes.inspect}")
+    end
+  end
+
+  class Table
+    def paginate(sort_keys, options={})
+      _size = size
+      page_size = options[:size] || 10
+      minimum_size = [1, _size].min
+      if page_size < 1
+        raise TooSmallPageSize.new(page_size, minimum_size.._size)
+      end
+
+      max_page = [(_size / page_size.to_f).ceil, 1].max
+      page = options[:page] || 1
+      if page < 1
+        raise TooSmallPage.new(page, 1..max_page)
+      elsif max_page < page
+        raise TooLargePage.new(page, 1..max_page)
+      end
+
+      offset = (page - 1) * page_size
+      limit = page_size
+      records = sort(sort_keys, :offset => offset, :limit => limit)
+      records.extend(Pagination)
+      records.send(:set_pagination_info, page, page_size, _size)
+      records
+    end
+  end
+
+  # ページネーション機能を追加するモジュール。
+  #
+  # ページ番号など、0ベースではなく1ベースです。
+  module Pagination
+    attr_reader :current_page, :page_size, :n_pages, :n_records
+
+    def have_pages?
+      @n_pages > 1
+    end
+
+    def first_page
+      1
+    end
+
+    def first_page?
+      @current_page == first_page
+    end
+
+    def last_page
+      @n_pages
+    end
+
+    def last_page?
+      @current_page == last_page
+    end
+
+    def have_next_page?
+      @current_page < @n_pages
+    end
+
+    def next_page
+      have_next_page? ? @current_page + 1 : nil
+    end
+
+    def have_previous_page?
+      @current_page > 1
+    end
+
+    def previous_page
+      have_previous_page? ? @current_page - 1 : nil
+    end
+
+    def n_records_in_page
+      size
+    end
+
+    def start_offset
+      return nil if @n_records.zero?
+      1 + (@current_page - 1) * @page_size
+    end
+
+    def end_offset
+      return nil if @n_records.zero?
+      [start_offset + @page_size - 1, @n_records].min
+    end
+
+    def pages
+      first_page..last_page
+    end
+
+    private
+    def set_pagination_info(current_page, page_size, n_records)
+      @current_page = current_page
+      @page_size = page_size
+      @n_records = n_records
+      @n_pages = [(@n_records / @page_size.to_f).ceil, 1].max
+    end
+  end
+end

data/lib/groonga/record.rb

@@ -15,6 +15,8 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+require 'English'
+
 module Groonga
   class Record
     # レコードが所属するテーブル

data/lib/groonga/schema.rb

@@ -43,6 +43,77 @@ module Groonga
   #     end
   #   end
   class Schema
+    # スキーマ操作で発生する例外のスーパークラス。
+    class Error < Groonga::Error
+    end
+
+    # テーブルが存在しないときに発生する。
+    class TableNotExists < Error
+      attr_reader :name
+      def initialize(name)
+        @name = name
+        super("table doesn't exist: <#{@name}>")
+      end
+    end
+
+    # すでに存在するテーブルと違うオプションでテーブルを作ろ
+    # うとしたときに発生する。
+    class TableCreationWithDifferentOptions < Error
+      attr_reader :table, :options
+      def initialize(table, options)
+        @table = table
+        @options = options
+        super("creating table with differnt options: " +
+              "#{@table.inspect}: #{@options.inspect}")
+      end
+    end
+
+    # すでに存在するカラムと違うオプションでテーブルを作ろ
+    # うとしたときに発生する。
+    class ColumnCreationWithDifferentOptions < Error
+      attr_reader :column, :options
+      def initialize(column, options)
+        @column = column
+        @options = options
+        super("creating column with differnt option: " +
+              "#{@column.inspect}: #{@options.inspect}")
+      end
+    end
+
+    # 未知のインデックス対象を指定したときに発生する。
+    class UnknownIndexTarget < Error
+      attr_reader :target_name
+      def initialize(target_name)
+        @target_name = target_name
+        super("unknown index target: <#{@target_name}>")
+      end
+    end
+
+    # 未知のオプションを指定したときに発生する。
+    class UnknownOptions < Error
+      attr_reader :options, :unknown_keys, :available_keys
+      def initialize(options, unknown_keys, available_keys)
+        @options = options
+        @unknown_keys = unknown_keys
+        @available_keys = available_keys
+        message = "unknown keys are specified: #{u@nknown_keys.inspect}"
+        message << ": available keys: #{@available_keys.inspect}"
+        message << ": options: #{@options.inspect}"
+        super(message)
+      end
+    end
+
+    # 未知のテーブルの種類を指定したときに発生する。
+    class UnknownTableType < Error
+      attr_reader :type, :available_types
+      def initialize(type, available_types)
+        @type = type
+        @available_types = available_types
+        super("unknown table type: #{@type.inspect}: " +
+              "available types: #{@available_types.inspect}")
+      end
+    end
+
     class << self
 
       # call-seq:
@@ -144,11 +215,14 @@ module Groonga
       #   ルにGroonga::IndexColumnを定義する場合は
       #   <tt>"TokenBigram"</tt>などを指定する必要がある。
       #
-      # 以下は+:type+に+:patricia_trie+を指定した時に指定可能。
+      # 以下は+:type+に+:hash+または+:patricia_trie+を指定し
+      # た時に指定可能。
       #
       # [+:key_normalize+]
       #   +true+を指定するとキーを正規化する。
       #
+      # 以下は+:type+に+:patricia_trie+を指定した時に指定可能。
+      #
       # [+:key_with_sis+]
       #   +true+を指定するとキーの文字列の全suffixが自動的に
       #   登録される。
@@ -569,11 +643,18 @@ module Groonga
       def define # :nodoc:
         table = context[@name]
         if @options[:change]
-          raise ArgumentError, "table doesn't exist: #{@name}" if table.nil?
+          raise TableNotExists.new(@name) if table.nil?
         else
-          if table and @options[:force]
-            table.remove
-            table = nil
+          if table
+            unless same_table?(table, create_options)
+              if @options[:force]
+                table.remove
+                table = nil
+              else
+                options = create_options
+                raise TableCreationWithDifferentOptions.new(table, options)
+              end
+            end
           end
           table ||= @table_type.create(create_options)
         end
@@ -832,9 +913,7 @@ module Groonga
         return if options.nil?
         unknown_keys = options.keys - AVAILABLE_OPTION_KEYS
         unless unknown_keys.empty?
-          message = "unknown keys are specified: #{unknown_keys.inspect}"
-          message << ": available keys: #{AVAILABLE_OPTION_KEYS.inspect}"
-          raise ArgumentError, message
+          raise UnknownOptions.new(options, unknown_keys, AVAILABLE_OPTION_KEYS)
         end
       end
 
@@ -848,7 +927,7 @@ module Groonga
         when :patricia_trie
           Groonga::PatriciaTrie
         else
-          raise ArgumentError, "unknown table type: #{type.inspect}"
+          raise UnknownTableType.new(type, [nil, :array, :hash, :patricia_trie])
         end
       end
 
@@ -863,6 +942,7 @@ module Groonga
         }
         key_support_table_common = {
           :key_type => Schema.normalize_type(@options[:key_type]),
+          :key_normalize => @options[:key_normalize],
           :default_tokenizer => @options[:default_tokenizer],
         }
 
@@ -872,12 +952,9 @@ module Groonga
           common.merge(key_support_table_common)
         elsif @table_type == Groonga::PatriciaTrie
           options = {
-            :key_normalize => @options[:key_normalize],
             :key_with_sis => @options[:key_with_sis],
           }
           common.merge(key_support_table_common).merge(options)
-        else
-          raise ArgumentError, "unknown table type: #{@table_type.inspect}"
         end
       end
 
@@ -903,6 +980,44 @@ module Groonga
         definition.options.merge!(column_options.merge(options))
         self
       end
+
+      def same_table?(table, options)
+        return false unless table.class == @table_type
+        return false unless table.range == resolve_name(options[:value_type])
+        sub_records = options[:sub_records]
+        sub_records = false if sub_records.nil?
+        return false unless table.support_sub_records? == sub_records
+
+        case table
+        when Groonga::Array
+          true
+        when Groonga::Hash, Groonga::PatriciaTrie
+          return false unless table.domain == resolve_name(options[:key_type])
+          default_tokenizer = resolve_name(options[:default_tokenizer])
+          return false unless table.default_tokenizer == default_tokenizer
+          key_normalize = options[:key_normalize]
+          key_normalize = false if key_normalize.nil?
+          return false unless table.normalize_key? == key_normalize
+          if table.is_a?(Groonga::PatriciaTrie)
+            key_with_sis = options[:key_with_sis]
+            key_with_sis = false if key_with_sis.nil?
+            return false unless table.register_key_with_sis? == key_with_sis
+          end
+          true
+        else
+          false
+        end
+      end
+
+      def resolve_name(type)
+        if type.nil?
+          nil
+        elsif type.is_a?(String)
+          context[type]
+        else
+          type
+        end
+      end
     end
 
     class TableRemoveDefinition # :nodoc:
@@ -935,7 +1050,7 @@ module Groonga
       def define # :nodoc:
         view = context[@name]
         if @options[:change]
-          raise ArgumentError, "view doesn't exist: #{@name}" if view.nil?
+          raise TableNotExists.new(@name) if view.nil?
         else
           if view and @options[:force]
             view.remove
@@ -945,9 +1060,11 @@ module Groonga
         end
         _context = context
         @tables.each do |table|
-          _table = table
-          table = context[table] unless table.is_a?(Groonga::Table)
-          raise ArgumentError, "table doesn't exist: #{_table}" if table.nil?
+          unless table.is_a?(Groonga::Table)
+            table_name = table
+            table = context[table_name]
+            raise TableNotExists.new(table_name) if table.nil?
+          end
           view.add_table(table)
         end
         view
@@ -971,9 +1088,7 @@ module Groonga
         return if options.nil?
         unknown_keys = options.keys - AVAILABLE_OPTION_KEYS
         unless unknown_keys.empty?
-          message = "unknown keys are specified: #{unknown_keys.inspect}"
-          message << ": available keys: #{AVAILABLE_OPTION_KEYS.inspect}"
-          raise ArgumentError, message
+          raise UnknownOptions.new(options, unknown_keys, AVAILABLE_OPTION_KEYS)
         end
       end
 
@@ -1021,10 +1136,8 @@ module Groonga
           if @options.delete(:force)
             column.remove
           else
-            raise ArgumentError,
-                  "the same name column with different type is " +
-                  "already defined: #{@type.inspect}(#{@options.inspect}): " +
-                  "#{column.inspect}"
+            options = @options.merge(:type => @type)
+            raise ColumnCreationWithDifferentOptions.new(column, options)
           end
         end
         table.define_column(@name,
@@ -1073,7 +1186,7 @@ module Groonga
         if target_table.nil? or
             !(@target_column == "_key" or
               target_table.have_column?(@target_column))
-          raise ArgumentError, "Unknown index target: <#{target_name}>"
+          raise UnknownIndexTarget.new(target_name)
         end
         index = table.column(@name)
         if index
@@ -1081,11 +1194,9 @@ module Groonga
           if @options.delete(:force)
             index.remove
           else
-            raise ArgumentError,
-                  "the same name index column with " +
-                  "different target or options is " +
-                  "already defined: #{target_name.inspect}" +
-                  "(#{@options.inspect}): #{index.inspect}"
+            options = @options.merge(:type => :index,
+                                     :target_name => target_name)
+            raise ColumnCreationWithDifferentOptions.new(index, options)
           end
         end
         index = table.define_index_column(@name,

data/rroonga-build.rb

@@ -18,8 +18,8 @@
 module RroongaBuild
   module RequiredGroongaVersion
     MAJOR = 0
-    MINOR = 1
-    MICRO = 9
+    MINOR = 7
+    MICRO = 4
     VERSION = [MAJOR, MINOR, MICRO]
   end
 

data/test-unit/Rakefile

@@ -0,0 +1,40 @@
+# -*- ruby -*-
+
+require 'rubygems'
+gem 'rdoc'
+require 'hoe'
+require './lib/test/unit/version.rb'
+
+ENV["NODOT"] = "yes"
+
+version = Test::Unit::VERSION
+ENV["VERSION"] = version
+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')
+
+  # Ex-Parrot:
+  # p.developer('Nathaniel Talbott', 'nathaniel@talbott.ws')
+end
+
+task :check_manifest => :clean_test_result
+task :check_manifest => :clean_coverage
+
+task :clean_test_result do
+  test_results = Dir.glob("**/.test-result")
+  sh("rm", "-rf", *test_results) unless test_results.empty?
+end
+
+task :clean_coverage do
+  sh("rm", "-rf", "coverage")
+end
+
+task :tag do
+  message = "Released Test::Unit #{version}!"
+  base = "svn+ssh://#{ENV['USER']}@rubyforge.org/var/svn/test-unit/"
+  sh 'svn', 'copy', '-m', message, "#{base}trunk", "#{base}tags/#{version}"
+end
+
+# vim: syntax=Ruby