activegroonga 4.0.0 → 4.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3219e30cd7f1459d4a6ae0c0cf5763be5997049f
+  data.tar.gz: 70d7b188ab8e741e9cb1483b96d1270f29c05648
+SHA512:
+  metadata.gz: 6a348297bdd0b71a97c8f45a6aeba7d5c2b7cd8a3fc9aca8c30da07fb52580ac574d9f6656c2fe6cfc324bfd83f0f8cf046c75205d7968bd3386ff96617917bf
+  data.tar.gz: 1eb7d8d90775dc92ea54ca44e13775f8814944df1506fd97e0a64063a435157140aa4b36bebdefdc9f1f57b305c7c980029e799ff4b7f95565d42caf906d7102

data/README.textile

@@ -6,17 +6,17 @@ ActiveGroonga
 
 h2. Description
 
-A library to use groonga with ActiveRecord like API.
+A library to use Groonga with ActiveRecord like API.
 
-groonga provides both of full text search and column store
-features. ActiveGroonga + groonga can be used as an
+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 rroonga. See the following URLs
-about rroonga and groonga.
+ActiveGroonga is based on Rroonga. See the following URLs
+about Rroonga and Groonga.
 
-* "rroonga":http://groonga.rubyforge.org/
-* "groonga":http://groonga.org/
+* "Rroonga":http://ranguba.org/
+* "Groonga":http://groonga.org/
 
 h2. Authors
 
@@ -31,7 +31,7 @@ contributed patches.)
 
 h2. Dependencies
 
-* rroonga
+* Rroonga
 
 h2. Install
 
@@ -42,12 +42,12 @@ h2. Install
 
 h2. Documents
 
-* "Reference manual in English":http://groonga.rubyforge.org/rroonga/en/
-* "Reference manual in Japanese":http://groonga.rubyforge.org/rroonga/ja/
+* "Reference manual in English":http://ranguba.org/activegroonga/en/
+* "Reference manual in Japanese":http://ranguba.org/activegroonga/ja/
 
 h2. Mailing list
 
-* English: "groonga-users-en":http://rubyforge.org/mailman/listinfo/groonga-users-en
+* English: "groonga-talk":http://lists.sourceforge.net/mailman/listinfo/groonga-talk
 * Japanese: "groonga-dev":http://lists.sourceforge.jp/mailman/listinfo/groonga-dev
 
 h2. Thanks

data/Rakefile

@@ -44,8 +44,9 @@ Packnga::DocumentTask.new(spec) do |task|
   task.translate_languages = ["ja"]
 end
 
+ranguba_org_dir = Dir.glob("{..,../../www}/ranguba.org").first
 Packnga::ReleaseTask.new(spec) do |task|
-  task.index_html_dir = "../rroonga/doc/html"
+  task.index_html_dir = ranguba_org_dir
 end
 
 task :test do

data/activegroonga.gemspec

@@ -27,7 +27,6 @@ end
 Gem::Specification.new do |spec|
   spec.name = "activegroonga"
   spec.version = ActiveGroonga::VERSION::STRING.dup
-  spec.rubyforge_project = "groonga"
   spec.homepage = "http://ranguba.org/#about-active-groonga"
   spec.authors = ["Kouhei Sutou"]
   spec.email = ["kou@clear-code.com"]

data/doc/text/news.textile

@@ -1,5 +1,36 @@
 h1. NEWS
 
