activegroonga 0.0.1 → 0.0.2

data/NEWS.ja.rdoc

@@ -1,5 +1,9 @@
 = お知らせ
 
+== 0.0.2: 2009-06-05
+
+* Ruby/groonga 0.0.2対応
+
 == 0.0.1: 2009-04-30
 
 * 最初のリリース！

data/NEWS.rdoc

@@ -1,5 +1,9 @@
 = NEWS
 
+== 0.0.2: 2009-06-05
+
+* Support Ruby/groonga 0.0.2.
+
 == 0.0.1: 2009-04-30
 
 * Initial release!

data/Rakefile

@@ -27,7 +27,7 @@ require 'hoe'
 
 ENV["NODOT"] = "yes"
 
-Hoe::SUPPORTED_TEST_FRAMEWORKS[:testunit2] = "test/run-test.rb"
+Hoe::Test::SUPPORTED_TEST_FRAMEWORKS[:testunit2] = "test/run-test.rb"
 
 base_dir = File.join(File.dirname(__FILE__))
 truncate_base_dir = Proc.new do |x|
@@ -85,7 +85,10 @@ end
 
 ENV["VERSION"] ||= guess_version
 version = ENV["VERSION"]
-project = Hoe.new('activegroonga', version) do |project|
+project = nil
+Hoe.spec('activegroonga') do |_project|
+  project = _project
+  project.version = version
   project.rubyforge_name = 'groonga'
   authors = File.join(base_dir, "AUTHORS")
   project.author = File.readlines(authors).collect do |line|
@@ -104,7 +107,7 @@ project = Hoe.new('activegroonga', version) do |project|
     :extra_rdoc_files => Dir.glob("*.rdoc"),
   }
   project.readme_file = "README.ja.rdoc"
-  project.extra_deps = [["activerecord", "=2.3.2"]]
+  project.extra_deps = [["groonga", "=#{version}"], ["activerecord", "=2.3.2"]]
 
   news_of_current_release = File.read("NEWS.rdoc").split(/^==\s.*$/)[1]
   project.changes = cleanup_white_space(news_of_current_release)
@@ -173,3 +176,9 @@ task :prepare_docs_for_publishing do
     end
   end
 end
+
+task :tag do
+  repository = "svn+ssh://rubyforge.org/var/svn/groonga/activegroonga"
+  sh("svn cp -m 'release #{version}!!!' " +
+     "#{repository}/trunk #{repository}/tags/#{version}")
+end

data/lib/active_groonga.rb

@@ -21,8 +21,8 @@ base_dir = File.dirname(__FILE__)
 ruby_groonga_dir = File.join(base_dir, "..", "..", "groonga")
 ruby_groonga_dir = File.expand_path(ruby_groonga_dir)
 if File.exist?(ruby_groonga_dir)
-  $LOAD_PATH.unshift(File.join(ruby_groonga_dir, "src"))
-  $LOAD_PATH.unshift(File.join(ruby_groonga_dir, "src", "lib"))
+  $LOAD_PATH.unshift(File.join(ruby_groonga_dir, "ext"))
+  $LOAD_PATH.unshift(File.join(ruby_groonga_dir, "lib"))
 end
 require 'groonga'
 

data/lib/active_groonga/base.rb

@@ -590,9 +590,9 @@ module ActiveGroonga
           end
           database_file = File.join(database_directory, "database.groonga")
           if File.exist?(database_file)
-            Groonga::Database.new(database_file)
+            @@database = Groonga::Database.new(database_file)
           else
-            Groonga::Database.create(:path => database_file)
+            @@database = Groonga::Database.create(:path => database_file)
           end
           self.database_directory = database_directory
         end
@@ -648,7 +648,11 @@ module ActiveGroonga
             end
           end
           if index_records
-            sorted_records = index_records.sort([".:score"], :limit => limit)
+            sorted_records = index_records.sort([
+                                                 :key => ".:score",
+                                                 :order => :descending,
+                                                ],
+                                                :limit => limit)
             limit = sorted_records.size
             target_records = sorted_records.records(:order => :ascending).collect do |record|
               index_record_id = record.value.unpack("i")[0]

data/lib/active_groonga/column.rb

@@ -80,9 +80,9 @@ module ActiveGroonga
       case @column.range
       when Groonga::Type
         case @column.range.id
-        when Groonga::Type::INT
+        when Groonga::Type::INT32
           :integer
-        when Groonga::Type::UINT
+        when Groonga::Type::UINT32, Groonga::Type::UINT64
           :unsigned_integer
         when Groonga::Type::INT64
           :decimal

data/lib/active_groonga/schema.rb

@@ -106,13 +106,12 @@ module ActiveGroonga
 
         name = "#{table_name}/#{column_name}"
         path = File.join(base_dir, "#{column_name}.groonga")
-        index_column = index_table.define_column(name, table,
-                                                 :path => path,
-                                                 :type => "index",
-                                                 :compress => "zlib",
-                                                 # :with_section => true,
-                                                 # :with_weight => true,
-                                                 :with_position => true)
+        index_column = index_table.define_index_column(name, table,
+                                                       :path => path,
+                                                       :compress => "zlib",
+                                                       # :with_section => true,
+                                                       # :with_weight => true,
+                                                       :with_position => true)
         index_column.source = column
 
         record = index_management_table.add
@@ -197,6 +196,7 @@ module ActiveGroonga
                                                # :key_with_sis => true,
                                                # :key_normalize => true,
                                                :path => table_file)
+          table.default_tokenizer = "<token:bigram>"
 
           base_dir = File.join(Base.metadata_directory, table_name)
           FileUtils.mkdir_p(base_dir)

data/lib/active_groonga/version.rb

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

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

@@ -143,12 +143,11 @@ module ActiveGroongaTestUtils
       bookmarks_index_dir + "content.groonga"
     path = @bookmarks_content_index_column_path.to_s
     @bookmarks_content_index_column =
-      @index.define_column("bookmarks/content", @bookmarks,
-                           :type => "index",
-                           :with_section => true,
-                           :with_weight => true,
-                           :with_position => true,
-                           :path => path)
+      @index.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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activegroonga
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 +09:00
+date: 2009-06-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: groonga
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.0.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   type: :runtime
@@ -184,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: groonga
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: A library to use groonga with ActiveRecord like API.