schema_comments 0.2.0.alpha2 → 0.2.0.alpha3

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile

@@ -19,4 +19,5 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.8.3"
   gem "simplecov", ">= 0"
+  gem "ZenTest"
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    ZenTest (4.7.0)
     actionmailer (3.2.3)
       actionpack (= 3.2.3)
       mail (~> 2.4.4)
@@ -109,6 +110,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ZenTest
   activerecord (>= 3.0.0)
   activesupport (>= 3.0.0)
   bundler (~> 1.0.0)

data/VERSION

@@ -1 +1 @@
-0.2.0.alpha2
+0.2.0.alpha3

data/lib/schema_comments/base.rb

@@ -42,7 +42,7 @@ module SchemaComments
             klass.respond_to?(:table_exists?) and klass.table_exists?
         end
         subclasses.inject({}) do |d, m|
-          comment = m.table_comment
+          comment = m.table_comment || ''
           comment.gsub!(ignore_pattern_to_export_i18n, '') if ignore_pattern_to_export_i18n
           d[m.name.underscore] = comment
           d

data/lib/schema_comments/connection_adapters.rb

@@ -83,12 +83,12 @@ module SchemaComments
     module ConcreteAdapter
       def self.included(mod)
         mod.module_eval do
-          alias_method_chain :columns, :schema_comments
-          alias_method_chain :create_table, :schema_comments
-          alias_method_chain :drop_table, :schema_comments
-          alias_method_chain :rename_table, :schema_comments
+          alias_method_chain :columns      , :schema_comments
+          alias_method_chain :create_table , :schema_comments
+          alias_method_chain :drop_table   , :schema_comments
+          alias_method_chain :rename_table , :schema_comments
           alias_method_chain :remove_column, :schema_comments
-          alias_method_chain :add_column, :schema_comments
+          alias_method_chain :add_column   , :schema_comments
           alias_method_chain :change_column, :schema_comments
           alias_method_chain :rename_column, :schema_comments
         end

data/lib/schema_comments/schema_comment.rb

@@ -4,46 +4,28 @@ require 'hash_key_orderable'
 
 module SchemaComments
 
-  # 現在はActiveRecord::Baseを継承していますが、将来移行が完全に終了した
-  # 時点で、ActiveRecord::Baseの継承をやめます。
-  #
-  # それまではDBからのロードは可能ですが、YAMLにのみ保存します。
-  class SchemaComment < ActiveRecord::Base
-    set_table_name('schema_comments')
+  class SchemaComment
 
     TABLE_KEY = 'table_comments'
     COLUMN_KEY = 'column_comments'
 
     class << self
       def table_comment(table_name)
-        if yaml_exist?
-          @table_names ||= yaml_access{|db| db[TABLE_KEY]}.dup
-          return @table_names[table_name.to_s]
-        end
-        return nil unless table_exists?
-        connection.select_value(sanitize_conditions("select descriptions from schema_comments where table_name = '%s' and column_name is null" % table_name))
+        @table_names ||= yaml_access{|db| db[TABLE_KEY]}.dup
+        @table_names[table_name.to_s]
       end
 
       def column_comment(table_name, column_name)
-        if yaml_exist?
-          @column_names ||= yaml_access{|db| db[COLUMN_KEY] }.dup
-          column_hash = @column_names[table_name.to_s] || {}
-          return column_hash[column_name.to_s]
-        end
-        return nil unless table_exists?
-        connection.select_value(sanitize_conditions("select descriptions from schema_comments where table_name = '%s' and column_name = '%s'" % [table_name, column_name]))
+        @column_names ||= yaml_access{|db| db[COLUMN_KEY] }.dup
+        column_hash = @column_names[table_name.to_s] || {}
+        column_hash[column_name.to_s]
       end
 
       def column_comments(table_name)
-        if yaml_exist?
-          result = nil
-          @column_names ||= yaml_access{|db| db[COLUMN_KEY] }.dup
-          result = @column_names[table_name.to_s]
-          return result || {}
-        end
-        return {} unless table_exists?
-        hash_array = connection.select_all(sanitize_conditions("select column_name, descriptions from schema_comments where table_name = '%s' and column_name is not null" % table_name))
-        hash_array.inject({}){|dest, r| dest[r['column_name']] = r['descriptions']; dest}
+        result = nil
+        @column_names ||= yaml_access{|db| db[COLUMN_KEY] }.dup
+        result = @column_names[table_name.to_s]
+        result || {}
       end
 
       def save_table_comment(table_name, comment)
