activegroonga 1.0.0 → 1.0.1

data/NEWS.ja.rdoc

@@ -1,5 +1,22 @@
 = お知らせ
 
+== 1.0.1: 2010-11-29
+
+=== 改良
+
+* ジェネレータ: テーブルの種類の指定に対応。
+* ActiveGroonga::Base.exists?を追加。
+* ActiveGroonga::Base.allを追加。
+
+=== 変更
+
+* ハッシュテーブル・パトリシアトライを利用しているときはレコード識別子
+  としてIDではなくキーを使うように変更。
+
+== 1.0.0: 2010-11-29
+
+* Rails 3対応
+
 == 0.0.7: 2009-10-02
 
 * Ruby/groonga 0.0.7対応

data/NEWS.rdoc

@@ -1,5 +1,22 @@
 = NEWS
 
+== 1.0.1: 2010-11-29
+
+=== Improvments
+
+* generator: Supported table type customize.
+* Added ActiveGroonga::Base.exists?.
+* Added ActiveGroonga::Base.all.
+
+=== Changes
+
+* Changed to use record key instead of record ID for record
+  identifier for hash table and patricia trie.
+
+== 1.0.0: 2010-11-29
+
+* Support Rails 3.
+
 == 0.0.7: 2009-10-02
 
 * Support Ruby/groonga 0.0.7.

data/Rakefile

@@ -34,12 +34,12 @@ truncate_base_dir = Proc.new do |x|
   x.gsub(/^#{Regexp.escape(base_dir + File::SEPARATOR)}/, '')
 end
 
-@groonga_base_dir = File.expand_path(File.join(base_dir, '..', 'groonga'))
-groonga_ext_dir = File.join(@groonga_base_dir, 'src')
-groonga_lib_dir = File.join(groonga_ext_dir, 'lib')
-$LOAD_PATH.unshift(groonga_ext_dir)
-$LOAD_PATH.unshift(groonga_lib_dir)
-ENV["RUBYLIB"] = "#{groonga_lib_dir}:#{groonga_ext_dir}:#{ENV['RUBYLIB']}"
+@rroonga_base_dir = File.expand_path(File.join(base_dir, '..', 'rroonga'))
+rroonga_ext_dir = File.join(@rroonga_base_dir, 'ext', "groonga")
+rroonga_lib_dir = File.join(@rroonga_base_dir, 'lib')
+$LOAD_PATH.unshift(rroonga_ext_dir)
+$LOAD_PATH.unshift(rroonga_lib_dir)
+ENV["RUBYLIB"] = "#{rroonga_lib_dir}:#{rroonga_ext_dir}:#{ENV['RUBYLIB']}"
 
 active_groonga_lib_dir = File.join(base_dir, "lib")
 $LOAD_PATH.unshift(active_groonga_lib_dir)
@@ -164,7 +164,7 @@ def apply_template(file, head, header, footer)
 end
 
 def erb_template(name)
-  file = File.join(@groonga_base_dir, "html", "#{name}.html.erb")
+  file = File.join(@rroonga_base_dir, "html", "#{name}.html.erb")
   template = File.read(file)
   erb = ERB.new(template, nil, "-")
   erb.filename = file
@@ -182,10 +182,9 @@ task :prepare_docs_for_publishing do
   end
 end
 
+desc "Tag the current revision."
 task :tag do
-  repository = "svn+ssh://rubyforge.org/var/svn/groonga/activegroonga"
-  sh("svn cp -m 'release #{version}!!!' " +
-     "#{repository}/trunk #{repository}/tags/#{version}")
+  sh("git tag -a #{version} -m 'release #{version}!!!'")
 end
 
 desc "generate activegroonga.gemspec"

data/lib/active_groonga/base.rb

@@ -79,17 +79,32 @@ module ActiveGroonga
         instantiate(record)
       end
 
-      def select(options={})
-        if block_given?
-          records = table.select do |record|
-            yield(record)
-          end
-          ResultSet.new(records, self, :expression => records.expression)
+      def exists?(record_id)
+        record_id = record_id.record_id if record_id.respond_to?(:record_id)
+        if table.support_key?
+          not table[record_id].nil?
         else
-          ResultSet.new(table, self)
+          begin
+            record_id = Integer(record_id)
+          rescue ArgumentError
+            return false
+          end
+          table.exist?(record_id)
         end
       end
 
+      def select(options={})
+        return all(options) unless block_given?
+        records = table.select do |record|
+          yield(record)
+        end
+        ResultSet.new(records, self, :expression => records.expression)
+      end
+
+      def all(options={})
+        ResultSet.new(table, self)
+      end
+
       def count
         table.size
       end
@@ -238,6 +253,10 @@ module ActiveGroonga
       id
     end
 
+    def to_key
+      persisted? ? [record_id] : nil
+    end
+
     def attributes
       @attributes
     end

data/lib/active_groonga/version.rb

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

data/lib/rails/generators/active_groonga/migration/migration_generator.rb

@@ -43,7 +43,7 @@ module ActiveGroonga
 
       private
       def parse_columns! #:nodoc:
-        self.columns = (columns || []).map do |key_value|
+        self.columns = (columns || []).collect do |key_value|
           name, type, *options = key_value.split(':')
           Column.new(name, type, options)
         end

data/lib/rails/generators/active_groonga/model/model_generator.rb

@@ -14,14 +14,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 require 'rails/generators/active_groonga'
+require 'rails/generators/active_groonga/migration/column'
 
 module ActiveGroonga
   module Generators
     class ModelGenerator < Base
-      argument(:attributes,
-               :type => :array,
-               :default => [],
-               :banner => "field:type field:type")
+      argument(:columns, :type => :array, :default => [],
+               :banner => "name:type[:option:option] name:type[:option:option]")
 
       check_class_collision
 
@@ -31,6 +30,15 @@ module ActiveGroonga
                    :type => :string,
                    :desc => "The parent class for the generated model")
 
+      def initialize(args, *options)
+        super
+        @key = nil
+        @table_type = nil
+        @key_normalize = false
+        @default_tokenizer = nil
+        parse_columns!
+      end
+
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
         migration_template("migration.rb",
@@ -49,12 +57,56 @@ module ActiveGroonga
         end
       end
 
+      def create_table_code
+        code = "create_table(:#{table_name}"
+        options = []
+        options << ":type => :#{@table_type}" if @table_type
+        options << ":key_type => \"#{@key}\"" if @key
+        options << ":key_normalize => #{@key_normalize}" if @key_normalize
+        options << ":default_tokenizer => \"#{@tokenizer}\"" if @tokenizer
+        code << ", #{options.join(', ')}" unless options.empty?
+        code << ")"
+        code
+      end
+
+      def remove_table_code
+        "remove_table(:#{table_name})"
+      end
+
       hook_for :test_framework
 
       protected
       def parent_class_name
         options[:parent] || "ActiveGroonga::Base"
       end
+
+      private
+      def parse_columns! #:nodoc:
+        parsed_columns = []
+        (columns || []).each do |key_value|
+          name, type, *options = key_value.split(':')
+          case name
+          when "key"
+            @key = Groonga::Schema.normalize_type(type)
+            @table_type = options.find do |option|
+              ["hash", "patricia_trie"].include?(option)
+            end
+            key_normalize = options.include?("normalize")
+            @table_type ||= @key_normalize ? "patricia_trie" : "hash"
+            if @table_type == "patricia_trie"
+              @key_normalize = key_normalize
+            end
+            tokenizer_label_index = options.index("tokenizer")
+            if tokenizer_label_index
+              tokenizer = options[tokenizer_label_index + 1]
+              @tokenizer = Groonga::Schema.normalize_type(tokenizer)
+            end
+          else
+            parsed_columns << Column.new(name, type, options)
+          end
+        end
+        self.columns = parsed_columns
+      end
     end
   end
 end

data/lib/rails/generators/active_groonga/model/templates/migration.rb

@@ -1,8 +1,8 @@
 class <%= migration_class_name %> < ActiveGroonga::Migration
   def up
-    create_table(:<%= table_name %>) do |table|
-<% attributes.each do |attribute| -%>
-      table.<%= attribute.type %>(:<%= attribute.name %>)
+    <%= create_table_code %> do |table|
+<% columns.each do |column| -%>
+      table.<%= column.create_code %>
 <% end -%>
 <% if options[:timestamps] -%>
       table.timestamps
@@ -11,6 +11,6 @@ class <%= migration_class_name %> < ActiveGroonga::Migration
   end
 
   def down
-    remove_table(:<%= table_name %>)
+    <%= remove_table_code %>
   end
 end

data/test/test-base.rb

@@ -209,4 +209,11 @@ class TestBase < Test::Unit::TestCase
     assert_equal([google],
                  Bookmark.select {|record| record.content =~ "Google"}.to_a)
   end
+
+  def test_exists?
+    daijiro = @user_records[:daijiro]
+    assert_true(User.exists?(daijiro.record_id))
+    daijiro.delete
+    assert_false(User.exists?(daijiro.record_id))
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activegroonga
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +09:00
+date: 2010-11-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency