rroonga 1.2.1 → 1.2.2

data/README.textile

@@ -25,6 +25,7 @@ h2. Authors
 * Daijiro MORI <morita@razil.jp>
 * Yuto HAYAMIZU <y.hayamizu@gmail.com>
 * SHIDARA Yoji <dara@shidara.net>
+* yoshihara haruka <yoshihara@clear-code.com>
 
 h2. License
 

data/Rakefile

@@ -117,15 +117,31 @@ module YARD
   end
 end
 
+reference_base_dir = Pathname.new("doc/html")
+doc_en_dir = reference_base_dir + "en"
 YARD::Rake::YardocTask.new do |task|
   task.options += ["--title", "#{spec.name} - #{version}"]
   # task.options += ["--charset", "UTF-8"]
   task.options += ["--readme", "README.textile"]
-  task.options += ["--files", "text/tutorial.textile"]
+  task.options += ["--files", "doc/text/**/*"]
+  task.options += ["--output-dir", doc_en_dir.to_s]
+  task.options += ["--charset", "utf-8"]
   task.files += FileList["ext/groonga/**/*.c"]
   task.files += FileList["lib/**/*.rb"]
 end
 
+task :yard do
+  doc_en_dir.find do |path|
+    next if path.extname != ".html"
+    html = path.read
+    html = html.gsub(/<div id="footer">.+<\/div>/m,
+                     "<div id=\"footer\"></div>")
+    path.open("w") do |html_file|
+      html_file.print(html)
+    end
+  end
+end
+
 def windows?(platform=nil)
   platform ||= RUBY_PLATFORM
   platform =~ /mswin(?!ce)|mingw|cygwin|bccwin/
@@ -169,12 +185,12 @@ end
 
 include ERB::Util
 
-def apply_template(file, head, header, footer, language)
+def apply_template(file, top_path, current_page, head, header, footer, language)
   content = File.read(file)
   content = content.sub(/lang="en"/, 'lang="#{language}"')
 
   title = nil
-  content = content.sub(/<title>(.+?)<\/title>/) do
+  content = content.sub(/<title>(.+?)<\/title>/m) do
     title = $1
     head.result(binding)
   end
@@ -204,22 +220,21 @@ def rsync_to_rubyforge(spec, source, destination, options={})
   config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
   host = "#{config["username"]}@rubyforge.org"
 
-  rsync_args = "-av --exclude '*.erb' --dry-run"
+  rsync_args = "-av --exclude '*.erb' --chmod=ug+w"
   rsync_args << " --delete" if options[:delete]
-  remote_dir = "/var/www/gforge-projects/#{spec.rubyforge_name}/"
+  remote_dir = "/var/www/gforge-projects/#{spec.rubyforge_project}/"
   sh("rsync #{rsync_args} #{source} #{host}:#{remote_dir}#{destination}")
 end
 
 namespace :reference do
   translate_languages = [:ja]
   supported_languages = [:en, *translate_languages]
-  reference_base_dir = "references"
-  html_files = FileList["doc/**/*.html"].to_a
+  html_files = FileList["doc/html/en/**/*.html"].to_a
 
-  directory reference_base_dir
-  CLOBBER.include(reference_base_dir)
+  directory reference_base_dir.to_s
+  CLOBBER.include(reference_base_dir.to_s)
 
-  po_dir = "po"
+  po_dir = "doc/po"
   namespace :pot do
     pot_file = "#{po_dir}/#{spec.name}.pot"
 
@@ -237,7 +252,7 @@ namespace :reference do
       namespace language do
         po_file = "#{po_dir}/#{language}.po"
 
-        file po_file do |t|
+        file po_file => html_files do |t|
           sh("xml2po", "--keep-entities", "--update", t.name, *html_files)
         end
 
@@ -248,17 +263,14 @@ namespace :reference do
   end
 
   namespace :translate do