@@ -70,23 +52,19 @@ module SchemaComments
       end
 
       def update_table_name(table_name, new_name)
-        if yaml_exist?
-          yaml_access do |db|
-            db[TABLE_KEY][new_name.to_s] = db[TABLE_KEY].delete(table_name.to_s)
-            db[COLUMN_KEY][new_name.to_s] = db[COLUMN_KEY].delete(table_name.to_s)
-          end
+        yaml_access do |db|
+          db[TABLE_KEY][new_name.to_s] = db[TABLE_KEY].delete(table_name.to_s)
+          db[COLUMN_KEY][new_name.to_s] = db[COLUMN_KEY].delete(table_name.to_s)
         end
         @table_names = nil
         @column_names = nil
       end
 
       def update_column_name(table_name, column_name, new_name)
-        if yaml_exist?
-          yaml_access do |db|
-            table_cols = db[COLUMN_KEY][table_name.to_s]
-            if table_cols
-              table_cols[new_name.to_s] = table_cols.delete(column_name.to_s)
-            end
+        yaml_access do |db|
+          table_cols = db[COLUMN_KEY][table_name.to_s]
+          if table_cols
+            table_cols[new_name.to_s] = table_cols.delete(column_name.to_s)
           end
         end
         @table_names = nil
@@ -118,7 +96,6 @@ module SchemaComments
           result
         end
       end
-
     end
 
     class SortedStore < YAML::Store

data/lib/schema_comments/schema_dumper.rb

@@ -1,55 +1,38 @@
 # -*- coding: utf-8 -*-
 module SchemaComments
-  module SchemaDumper
-    def self.included(mod)
-#       mod.extend(ClassMethods)
-#       mod.instance_eval do
-#         alias :ignore_tables_without_schema_comments :ignore_tables
-#         alias :ignore_tables :ignore_tables_with_schema_comments
-#       end
-      mod.module_eval do
-        alias_method_chain :tables, :schema_comments
-        alias_method_chain :table, :schema_comments
-      end
-    end
-
-    IGNORED_TABLE = 'schema_comments'
-
-#     module ClassMethods
-#       def ignore_tables_with_schema_comments
-#         result = ignore_tables_without_schema_comments
-#         result << IGNORED_TABLE unless result.include?(IGNORED_TABLE)
-#         result
-#       end
-#     end
+  class SchemaDumper < ActiveRecord::SchemaDumper
 
     private
-    def tables_with_schema_comments(stream)
-      tables_without_schema_comments(stream)
-      if adapter_name == "mysql"
-        # ビューはtableの後に実行するようにしないと rake db:schema:load で失敗します。
-        mysql_views(stream)
-      end
+    def tables(stream)
+      result = super(stream)
+      # ビューはtableの後に実行するようにしないと rake db:schema:load で失敗します。
+      mysql_views(stream) if adapter_name == "mysql"
+      result
     end
 
-    def table_with_schema_comments(table, stream)
-      return if IGNORED_TABLE == table.downcase
+    def mysql_view?(table)
+      return false unless adapter_name == 'mysql'
+      config = ActiveRecord::Base.configurations[Rails.env]
+      match_count = @connection.select_value(
+        "select count(*) from information_schema.TABLES where TABLE_TYPE = 'VIEW' AND TABLE_SCHEMA = '%s' AND TABLE_NAME = '%s'" % [
+          config["database"], table])
+      match_count.to_i > 0
+    end
+
+    def table(table, stream)
       # MySQLは、ビューもテーブルとして扱うので、一個一個チェックします。
-      if adapter_name == 'mysql'
-        config = ActiveRecord::Base.configurations[Rails.env]
-        match_count = @connection.select_value(
-          "select count(*) from information_schema.TABLES where TABLE_TYPE = 'VIEW' AND TABLE_SCHEMA = '%s' AND TABLE_NAME = '%s'" % [
-            config["database"], table])
-        return if match_count.to_i > 0
-      end
+      return if mysql_view?(table)
+
       columns = @connection.columns(table)
       begin
         tbl = StringIO.new
 
