activerecord 3.0.11 → 3.0.12.rc1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of activerecord might be problematic. Click here for more details.

@@ -1439,7 +1439,7 @@ module ActiveRecord
1439
1439
 
1440
1440
  if association.nil? || force_reload
1441
1441
  association = association_proxy_class.new(self, reflection)
1442
- retval = force_reload ? reflection.klass.uncached { association.reload } : association.load
1442
+ retval = force_reload ? reflection.klass.uncached { association.reload } : association._load
1443
1443
  if retval.nil? and association_proxy_class == BelongsToAssociation
1444
1444
  association_instance_set(reflection.name, nil)
1445
1445
  return nil
@@ -113,7 +113,7 @@ module ActiveRecord
113
113
  end
114
114
 
115
115
  # Loads the \target if not already loaded. Returns +self+ if the \target is present.
116
- def load
116
+ def _load
117
117
  load_target unless loaded?
118
118
  self unless @target.nil?
119
119
  end
@@ -121,7 +121,7 @@ module ActiveRecord
121
121
  # Reloads the \target and returns +self+ on success.
122
122
  def reload
123
123
  reset
124
- load
124
+ _load
125
125
  end
126
126
 
127
127
  # Has the \target been already \loaded?
@@ -2,8 +2,8 @@ module ActiveRecord
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 3
4
4
  MINOR = 0
5
- TINY = 11
6
- PRE = nil
5
+ TINY = 12
6
+ PRE = "rc1"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
9
9
  end
metadata CHANGED
@@ -1,13 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: activerecord
3
3
  version: !ruby/object:Gem::Version
4
- hash: 17
5
- prerelease:
4
+ hash: 15424023
5
+ prerelease: 7
6
6
  segments:
7
7
  - 3
8
8
  - 0
9
- - 11
10
- version: 3.0.11
9
+ - 12
10
+ - rc
11
+ - 1
12
+ version: 3.0.12.rc1
11
13
  platform: ruby
12
14
  authors:
13
15
  - David Heinemeier Hansson
@@ -15,45 +17,48 @@ autorequire:
15
17
  bindir: bin
16
18
  cert_chain: []
17
19
 
18
- date: 2011-11-18 00:00:00 Z
20
+ date: 2012-02-22 00:00:00 Z
19
21
  dependencies:
20
22
  - !ruby/object:Gem::Dependency
21
23
  name: activesupport
22
- type: :runtime
23
24
  prerelease: false
24
- version_requirements: &id001 !ruby/object:Gem::Requirement
25
+ requirement: &id001 !ruby/object:Gem::Requirement
25
26
  none: false
26
27
  requirements:
27
28
  - - "="
28
29
  - !ruby/object:Gem::Version
29
- hash: 17
30
+ hash: 15424023
30
31
  segments:
31
32
  - 3
32
33
  - 0
33
- - 11
34
- version: 3.0.11
35
- requirement: *id001
34
+ - 12
35
+ - rc
36
+ - 1
37
+ version: 3.0.12.rc1
38
+ type: :runtime
39
+ version_requirements: *id001
36
40
  - !ruby/object:Gem::Dependency
37
41
  name: activemodel
38
- type: :runtime
39
42
  prerelease: false
40
- version_requirements: &id002 !ruby/object:Gem::Requirement
43
+ requirement: &id002 !ruby/object:Gem::Requirement
41
44
  none: false
42
45
  requirements:
43
46
  - - "="
44
47
  - !ruby/object:Gem::Version
45
- hash: 17
48
+ hash: 15424023
46
49
  segments:
47
50
  - 3
48
51
  - 0
49
- - 11
50
- version: 3.0.11
51
- requirement: *id002
52
+ - 12
53
+ - rc
54
+ - 1
55
+ version: 3.0.12.rc1
56
+ type: :runtime
57
+ version_requirements: *id002
52
58
  - !ruby/object:Gem::Dependency
53
59
  name: arel
54
- type: :runtime
55
60
  prerelease: false
56
- version_requirements: &id003 !ruby/object:Gem::Requirement
61
+ requirement: &id003 !ruby/object:Gem::Requirement
57
62
  none: false
58
63
  requirements:
59
64
  - - ~>
@@ -64,12 +69,12 @@ dependencies:
64
69
  - 0
65
70
  - 10
66
71
  version: 2.0.10
67
- requirement: *id003
72
+ type: :runtime
73
+ version_requirements: *id003
68
74
  - !ruby/object:Gem::Dependency
69
75
  name: tzinfo
70
- type: :runtime
71
76
  prerelease: false
72
- version_requirements: &id004 !ruby/object:Gem::Requirement
77
+ requirement: &id004 !ruby/object:Gem::Requirement
73
78
  none: false
74
79
  requirements:
75
80
  - - ~>
@@ -80,7 +85,8 @@ dependencies:
80
85
  - 3
81
86
  - 23
82
87
  version: 0.3.23
83
- requirement: *id004
88
+ type: :runtime
89
+ version_requirements: *id004
84
90
  description: Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.
85
91
  email: david@loudthinking.com
86
92
  executables: []
@@ -92,98 +98,98 @@ extra_rdoc_files:
92
98
  files:
93
99
  - CHANGELOG
94
100
  - README.rdoc
101
+ - examples/associations.png
95
102
  - examples/performance.rb
96
103
  - examples/simple.rb
97
- - examples/associations.png
98
- - lib/active_record/locale/en.yml
104
+ - lib/active_record/aggregations.rb
105
+ - lib/active_record/association_preload.rb
106
+ - lib/active_record/associations/association_collection.rb
107
+ - lib/active_record/associations/association_proxy.rb
108
+ - lib/active_record/associations/belongs_to_association.rb
109
+ - lib/active_record/associations/belongs_to_polymorphic_association.rb
110
+ - lib/active_record/associations/has_and_belongs_to_many_association.rb
111
+ - lib/active_record/associations/has_many_association.rb
112
+ - lib/active_record/associations/has_many_through_association.rb
113
+ - lib/active_record/associations/has_one_association.rb
114
+ - lib/active_record/associations/has_one_through_association.rb
115
+ - lib/active_record/associations/through_association_scope.rb
99
116
  - lib/active_record/associations.rb
100
- - lib/active_record/relation.rb
101
- - lib/active_record/migration.rb
102
- - lib/active_record/railties/jdbcmysql_error.rb
103
- - lib/active_record/railties/databases.rake
104
- - lib/active_record/railties/controller_runtime.rb
105
- - lib/active_record/nested_attributes.rb
106
- - lib/active_record/dynamic_finder_match.rb
107
- - lib/active_record/attribute_methods.rb
108
- - lib/active_record/relation/spawn_methods.rb
109
- - lib/active_record/relation/predicate_builder.rb
110
- - lib/active_record/relation/batches.rb
111
- - lib/active_record/relation/calculations.rb
112
- - lib/active_record/relation/finder_methods.rb
113
- - lib/active_record/relation/query_methods.rb
114
- - lib/active_record/schema.rb
115
- - lib/active_record/named_scope.rb
116
- - lib/active_record/schema_dumper.rb
117
- - lib/active_record/errors.rb
118
- - lib/active_record/test_case.rb
119
- - lib/active_record/fixtures.rb
117
+ - lib/active_record/attribute_methods/before_type_cast.rb
120
118
  - lib/active_record/attribute_methods/dirty.rb
121
119
  - lib/active_record/attribute_methods/primary_key.rb
122
- - lib/active_record/attribute_methods/time_zone_conversion.rb
123
120
  - lib/active_record/attribute_methods/query.rb
124
- - lib/active_record/attribute_methods/write.rb
125
121
  - lib/active_record/attribute_methods/read.rb
126
- - lib/active_record/attribute_methods/before_type_cast.rb
127
- - lib/active_record/aggregations.rb
128
- - lib/active_record/locking/pessimistic.rb
129
- - lib/active_record/locking/optimistic.rb
130
- - lib/active_record/observer.rb
131
- - lib/active_record/log_subscriber.rb
132
- - lib/active_record/reflection.rb
133
- - lib/active_record/counter_cache.rb
134
- - lib/active_record/version.rb
135
- - lib/active_record/transactions.rb
136
- - lib/active_record/serialization.rb
137
- - lib/active_record/timestamp.rb
138
- - lib/active_record/railtie.rb
139
- - lib/active_record/session_store.rb
140
- - lib/active_record/persistence.rb
141
- - lib/active_record/validations.rb
142
- - lib/active_record/callbacks.rb
122
+ - lib/active_record/attribute_methods/time_zone_conversion.rb
123
+ - lib/active_record/attribute_methods/write.rb
124
+ - lib/active_record/attribute_methods.rb
143
125
  - lib/active_record/autosave_association.rb
144
126
  - lib/active_record/base.rb
145
- - lib/active_record/connection_adapters/postgresql_adapter.rb
146
- - lib/active_record/connection_adapters/abstract/quoting.rb
147
- - lib/active_record/connection_adapters/abstract/schema_statements.rb
127
+ - lib/active_record/callbacks.rb
128
+ - lib/active_record/connection_adapters/abstract/connection_pool.rb
129
+ - lib/active_record/connection_adapters/abstract/connection_specification.rb
148
130
  - lib/active_record/connection_adapters/abstract/database_limits.rb
149
- - lib/active_record/connection_adapters/abstract/schema_definitions.rb
150
131
  - lib/active_record/connection_adapters/abstract/database_statements.rb
151
- - lib/active_record/connection_adapters/abstract/connection_specification.rb
152
- - lib/active_record/connection_adapters/abstract/connection_pool.rb
153
132
  - lib/active_record/connection_adapters/abstract/query_cache.rb
133
+ - lib/active_record/connection_adapters/abstract/quoting.rb
134
+ - lib/active_record/connection_adapters/abstract/schema_definitions.rb
135
+ - lib/active_record/connection_adapters/abstract/schema_statements.rb
154
136
  - lib/active_record/connection_adapters/abstract_adapter.rb
155
- - lib/active_record/connection_adapters/sqlite3_adapter.rb
156
137
  - lib/active_record/connection_adapters/mysql_adapter.rb
138
+ - lib/active_record/connection_adapters/postgresql_adapter.rb
139
+ - lib/active_record/connection_adapters/sqlite3_adapter.rb
157
140
  - lib/active_record/connection_adapters/sqlite_adapter.rb
158
- - lib/active_record/association_preload.rb
141
+ - lib/active_record/counter_cache.rb
142
+ - lib/active_record/dynamic_finder_match.rb
159
143
  - lib/active_record/dynamic_scope_match.rb
160
- - lib/active_record/validations/uniqueness.rb
161
- - lib/active_record/validations/associated.rb
144
+ - lib/active_record/errors.rb
145
+ - lib/active_record/fixtures.rb
146
+ - lib/active_record/locale/en.yml
147
+ - lib/active_record/locking/optimistic.rb
148
+ - lib/active_record/locking/pessimistic.rb
149
+ - lib/active_record/log_subscriber.rb
150
+ - lib/active_record/migration.rb
151
+ - lib/active_record/named_scope.rb
152
+ - lib/active_record/nested_attributes.rb
153
+ - lib/active_record/observer.rb
154
+ - lib/active_record/persistence.rb
162
155
  - lib/active_record/query_cache.rb
