schema_comments 0.1.4 → 0.2.0.alpha1

data/lib/schema_comments/schema_dumper.rb

@@ -3,18 +3,18 @@ module SchemaComments
   module SchemaDumper
     def self.included(mod)
 #       mod.extend(ClassMethods)
-#       mod.instance_eval do 
+#       mod.instance_eval do
 #         alias :ignore_tables_without_schema_comments :ignore_tables
-#         alias :ignore_tables :ignore_tables_with_schema_comments 
+#         alias :ignore_tables :ignore_tables_with_schema_comments
 #       end
-      mod.module_eval do 
+      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
@@ -22,7 +22,7 @@ module SchemaComments
 #         result
 #       end
 #     end
-    
+
     private
     def tables_with_schema_comments(stream)
       tables_without_schema_comments(stream)
@@ -36,7 +36,7 @@ module SchemaComments
       return if IGNORED_TABLE == table.downcase
       # MySQLは、ビューもテーブルとして扱うので、一個一個チェックします。
       if adapter_name == 'mysql'
-        config = ActiveRecord::Base.configurations[RAILS_ENV]
+        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])
@@ -60,10 +60,10 @@ module SchemaComments
           tbl.print ", :id => false"
         end
         tbl.print ", :force => true"
-        
+
         table_comment = @connection.table_comment(table)
         tbl.print ", :comment => '#{table_comment}'" unless table_comment.blank?
-        
+
         tbl.puts " do |t|"
 
         column_specs = columns.map do |column|
@@ -110,7 +110,7 @@ module SchemaComments
 
         tbl.puts "  end"
         tbl.puts
-        
+
         indexes(table, tbl)
 
         tbl.rewind
@@ -120,24 +120,24 @@ module SchemaComments
         stream.puts "#   #{e.message}"
         stream.puts
       end
-      
+
       stream
     end
 
     def adapter_name
-      config = ActiveRecord::Base.configurations[RAILS_ENV]
+      config = ActiveRecord::Base.configurations[Rails.env]
       config ? config['adapter'] : ActiveRecord::Base.connection.adapter_name
     end
 
     def mysql_views(stream)
-      config = ActiveRecord::Base.configurations[RAILS_ENV]
+      config = ActiveRecord::Base.configurations[Rails.env]
       view_names = @connection.select_values(
         "select TABLE_NAME from information_schema.TABLES where TABLE_TYPE = 'VIEW' AND TABLE_SCHEMA = '%s'" % config["database"])
       view_names.each do |view_name|
         mysql_view(view_name, stream)
       end
     end
-    
+
     def mysql_view(view_name, stream)
       ddl = @connection.select_value("show create view #{view_name}")
       ddl.gsub!(/^CREATE .+? VIEW /i, "CREATE OR REPLACE VIEW ")
@@ -157,6 +157,6 @@ module SchemaComments
       stream.print(ddl.split(/\n/).map{|line| '    ' << line.strip}.join("\n"))
       stream.print("\n  EOS\n")
     end
-    
+
   end
 end

data/lib/schema_comments.rb

@@ -1,6 +1,8 @@
+require 'active_support/core_ext/module'
+
 module SchemaComments
   VERSION = '0.1.0'
-  
+
   autoload :Base, 'schema_comments/base'
   autoload :ConnectionAdapters, 'schema_comments/connection_adapters'
   autoload :Migration, 'schema_comments/migration'
@@ -9,10 +11,10 @@ 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'))
+  # 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 = DEFAULT_YAML_PATH
 
   mattr_accessor :quiet
 
@@ -23,7 +25,7 @@ module SchemaComments
     def setup
       base_names = %w(Base Migration Migrator Schema SchemaDumper) +
         %w(Column ColumnDefinition TableDefinition).map{|name| "ConnectionAdapters::#{name}"}
-      
+
       base_names.each do |base_name|
         ar_class = "ActiveRecord::#{base_name}".constantize
         sc_class = "SchemaComments::#{base_name}".constantize
@@ -31,13 +33,13 @@ module SchemaComments
           ar_class.__send__(:include, sc_class)
         end
       end
-      
+
       unless ActiveRecord::ConnectionAdapters::AbstractAdapter.ancestors.include?(SchemaComments::ConnectionAdapters::Adapter)
         ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
           include SchemaComments::ConnectionAdapters::Adapter
         end
       end
-      
+
       # %w(Mysql PostgreSQL SQLite3 SQLite Firebird DB2 Oracle Sybase Openbase Frontbase)
       %w(Mysql PostgreSQL SQLite3 SQLite).each do |adapter|
         begin
@@ -50,7 +52,7 @@ module SchemaComments
         end
       end
     end
-    
+
   end
 
 end

data/schema_comments.gemspec

@@ -1,121 +1,117 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{schema_comments}
-  s.version = "0.1.4"
+  s.name = "schema_comments"
+  s.version = "0.2.0.alpha1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["akimatter"]
-  s.date = %q{2010-04-14}
-  s.description = %q{schema_comments generates extra methods dynamically for attribute which has options}
-  s.email = %q{akm2000@gmail.com}
+  s.date = "2012-04-16"
+  s.description = "schema_comments generates extra methods dynamically for attribute which has options"
+  s.email = "akm2000@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE.txt",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "autotest/discover.rb",
-     "init.rb",
-     "lib/annotate_models.rb",
-     "lib/hash_key_orderable.rb",
-     "lib/schema_comments.rb",
-     "lib/schema_comments/base.rb",
-     "lib/schema_comments/connection_adapters.rb",
-     "lib/schema_comments/migration.rb",
-     "lib/schema_comments/migrator.rb",
-     "lib/schema_comments/schema.rb",
-     "lib/schema_comments/schema_comment.rb",
-     "lib/schema_comments/schema_dumper.rb",
-     "lib/schema_comments/task.rb",
-     "schema_comments.gemspec",
-     "spec/.gitignore",
-     "spec/annotate_models_spec.rb",
-     "spec/database.yml",
-     "spec/fixtures/.gitignore",
-     "spec/hash_key_orderable_spec.rb",
-     "spec/i18n_export_spec.rb",
-     "spec/migration_spec.rb",
-     "spec/migrations/valid/001_create_products.rb",
-     "spec/migrations/valid/002_rename_products.rb",
-     "spec/migrations/valid/003_rename_products_again.rb",
-     "spec/migrations/valid/004_remove_price.rb",
-     "spec/migrations/valid/005_change_products_name.rb",
-     "spec/migrations/valid/006_change_products_name_with_comment.rb",
-     "spec/migrations/valid/007_change_comments.rb",
-     "spec/migrations/valid/008_create_users_without_comment.rb",
-     "spec/rcov.opts",
-     "spec/resources/models/product.rb",
-     "spec/resources/models/product_name.rb",
-     "spec/schema.rb",
-     "spec/schema_comments/.gitignore",
-     "spec/schema_comments/connection_adapters_spec.rb",
-     "spec/schema_comments/schema_comment_spec.rb",
-     "spec/schema_comments/schema_comments_broken_column_comments.yml",
-     "spec/schema_comments/schema_comments_broken_column_hash.yml",
-     "spec/schema_comments/schema_comments_broken_table_comments.yml",
-     "spec/schema_comments/schema_comments_users_without_column_hash.yml",
-     "spec/schema_comments/schema_dumper_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/yaml_export_spec.rb",
-     "tasks/annotate_models_tasks.rake",
-     "tasks/schema_comments.rake"
-  ]
-  s.homepage = %q{http://github.com/akm/schema_comments}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{schema_comments generates extra methods dynamically}
-  s.test_files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "autotest/discover.rb",
+    "init.rb",
+    "lib/annotate_models.rb",
+    "lib/hash_key_orderable.rb",
+    "lib/schema_comments.rb",
+    "lib/schema_comments/base.rb",
+    "lib/schema_comments/connection_adapters.rb",
+    "lib/schema_comments/migration.rb",
+    "lib/schema_comments/migrator.rb",
+    "lib/schema_comments/schema.rb",
+    "lib/schema_comments/schema_comment.rb",
+    "lib/schema_comments/schema_dumper.rb",
+    "lib/schema_comments/task.rb",
+    "schema_comments.gemspec",
+    "spec/.gitignore",
     "spec/annotate_models_spec.rb",
-     "spec/hash_key_orderable_spec.rb",
-     "spec/i18n_export_spec.rb",
-     "spec/migration_spec.rb",
-     "spec/migrations/valid/001_create_products.rb",
-     "spec/migrations/valid/002_rename_products.rb",
-     "spec/migrations/valid/003_rename_products_again.rb",
-     "spec/migrations/valid/004_remove_price.rb",
-     "spec/migrations/valid/005_change_products_name.rb",
-     "spec/migrations/valid/006_change_products_name_with_comment.rb",
-     "spec/migrations/valid/007_change_comments.rb",
-     "spec/migrations/valid/008_create_users_without_comment.rb",
-     "spec/resources/models/product.rb",
-     "spec/resources/models/product_name.rb",
-     "spec/schema.rb",
-     "spec/schema_comments/connection_adapters_spec.rb",
-     "spec/schema_comments/schema_comment_spec.rb",
-     "spec/schema_comments/schema_dumper_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/yaml_export_spec.rb",
-     "spec/database.yml",
-     "spec/human_readable_schema_comments.yml",
-     "spec/schema_comments/schema_comments.yml",
-     "spec/schema_comments/schema_comments_broken_column_comments.yml",
-     "spec/schema_comments/schema_comments_broken_column_hash.yml",
-     "spec/schema_comments/schema_comments_broken_table_comments.yml",
-     "spec/schema_comments/schema_comments_users_without_column_hash.yml",
-     "spec/schema_comments.yml"
+    "spec/database.yml",
+    "spec/fake_app.rb",
+    "spec/fixtures/.gitignore",
+    "spec/hash_key_orderable_spec.rb",
+    "spec/i18n_export_spec.rb",
+    "spec/migration_spec.rb",
+    "spec/migrations/valid/001_create_products.rb",
+    "spec/migrations/valid/002_rename_products.rb",
+    "spec/migrations/valid/003_rename_products_again.rb",
+    "spec/migrations/valid/004_remove_price.rb",
+    "spec/migrations/valid/005_change_products_name.rb",
+    "spec/migrations/valid/006_change_products_name_with_comment.rb",
+    "spec/migrations/valid/007_change_comments.rb",
+    "spec/migrations/valid/008_create_users_without_comment.rb",
+    "spec/rcov.opts",
+    "spec/resources/models/product.rb",
+    "spec/resources/models/product_name.rb",
+    "spec/schema.rb",
+    "spec/schema_comments/.gitignore",
+    "spec/schema_comments/connection_adapters_spec.rb",
+    "spec/schema_comments/schema_comment_spec.rb",
+    "spec/schema_comments/schema_comments_broken_column_comments.yml",
+    "spec/schema_comments/schema_comments_broken_column_hash.yml",
+    "spec/schema_comments/schema_comments_broken_table_comments.yml",
+    "spec/schema_comments/schema_comments_users_without_column_hash.yml",
+    "spec/schema_comments/schema_dumper_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/yaml_export_spec.rb",
+    "tasks/annotate_models_tasks.rake",
+    "tasks/schema_comments.rake"
   ]
+  s.homepage = "http://github.com/akm/schema_comments"
+  s.licenses = ["Ruby License"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.15"
+  s.summary = "schema_comments generates extra methods dynamically"
+  s.test_files = ["spec/annotate_models_spec.rb", "spec/fake_app.rb", "spec/hash_key_orderable_spec.rb", "spec/i18n_export_spec.rb", "spec/migration_spec.rb", "spec/migrations/valid/001_create_products.rb", "spec/migrations/valid/002_rename_products.rb", "spec/migrations/valid/003_rename_products_again.rb", "spec/migrations/valid/004_remove_price.rb", "spec/migrations/valid/005_change_products_name.rb", "spec/migrations/valid/006_change_products_name_with_comment.rb", "spec/migrations/valid/007_change_comments.rb", "spec/migrations/valid/008_create_users_without_comment.rb", "spec/resources/models/product.rb", "spec/resources/models/product_name.rb", "spec/schema.rb", "spec/schema_comments/connection_adapters_spec.rb", "spec/schema_comments/schema_comment_spec.rb", "spec/schema_comments/schema_dumper_spec.rb", "spec/spec_helper.rb", "spec/yaml_export_spec.rb", "spec/database.yml", "spec/human_readable_schema_comments.yml", "spec/schema_comments/schema_comments.yml", "spec/schema_comments/schema_comments_broken_column_comments.yml", "spec/schema_comments/schema_comments_broken_column_hash.yml", "spec/schema_comments/schema_comments_broken_table_comments.yml", "spec/schema_comments/schema_comments_users_without_column_hash.yml", "spec/schema_comments.yml"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.1.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.1.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 2.8.1"])
+      s.add_development_dependency(%q<yard>, ["~> 0.7"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      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"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
+      s.add_dependency(%q<activerecord>, ["~> 3.1.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 2.8.1"])
+      s.add_dependency(%q<yard>, ["~> 0.7"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
+    s.add_dependency(%q<activerecord>, ["~> 3.1.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 2.8.1"])
+    s.add_dependency(%q<yard>, ["~> 0.7"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/spec/annotate_models_spec.rb

@@ -15,10 +15,10 @@ describe AnnotateModels do
     ActiveRecord::Base.connection.initialize_schema_migrations_table
     ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}"
   end
-  
+
   it "get_schema_info" do
     (ActiveRecord::Base.connection.tables - %w(schema_migrations)).should == []
-    
+
     ActiveRecord::Schema.define(:version => "20090721185959") do
       drop_table("books") rescue nil
 
@@ -52,5 +52,5 @@ describe AnnotateModels do
 # 
 }
   end
-  
+
 end

data/spec/fake_app.rb

@@ -0,0 +1,17 @@
+
+# see https://github.com/amatsuda/kaminari/blob/master/spec/fake_app.rb
+
+require 'active_record'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+
+# database
+ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+ActiveRecord::Base.establish_connection('test')
+
+# config
+app = Class.new(Rails::Application)
+app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
+app.config.session_store :cookie_store, :key => "_myapp_session"
+app.config.active_support.deprecation = :log
+app.initialize!

data/spec/hash_key_orderable_spec.rb

@@ -47,4 +47,4 @@ describe HashKeyOrderable do
     end
 
   end
-end   
+end

data/spec/i18n_export_spec.rb

@@ -13,32 +13,32 @@ describe SchemaComments::Base do
     ActiveRecord::Base.connection.initialize_schema_migrations_table
     ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}"
   end
-  
+
   it "test_valid_migration" do
     (ActiveRecord::Base.connection.tables - %w(schema_migrations)).should == []
-    
+
     migration_path = File.join(MIGRATIONS_ROOT, 'valid')
     Dir.glob('*.rb').each do |file|
       require(file) if /^\d+?_.*/ =~ file
     end
-    
+
     Product.reset_table_comments
     Product.reset_column_comments
 
     ActiveRecord::Migrator.up(migration_path, 1)
     ActiveRecord::Migrator.current_version.should == 1
-    
+
     ActiveRecord::Base.export_i18n_models.keys.include?('product').should == true
     ActiveRecord::Base.export_i18n_models['product'].should == '商品'
-    
+
     ActiveRecord::Base.export_i18n_attributes.keys.include?('product').should == true
     ActiveRecord::Base.export_i18n_attributes['product'].should == {
-          'product_type_cd' => '種別コード', 
+          'product_type_cd' => '種別コード',
           "price" => "価格",
           "name" => "商品名",
           "created_at" => "登録日時",
           "updated_at" => "更新日時"
         }
   end
-  
+
 end

data/spec/migrations/valid/001_create_products.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 class CreateProducts < ActiveRecord::Migration
-  
+
   def self.up
     create_table "products", :comment => '商品' do |t|
       t.string   "product_type_cd", :comment => '種別コード'

data/spec/schema_comments/connection_adapters_spec.rb

@@ -8,7 +8,7 @@ describe SchemaComments::ConnectionAdapters do
   before(:each) do
     SchemaComments.yaml_path = File.expand_path(File.join(File.dirname(__FILE__), 'schema_comments.yml'))
     FileUtils.rm(SchemaComments.yaml_path, :verbose => true) if File.exist?(SchemaComments.yaml_path)
-    
+
     (ActiveRecord::Base.connection.tables - IGNORED_TABLES).each do |t|
       ActiveRecord::Base.connection.drop_table(t) rescue nil
     end
@@ -16,31 +16,31 @@ describe SchemaComments::ConnectionAdapters do
     ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}"
 
     (ActiveRecord::Base.connection.tables - %w(schema_migrations)).should == []
-    
+
     migration_path = File.join(MIGRATIONS_ROOT, 'valid')
     Dir.glob('*.rb').each do |file|
       require(file) if /^\d+?_.*/ =~ file
     end
-    
+
     Product.reset_table_comments
     Product.reset_column_comments
-    
+
     ActiveRecord::Migrator.up(migration_path, 1)
     ActiveRecord::Migrator.current_version.should == 1
 
     ActiveRecord::Base.export_i18n_models.keys.include?('product').should == true
     ActiveRecord::Base.export_i18n_models['product'].should == '商品'
-    
+
     ActiveRecord::Base.export_i18n_attributes.keys.include?('product').should == true
     ActiveRecord::Base.export_i18n_attributes['product'].should == {
-      'product_type_cd' => '種別コード', 
+      'product_type_cd' => '種別コード',
       "price" => "価格",
       "name" => "商品名",
       "created_at" => "登録日時",
       "updated_at" => "更新日時"
     }
   end
-  
+
   describe SchemaComments::ConnectionAdapters::Column do
     describe :comment do
       it "should return comment" do

data/spec/schema_comments/schema_comment_spec.rb

@@ -8,7 +8,7 @@ describe SchemaComments::SchemaComment do
   before(:each) do
     SchemaComments.yaml_path = File.expand_path(File.join(File.dirname(__FILE__), 'schema_comments.yml'))
     FileUtils.rm(SchemaComments.yaml_path, :verbose => true) if File.exist?(SchemaComments.yaml_path)
-    
+
     (ActiveRecord::Base.connection.tables - IGNORED_TABLES).each do |t|
       ActiveRecord::Base.connection.drop_table(t) rescue nil
     end
@@ -45,7 +45,7 @@ describe SchemaComments::SchemaComment do
       ActiveRecord::Migrator.up(migration_path, 8)
       ActiveRecord::Migrator.current_version.should == 8
 
-      SchemaComments.yaml_path = 
+      SchemaComments.yaml_path =
         File.expand_path(File.join(
           File.dirname(__FILE__), "schema_comments_users_without_column_hash.yml"))
       SchemaComments::SchemaComment.yaml_access do |db|
@@ -64,7 +64,7 @@ describe SchemaComments::SchemaComment do
         ActiveRecord::Migrator.up(migration_path, 8)
         ActiveRecord::Migrator.current_version.should == 8
 
-        SchemaComments.yaml_path = 
+        SchemaComments.yaml_path =
           File.expand_path(File.join(
             File.dirname(__FILE__), "schema_comments_broken_#{broken_type}.yml"))
         lambda{
@@ -72,7 +72,7 @@ describe SchemaComments::SchemaComment do
         }.should raise_error(SchemaComments::YamlError)
       end
     end
-    
+
   end
 
 end

data/spec/schema_comments/schema_comments.yml

@@ -3,7 +3,8 @@ table_comments:
   products: "商品"
 column_comments: 
   products: 
-    product_type_cd: "カテゴリコード"
-    name: "商品名称"
+    product_type_cd: "種別コード"
+    price: "価格"
+    name: "商品名"
     created_at: "登録日時"
     updated_at: "更新日時"

data/spec/schema_comments/schema_dumper_spec.rb

@@ -8,14 +8,14 @@ describe ActiveRecord::SchemaDumper do
   before(:each) do
     SchemaComments.yaml_path = File.expand_path(File.join(File.dirname(__FILE__), 'schema_comments.yml'))
     FileUtils.rm(SchemaComments.yaml_path, :verbose => true) if File.exist?(SchemaComments.yaml_path)
-    
+
     (ActiveRecord::Base.connection.tables - IGNORED_TABLES).each do |t|
       ActiveRecord::Base.connection.drop_table(t) rescue nil
     end
     ActiveRecord::Base.connection.initialize_schema_migrations_table
     ActiveRecord::Base.connection.execute "DELETE FROM #{ActiveRecord::Migrator.schema_migrations_table_name}"
   end
-  
+
   describe :dump do
     it "products" do
       (ActiveRecord::Base.connection.tables - %w(schema_migrations)).should == []
@@ -34,7 +34,7 @@ describe ActiveRecord::SchemaDumper do
 
       ActiveRecord::Base.export_i18n_attributes.keys.include?('product').should == true
       ActiveRecord::Base.export_i18n_attributes['product'].should == {
-        'product_type_cd' => '種別コード', 
+        'product_type_cd' => '種別コード',
         "price" => "価格",
         "name" => "商品名",
         "created_at" => "登録日時",
@@ -45,13 +45,15 @@ describe ActiveRecord::SchemaDumper do
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, dest)
       dest.rewind
       dest.read.should == <<EOS
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended to check this file into your version control system.