activegroonga 2.1.2 → 2.1.3

data/doc/text/news.textile

@@ -1,5 +1,16 @@
 h1. NEWS
 
+h2(#2-1-3). 2.1.3: 2013-01-06
+
+h3. Improvements
+
+* [GitHub#8] Supported reference column to key support tables such as
+  hash table. [Reported by Kenta Sato]
+
+h3. Thanks
+
+* Kenta Sato
+
 h2(#2-1-2). 2.1.2: 2013-01-04
 
 h3. Improvements

data/lib/active_groonga/persistence.rb

@@ -95,7 +95,7 @@ module ActiveGroonga
         next if value.nil?
         if value.is_a?(Base)
           value.save if value.new_record?
-          value = value.id
+          value = value.record_id
         end
         attributes[key] = value
       end

data/lib/active_groonga/version.rb

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

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

@@ -42,6 +42,7 @@ module ActiveGroongaTestUtils
     setup_bookmarks_index_tables
     setup_tasks_table
     setup_sites_table
+    setup_pages_table
 
     setup_user_records
     setup_bookmark_records
@@ -49,7 +50,17 @@ module ActiveGroongaTestUtils
   end
 
   def setup_tmp_directory
-    @tmp_dir = Pathname(File.dirname(__FILE__)) + "tmp"
+    @base_tmp_dir = Pathname(File.dirname(__FILE__)) + "tmp"
+    memory_file_system = "/dev/shm"
+    if File.exist?(memory_file_system)
+      FileUtils.mkdir_p(@base_tmp_dir.parent.to_s)
+      FileUtils.rm_f(@base_tmp_dir.to_s)
+      FileUtils.ln_s(memory_file_system, @base_tmp_dir.to_s)
+    else
+      FileUtils.mkdir_p(@base_tmp_dir.to_s)
+    end
+
+    @tmp_dir = @base_tmp_dir + "active-groonga"
     FileUtils.rm_rf(@tmp_dir.to_s)
     FileUtils.mkdir_p(@tmp_dir.to_s)
   end
@@ -192,6 +203,20 @@ module ActiveGroongaTestUtils
                                          :path => @score_column_path.to_s)
   end
 
+  def setup_pages_table
+    @pages_path = @tables_dir + "pages"
+    @pages = Groonga::Hash.create(:name => "pages",
+                                  :key_type => "ShortText",
+                                  :path => @pages_path.to_s)
+
+    columns_dir = @tables_dir + "pages.columns"
+    columns_dir.mkpath
+
+    @site_column_path = columns_dir + "site"
+    @site_column = @pages.define_column("site", @sites,
+                                        :path => @site_column_path.to_s)
+  end
+
   def setup_user_records
     @user_records = {}
 
@@ -228,11 +253,13 @@ module ActiveGroongaTestUtils
       remove_const(:Bookmark) if const_defined?(:Bookmark)
       remove_const(:Task) if const_defined?(:Task)
       remove_const(:Site) if const_defined?(:Site)
+      remove_const(:Page) if const_defined?(:Page)
     end
     load((base_dir + 'user.rb').to_s)
     load((base_dir + 'bookmark.rb').to_s)
     load((base_dir + 'task.rb').to_s)
     load((base_dir + 'site.rb').to_s)
+    load((base_dir + 'page.rb').to_s)
   end
 
   def teardown_sand_box

data/test/fixtures/page.rb

@@ -0,0 +1,2 @@
+class Page < ActiveGroonga::Base
+end

data/test/test-persistence.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2010-2013  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
@@ -30,12 +30,33 @@ class TestPersistence < Test::Unit::TestCase
                  [found_site.key, found_site.title])
   end
 
-  def test_create_hash
-    groonga = Site.create(:key => "http://groonga.org/",
-                          :title => "groonga")
-    found_groonga = Site.find("http://groonga.org/")
-    assert_equal(["http://groonga.org/", "groonga"],
-                 [found_groonga.key, found_groonga.title])
+  class TestCreate < self
+    def test_hash
+      groonga = Site.create(:key => "http://groonga.org/",
+                            :title => "groonga")
+      found_groonga = Site.find("http://groonga.org/")
+      assert_equal(["http://groonga.org/", "groonga"],
+                   [found_groonga.key, found_groonga.title])
+    end
+
+    class TestReference < self
+      def test_have_key
+        groonga = Site.create(:key => "http://groonga.org/",
+                              :title => "groonga")
+        doc = Page.create(:key => "http://groonga.org/doc/",
+                          :site => groonga)
+        found_doc = Page.find("http://groonga.org/doc/")
+        assert_equal(groonga.key, found_doc.site.key)
+      end
+
+      def test_no_key
+        daijiro = @user_records[:daijiro]
+        groonga = Bookmark.create(:uri => "http://groonga.org/",
+                                  :user => daijiro)
+        found_groonga = Bookmark.find(groonga.id)
+        assert_equal(daijiro.id, found_groonga.user.id)
+      end
+    end
   end
 
   def test_update

data/test/test-schema.rb

@@ -96,6 +96,12 @@ ActiveGroonga::Schema.define(:version => 0) do |schema|
       table.short_text("uri")
     end
 
+    create_table("pages",
+                 :type => :hash,
+                 :key_type => "ShortText",
+                 :force => true) do |table|
+    end
+
     create_table("sites",
                  :type => :hash,
                  :key_type => "ShortText",
@@ -125,6 +131,10 @@ ActiveGroonga::Schema.define(:version => 0) do |schema|
       table.reference("user", "users")
     end
 
+    change_table("pages") do |table|
+      table.reference("site", "sites")
+    end
+
     change_table("terms") do |table|
       table.index("bookmarks", "comment", :name => "bookmarks_comment")
       table.index("bookmarks", "content", :name => "bookmarks_content")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activegroonga
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -194,6 +194,7 @@ files:
 - test/run-test.rb
 - test/test-schema.rb
 - test/fixtures/site.rb
+- test/fixtures/page.rb
 - test/fixtures/user.rb
 - test/fixtures/bookmark.rb
 - test/fixtures/task.rb
@@ -233,6 +234,7 @@ test_files:
 - test/run-test.rb
 - test/test-schema.rb
 - test/fixtures/site.rb
+- test/fixtures/page.rb
 - test/fixtures/user.rb
 - test/fixtures/bookmark.rb
 - test/fixtures/task.rb