+h2(#4-2-0). 4.2.0: 2014-12-23
+
+h3. Improvements
+
+* Supported Rails 4.2.0.
+* [GitHub#11] Supported yielding block on {ActiveGroonga::Base.new}.
+  [Patch by Eito Katagiri]
+* [GitHub#13][development] Reduced needless @make@ on testing.
+  [Patch by Eito Katagiri]
+* [GitHub#17] Added @groonga:migrate:status@ task that is similar to
+  @db:migrate:status@ task.
+  [Patch by Eito Katagiri]
+
+h3. Fixes
+
+* [GitHub#14] Fixed URL in document.
+  [Patch by Eito Katagiri]
+* [GitHub#15] Fixed a bug that @Groonga::NoSuchColumn@ is raised when
+  iterating {ActiveGroonga::ResultSet} that is created with
+  {ActiveGroonga::Base#select} of @Groonga::Hash@ table.
+  [Patch by Eito Katagiri]
+* [GitHub#16] Fixed indentation in generated migration file.
+  [Patch by Eito Katagiri]
+* Fixed a bug that @updated_at@ isn't updated on creating a record.
+  [Reported by niku]
+
+h3. Thanks
+
+* Eito Katagiri
+* niku
+
 h2(#4-0-0). 4.0.0: 2013-08-29
 
 h3. Improvements

data/lib/active_groonga/base.rb

@@ -95,8 +95,7 @@ module ActiveGroonga
             create(nested_attributes, &block)
           end
         else
-          object = new(attributes)
-          yield(object) if block_given?
+          object = new(attributes, &block)
           object.save
           object
         end
@@ -136,7 +135,8 @@ module ActiveGroonga
         records = table.select do |record|
           yield(record)
         end
-        create_result_set(records, :expression => records.expression)
+        create_result_set(records,
+                          options.merge(:expression => records.expression))
       end
 
       def all(options={})
@@ -272,6 +272,7 @@ module ActiveGroonga
         reload_attributes
         self.attributes = (record_or_attributes || {})
       end
+      yield(self) if block_given?
     end
 
     def have_column?(name)

data/lib/active_groonga/persistence.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -104,7 +104,9 @@ module ActiveGroonga
       else
         record = table.add(attributes)
       end
-      record["created_at"] = Time.now if record.have_column?("created_at")
+      current_time = Time.now
+      record["created_at"] = current_time if record.have_column?("created_at")
+      record["updated_at"] = current_time if record.have_column?("updated_at")
       reload_attributes(record)
       @id = record.id
       @key = record.key if record.support_key?
@@ -142,7 +144,7 @@ module ActiveGroonga
       else
         attributes["id"] = record.id
       end
-      attributes["score"] = record.score if record.support_sub_records?
+      attributes["score"] = record.score if record.support_score?
       record.columns.each do |column|
         next if column.is_a?(Groonga::IndexColumn)
         value = record[column.local_name]

data/lib/active_groonga/railties/groonga.rake

@@ -86,6 +86,30 @@ namespace :groonga do
       migrator.migrate(version)
       Rake::Task["groonga:schema:dump"].invoke
     end
+
+    desc "Display status of migration"
+    task :status => [:environment, "groonga:load_config"] do
+      schema_table = ActiveGroonga::Migrator.new(:up, migrations_path.call).management_table
+      db_list = schema_table.migrated_versions
+      db_list.map! { |version| "%.3d" % version }
+      file_list = []
+      Dir.foreach(migrations_path.call).each do |path|
+        if /([0-9]+)_([_a-z0-9]+)\.rb/ =~ path
+          status = db_list.delete($1) ? "up" : "down"
+          file_list << [status, $1, $2.humanize]
+        end
+      end
+      db_list.map! do |version|
+        ["up", version, "********** NO FILE **********"]
+      end
+      puts "\n"
+      puts "#{'Status'.center(8)}  #{'Migration ID'.ljust(14)}  Migration Name"
+      puts "-" * 50
+      (db_list + file_list).sort_by {|migration| migration[1]}.each do |migration|
+        puts "#{migration[0].center(8)}  #{migration[1].ljust(14)}  #{migration[2]}"
+      end
+      puts
+    end
   end
 
   namespace :schema do

data/lib/active_groonga/result_set.rb

@@ -181,7 +181,7 @@ module ActiveGroonga
         resolved_record = resolved_record.key
       end
       instance = @klass.instantiate(resolved_record)
-      instance.score = record.score
+      instance.score = record.score if record.support_score?
       instance
     end
 

data/lib/active_groonga/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2013  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -16,7 +16,7 @@
 module ActiveGroonga
   module VERSION
     MAJOR = 4
-    MINOR = 0
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join(".")

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

@@ -1,7 +1,7 @@
 class <%= migration_class_name %> < ActiveGroonga::Migration
   def up
 <%- if migration_action -%>
-  change_table(:<%= table_name %>) do |table|
+    change_table(:<%= table_name %>) do |table|
   <% columns.each do |column| -%>
     <%- if migration_action == "add" -%>
       table.<%= column.create_code %>
@@ -9,13 +9,13 @@ class <%= migration_class_name %> < ActiveGroonga::Migration
       table.<%= column.remove_code %>
     <%- end -%>
   <%- end -%>
-  end
+    end
 <%- end -%>
   end
 
   def down
 <%- if migration_action -%>
-  change_table(:<%= table_name %>) do |table|
+    change_table(:<%= table_name %>) do |table|
   <% columns.reverse.each do |column| -%>
     <%- if migration_action == "add" -%>
       table.<%= column.remove_code %>
@@ -23,7 +23,7 @@ class <%= migration_class_name %> < ActiveGroonga::Migration
       table.<%= column.create_code %>
     <%- end -%>
   <%- end -%>
-  end
+    end
 <%- end -%>
   end
 end

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

@@ -89,8 +89,7 @@ module ActiveGroongaTestUtils
   def setup_users_table
     @users_path = @tables_dir + "users"
     @users = Groonga::Array.create(:name => "users",
-                                   :path => @users_path.to_s,
-                                   :sub_records => true)
+                                   :path => @users_path.to_s)
 
     columns_dir = @tables_dir + "users.columns"
     columns_dir.mkpath
@@ -103,8 +102,7 @@ module ActiveGroongaTestUtils
   def setup_bookmarks_table
     @bookmarks_path = @tables_dir + "bookmarks"
     @bookmarks = Groonga::Array.create(:name => "bookmarks",
-                                       :path => @bookmarks_path.to_s,
-                                       :sub_records => true)
+                                       :path => @bookmarks_path.to_s)
 
     columns_dir = @tables_dir + "bookmarks.columns"
     columns_dir.mkpath
@@ -155,8 +153,6 @@ module ActiveGroongaTestUtils
     path = @bookmarks_comment_index_column_path.to_s
     @bookmarks_comment_index_column =
       @terms.define_index_column("bookmarks_comment", @bookmarks,
-                                 :with_section => true,
-                                 :with_weight => true,
                                  :with_position => true,
                                  :path => path)
     @bookmarks_comment_index_column.source = @comment_column
@@ -165,8 +161,6 @@ module ActiveGroongaTestUtils
     path = @bookmarks_content_index_column_path.to_s
     @bookmarks_content_index_column =
       @terms.define_index_column("bookmarks_content", @bookmarks,
-                                 :with_section => true,
-                                 :with_weight => true,
                                  :with_position => true,
                                  :path => path)
     @bookmarks_content_index_column.source = @content_column
@@ -175,8 +169,7 @@ module ActiveGroongaTestUtils
   def setup_tasks_table
     @tasks_path = @tables_dir + "tasks"
     @tasks = Groonga::Array.create(:name => "tasks",
-                                   :path => @tasks_path.to_s,
-                                   :sub_records => true)
+                                   :path => @tasks_path.to_s)
 
     columns_dir = @tables_dir + "tasks.columns"
     columns_dir.mkpath

data/test/run-test.rb

@@ -27,11 +27,12 @@ require "test/unit/notify"
 
 base_dir = Pathname(__FILE__).dirname.parent.expand_path
 
-rroonga_dir = base_dir.parent + "rroonga"
 lib_dir = base_dir + "lib"
 test_dir = base_dir + "test"
 
-if rroonga_dir.exist?
+rroonga_dir = base_dir.parent + "rroonga"
+rroonga_makefile = rroonga_dir + "Makefile"
+if rroonga_makefile.exist?
   make = nil
   if system("which gmake > /dev/null")
     make = "gmake"

data/test/test-base.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
+# Copyright (C) 2009-2014  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
@@ -47,6 +47,13 @@ class TestBase < Test::Unit::TestCase
     assert_equal("send mails", send_mail.name)
   end
 
+  def test_new_with_block
+    yahoo_japan = Site.new do |s|
+      s.key = "http://www.yahoo.co.jp/"
+    end
+    assert_equal("http://www.yahoo.co.jp/", yahoo_japan.key)
+  end
+
   def test_update
     groonga_id = @bookmark_records[:groonga].id
     groonga = Bookmark.find(groonga_id)
@@ -193,7 +200,7 @@ class TestBase < Test::Unit::TestCase
     google = Bookmark.create("uri" => "http://google.com/",
                              "comment" => "a search engine")
     assert_not_equal(Time.at(0), google.created_at)
-    assert_equal(Time.at(0), google.updated_at)
+    assert_not_equal(Time.at(0), google.updated_at)
   end
 
   def test_reload

data/test/test-result-set.rb

@@ -141,6 +141,42 @@ class TestResultSet < Test::Unit::TestCase
     end
   end
 
+  class TestEach < self
+    class TestNoScore < self
+      def test_have_key_table
+        groonga = Site.create(:key => "http://groonga.org/",
+                              :title => "groonga")
+        Page.create(:key => "http://groonga.org/doc/",
+                    :site => groonga)
+        sites = Page.all.collect do |page|
+          site = page.site
+          [site, site.score]
+        end
+        assert_equal([[groonga, nil]],
+                     sites)
+      end
+
+      def test_no_key_table
+        expected_users = @bookmark_records.collect do |key, bookmark|
+          user = bookmark.user
+          score = nil
+          score = user.score if user.support_score?
+          [user.name, score]
+        end
+        actual_users = Bookmark.all.collect do |bookmark|
+          user = bookmark.user
+          [user.name, user.score]
+        end
+
+        sort_key = lambda do |(name, _)|
+          name
+        end
+        assert_equal(expected_users.sort_by(&sort_key),
+                     actual_users.sort_by(&sort_key))
+      end
+    end
+  end
+
   class TestEmpty < self
     def test_have_records
       all_bookmarks = Bookmark.all

data/test/test-schema.rb

@@ -136,8 +136,8 @@ 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")
+      table.index("bookmarks", "comment", :name => "bookmarks_comment", :with_position => true)
+      table.index("bookmarks", "content", :name => "bookmarks_content", :with_position => true)
     end
   end
 end

metadata

@@ -1,242 +1,223 @@
 --- !ruby/object:Gem::Specification
 name: activegroonga
 version: !ruby/object:Gem::Version
-  version: 4.0.0
-  prerelease: 
+  version: 4.2.0
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: packnga
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'groonga provides both of full text search and column store
-
-  features. ActiveGroonga + groonga can be used as an
-
-  alternative of ActiveRecord + RDB.'
+description: |-
+  Groonga provides both of full text search and column store
+  features. ActiveGroonga + Groonga can be used as an
+  alternative of ActiveRecord + RDB.
 email:
 - kou@clear-code.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
 - README.textile
 - Rakefile
-- .yardopts
 - activegroonga.gemspec
+- doc/text/lgpl.txt
+- doc/text/news.textile
+- doc/text/tutorial.textile
 - lib/active_groonga.rb
-- lib/rails/generators/active_groonga.rb
-- lib/rails/generators/active_groonga/migration/migration_generator.rb
-- lib/rails/generators/active_groonga/migration/templates/migration.rb
-- lib/rails/generators/active_groonga/migration/column.rb
-- lib/rails/generators/active_groonga/model/model_generator.rb
-- lib/rails/generators/active_groonga/model/templates/model.rb
-- lib/rails/generators/active_groonga/model/templates/migration.rb
-- lib/rails/generators/active_groonga/model/templates/module.rb
-- lib/active_groonga/railties/configurable.rb
-- lib/active_groonga/version.rb
-- lib/active_groonga/test_case.rb
-- lib/active_groonga/validations.rb
-- lib/active_groonga/test_help.rb
-- lib/active_groonga/vector.rb
+- lib/active_groonga/base.rb
+- lib/active_groonga/callbacks.rb
 - lib/active_groonga/database.rb
-- lib/active_groonga/persistence.rb
 - lib/active_groonga/error.rb
-- lib/active_groonga/schema.rb
-- lib/active_groonga/migrator.rb
 - lib/active_groonga/fixtures.rb
-- lib/active_groonga/callbacks.rb
+- lib/active_groonga/locale/en.yml
 - lib/active_groonga/migration.rb
-- lib/active_groonga/base.rb
-- lib/active_groonga/result_set.rb
+- lib/active_groonga/migrator.rb
+- lib/active_groonga/persistence.rb
 - lib/active_groonga/railtie.rb
+- lib/active_groonga/railties/configurable.rb
 - lib/active_groonga/railties/groonga.rake
-- lib/active_groonga/locale/en.yml
-- doc/text/tutorial.textile
-- doc/text/lgpl.txt
-- doc/text/news.textile
+- lib/active_groonga/result_set.rb
+- lib/active_groonga/schema.rb
+- lib/active_groonga/test_case.rb
+- lib/active_groonga/test_help.rb
+- lib/active_groonga/validations.rb
+- lib/active_groonga/vector.rb
+- lib/active_groonga/version.rb
+- lib/rails/generators/active_groonga.rb
+- lib/rails/generators/active_groonga/migration/column.rb
+- lib/rails/generators/active_groonga/migration/migration_generator.rb
+- lib/rails/generators/active_groonga/migration/templates/migration.rb
+- lib/rails/generators/active_groonga/model/model_generator.rb
+- lib/rails/generators/active_groonga/model/templates/migration.rb
+- lib/rails/generators/active_groonga/model/templates/model.rb
+- lib/rails/generators/active_groonga/model/templates/module.rb
 - test/active-groonga-test-utils.rb
+- test/fixtures/bookmark.rb
+- test/fixtures/page.rb
+- test/fixtures/site.rb
+- test/fixtures/task.rb
+- test/fixtures/user.rb
+- test/run-test.rb
 - test/test-associations.rb
-- test/test-result-set.rb
+- test/test-base.rb
 - test/test-callbacks.rb
 - test/test-persistence.rb
-- test/test-validations.rb
-- test/run-test.rb
+- test/test-result-set.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
-- test/test-base.rb
+- test/test-validations.rb
 homepage: http://ranguba.org/#about-active-groonga
 licenses:
 - LGPLv2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: groonga
-rubygems_version: 1.8.23
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: A library to use groonga with ActiveRecord like API.
+specification_version: 4
+summary: A library to use Groonga with ActiveRecord like API.
 test_files:
+- test/test-persistence.rb
+- test/test-callbacks.rb
 - test/active-groonga-test-utils.rb
-- test/test-associations.rb
+- test/test-base.rb
 - test/test-result-set.rb
-- test/test-callbacks.rb
-- test/test-persistence.rb
-- test/test-validations.rb
 - test/run-test.rb
+- test/test-validations.rb
+- test/test-associations.rb
 - test/test-schema.rb
 - test/fixtures/site.rb
-- test/fixtures/page.rb
 - test/fixtures/user.rb
-- test/fixtures/bookmark.rb
+- test/fixtures/page.rb
 - test/fixtures/task.rb
-- test/test-base.rb
+- test/fixtures/bookmark.rb
 has_rdoc: