schema_comments 0.2.0.alpha5 → 0.2.0

data/spec/annotate_models_spec.rb

@@ -34,6 +34,13 @@ describe AnnotateModels do
     class Book < ActiveRecord::Base
     end
 
+puts "ActiveRecord::Base.connection.adapter_name: #{ActiveRecord::Base.connection.adapter_name.inspect}"
+
+    int_expr =
+      case ActiveRecord::Base.connection.adapter_name
+      when /mysql/i then ":integer(4)"
+      else               ":integer   "
+      end
 
     AnnotateModels.get_schema_info(Book).should == %{# == Schema Info ==
 # 
@@ -41,9 +48,9 @@ describe AnnotateModels do
 #
 # Table name: books # 書籍
 #
-#  id         :integer         not null, primary key
+#  id         #{int_expr}      not null, primary key
 #  title      :string(100)     not null               # タイトル
-#  size       :integer         not null, default(1)   # 判型
+#  size       #{int_expr}      not null, default(1)   # 判型
 #  price      :decimal(17, 14) not null, default(0.0) # 価格
 #  created_at :datetime                               # 登録日時
 #  updated_at :datetime                               # 更新日時

data/spec/database.yml

@@ -1,13 +1,15 @@
-sqlite:
-  :adapter: sqlite
-  :dbfile: schema_comments_test.sqlite.db
 sqlite3:
   :adapter: sqlite3
-  :database: schema_comments_test.sqlite3.db
+  :database: ":memory:"
 mysql:
   adapter: mysql
   encoding: utf8
   username: root
   password:
-  socket: /opt/local/var/run/mysql5/mysqld.sock
-  database: schema_comments_test
+  database: schema_comments_mysql_test
+mysql2:
+  adapter: mysql2
+  encoding: utf8
+  username: root
+  password:
+  database: schema_comments_mysql2_test

data/spec/fake_app.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 # see https://github.com/amatsuda/kaminari/blob/master/spec/fake_app.rb
 
@@ -6,8 +7,28 @@ require 'action_controller/railtie'
 require 'action_view/railtie'
 
 # database
-ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
-ActiveRecord::Base.establish_connection('test')
+db_name = ENV['DB'] || 'sqlite3'
+configs = YAML.load_file(File.expand_path("../database.yml", __FILE__))
+config = configs[db_name]
+
+def mysql_creation_options(config)
+  @charset   = ENV['CHARSET']   || 'utf8'
+  @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
+  {:charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation)}
+end
+
+case db_name
+when /mysql/ then
+  ActiveRecord::Base.establish_connection(config.merge('database' => nil))
+  begin
+    ActiveRecord::Base.connection.create_database(config['database'], mysql_creation_options(config))
+  rescue ActiveRecord::StatementInvalid => e
+    raise e unless e.message =~ /^Mysql2?::Error: Can't create database|^ActiveRecord::JDBCError: Can't create database/
+  end
+end
+
+ActiveRecord::Base.configurations = configs
+ActiveRecord::Base.establish_connection( db_name )
 
 # config
 app = Class.new(Rails::Application)

data/spec/human_readable_schema_comments.yml

@@ -1,14 +1,14 @@
---- 
-table_comments: 
-  addresses: "住所"
-  emails: "メール"
-  person: "人"
-column_comments: 
-  addresses: 
-    person_id: "人"
-    descriptions: "記述"
-  emails: 
-    person_id: "人"
-    address: "アドレス"
-  person: 
-    name: "名前"
+---
+table_comments:
+  addresses: 住所
+  emails: メール
+  person: 人
+column_comments:
+  addresses:
+    person_id: 人
+    descriptions: 記述
+  emails:
+    person_id: 人
+    address: アドレス
+  person:
+    name: 名前

data/spec/schema_comments.yml

@@ -1,9 +1,9 @@
---- 
-table_comments: 
-  products: "商品"
-column_comments: 
-  products: 
-    product_type_cd: "カテゴリコード"
-    name: "商品名称"
-    created_at: "登録日時"
-    updated_at: "更新日時"
+---
+table_comments:
+  products: 商品
+column_comments:
+  products:
+    product_type_cd: カテゴリコード
+    name: 商品名称
+    created_at: 登録日時
+    updated_at: 更新日時

data/spec/schema_comments/connection_adapters_spec.rb

@@ -3,8 +3,6 @@ require File.join(File.dirname(__FILE__), '../spec_helper')
 
 describe SchemaComments::ConnectionAdapters do
 
-  IGNORED_TABLES = %w(schema_migrations)
-
   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)

data/spec/schema_comments/schema_comment_spec.rb

@@ -3,8 +3,6 @@ require File.join(File.dirname(__FILE__), '../spec_helper')
 
 describe SchemaComments::SchemaComment do
 
-  IGNORED_TABLES = %w(schema_migrations)
-
   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)

data/spec/schema_comments/schema_comments.yml

@@ -1,10 +1,10 @@
---- 
-table_comments: 
-  products: "商品"
-column_comments: 
-  products: 
-    product_type_cd: "種別コード"
-    price: "価格"
-    name: "商品名"
-    created_at: "登録日時"
-    updated_at: "更新日時"
+---
+table_comments:
+  products: 商品
+column_comments:
+  products:
+    product_type_cd: 種別コード
+    price: 価格
+    name: 商品名
+    created_at: 登録日時
+    updated_at: 更新日時

data/spec/schema_comments/schema_comments_users_without_column_hash.yml

@@ -1,10 +1,10 @@
---- 
-table_comments: 
-  products: "商品"
-column_comments: 
-  products: 
-    product_type_cd: "カテゴリコード"
-    name: "商品名"
-    created_at: "登録日時"
-    updated_at: "更新日時"
+---
+table_comments:
+  products: 商品
+column_comments:
+  products:
+    product_type_cd: カテゴリコード
+    name: 商品名
+    created_at: 登録日時
+    updated_at: 更新日時
   users: 

data/spec/schema_comments/schema_dumper_spec.rb

@@ -3,8 +3,6 @@ require File.join(File.dirname(__FILE__), '../spec_helper')
 
 describe ActiveRecord::SchemaDumper do
 
-  IGNORED_TABLES = %w(schema_migrations)
-
   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)
@@ -42,9 +40,10 @@ describe ActiveRecord::SchemaDumper do
       }
 
       dest = StringIO.new
-      ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, dest)
+      # ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, dest)
+      SchemaComments::SchemaDumper.dump(ActiveRecord::Base.connection, dest)
       dest.rewind
-      dest.read.should == <<EOS
+      s = <<EOS
 # 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
@@ -61,15 +60,32 @@ describe ActiveRecord::SchemaDumper do
 ActiveRecord::Schema.define(:version => 1) do
 
   create_table "products", :force => true, :comment => '商品' do |t|
+EOS
+
+      if ENV['DB'] =~ /mysql/i
+        s << <<EOS
+    #t.column "id",              "int(11)",      :null => false, :comment => "AUTO_INCREMENT PRIMARY KEY by rails"
+    t.column "product_type_cd", "varchar(255)",                 :comment => "種別コード"
+    t.column "price",           "int(11)",                      :comment => "価格"
+    t.column "name",            "varchar(255)",                 :comment => "商品名"
+    t.column "created_at",      "datetime",                     :comment => "登録日時"
+    t.column "updated_at",      "datetime",                     :comment => "更新日時"
+EOS
+      else
+        s << <<EOS
     t.string   "product_type_cd", :comment => "種別コード"
     t.integer  "price",           :comment => "価格"
     t.string   "name",            :comment => "商品名"
     t.datetime "created_at",      :comment => "登録日時"
     t.datetime "updated_at",      :comment => "更新日時"
+EOS
+      end
+      s << <<EOS
   end
 
 end
 EOS
+      dest.read.should == s
     end
 
   end

data/spec/spec_helper.rb

@@ -1,19 +1,30 @@
+if ENV["COVERAGE"] and not(ENV["COVERAGE"].empty?)
+  require "simplecov"
+  SimpleCov.start
+end
+
+ENV['DB'] ||= 'sqlite3'
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'rails'
 require 'schema_comments'
 # require 'database_cleaner'
+SchemaComments.yaml_path = File.expand_path("schema_comments.yml", File.dirname(__FILE__))
 
 # Ensure we use 'syck' instead of 'psych' in 1.9.2
 # RubyGems >= 1.5.0 uses 'psych' on 1.9.2, but
 # Psych does not yet support YAML 1.1 merge keys.
 # Merge keys is often used in mongoid.yml
 # See: http://redmine.ruby-lang.org/issues/show/4300
-if RUBY_VERSION >= '1.9.2'
-  YAML::ENGINE.yamler = 'syck'
-end
-require 'yaml_waml'
+# if RUBY_VERSION >= '1.9.2'
+
+# if defined?(YAML::ENGINE) && YAML::ENGINE.respond_to?(:yamler=)
+#   YAML::ENGINE.yamler = 'syck'
+# end
+
+# require 'yaml_waml'
 
 require 'fake_app'
 
@@ -23,6 +34,7 @@ require 'rspec/rails'
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
+
 RSpec.configure do |config|
 
   %w(resources/models).each do |path|
@@ -38,3 +50,4 @@ end
 
 MIGRATIONS_ROOT = File.join(File.dirname(__FILE__), 'migrations')
 
+IGNORED_TABLES = %w(schema_migrations)

data/spec/yaml_export_spec.rb

@@ -34,18 +34,18 @@ describe SchemaComments::SchemaComment do
     File.read(SchemaComments.yaml_path).split(/$/).map(&:strip).should == %{
 ---
 table_comments:
-  addresses: "住所"
-  emails: "メール"
-  person: "人"
+  addresses: 住所
+  emails: メール
+  person: 人
 column_comments:
   addresses:
-    person_id: "人"
-    descriptions: "記述"
+    person_id: 人
+    descriptions: 記述
   emails:
-    person_id: "人"
-    address: "アドレス"
+    person_id: 人
+    address: アドレス
   person:
-    name: "名前"
+    name: 名前
 }.split(/$/).map(&:strip)
   end
 

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: schema_comments
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha5
-  prerelease: 6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - akimatter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168170080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168170080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2168169580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,76 +37,95 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168169580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2168185480 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168185480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &2168184960 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168184960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2168184480 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *2168184480
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &2168183960 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: *2168183960
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2168183440 !ruby/object:Gem::Requirement
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.10.1
   type: :development
   prerelease: false
-  version_requirements: *2168183440
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2168182960 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.10.1
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168182960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2168182480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168182480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: ZenTest
-  requirement: &2168181980 !ruby/object:Gem::Requirement
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +149,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168181980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.8.3
 description: schema_comments generates extra methods dynamically for attribute which
   has options
 email: akm2000@gmail.com
@@ -135,26 +185,24 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
-- Rakefile
 - VERSION
 - 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/mysql.rb
 - lib/schema_comments/schema_dumper.rb
 - lib/schema_comments/task.rb
-- schema_comments.gemspec
-- spec/.gitignore
+- lib/schema_comments.rb
+- tasks/annotate_models_tasks.rake
+- tasks/schema_comments.rake
 - spec/annotate_models_spec.rb
-- 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
@@ -166,25 +214,21 @@ files:
 - 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
+- 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
 homepage: http://github.com/akm/schema_comments
 licenses:
@@ -201,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -464680538847567695
+      hash: -2176134516294785649
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -210,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: schema_comments generates extra methods dynamically