+        # first dump primary key column
         if @connection.respond_to?(:pk_and_sequence_for)
-          pk, pk_seq = @connection.pk_and_sequence_for(table)
+          pk, _ = @connection.pk_and_sequence_for(table)
+        elsif @connection.respond_to?(:primary_key)
+          pk = @connection.primary_key(table)
         end
-        pk ||= 'id'
 
         tbl.print "  create_table #{table.inspect}"
         if columns.detect { |c| c.name == pk }
@@ -66,32 +49,38 @@ module SchemaComments
 
         tbl.puts " do |t|"
 
+        # then dump all non-primary key columns
         column_specs = columns.map do |column|
           raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" if @types[column.type].nil?
           next if column.name == pk
           spec = {}
           spec[:name]      = column.name.inspect
-          spec[:type]      = column.type.to_s
-          spec[:limit]     = column.limit.inspect if column.limit != @types[column.type][:limit] && column.type != :decimal
-          spec[:precision] = column.precision.inspect if !column.precision.nil?
-          spec[:scale]     = column.scale.inspect if !column.scale.nil?
-          spec[:null]      = 'false' if !column.null
-          spec[:default]   = default_string(column.default) if !column.default.nil?
+
+          # AR has an optimization which handles zero-scale decimals as integers. This
+          # code ensures that the dumper still dumps the column as a decimal.
+          spec[:type]      = if column.type == :integer && [/^numeric/, /^decimal/].any? { |e| e.match(column.sql_type) }
+                               'decimal'
+                             else
+                               column.type.to_s
+                             end
+          spec[:limit]     = column.limit.inspect if column.limit != @types[column.type][:limit] && spec[:type] != 'decimal'
+          spec[:precision] = column.precision.inspect if column.precision
+          spec[:scale]     = column.scale.inspect if column.scale
+          spec[:null]      = 'false' unless column.null
+          spec[:default]   = default_string(column.default) if column.has_default?
           spec[:comment]   = '"' << (column.comment || '').gsub(/\"/, '\"') << '"' # ここでinspectを使うと最後の文字だけ文字化け(UTF-8のコード)になっちゃう
           (spec.keys - [:name, :type]).each{ |k| spec[k].insert(0, "#{k.inspect} => ")}
           spec
         end.compact
 
         # find all migration keys used in this table
-        keys = [:name, :limit, :precision, :scale, :default, :null, :comment] & column_specs.map(&:keys).flatten
+        keys = [:name, :limit, :precision, :scale, :default, :null, :comment] & column_specs.map{ |k| k.keys }.flatten
 
         # figure out the lengths for each column based on above keys
-        lengths = keys.map{ |key|
-          column_specs.map{ |spec| spec[key] ? spec[key].length + 2 : 0 }.max
-        }
+        lengths = keys.map{ |key| column_specs.map{ |spec| spec[key] ? spec[key].length + 2 : 0 }.max }
 
         # the string we're going to sprintf our values against, with standardized column widths
-        format_string = lengths.map{|len| len ? "%-#{len}s" : "%s" }
+        format_string = lengths.map{ |len| "%-#{len}s" }
 
         # find the max length for the 'type' column, which is special
         type_length = column_specs.map{ |column| column[:type].length }.max

data/lib/schema_comments.rb

@@ -11,10 +11,8 @@ module SchemaComments
   autoload :SchemaComment, 'schema_comments/schema_comment'
   autoload :SchemaDumper, 'schema_comments/schema_dumper'
 
-  # DEFAULT_YAML_PATH = File.expand_path(File.join(RAILS_ROOT, 'db/schema_comments.yml'))
-
   mattr_accessor :yaml_path
-  # self.yaml_path = DEFAULT_YAML_PATH
+  self.yaml_path = Rails.root.join("db/schema_comments.yml").to_s if defined?(Rails)
 
   mattr_accessor :quiet
 
@@ -23,7 +21,7 @@ module SchemaComments
 
   class << self
     def setup
-      base_names = %w(Base Migration Migrator Schema SchemaDumper) +
+      base_names = %w(Base Migration Migrator Schema) +
         %w(Column ColumnDefinition TableDefinition).map{|name| "ConnectionAdapters::#{name}"}
 
       base_names.each do |base_name|
@@ -41,7 +39,7 @@ module SchemaComments
       end
 
       # %w(Mysql PostgreSQL SQLite3 SQLite Firebird DB2 Oracle Sybase Openbase Frontbase)
-      %w(Mysql PostgreSQL SQLite3 SQLite).each do |adapter|
+      %w(Mysql Mysql2 PostgreSQL SQLite3 SQLite).each do |adapter|
         begin
           require("active_record/connection_adapters/#{adapter.downcase}_adapter")
           adapter_class = ('ActiveRecord::ConnectionAdapters::' << "#{adapter}Adapter").constantize

data/schema_comments.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "schema_comments"
-  s.version = "0.2.0.alpha2"
+  s.version = "0.2.0.alpha3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["akimatter"]
-  s.date = "2012-04-16"
+  s.date = "2012-04-17"
   s.description = "schema_comments generates extra methods dynamically for attribute which has options"
   s.email = "akm2000@gmail.com"
   s.extra_rdoc_files = [
@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".rspec",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "autotest/discover.rb",
     "init.rb",
     "lib/annotate_models.rb",
     "lib/hash_key_orderable.rb",
@@ -91,6 +91,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<ZenTest>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
       s.add_dependency(%q<activerecord>, [">= 3.0.0"])
@@ -101,6 +102,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<ZenTest>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
@@ -112,6 +114,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<ZenTest>, [">= 0"])
   end
 end
 

data/tasks/schema_comments.rake

@@ -1,79 +1,43 @@
 # -*- coding: utf-8 -*-
 require 'yaml'
-require 'yaml_waml'
+# require 'yaml_waml'
 require 'active_record'
+require 'schema_comments'
+require 'schema_comments/schema_comment'
 
-# テストを実行する際はschema_commentsのschema_comments.ymlへの出力を抑制します。
-namespace :db do
-  Rake.application.send(:eval, "@tasks.delete('db:migrate')")
-  desc "Migrate the database through scripts in db/migrate and update db/schema.rb by invoking db:schema:dump. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
-  task :migrate => :environment do
-    SchemaComments::SchemaComment.yaml_access do
-      ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-      ActiveRecord::Migrator.migrate("db/migrate/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-      SchemaComments.quiet = true
-      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-    end
-  end
-
-  Rake.application.send(:eval, "@tasks.delete('db:rollback')")
-  desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
-  task :rollback => :environment do
-    SchemaComments::SchemaComment.yaml_access do
-      step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-      ActiveRecord::Migrator.rollback('db/migrate/', step)
-      SchemaComments.quiet = true
-      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-    end
-  end
-
-  namespace :migrate do
-    desc 'Runs the "up" for a given migration VERSION.'
-    task :up => :environment do
-      SchemaComments::SchemaComment.yaml_access do
-        version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-        raise "VERSION is required" unless version
-        ActiveRecord::Migrator.run(:up, "db/migrate/", version)
-        SchemaComments.quiet = true
-        Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-      end
-    end
-
-    desc 'Runs the "down" for a given migration VERSION.'
-    task :down => :environment do
-      SchemaComments::SchemaComment.yaml_access do
-        version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-        raise "VERSION is required" unless version
-        ActiveRecord::Migrator.run(:down, "db/migrate/", version)
-        SchemaComments.quiet = true
-        Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
-      end
-    end
-  end
+db_namespace = namespace :db do
+  namespace :schema do
 
-  namespace :test do
-    Rake.application.send(:eval, "@tasks.delete('db:test:prepare')")
-    desc 'Check for pending migrations and load the test schema'
-    task :prepare => 'db:abort_if_pending_migrations' do
-      SchemaComments::SchemaComment.yaml_access do
-        SchemaComments.quiet = true
-        if defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
-          Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:load"
-          }[ActiveRecord::Base.schema_format]].invoke
+    Rake.application.send(:eval, "@tasks.delete('db:schema:dump')")
+    desc 'Create a db/schema.rb file that can be portably used against any DB supported by AR'
+    task :dump => [:environment, :load_config] do
+      begin
+        SchemaComments.setup
+        require 'active_record/schema_dumper'
+        filename = ENV['SCHEMA'] || "#{Rails.root}/db/schema.rb"
+        File.open(filename, "w:utf-8") do |file|
+          ActiveRecord::Base.establish_connection(Rails.env)
+          # ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+          SchemaComments::SchemaDumper.dump(ActiveRecord::Base.connection, file)
         end
+        db_namespace['schema:dump'].reenable
+      rescue Exception => e
+        puts "[#{e.class}] #{e.message}:\n  " << e.backtrace.join("\n  ")
+        raise e
       end
     end
-  end
 
+  end
 end
 
-
-
 class ActiveRecord::Base
   class << self
     attr_accessor :ignore_pattern_to_export_i18n
-    self.ignore_pattern_to_export_i18n = /\(\(\(.*\)\)\)/
+  end
 
+  self.ignore_pattern_to_export_i18n = /\(\(\(.*\)\)\)/
+
+  class << self
     def export_i18n_models
       subclasses = ActiveRecord::Base.send(:subclasses).select do |klass|
         (klass != SchemaComments::SchemaComment) and
@@ -159,7 +123,7 @@ end
 namespace :i18n do
   namespace :schema_comments do
     task :load_all_models => :environment do
-      Dir.glob(File.join(RAILS_ROOT, 'app', 'models', '**', '*.rb')) do |file_name|
+      Dir.glob(Rails.root.join('app/models/**/*.rb')) do |file_name|
         require file_name
       end
     end
@@ -182,7 +146,7 @@ namespace :i18n do
     task :update_config_locale => :"i18n:schema_comments:load_all_models" do
       require 'yaml/store'
       locale = (ENV['LOCALE'] || I18n.locale).to_s
-      path = (ENV['YAML_PATH'] || File.join(RAILS_ROOT, "config/locales/#{locale}.yml"))
+      path = (ENV['YAML_PATH'] || Rails.root.join("config/locales/#{locale}.yml"))
       print "updating #{path}..."
 
       begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_comments
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha2
+  version: 0.2.0.alpha3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2158918000 !ruby/object:Gem::Requirement
+  requirement: &2168170300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158918000
+  version_requirements: *2168170300
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2158916980 !ruby/object:Gem::Requirement
+  requirement: &2168169800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158916980
+  version_requirements: *2168169800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2158916160 !ruby/object:Gem::Requirement
+  requirement: &2168169320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2158916160
+  version_requirements: *2168169320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2158915500 !ruby/object:Gem::Requirement
+  requirement: &2168185180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *2158915500
+  version_requirements: *2168185180
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2158915020 !ruby/object:Gem::Requirement
+  requirement: &2168184700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *2158915020
+  version_requirements: *2168184700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2158974440 !ruby/object:Gem::Requirement
+  requirement: &2168184180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2158974440
+  version_requirements: *2168184180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2158973900 !ruby/object:Gem::Requirement
+  requirement: &2168183700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2158973900
+  version_requirements: *2168183700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2158973420 !ruby/object:Gem::Requirement
+  requirement: &2168183180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2158973420
+  version_requirements: *2168183180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2158972860 !ruby/object:Gem::Requirement
+  requirement: &2168182700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2158972860
+  version_requirements: *2168182700
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: &2168182220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2168182220
 description: schema_comments generates extra methods dynamically for attribute which
   has options
 email: akm2000@gmail.com
@@ -119,13 +130,13 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
+- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
-- autotest/discover.rb
 - init.rb
 - lib/annotate_models.rb
 - lib/hash_key_orderable.rb
@@ -190,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3771409335729466144
+      hash: -382324986614841609
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/autotest/discover.rb

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-$KCODE='u'
-
-# Autotestを実行するためのスクリプトです。
-# see http://rails.aizatto.com/2007/11/19/autotest-ing-your-rails-plugin/
-# $:.push(File.join(File.dirname(__FILE__), %w[.. .. rspec]))
-
-Autotest.add_discovery do
-  "rspec"
-end