-    directory reference_base_dir
-
     translate_languages.each do |language|
       po_file = "#{po_dir}/#{language}.po"
       translate_doc_dir = "#{reference_base_dir}/#{language}"
 
-      doc_dir = Pathname("doc")
       desc "Translates documents to #{language}."
       task language => [po_file, reference_base_dir, *html_files] do
-        doc_dir.find do |path|
-          base_path = path.relative_path_from(doc_dir)
+        doc_en_dir.find do |path|
+          base_path = path.relative_path_from(doc_en_dir)
           translated_path = "#{translate_doc_dir}/#{base_path}"
           if path.directory?
             mkdir_p(translated_path)
@@ -284,34 +296,40 @@ namespace :reference do
   task :translate => translate_task_names
 
   desc "Generates references."
-  task :generate => [:yard, :translate] do
-    cp_r("doc", "#{reference_base_dir}/en", :preserve => true)
-  end
+  task :generate => [:yard, :translate]
 
   namespace :publication do
     task :prepare do
-      head = erb_template("head")
-      header = erb_template("header")
-      footer = erb_template("footer")
       supported_languages.each do |language|
-        doc_dir = "#{reference_base_dir}/#{language}"
-        Find.find(doc_dir) do |file|
-          if /\.html\z/ =~ file and /_(?:c|rb)\.html\z/ !~ file
-            apply_template(file, head, header, footer, language)
+        doc_dir = Pathname.new("#{reference_base_dir}/#{language}")
+        head = erb_template("head.#{language}")
+        header = erb_template("header.#{language}")
+        footer = erb_template("footer.#{language}")
+        doc_dir.find do |file|
+          case file.basename.to_s
+          when "_index.html", /\A(?:class|method|file)_list.html\z/
+            next
+          when /\.html\z/
+            relative_dir_path = file.relative_path_from(doc_dir).dirname
+            current_page = relative_dir_path + file.basename
+            top_path = doc_dir.relative_path_from(file.dirname).to_s
+            apply_template(file, top_path, current_page,
+                           head, header, footer, language)
           end
         end
       end
       File.open("#{reference_base_dir}/.htaccess", "w") do |file|
         file.puts("Redirect permanent /rroonga/text/TUTORIAL_ja_rdoc.html " +
                   "http://groonga.rubyforge.org/rroonga/ja/file.tutorial.html")
-        file.puts("Redirect permanent /rroonga/ " +
+        file.puts("RedirectMatch permanent ^/rroonga/$ " +
                   "http://groonga.rubyforge.org/rroonga/en/")
       end
     end
   end
 
+  desc "Upload document to rubyforge."
   task :publish => [:generate, "reference:publication:prepare"] do
-    rsync_to_rubyforge(spec, "#{reference_base_dir}/", "/#{spec.name}",
+    rsync_to_rubyforge(spec, "#{reference_base_dir}/", spec.name,
                        :delete => true)
   end
 end
@@ -322,6 +340,8 @@ namespace :html do
     rsync_to_rubyforge(spec, "html/", "")
   end
 end
+
+desc "Upload document and HTML to rubyforge."
 task :publish => ["reference:publish", "html:publish"]
 
 desc "Tag the current revision."

data/ext/groonga/rb-grn-expression.c

@@ -559,8 +559,9 @@ rb_grn_expression_inspect (VALUE self)
     grn_expr_inspect(context, &inspected, expression);
 #endif
     GRN_TEXT_PUTS(context, &inspected, ">");
-    rb_inspected = rb_str_new(GRN_TEXT_VALUE(&inspected),
-			      GRN_TEXT_LEN(&inspected));
+    rb_inspected = rb_grn_context_rb_string_new(context,
+						GRN_TEXT_VALUE(&inspected),
+						GRN_TEXT_LEN(&inspected));
     GRN_OBJ_FIN(context, &inspected);
 
     return rb_inspected;

data/ext/groonga/rb-grn-object.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  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
@@ -414,10 +414,6 @@ void
 rb_grn_named_object_bind (RbGrnNamedObject *rb_grn_named_object,
 			  grn_ctx *context, grn_obj *object)
 {
-    RbGrnObject *rb_grn_object;
-
-    rb_grn_object = RB_GRN_OBJECT(rb_grn_named_object);
-
     rb_grn_named_object->name = NULL;
     rb_grn_named_object->name_size = 0;
 }
@@ -1284,14 +1280,12 @@ static VALUE
 rb_grn_object_set (VALUE self, VALUE rb_id, VALUE rb_value, int flags)
 {
     RbGrnObject *rb_grn_object;
-    grn_ctx *context;
     grn_id id;
 
     rb_grn_object = SELF(self);
     if (!rb_grn_object->object)
 	return Qnil;
 
-    context = rb_grn_object->context;
     id = NUM2UINT(rb_id);
 
     return rb_grn_object_set_raw(rb_grn_object, id, rb_value, flags, self);

data/ext/groonga/rb-grn-table.c

@@ -1028,7 +1028,7 @@ rb_grn_table_sort (int argc, VALUE *argv, VALUE self)
     grn_obj *result;
     grn_table_sort_key *keys;
     int i, n_keys;
-    int n_records, offset = 0, limit = -1;
+    int offset = 0, limit = -1;
     VALUE rb_keys, options;
     VALUE rb_offset, rb_limit;
     VALUE *rb_sort_keys;
@@ -1111,8 +1111,10 @@ rb_grn_table_sort (int argc, VALUE *argv, VALUE self)
 
     result = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_NO_KEY,
 			      NULL, table);
-    n_records = grn_table_sort(context, table, offset, limit,
-			       result, keys, n_keys);
+    /* use n_records that is return value from
+       grn_table_sort() when rroonga user become specifying
+       output table. */
+    grn_table_sort(context, table, offset, limit, result, keys, n_keys);
     exception = rb_grn_context_to_exception(context, self);
     if (!NIL_P(exception)) {
         grn_obj_unlink(context, result);

data/ext/groonga/rb-grn-view.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2010-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
@@ -292,7 +292,7 @@ rb_grn_view_sort (int argc, VALUE *argv, VALUE self)
     grn_obj *result;
     grn_table_sort_key *keys;
     int i, n_keys;
-    int n_records, offset = 0, limit = -1;
+    int offset = 0, limit = -1;
     VALUE rb_keys, options;
     VALUE rb_offset, rb_limit;
     VALUE *rb_sort_keys;
@@ -376,14 +376,10 @@ rb_grn_view_sort (int argc, VALUE *argv, VALUE self)
 
     result = grn_table_create(context, NULL, 0, NULL, GRN_TABLE_VIEW,
 			      NULL, NULL);
-    grn_view_add(context, result,
-		 grn_table_create(context, NULL, 0, NULL, GRN_TABLE_NO_KEY,
-				  NULL, grn_ctx_get(context, "People", strlen("People"))));
-    grn_view_add(context, result,
-		 grn_table_create(context, NULL, 0, NULL, GRN_TABLE_NO_KEY,
-				  NULL, grn_ctx_get(context, "People", strlen("People"))));
-    n_records = grn_table_sort(context, view, offset, limit,
-			       result, keys, n_keys);
+    /* use n_records that is return value from
+       grn_table_sort() when rroonga user become specifying
+       output table. */
+    grn_table_sort(context, view, offset, limit, result, keys, n_keys);
     exception = rb_grn_context_to_exception(context, self);
     if (!NIL_P(exception)) {
         grn_obj_unlink(context, result);

data/ext/groonga/rb-grn.h

@@ -69,7 +69,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 1
 #define RB_GRN_MINOR_VERSION 2
-#define RB_GRN_MICRO_VERSION 1
+#define RB_GRN_MICRO_VERSION 2
 
 #define RB_GRN_QUERY_DEFAULT_MAX_EXPRESSIONS 32
 

data/extconf.rb

@@ -46,7 +46,7 @@ def install_groonga_locally(major, minor, micro)
 
   install_dir = local_groonga_install_dir
   Dir.chdir(local_groonga_base_dir) do
-    url = "http://groonga.org/files/groonga/#{tar_gz}"
+    url = "http://packages.groonga.org/source/groonga/#{tar_gz}"
     message("downloading %s...", url)
     open(url, "rb") do |input|
       File.open(tar_gz, "wb") do |output|

data/lib/groonga/record.rb

@@ -293,6 +293,8 @@ module Groonga
     # レコードが所属しているテーブルで定義されているインデックス
     # 型のカラムでない全カラムを対象とし、カラムの名前をキーとし
     # たこのレコードのカラムの値のハッシュを返す。
+    #
+    # return same attributes object if duplicate records exist.
     def attributes
       accessor = AttributeHashBuilder.new(self)
       accessor.build
@@ -414,7 +416,7 @@ module Groonga
 
       def initialize(root_record)
         @root_record = root_record
-        @built_records = []
+        @all_built_attributes = {}
       end
 
       def build
@@ -423,32 +425,25 @@ module Groonga
 
       private
       def build_attributes(record)
-        building(record) do
-          attributes = create_attributes(record)
-          add_key(attributes, record)
-          add_score(attributes, record)
-          add_n_sub_records(attributes, record)
-          add_columns(attributes, record)
-
-          attributes
+        if @all_built_attributes.has_key?(record)
+          return @all_built_attributes[record]
         end
-      end
 
-      def build_recursive_attributes(record)
-        attributes = create_attributes(record)
-        add_table(attributes, record)
+        attributes = {}
+        @all_built_attributes[record] = attributes
+
+        add_id(attributes, record)
         add_key(attributes, record)
+        add_score(attributes, record)
+        add_n_sub_records(attributes, record)
+        add_columns(attributes, record)
 
         attributes
       end
 
       def build_value(value)
         if value.is_a?(Record)
-          if recursive?(value)
-            build_recursive_attributes(value)
-          else
-            build_attributes(value)
-          end
+          build_attributes(value)
         else
           value
         end
@@ -460,8 +455,8 @@ module Groonga
         end
       end
 
-      def create_attributes(record)
-        {"_id" => record.id}
+      def add_id(attributes, record)
+        attributes["_id"] = record.id
       end
 
       def add_table(attributes, record)
@@ -502,18 +497,6 @@ module Groonga
           attributes["_nsubrecs"] = record.n_sub_records
         end
       end
-
-      def building(record)
-        @built_records.push(record)
-        returned_object = yield
-        @built_records.pop
-
-        returned_object
-      end
-
-      def recursive?(record)
-        @built_records.include?(record)
-      end
     end
   end
 end

data/test/test-record.rb

@@ -325,20 +325,55 @@ class RecordTest < Test::Unit::TestCase
         "user" => nil,
         "uri" => "http://groonga.org/document.html",
         "rate" => 8,
-        "next" => {
-          "_table" => "Bookmarks",
-          "_id" => 1,
-        },
         "content" => nil,
         "comment" => "Informative"
       },
       "content" => nil,
       "comment" => "Great!"
     }
+    expected["next"]["next"] = expected
 
     assert_equal(expected, top_page_record.attributes)
   end
 
+  def test_duplicate_records_attributes
+    @bookmarks.define_column("next1", @bookmarks)
+    @bookmarks.define_column("next2", @bookmarks)
+
+    top_page_record = @bookmarks.add(top_page)
+    doc_page_record = @bookmarks.add(doc_page)
+
+    top_page_record["next1"] = doc_page_record
+    top_page_record["next2"] = doc_page_record
+    doc_page_record["next1"] = top_page_record
+
+    doc_page_attributes = {
+      "_id" => 2,
+      "user" => nil,
+      "uri" => "http://groonga.org/document.html",
+      "rate" => 8,
+      "content" => nil,
+      "comment" => "Informative",
+      "next2" => nil
+    }
+    top_page_attributes = {
+      "_id" => 1,
+      "user" => nil,
+      "uri" => "http://groonga.org/",
+      "rate" => 5,
+      "next1" => doc_page_attributes,
+      "next2" => doc_page_attributes,
+      "content" => nil,
+      "comment" => "Great!"
+    }
+    doc_page_attributes["next1"] = top_page_attributes
+
+    actual_records = top_page_record.attributes
+    assert_equal(top_page_attributes, actual_records)
+    assert_equal(actual_records["next1"].object_id,
+                 actual_records["next2"].object_id)
+  end
+
   def test_select_result_attributes
     top_page_record = @bookmarks.add(top_page)
     select_result = @bookmarks.select
@@ -372,13 +407,10 @@ class RecordTest < Test::Unit::TestCase
       "user" => nil,
       "uri" => "http://groonga.org/",
       "rate" => 5,
-      "next" => {
-        "_table" => "Bookmarks",
-        "_id" => 1
-      },
       "content" => nil,
       "comment" => "Great!"
     }
+    expected["next"] = expected
 
     assert_equal(expected, top_page_record.attributes)
   end
@@ -423,31 +455,28 @@ class RecordTest < Test::Unit::TestCase
       doc_page_record
     ]
 
-    expected = {
+    top_page_attributes = {
       "_id" => 1,
       "user" => nil,
       "uri" => "http://groonga.org/",
       "rate" => 5,
-      "related_bookmarks" => [
-        {
-          "_table" => "Bookmarks",
-          "_id" => 1
-        },
-        {
-          "_id" => 2,
-          "comment" => "Informative",
-          "content" => nil,
-          "rate" => 8,
-          "related_bookmarks" => [],
-          "uri" => "http://groonga.org/document.html",
-          "user" => nil,
-        }
-      ],
       "content" => nil,
       "comment" => "Great!"
     }
-
-    assert_equal(expected, top_page_record.attributes)
+    doc_page_attributes = {
+      "_id" => 2,
+      "comment" => "Informative",
+      "content" => nil,
+      "rate" => 8,
+      "related_bookmarks" => [],
+      "uri" => "http://groonga.org/document.html",
+      "user" => nil,
+    }
+    top_page_attributes["related_bookmarks"] = [
+      top_page_attributes,
+      doc_page_attributes
+    ]
+    assert_equal(top_page_attributes, top_page_record.attributes)
   end
 
   def test_dynamic_accessor

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: rroonga
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   segments:
   - 1
   - 2
-  - 1
+  - 2
   prerelease: false
 platform: ruby
 authors:
@@ -17,7 +17,7 @@ authors:
 autorequire: !!null 
 bindir: bin
 cert_chain: []
-date: 2011-06-07 00:00:00.000000000 +09:00
+date: 2011-06-27 00:00:00.000000000 +09:00
 default_executable: grndump
 dependencies: []
 description: ! 'rroonga is an extension library to use groonga''s DB-API
@@ -51,47 +51,88 @@ files:
 - ext/groonga/Makefile
 - ext/groonga/extconf.rb
 - ext/groonga/groonga.def
+- ext/groonga/groonga.so
 - ext/groonga/rb-grn-accessor.c
+- ext/groonga/rb-grn-accessor.o
 - ext/groonga/rb-grn-array-cursor.c
+- ext/groonga/rb-grn-array-cursor.o
 - ext/groonga/rb-grn-array.c
+- ext/groonga/rb-grn-array.o
 - ext/groonga/rb-grn-column.c
+- ext/groonga/rb-grn-column.o
 - ext/groonga/rb-grn-context.c
+- ext/groonga/rb-grn-context.o
 - ext/groonga/rb-grn-database.c
+- ext/groonga/rb-grn-database.o
 - ext/groonga/rb-grn-encoding-support.c
+- ext/groonga/rb-grn-encoding-support.o
 - ext/groonga/rb-grn-encoding.c
+- ext/groonga/rb-grn-encoding.o
 - ext/groonga/rb-grn-exception.c
+- ext/groonga/rb-grn-exception.o
 - ext/groonga/rb-grn-expression-builder.c
+- ext/groonga/rb-grn-expression-builder.o
 - ext/groonga/rb-grn-expression.c
+- ext/groonga/rb-grn-expression.o
 - ext/groonga/rb-grn-fix-size-column.c
+- ext/groonga/rb-grn-fix-size-column.o
 - ext/groonga/rb-grn-hash-cursor.c
+- ext/groonga/rb-grn-hash-cursor.o
 - ext/groonga/rb-grn-hash.c
+- ext/groonga/rb-grn-hash.o
 - ext/groonga/rb-grn-index-column.c
+- ext/groonga/rb-grn-index-column.o
 - ext/groonga/rb-grn-index-cursor.c
+- ext/groonga/rb-grn-index-cursor.o
 - ext/groonga/rb-grn-logger.c
+- ext/groonga/rb-grn-logger.o
 - ext/groonga/rb-grn-object.c
+- ext/groonga/rb-grn-object.o
 - ext/groonga/rb-grn-operator.c
+- ext/groonga/rb-grn-operator.o
 - ext/groonga/rb-grn-patricia-trie-cursor.c
+- ext/groonga/rb-grn-patricia-trie-cursor.o
 - ext/groonga/rb-grn-patricia-trie.c
+- ext/groonga/rb-grn-patricia-trie.o
 - ext/groonga/rb-grn-plugin.c
+- ext/groonga/rb-grn-plugin.o
 - ext/groonga/rb-grn-posting.c
+- ext/groonga/rb-grn-posting.o
 - ext/groonga/rb-grn-procedure.c
+- ext/groonga/rb-grn-procedure.o
 - ext/groonga/rb-grn-query.c
+- ext/groonga/rb-grn-query.o
 - ext/groonga/rb-grn-record.c
+- ext/groonga/rb-grn-record.o
 - ext/groonga/rb-grn-snippet.c
+- ext/groonga/rb-grn-snippet.o
 - ext/groonga/rb-grn-table-cursor-key-support.c
+- ext/groonga/rb-grn-table-cursor-key-support.o
 - ext/groonga/rb-grn-table-cursor.c
+- ext/groonga/rb-grn-table-cursor.o
 - ext/groonga/rb-grn-table-key-support.c
+- ext/groonga/rb-grn-table-key-support.o
 - ext/groonga/rb-grn-table.c
+- ext/groonga/rb-grn-table.o
 - ext/groonga/rb-grn-type.c
+- ext/groonga/rb-grn-type.o
 - ext/groonga/rb-grn-utils.c
+- ext/groonga/rb-grn-utils.o
 - ext/groonga/rb-grn-variable-size-column.c
+- ext/groonga/rb-grn-variable-size-column.o
 - ext/groonga/rb-grn-variable.c
+- ext/groonga/rb-grn-variable.o
 - ext/groonga/rb-grn-view-accessor.c
+- ext/groonga/rb-grn-view-accessor.o
 - ext/groonga/rb-grn-view-cursor.c
+- ext/groonga/rb-grn-view-cursor.o
 - ext/groonga/rb-grn-view-record.c
+- ext/groonga/rb-grn-view-record.o
 - ext/groonga/rb-grn-view.c
+- ext/groonga/rb-grn-view.o
 - ext/groonga/rb-grn.h
 - ext/groonga/rb-groonga.c
+- ext/groonga/rb-groonga.o
 - extconf.rb
 - lib/groonga.rb
 - lib/groonga/context.rb