activegroonga 1.0.3 → 1.0.4

data/NEWS.ja.rdoc

@@ -1,5 +1,11 @@
 = お知らせ
 
+== 1.0.4: 2011-04-01
+
+=== 改良
+
+* Kaminari対応。（Viewのみ）
+
 == 1.0.3: 2010-12-25
 
 === 改良

data/NEWS.rdoc

@@ -1,5 +1,11 @@
 = NEWS
 
+== 1.0.4: 2011-04-01
+
+=== Improvements
+
+* Supported Kaminari. (View interface only)
+
 == 1.0.3: 2010-12-25
 
 === Improvements

data/README.ja.rdoc

@@ -12,10 +12,10 @@ groongaは全文検索機能とカラムストアの機能を提供していま
 ActiveRecordとRDBの組み合わせの代わりに、ActiveGroongaと
 groongaの組み合わせを使うことができます。
 
-Ruby/groongaをベースとしています。Ruby/groongaとgroongaに関
-する情報は以下を参照して下さい。
+rroongaをベースとしています。rroongaとgroongaに関する情報は以
+下を参照して下さい。
 
-* Ruby/groonga: http://groonga.rubyforge.org/
+* rroonga: http://groonga.rubyforge.org/
 * groonga: http://groonga.org/
 
 == 作者
@@ -39,7 +39,7 @@ LGPL 2.1です。詳しくはlicense/LGPLを見てください。
 
 == ドキュメント
 
-http://groonga.rubyforge.org/active_groonga/
+http://groonga.rubyforge.org/activegroonga/
 
 == メーリングリスト
 

data/README.rdoc

@@ -12,10 +12,10 @@ groonga provides both of full text search and column store
 features. ActiveGroonga + groonga can be used as an
 alternative of ActiveRecord + RDB.
 
-ActiveGroonga is based on Ruby/groonga. See the following
-URLs about Ruby/groonga and groonga.
+ActiveGroonga is based on rroonga. See the following URLs
+about rroonga and groonga.
 
-* Ruby/groonga: http://groonga.rubyforge.org/
+* rroonga: http://groonga.rubyforge.org/
 * groonga: http://groonga.org/
 
 == Author
@@ -41,7 +41,7 @@ contributed patches.)
 
 Japanese only. Sorry.
 
-http://groonga.rubyforge.org/active_groonga/
+http://groonga.rubyforge.org/activegroonga/
 
 == Mailing list
 

data/Rakefile

@@ -121,7 +121,7 @@ Hoe.spec('activegroonga') do |_project|
   description = cleanup_white_space(entries[entries.index("Description") + 1])
   project.summary, project.description, = description.split(/\n\n+/, 3)
 
-  project.remote_rdoc_dir = "active_groonga"
+  project.remote_rdoc_dir = "activegroonga"
 end
 
 project.spec.dependencies.delete_if {|dependency| dependency.name == "hoe"}
@@ -182,6 +182,24 @@ task :prepare_docs_for_publishing do
   end
 end
 
+namespace :backward_compatibility do
+  desc "Publish HTML for backward compatibility."
+  task :publish_html do
+    config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+    host = "#{config["username"]}@rubyforge.org"
+
+    rsync_args = "-av --exclude .svn --delete"
+    remote_dir = "/var/www/gforge-projects/#{project.rubyforge_name}/"
+    mkdir_p "active_groonga"
+    File.open("active_groonga/.htaccess", "w") do |htaccess|
+      htaccess.puts(<<-EOH)
+Redirect permanent / http://groonga.rubyforge.org/activegroonga/
+EOH
+    end
+    sh "rsync #{rsync_args} active_groonga/ #{host}:#{remote_dir}"
+  end
+end
+
 desc "Tag the current revision."
 task :tag do
   sh("git tag -a #{version} -m 'release #{version}!!!'")

data/lib/active_groonga/base.rb

@@ -33,6 +33,8 @@ module ActiveGroonga
     cattr_accessor :configurations
 
     @@context = nil
+    cattr_writer :context, :instance_writer => false
+
     @@encoding = "utf8"
     cattr_reader :encoding, :instance_reader => false
 
@@ -110,7 +112,7 @@ module ActiveGroonga
       end
 
       def context
-        Groonga::Context.default
+        @@context ||= Groonga::Context.default
       end
 
       def encoding=(new_encoding)

data/lib/active_groonga/persistence.rb

@@ -24,7 +24,7 @@ module ActiveGroonga
     end
 
     def persisted?
-      not (new_record? or destroyed?)
+      !new_record? and !destroyed?
     end
 
     def save(options={})

data/lib/active_groonga/result_set.rb

@@ -31,6 +31,7 @@ module ActiveGroonga
     end
 
     def paginate(sort_keys, options={})
+      options[:page] = normalize_page_value(options[:page])
       records = @records.paginate(sort_keys, options)
       set = self.class.new(records, @klass,
                            :expression => @expression)
@@ -81,12 +82,28 @@ module ActiveGroonga
       end
     end
 
+    def normalize_page_value(page)
+      if page.blank?
+        1
+      else
+        begin
+          Integer(page)
+        rescue ArgumentError
+          1
+        end
+      end
+    end
+
     module PaginationProxy
       Groonga::Pagination.instance_methods.each do |method_name|
         define_method(method_name) do
           @records.send(method_name)
         end
       end
+
+      # For kaminari.
+      alias_method :num_pages, :n_pages
+      alias_method :limit_value, :page_size
     end
   end
 end

data/lib/active_groonga/version.rb

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

data/lib/active_groonga.rb

@@ -17,13 +17,6 @@ require 'pathname'
 
 require 'active_model'
 
-base_dir = Pathname(__FILE__).dirname
-rroonga_dir = (base_dir + "../../groonga").expand_path
-if rroonga_dir.exist?
-  $LOAD_PATH.unshift(rroonga_dir + "ext" + "groonga")
-  $LOAD_PATH.unshift(rroonga_dir + "lib")
-end
-
 require 'groonga'
 
 module ActiveGroonga
@@ -48,4 +41,5 @@ module ActiveGroonga
   end
 end
 
+base_dir = Pathname(__FILE__).dirname
 I18n.load_path << (base_dir + 'active_groonga/locale/en.yml').to_s

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

@@ -27,6 +27,7 @@ module ActiveGroongaTestUtils
   end
 
   def setup_sand_box
+    ActiveGroonga::Base.context = nil
     Groonga::Context.default = nil
     @context = Groonga::Context.default
 

data/test/test-schema.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2011  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
@@ -118,6 +118,7 @@ ActiveGroonga::Schema.define(:version => 0) do |schema|
     create_table("terms",
                  :type => :patricia_trie,
                  :key_type => "ShortText",
+                 :default_tokenizer => "TokenBigram",
                  :force => true) do |table|
     end
 
@@ -131,6 +132,7 @@ ActiveGroonga::Schema.define(:version => 0) do |schema|
     end
 
     change_table("terms") do |table|
+      table.index("bookmarks", "comment", :name => "bookmarks_comment")
       table.index("bookmarks", "content", :name => "bookmarks_content")
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activegroonga
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-25 00:00:00 +09:00
+date: 2011-03-31 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: groonga
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A library to use groonga with ActiveRecord like API.