schema_comments 0.2.0.alpha1 → 0.2.0.alpha2
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +3 -4
- data/Gemfile.lock +40 -42
- data/VERSION +1 -1
- data/lib/schema_comments/base.rb +2 -1
- data/schema_comments.gemspec +7 -7
- data/tasks/schema_comments.rake +24 -23
- metadata +24 -24
data/Gemfile
CHANGED
@@ -1,11 +1,10 @@
|
|
1
1
|
source "http://rubygems.org"
|
2
2
|
|
3
|
-
gem "activesupport", "
|
4
|
-
gem "activerecord", "
|
5
|
-
|
3
|
+
gem "activesupport", ">= 3.0.0"
|
4
|
+
gem "activerecord", ">= 3.0.0"
|
6
5
|
|
7
6
|
group :test do
|
8
|
-
gem "rails", "
|
7
|
+
gem "rails", ">= 3.0.0"
|
9
8
|
gem "sqlite3"
|
10
9
|
gem "yaml_waml"
|
11
10
|
end
|
data/Gemfile.lock
CHANGED
@@ -1,35 +1,34 @@
|
|
1
1
|
GEM
|
2
2
|
remote: http://rubygems.org/
|
3
3
|
specs:
|
4
|
-
actionmailer (3.
|
5
|
-
actionpack (= 3.
|
6
|
-
mail (~> 2.
|
7
|
-
actionpack (3.
|
8
|
-
activemodel (= 3.
|
9
|
-
activesupport (= 3.
|
4
|
+
actionmailer (3.2.3)
|
5
|
+
actionpack (= 3.2.3)
|
6
|
+
mail (~> 2.4.4)
|
7
|
+
actionpack (3.2.3)
|
8
|
+
activemodel (= 3.2.3)
|
9
|
+
activesupport (= 3.2.3)
|
10
10
|
builder (~> 3.0.0)
|
11
11
|
erubis (~> 2.7.0)
|
12
|
-
|
13
|
-
rack (~> 1.
|
14
|
-
rack-cache (~> 1.
|
15
|
-
rack-mount (~> 0.8.2)
|
12
|
+
journey (~> 1.0.1)
|
13
|
+
rack (~> 1.4.0)
|
14
|
+
rack-cache (~> 1.2)
|
16
15
|
rack-test (~> 0.6.1)
|
17
|
-
sprockets (~> 2.
|
18
|
-
activemodel (3.
|
19
|
-
activesupport (= 3.
|
16
|
+
sprockets (~> 2.1.2)
|
17
|
+
activemodel (3.2.3)
|
18
|
+
activesupport (= 3.2.3)
|
20
19
|
builder (~> 3.0.0)
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
arel (~> 2.2.3)
|
20
|
+
activerecord (3.2.3)
|
21
|
+
activemodel (= 3.2.3)
|
22
|
+
activesupport (= 3.2.3)
|
23
|
+
arel (~> 3.0.2)
|
26
24
|
tzinfo (~> 0.3.29)
|
27
|
-
activeresource (3.
|
28
|
-
activemodel (= 3.
|
29
|
-
activesupport (= 3.
|
30
|
-
activesupport (3.
|
25
|
+
activeresource (3.2.3)
|
26
|
+
activemodel (= 3.2.3)
|
27
|
+
activesupport (= 3.2.3)
|
28
|
+
activesupport (3.2.3)
|
29
|
+
i18n (~> 0.6)
|
31
30
|
multi_json (~> 1.0)
|
32
|
-
arel (
|
31
|
+
arel (3.0.2)
|
33
32
|
builder (3.0.0)
|
34
33
|
diff-lcs (1.1.3)
|
35
34
|
erubis (2.7.0)
|
@@ -41,34 +40,33 @@ GEM
|
|
41
40
|
git (>= 1.2.5)
|
42
41
|
rake
|
43
42
|
rdoc
|
43
|
+
journey (1.0.3)
|
44
44
|
json (1.6.6)
|
45
|
-
mail (2.
|
45
|
+
mail (2.4.4)
|
46
46
|
i18n (>= 0.4.0)
|
47
47
|
mime-types (~> 1.16)
|
48
48
|
treetop (~> 1.4.8)
|
49
49
|
mime-types (1.18)
|
50
|
-
multi_json (1.
|
50
|
+
multi_json (1.3.0)
|
51
51
|
polyglot (0.3.3)
|
52
|
-
rack (1.
|
52
|
+
rack (1.4.1)
|
53
53
|
rack-cache (1.2)
|
54
54
|
rack (>= 0.4)
|
55
|
-
rack-mount (0.8.3)
|
56
|
-
rack (>= 1.0.0)
|
57
55
|
rack-ssl (1.3.2)
|
58
56
|
rack
|
59
57
|
rack-test (0.6.1)
|
60
58
|
rack (>= 1.0)
|
61
|
-
rails (3.
|
62
|
-
actionmailer (= 3.
|
63
|
-
actionpack (= 3.
|
64
|
-
activerecord (= 3.
|
65
|
-
activeresource (= 3.
|
66
|
-
activesupport (= 3.
|
59
|
+
rails (3.2.3)
|
60
|
+
actionmailer (= 3.2.3)
|
61
|
+
actionpack (= 3.2.3)
|
62
|
+
activerecord (= 3.2.3)
|
63
|
+
activeresource (= 3.2.3)
|
64
|
+
activesupport (= 3.2.3)
|
67
65
|
bundler (~> 1.0)
|
68
|
-
railties (= 3.
|
69
|
-
railties (3.
|
70
|
-
actionpack (= 3.
|
71
|
-
activesupport (= 3.
|
66
|
+
railties (= 3.2.3)
|
67
|
+
railties (3.2.3)
|
68
|
+
actionpack (= 3.2.3)
|
69
|
+
activesupport (= 3.2.3)
|
72
70
|
rack-ssl (~> 1.3.2)
|
73
71
|
rake (>= 0.8.7)
|
74
72
|
rdoc (~> 3.4)
|
@@ -93,7 +91,7 @@ GEM
|
|
93
91
|
multi_json (~> 1.0)
|
94
92
|
simplecov-html (~> 0.5.3)
|
95
93
|
simplecov-html (0.5.3)
|
96
|
-
sprockets (2.
|
94
|
+
sprockets (2.1.2)
|
97
95
|
hike (~> 1.2)
|
98
96
|
rack (~> 1.0)
|
99
97
|
tilt (~> 1.1, != 1.3.0)
|
@@ -111,11 +109,11 @@ PLATFORMS
|
|
111
109
|
ruby
|
112
110
|
|
113
111
|
DEPENDENCIES
|
114
|
-
activerecord (
|
115
|
-
activesupport (
|
112
|
+
activerecord (>= 3.0.0)
|
113
|
+
activesupport (>= 3.0.0)
|
116
114
|
bundler (~> 1.0.0)
|
117
115
|
jeweler (~> 1.8.3)
|
118
|
-
rails (
|
116
|
+
rails (>= 3.0.0)
|
119
117
|
rdoc (~> 3.12)
|
120
118
|
rspec (~> 2.8.0)
|
121
119
|
rspec-rails (~> 2.8.1)
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.2.0.
|
1
|
+
0.2.0.alpha2
|
data/lib/schema_comments/base.rb
CHANGED
@@ -6,6 +6,7 @@ module SchemaComments
|
|
6
6
|
alias :columns_without_schema_comments :columns
|
7
7
|
alias :columns :columns_with_schema_comments
|
8
8
|
end
|
9
|
+
mod.ignore_pattern_to_export_i18n = /\[.*\]/
|
9
10
|
end
|
10
11
|
|
11
12
|
module ClassMethods
|
@@ -33,7 +34,7 @@ module SchemaComments
|
|
33
34
|
@table_comment = nil
|
34
35
|
end
|
35
36
|
|
36
|
-
|
37
|
+
attr_accessor :ignore_pattern_to_export_i18n
|
37
38
|
|
38
39
|
def export_i18n_models
|
39
40
|
subclasses = ActiveRecord::Base.send(:subclasses).select do |klass|
|
data/schema_comments.gemspec
CHANGED
@@ -5,7 +5,7 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "schema_comments"
|
8
|
-
s.version = "0.2.0.
|
8
|
+
s.version = "0.2.0.alpha2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["akimatter"]
|
@@ -82,8 +82,8 @@ Gem::Specification.new do |s|
|
|
82
82
|
s.specification_version = 3
|
83
83
|
|
84
84
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
85
|
-
s.add_runtime_dependency(%q<activesupport>, ["
|
86
|
-
s.add_runtime_dependency(%q<activerecord>, ["
|
85
|
+
s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
|
86
|
+
s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
|
87
87
|
s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
|
88
88
|
s.add_development_dependency(%q<rspec-rails>, ["~> 2.8.1"])
|
89
89
|
s.add_development_dependency(%q<yard>, ["~> 0.7"])
|
@@ -92,8 +92,8 @@ Gem::Specification.new do |s|
|
|
92
92
|
s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
|
93
93
|
s.add_development_dependency(%q<simplecov>, [">= 0"])
|
94
94
|
else
|
95
|
-
s.add_dependency(%q<activesupport>, ["
|
96
|
-
s.add_dependency(%q<activerecord>, ["
|
95
|
+
s.add_dependency(%q<activesupport>, [">= 3.0.0"])
|
96
|
+
s.add_dependency(%q<activerecord>, [">= 3.0.0"])
|
97
97
|
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
|
98
98
|
s.add_dependency(%q<rspec-rails>, ["~> 2.8.1"])
|
99
99
|
s.add_dependency(%q<yard>, ["~> 0.7"])
|
@@ -103,8 +103,8 @@ Gem::Specification.new do |s|
|
|
103
103
|
s.add_dependency(%q<simplecov>, [">= 0"])
|
104
104
|
end
|
105
105
|
else
|
106
|
-
s.add_dependency(%q<activesupport>, ["
|
107
|
-
s.add_dependency(%q<activerecord>, ["
|
106
|
+
s.add_dependency(%q<activesupport>, [">= 3.0.0"])
|
107
|
+
s.add_dependency(%q<activerecord>, [">= 3.0.0"])
|
108
108
|
s.add_dependency(%q<rspec>, ["~> 2.8.0"])
|
109
109
|
s.add_dependency(%q<rspec-rails>, ["~> 2.8.1"])
|
110
110
|
s.add_dependency(%q<yard>, ["~> 0.7"])
|
data/tasks/schema_comments.rake
CHANGED
@@ -15,7 +15,7 @@ namespace :db do
|
|
15
15
|
Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
|
16
16
|
end
|
17
17
|
end
|
18
|
-
|
18
|
+
|
19
19
|
Rake.application.send(:eval, "@tasks.delete('db:rollback')")
|
20
20
|
desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
|
21
21
|
task :rollback => :environment do
|
@@ -58,7 +58,7 @@ namespace :db do
|
|
58
58
|
SchemaComments::SchemaComment.yaml_access do
|
59
59
|
SchemaComments.quiet = true
|
60
60
|
if defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
|
61
|
-
Rake::Task[{ :sql => "db:test:clone_structure", :ruby => "db:test:load"
|
61
|
+
Rake::Task[{ :sql => "db:test:clone_structure", :ruby => "db:test:load"
|
62
62
|
}[ActiveRecord::Base.schema_format]].invoke
|
63
63
|
end
|
64
64
|
end
|
@@ -71,8 +71,9 @@ end
|
|
71
71
|
|
72
72
|
class ActiveRecord::Base
|
73
73
|
class << self
|
74
|
-
|
75
|
-
|
74
|
+
attr_accessor :ignore_pattern_to_export_i18n
|
75
|
+
self.ignore_pattern_to_export_i18n = /\(\(\(.*\)\)\)/
|
76
|
+
|
76
77
|
def export_i18n_models
|
77
78
|
subclasses = ActiveRecord::Base.send(:subclasses).select do |klass|
|
78
79
|
(klass != SchemaComments::SchemaComment) and
|
@@ -87,18 +88,18 @@ class ActiveRecord::Base
|
|
87
88
|
d[model_name] = comment
|
88
89
|
d
|
89
90
|
end
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
91
|
+
result.instance_eval do
|
92
|
+
def each_with_order(*args, &block)
|
93
|
+
self.keys.sort.each do |key|
|
94
|
+
yield(key, self[key])
|
95
|
+
end
|
96
|
+
end
|
97
|
+
alias :each_without_order :each
|
98
|
+
alias :each :each_with_order
|
99
|
+
end
|
100
|
+
result
|
100
101
|
end
|
101
|
-
|
102
|
+
|
102
103
|
def export_i18n_attributes
|
103
104
|
subclasses = ActiveRecord::Base.send(:subclasses).select do |klass|
|
104
105
|
(klass != SchemaComments::SchemaComment) and
|
@@ -116,7 +117,7 @@ class ActiveRecord::Base
|
|
116
117
|
comment.gsub!(/\[\[\[.*?\]\]\]/)
|
117
118
|
attrs[attr_name] = comment
|
118
119
|
end
|
119
|
-
|
120
|
+
|
120
121
|
column_names = m.columns.map(&:name) - ['id']
|
121
122
|
column_order_modeule = Module.new do
|
122
123
|
def each_with_column_order(*args, &block)
|
@@ -124,7 +125,7 @@ class ActiveRecord::Base
|
|
124
125
|
yield(column_name, self[column_name])
|
125
126
|
end
|
126
127
|
end
|
127
|
-
|
128
|
+
|
128
129
|
def self.extended(obj)
|
129
130
|
obj.instance_eval do
|
130
131
|
alias :each_without_column_order :each
|
@@ -134,13 +135,13 @@ class ActiveRecord::Base
|
|
134
135
|
end
|
135
136
|
attrs.instance_variable_set(:@column_names, column_names)
|
136
137
|
attrs.extend(column_order_modeule)
|
137
|
-
|
138
|
+
|
138
139
|
# テーブル名(複数形)をモデル名(単数形)に
|
139
140
|
model_name = ((m.table_comment || '').scan(/\[\[\[(?:model|class)(?:_name)?:\s*?([^\s]+?)\s*?\]\]\]/).flatten.first || m.name).underscore
|
140
141
|
d[model_name] = attrs
|
141
142
|
d
|
142
143
|
end
|
143
|
-
|
144
|
+
|
144
145
|
result.instance_eval do
|
145
146
|
def each_with_order(*args, &block)
|
146
147
|
self.keys.sort.each do |key|
|
@@ -162,28 +163,28 @@ namespace :i18n do
|
|
162
163
|
require file_name
|
163
164
|
end
|
164
165
|
end
|
165
|
-
|
166
|
+
|
166
167
|
desc "Export i18n model resources from schema_comments. you can set locale with environment variable LOCALE"
|
167
168
|
task :export_models => :"i18n:schema_comments:load_all_models" do
|
168
169
|
locale = (ENV['LOCALE'] || I18n.locale).to_s
|
169
170
|
obj = {locale => {'activerecord' => {'models' => ActiveRecord::Base.export_i18n_models}}}
|
170
171
|
puts YAML.dump(obj)
|
171
172
|
end
|
172
|
-
|
173
|
+
|
173
174
|
desc "Export i18n attributes resources from schema_comments. you can set locale with environment variable LOCALE"
|
174
175
|
task :export_attributes => :"i18n:schema_comments:load_all_models" do
|
175
176
|
locale = (ENV['LOCALE'] || I18n.locale).to_s
|
176
177
|
obj = {locale => {'activerecord' => {'attributes' => ActiveRecord::Base.export_i18n_attributes}}}
|
177
178
|
puts YAML.dump(obj)
|
178
179
|
end
|
179
|
-
|
180
|
+
|
180
181
|
desc "update i18n YAML. you can set locale with environment variable LOCALE"
|
181
182
|
task :update_config_locale => :"i18n:schema_comments:load_all_models" do
|
182
183
|
require 'yaml/store'
|
183
184
|
locale = (ENV['LOCALE'] || I18n.locale).to_s
|
184
185
|
path = (ENV['YAML_PATH'] || File.join(RAILS_ROOT, "config/locales/#{locale}.yml"))
|
185
186
|
print "updating #{path}..."
|
186
|
-
|
187
|
+
|
187
188
|
begin
|
188
189
|
db = YAML::Store.new(path)
|
189
190
|
db.transaction do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: schema_comments
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.0.
|
4
|
+
version: 0.2.0.alpha2
|
5
5
|
prerelease: 6
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,29 +13,29 @@ date: 2012-04-16 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activesupport
|
16
|
-
requirement: &
|
16
|
+
requirement: &2158918000 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
|
-
- -
|
19
|
+
- - ! '>='
|
20
20
|
- !ruby/object:Gem::Version
|
21
|
-
version: 3.
|
21
|
+
version: 3.0.0
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *2158918000
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: activerecord
|
27
|
-
requirement: &
|
27
|
+
requirement: &2158916980 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
|
-
- -
|
30
|
+
- - ! '>='
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: 3.
|
32
|
+
version: 3.0.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *2158916980
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: rspec
|
38
|
-
requirement: &
|
38
|
+
requirement: &2158916160 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 2.8.0
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *2158916160
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: rspec-rails
|
49
|
-
requirement: &
|
49
|
+
requirement: &2158915500 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 2.8.1
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *2158915500
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: yard
|
60
|
-
requirement: &
|
60
|
+
requirement: &2158915020 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ~>
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0.7'
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *2158915020
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: rdoc
|
71
|
-
requirement: &
|
71
|
+
requirement: &2158974440 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ~>
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '3.12'
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *2158974440
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: bundler
|
82
|
-
requirement: &
|
82
|
+
requirement: &2158973900 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ~>
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: 1.0.0
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *2158973900
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: jeweler
|
93
|
-
requirement: &
|
93
|
+
requirement: &2158973420 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ~>
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: 1.8.3
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *2158973420
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: simplecov
|
104
|
-
requirement: &
|
104
|
+
requirement: &2158972860 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,7 +109,7 @@ dependencies:
|
|
109
109
|
version: '0'
|
110
110
|
type: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *2158972860
|
113
113
|
description: schema_comments generates extra methods dynamically for attribute which
|
114
114
|
has options
|
115
115
|
email: akm2000@gmail.com
|
@@ -190,7 +190,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
190
190
|
version: '0'
|
191
191
|
segments:
|
192
192
|
- 0
|
193
|
-
hash:
|
193
|
+
hash: -3771409335729466144
|
194
194
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
195
195
|
none: false
|
196
196
|
requirements:
|