156
+ - lib/active_record/railtie.rb
157
+ - lib/active_record/railties/controller_runtime.rb
158
+ - lib/active_record/railties/databases.rake
159
+ - lib/active_record/railties/jdbcmysql_error.rb
160
+ - lib/active_record/reflection.rb
161
+ - lib/active_record/relation/batches.rb
162
+ - lib/active_record/relation/calculations.rb
163
+ - lib/active_record/relation/finder_methods.rb
164
+ - lib/active_record/relation/predicate_builder.rb
165
+ - lib/active_record/relation/query_methods.rb
166
+ - lib/active_record/relation/spawn_methods.rb
167
+ - lib/active_record/relation.rb
168
+ - lib/active_record/schema.rb
169
+ - lib/active_record/schema_dumper.rb
170
+ - lib/active_record/serialization.rb
163
171
  - lib/active_record/serializers/xml_serializer.rb
164
- - lib/active_record/associations/has_many_through_association.rb
165
- - lib/active_record/associations/belongs_to_polymorphic_association.rb
166
- - lib/active_record/associations/belongs_to_association.rb
167
- - lib/active_record/associations/has_one_through_association.rb
168
- - lib/active_record/associations/association_proxy.rb
169
- - lib/active_record/associations/has_many_association.rb
170
- - lib/active_record/associations/has_and_belongs_to_many_association.rb
171
- - lib/active_record/associations/has_one_association.rb
172
- - lib/active_record/associations/through_association_scope.rb
173
- - lib/active_record/associations/association_collection.rb
174
- - lib/rails/generators/active_record/migration.rb
175
- - lib/rails/generators/active_record/session_migration/session_migration_generator.rb
176
- - lib/rails/generators/active_record/session_migration/templates/migration.rb
172
+ - lib/active_record/session_store.rb
173
+ - lib/active_record/test_case.rb
174
+ - lib/active_record/timestamp.rb
175
+ - lib/active_record/transactions.rb
176
+ - lib/active_record/validations/associated.rb
177
+ - lib/active_record/validations/uniqueness.rb
178
+ - lib/active_record/validations.rb
179
+ - lib/active_record/version.rb
180
+ - lib/active_record.rb
177
181
  - lib/rails/generators/active_record/migration/migration_generator.rb
178
182
  - lib/rails/generators/active_record/migration/templates/migration.rb
183
+ - lib/rails/generators/active_record/migration.rb
179
184
  - lib/rails/generators/active_record/model/model_generator.rb
180
185
  - lib/rails/generators/active_record/model/templates/migration.rb
181
- - lib/rails/generators/active_record/model/templates/module.rb
182
186
  - lib/rails/generators/active_record/model/templates/model.rb
183
- - lib/rails/generators/active_record/observer/templates/observer.rb
187
+ - lib/rails/generators/active_record/model/templates/module.rb
184
188
  - lib/rails/generators/active_record/observer/observer_generator.rb
189
+ - lib/rails/generators/active_record/observer/templates/observer.rb
190
+ - lib/rails/generators/active_record/session_migration/session_migration_generator.rb
191
+ - lib/rails/generators/active_record/session_migration/templates/migration.rb
185
192
  - lib/rails/generators/active_record.rb
186
- - lib/active_record.rb
187
193
  homepage: http://www.rubyonrails.org
188
194
  licenses: []
189
195
 
@@ -207,16 +213,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
207
213
  required_rubygems_version: !ruby/object:Gem::Requirement
208
214
  none: false
209
215
  requirements:
210
- - - ">="
216
+ - - ">"
211
217
  - !ruby/object:Gem::Version
212
- hash: 3
218
+ hash: 25
213
219
  segments:
214
- - 0
215
- version: "0"
220
+ - 1
221
+ - 3
222
+ - 1
223
+ version: 1.3.1
216
224
  requirements: []
217
225
 
218
226
  rubyforge_project: activerecord
219
- rubygems_version: 1.8.6
227
+ rubygems_version: 1.8.16
220
228
  signing_key:
221
229
  specification_version: 3
222
230
  summary: Object-relational mapper framework (part of Rails).