dm-core 1.1.0 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Gemfile +22 -13
- data/README.rdoc +1 -1
- data/Rakefile +1 -2
- data/VERSION +1 -1
- data/dm-core.gemspec +29 -175
- data/lib/dm-core/adapters/abstract_adapter.rb +1 -2
- data/lib/dm-core/associations/many_to_many.rb +11 -5
- data/lib/dm-core/associations/many_to_one.rb +17 -2
- data/lib/dm-core/associations/one_to_many.rb +16 -0
- data/lib/dm-core/backwards.rb +13 -0
- data/lib/dm-core/collection.rb +1 -1
- data/lib/dm-core/model/property.rb +24 -27
- data/lib/dm-core/model/relationship.rb +22 -28
- data/lib/dm-core/model.rb +99 -41
- data/lib/dm-core/property/binary.rb +15 -0
- data/lib/dm-core/property/boolean.rb +6 -10
- data/lib/dm-core/property/date.rb +0 -2
- data/lib/dm-core/property/date_time.rb +0 -2
- data/lib/dm-core/property/decimal.rb +7 -3
- data/lib/dm-core/property/discriminator.rb +24 -26
- data/lib/dm-core/property/float.rb +5 -1
- data/lib/dm-core/property/numeric.rb +6 -9
- data/lib/dm-core/property/string.rb +2 -1
- data/lib/dm-core/property/time.rb +0 -2
- data/lib/dm-core/property/typecast/time.rb +7 -2
- data/lib/dm-core/property.rb +37 -50
- data/lib/dm-core/property_set.rb +1 -3
- data/lib/dm-core/query/conditions/comparison.rb +5 -1
- data/lib/dm-core/query/conditions/operation.rb +1 -1
- data/lib/dm-core/query.rb +3 -10
- data/lib/dm-core/relationship_set.rb +0 -2
- data/lib/dm-core/resource/{state → persistence_state}/clean.rb +4 -4
- data/lib/dm-core/resource/{state → persistence_state}/deleted.rb +2 -2
- data/lib/dm-core/resource/{state → persistence_state}/dirty.rb +2 -2
- data/lib/dm-core/resource/{state → persistence_state}/immutable.rb +3 -3
- data/lib/dm-core/resource/{state → persistence_state}/persisted.rb +3 -3
- data/lib/dm-core/resource/{state → persistence_state}/transient.rb +3 -3
- data/lib/dm-core/resource/{state.rb → persistence_state.rb} +2 -2
- data/lib/dm-core/resource.rb +27 -28
- data/lib/dm-core/spec/lib/adapter_helpers.rb +2 -5
- data/lib/dm-core/spec/setup.rb +3 -2
- data/lib/dm-core/spec/shared/public/property_spec.rb +8 -0
- data/lib/dm-core/spec/shared/resource_spec.rb +14 -0
- data/lib/dm-core/spec/shared/semipublic/property_spec.rb +5 -11
- data/lib/dm-core/support/descendant_set.rb +0 -2
- data/lib/dm-core/support/ext/array.rb +0 -19
- data/lib/dm-core/support/ext/blank.rb +1 -0
- data/lib/dm-core/support/hook.rb +0 -3
- data/lib/dm-core/support/naming_conventions.rb +6 -0
- data/lib/dm-core/support/ordered_set.rb +0 -2
- data/lib/dm-core/support/subject_set.rb +0 -2
- data/lib/dm-core/version.rb +1 -1
- data/lib/dm-core.rb +32 -67
- data/spec/public/associations/many_to_many_spec.rb +0 -1
- data/spec/public/model/property_spec.rb +55 -9
- data/spec/public/model/relationship_spec.rb +24 -2
- data/spec/public/model_spec.rb +32 -0
- data/spec/public/property/binary_spec.rb +33 -6
- data/spec/public/property/boolean_spec.rb +14 -6
- data/spec/public/property/class_spec.rb +14 -6
- data/spec/public/property/date_spec.rb +14 -6
- data/spec/public/property/date_time_spec.rb +14 -6
- data/spec/public/property/decimal_spec.rb +10 -2
- data/spec/public/property/discriminator_spec.rb +15 -1
- data/spec/public/property/float_spec.rb +14 -6
- data/spec/public/property/integer_spec.rb +14 -6
- data/spec/public/property/object_spec.rb +8 -0
- data/spec/public/property/serial_spec.rb +14 -6
- data/spec/public/property/string_spec.rb +14 -6
- data/spec/public/property/text_spec.rb +14 -6
- data/spec/public/property/time_spec.rb +14 -6
- data/spec/public/resource_spec.rb +58 -0
- data/spec/public/shared/finder_shared_spec.rb +8 -4
- data/spec/semipublic/associations/many_to_many_spec.rb +2 -0
- data/spec/semipublic/associations/many_to_one_spec.rb +2 -0
- data/spec/semipublic/associations/one_to_many_spec.rb +2 -0
- data/spec/semipublic/associations/one_to_one_spec.rb +2 -0
- data/spec/semipublic/property/binary_spec.rb +5 -5
- data/spec/semipublic/property/boolean_spec.rb +5 -23
- data/spec/semipublic/property/class_spec.rb +5 -5
- data/spec/semipublic/property/date_spec.rb +5 -5
- data/spec/semipublic/property/date_time_spec.rb +5 -5
- data/spec/semipublic/property/decimal_spec.rb +2 -2
- data/spec/semipublic/property/discriminator_spec.rb +5 -5
- data/spec/semipublic/property/float_spec.rb +5 -5
- data/spec/semipublic/property/integer_spec.rb +5 -5
- data/spec/semipublic/property/lookup_spec.rb +3 -3
- data/spec/semipublic/property/serial_spec.rb +5 -5
- data/spec/semipublic/property/string_spec.rb +5 -5
- data/spec/semipublic/property/text_spec.rb +5 -5
- data/spec/semipublic/property/time_spec.rb +5 -5
- data/spec/semipublic/query/conditions/comparison_spec.rb +44 -4
- data/spec/semipublic/query_spec.rb +2 -11
- data/spec/semipublic/resource/state/clean_spec.rb +6 -6
- data/spec/semipublic/resource/state/deleted_spec.rb +4 -4
- data/spec/semipublic/resource/state/dirty_spec.rb +8 -8
- data/spec/semipublic/resource/state/immutable_spec.rb +6 -6
- data/spec/semipublic/resource/state/transient_spec.rb +5 -5
- data/spec/semipublic/resource/state_spec.rb +15 -15
- data/spec/semipublic/shared/resource_shared_spec.rb +7 -1
- data/spec/semipublic/shared/resource_state_shared_spec.rb +8 -8
- data/spec/unit/array_spec.rb +0 -14
- data/spec/unit/blank_spec.rb +11 -0
- metadata +52 -174
- data/lib/dm-core/support/inflector.rb +0 -3
data/Gemfile
CHANGED
|
@@ -5,26 +5,29 @@ source 'http://rubygems.org'
|
|
|
5
5
|
SOURCE = ENV.fetch('SOURCE', :git).to_sym
|
|
6
6
|
REPO_POSTFIX = SOURCE == :path ? '' : '.git'
|
|
7
7
|
DATAMAPPER = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
|
|
8
|
-
DM_VERSION = '~> 1.
|
|
9
|
-
DO_VERSION = '~> 0.10.
|
|
8
|
+
DM_VERSION = '~> 1.2.0'
|
|
9
|
+
DO_VERSION = '~> 0.10.6'
|
|
10
10
|
DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
|
|
11
|
+
CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
|
|
11
12
|
|
|
12
|
-
gem 'addressable', '~> 2.2.
|
|
13
|
+
gem 'addressable', '~> 2.2.6'
|
|
13
14
|
|
|
14
15
|
group :development do
|
|
15
16
|
|
|
16
|
-
gem 'jeweler', '~> 1.
|
|
17
|
-
gem 'rake', '~> 0.
|
|
18
|
-
gem 'rspec', '~> 1.3.
|
|
19
|
-
gem 'yard', '~> 0.6'
|
|
17
|
+
gem 'jeweler', '~> 1.6.4'
|
|
18
|
+
gem 'rake', '~> 0.9.2'
|
|
19
|
+
gem 'rspec', '~> 1.3.2'
|
|
20
20
|
|
|
21
21
|
end
|
|
22
22
|
|
|
23
|
-
|
|
23
|
+
platforms :mri_18 do
|
|
24
|
+
group :quality do
|
|
24
25
|
|
|
25
|
-
|
|
26
|
-
|
|
26
|
+
gem 'rcov', '~> 0.9.10'
|
|
27
|
+
gem 'yard', '~> 0.7.2'
|
|
28
|
+
gem 'yardstick', '~> 0.4'
|
|
27
29
|
|
|
30
|
+
end
|
|
28
31
|
end
|
|
29
32
|
|
|
30
33
|
group :datamapper do
|
|
@@ -46,18 +49,24 @@ group :datamapper do
|
|
|
46
49
|
gem "do_#{adapter}", DO_VERSION, do_options.dup
|
|
47
50
|
end
|
|
48
51
|
|
|
49
|
-
gem 'dm-do-adapter', DM_VERSION,
|
|
52
|
+
gem 'dm-do-adapter', DM_VERSION,
|
|
53
|
+
SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}",
|
|
54
|
+
:branch => CURRENT_BRANCH
|
|
50
55
|
end
|
|
51
56
|
|
|
52
57
|
adapters.each do |adapter|
|
|
53
|
-
gem "dm-#{adapter}-adapter", DM_VERSION,
|
|
58
|
+
gem "dm-#{adapter}-adapter", ENV.fetch('ADAPTER_VERSION', DM_VERSION),
|
|
59
|
+
SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}",
|
|
60
|
+
:branch => CURRENT_BRANCH
|
|
54
61
|
end
|
|
55
62
|
|
|
56
63
|
plugins = ENV['PLUGINS'] || ENV['PLUGIN']
|
|
57
64
|
plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
|
|
58
65
|
|
|
59
66
|
plugins.each do |plugin|
|
|
60
|
-
gem plugin, DM_VERSION,
|
|
67
|
+
gem plugin, DM_VERSION,
|
|
68
|
+
SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}",
|
|
69
|
+
:branch => CURRENT_BRANCH
|
|
61
70
|
end
|
|
62
71
|
|
|
63
72
|
end
|
data/README.rdoc
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
DataMapper sports a very accessible code-base and a welcoming community.
|
|
6
6
|
Outside contributions and feedback are welcome and encouraged, especially
|
|
7
7
|
constructive criticism. Make your voice heard! Submit a
|
|
8
|
-
ticket[
|
|
8
|
+
ticket[https://github.com/datamapper/dm-core/issues] or
|
|
9
9
|
patch[http://datamapper.lighthouseapp.com], speak up
|
|
10
10
|
on our mailing-list[http://groups.google.com/group/datamapper/], chat with us
|
|
11
11
|
on irc[irc://irc.freenode.net/#datamapper], write a spec, get it reviewed, ask
|
data/Rakefile
CHANGED
|
@@ -2,7 +2,7 @@ require 'rubygems'
|
|
|
2
2
|
require 'rake'
|
|
3
3
|
|
|
4
4
|
begin
|
|
5
|
-
gem 'jeweler', '~> 1.
|
|
5
|
+
gem 'jeweler', '~> 1.6.4'
|
|
6
6
|
require 'jeweler'
|
|
7
7
|
|
|
8
8
|
Jeweler::Tasks.new do |gem|
|
|
@@ -12,7 +12,6 @@ begin
|
|
|
12
12
|
gem.email = 'dan.kubb@gmail.com'
|
|
13
13
|
gem.homepage = 'http://github.com/datamapper/%s' % gem.name
|
|
14
14
|
gem.authors = [ 'Dan Kubb' ]
|
|
15
|
-
gem.has_rdoc = 'yard'
|
|
16
15
|
|
|
17
16
|
gem.rubyforge_project = 'datamapper'
|
|
18
17
|
end
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
1.
|
|
1
|
+
1.2.0
|
data/dm-core.gemspec
CHANGED
|
@@ -4,14 +4,14 @@
|
|
|
4
4
|
# -*- encoding: utf-8 -*-
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
|
-
s.name =
|
|
8
|
-
s.version = "1.
|
|
7
|
+
s.name = "dm-core"
|
|
8
|
+
s.version = "1.2.0"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Dan Kubb"]
|
|
12
|
-
s.date =
|
|
13
|
-
s.description =
|
|
14
|
-
s.email =
|
|
12
|
+
s.date = "2011-10-09"
|
|
13
|
+
s.description = "Faster, Better, Simpler."
|
|
14
|
+
s.email = "dan.kubb@gmail.com"
|
|
15
15
|
s.extra_rdoc_files = [
|
|
16
16
|
"LICENSE",
|
|
17
17
|
"README.rdoc"
|
|
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
|
|
|
35
35
|
"lib/dm-core/associations/one_to_many.rb",
|
|
36
36
|
"lib/dm-core/associations/one_to_one.rb",
|
|
37
37
|
"lib/dm-core/associations/relationship.rb",
|
|
38
|
+
"lib/dm-core/backwards.rb",
|
|
38
39
|
"lib/dm-core/collection.rb",
|
|
39
40
|
"lib/dm-core/core_ext/kernel.rb",
|
|
40
41
|
"lib/dm-core/core_ext/pathname.rb",
|
|
@@ -76,13 +77,13 @@ Gem::Specification.new do |s|
|
|
|
76
77
|
"lib/dm-core/relationship_set.rb",
|
|
77
78
|
"lib/dm-core/repository.rb",
|
|
78
79
|
"lib/dm-core/resource.rb",
|
|
79
|
-
"lib/dm-core/resource/
|
|
80
|
-
"lib/dm-core/resource/
|
|
81
|
-
"lib/dm-core/resource/
|
|
82
|
-
"lib/dm-core/resource/
|
|
83
|
-
"lib/dm-core/resource/
|
|
84
|
-
"lib/dm-core/resource/
|
|
85
|
-
"lib/dm-core/resource/
|
|
80
|
+
"lib/dm-core/resource/persistence_state.rb",
|
|
81
|
+
"lib/dm-core/resource/persistence_state/clean.rb",
|
|
82
|
+
"lib/dm-core/resource/persistence_state/deleted.rb",
|
|
83
|
+
"lib/dm-core/resource/persistence_state/dirty.rb",
|
|
84
|
+
"lib/dm-core/resource/persistence_state/immutable.rb",
|
|
85
|
+
"lib/dm-core/resource/persistence_state/persisted.rb",
|
|
86
|
+
"lib/dm-core/resource/persistence_state/transient.rb",
|
|
86
87
|
"lib/dm-core/spec/lib/adapter_helpers.rb",
|
|
87
88
|
"lib/dm-core/spec/lib/collection_helpers.rb",
|
|
88
89
|
"lib/dm-core/spec/lib/counter_adapter.rb",
|
|
@@ -109,7 +110,6 @@ Gem::Specification.new do |s|
|
|
|
109
110
|
"lib/dm-core/support/ext/try_dup.rb",
|
|
110
111
|
"lib/dm-core/support/hook.rb",
|
|
111
112
|
"lib/dm-core/support/inflections.rb",
|
|
112
|
-
"lib/dm-core/support/inflector.rb",
|
|
113
113
|
"lib/dm-core/support/inflector/inflections.rb",
|
|
114
114
|
"lib/dm-core/support/inflector/methods.rb",
|
|
115
115
|
"lib/dm-core/support/lazy_array.rb",
|
|
@@ -271,177 +271,31 @@ Gem::Specification.new do |s|
|
|
|
271
271
|
"tasks/yard.rake",
|
|
272
272
|
"tasks/yardstick.rake"
|
|
273
273
|
]
|
|
274
|
-
s.homepage =
|
|
274
|
+
s.homepage = "http://github.com/datamapper/dm-core"
|
|
275
275
|
s.require_paths = ["lib"]
|
|
276
|
-
s.rubyforge_project =
|
|
277
|
-
s.rubygems_version =
|
|
278
|
-
s.summary =
|
|
279
|
-
s.test_files = [
|
|
280
|
-
"spec/lib/rspec_immediate_feedback_formatter.rb",
|
|
281
|
-
"spec/public/associations/many_to_many/read_multiple_join_spec.rb",
|
|
282
|
-
"spec/public/associations/many_to_many_spec.rb",
|
|
283
|
-
"spec/public/associations/many_to_one_spec.rb",
|
|
284
|
-
"spec/public/associations/many_to_one_with_boolean_cpk_spec.rb",
|
|
285
|
-
"spec/public/associations/many_to_one_with_custom_fk_spec.rb",
|
|
286
|
-
"spec/public/associations/one_to_many_spec.rb",
|
|
287
|
-
"spec/public/associations/one_to_one_spec.rb",
|
|
288
|
-
"spec/public/associations/one_to_one_with_boolean_cpk_spec.rb",
|
|
289
|
-
"spec/public/collection_spec.rb",
|
|
290
|
-
"spec/public/finalize_spec.rb",
|
|
291
|
-
"spec/public/model/hook_spec.rb",
|
|
292
|
-
"spec/public/model/property_spec.rb",
|
|
293
|
-
"spec/public/model/relationship_spec.rb",
|
|
294
|
-
"spec/public/model_spec.rb",
|
|
295
|
-
"spec/public/property/binary_spec.rb",
|
|
296
|
-
"spec/public/property/boolean_spec.rb",
|
|
297
|
-
"spec/public/property/class_spec.rb",
|
|
298
|
-
"spec/public/property/date_spec.rb",
|
|
299
|
-
"spec/public/property/date_time_spec.rb",
|
|
300
|
-
"spec/public/property/decimal_spec.rb",
|
|
301
|
-
"spec/public/property/discriminator_spec.rb",
|
|
302
|
-
"spec/public/property/float_spec.rb",
|
|
303
|
-
"spec/public/property/integer_spec.rb",
|
|
304
|
-
"spec/public/property/object_spec.rb",
|
|
305
|
-
"spec/public/property/serial_spec.rb",
|
|
306
|
-
"spec/public/property/string_spec.rb",
|
|
307
|
-
"spec/public/property/text_spec.rb",
|
|
308
|
-
"spec/public/property/time_spec.rb",
|
|
309
|
-
"spec/public/property_spec.rb",
|
|
310
|
-
"spec/public/resource_spec.rb",
|
|
311
|
-
"spec/public/sel_spec.rb",
|
|
312
|
-
"spec/public/setup_spec.rb",
|
|
313
|
-
"spec/public/shared/association_collection_shared_spec.rb",
|
|
314
|
-
"spec/public/shared/collection_finder_shared_spec.rb",
|
|
315
|
-
"spec/public/shared/collection_shared_spec.rb",
|
|
316
|
-
"spec/public/shared/finder_shared_spec.rb",
|
|
317
|
-
"spec/semipublic/adapters/abstract_adapter_spec.rb",
|
|
318
|
-
"spec/semipublic/adapters/in_memory_adapter_spec.rb",
|
|
319
|
-
"spec/semipublic/associations/many_to_many_spec.rb",
|
|
320
|
-
"spec/semipublic/associations/many_to_one_spec.rb",
|
|
321
|
-
"spec/semipublic/associations/one_to_many_spec.rb",
|
|
322
|
-
"spec/semipublic/associations/one_to_one_spec.rb",
|
|
323
|
-
"spec/semipublic/associations/relationship_spec.rb",
|
|
324
|
-
"spec/semipublic/associations_spec.rb",
|
|
325
|
-
"spec/semipublic/collection_spec.rb",
|
|
326
|
-
"spec/semipublic/model_spec.rb",
|
|
327
|
-
"spec/semipublic/property/binary_spec.rb",
|
|
328
|
-
"spec/semipublic/property/boolean_spec.rb",
|
|
329
|
-
"spec/semipublic/property/class_spec.rb",
|
|
330
|
-
"spec/semipublic/property/date_spec.rb",
|
|
331
|
-
"spec/semipublic/property/date_time_spec.rb",
|
|
332
|
-
"spec/semipublic/property/decimal_spec.rb",
|
|
333
|
-
"spec/semipublic/property/discriminator_spec.rb",
|
|
334
|
-
"spec/semipublic/property/float_spec.rb",
|
|
335
|
-
"spec/semipublic/property/integer_spec.rb",
|
|
336
|
-
"spec/semipublic/property/lookup_spec.rb",
|
|
337
|
-
"spec/semipublic/property/serial_spec.rb",
|
|
338
|
-
"spec/semipublic/property/string_spec.rb",
|
|
339
|
-
"spec/semipublic/property/text_spec.rb",
|
|
340
|
-
"spec/semipublic/property/time_spec.rb",
|
|
341
|
-
"spec/semipublic/property_spec.rb",
|
|
342
|
-
"spec/semipublic/query/conditions/comparison_spec.rb",
|
|
343
|
-
"spec/semipublic/query/conditions/operation_spec.rb",
|
|
344
|
-
"spec/semipublic/query/path_spec.rb",
|
|
345
|
-
"spec/semipublic/query_spec.rb",
|
|
346
|
-
"spec/semipublic/resource/state/clean_spec.rb",
|
|
347
|
-
"spec/semipublic/resource/state/deleted_spec.rb",
|
|
348
|
-
"spec/semipublic/resource/state/dirty_spec.rb",
|
|
349
|
-
"spec/semipublic/resource/state/immutable_spec.rb",
|
|
350
|
-
"spec/semipublic/resource/state/transient_spec.rb",
|
|
351
|
-
"spec/semipublic/resource/state_spec.rb",
|
|
352
|
-
"spec/semipublic/resource_spec.rb",
|
|
353
|
-
"spec/semipublic/shared/condition_shared_spec.rb",
|
|
354
|
-
"spec/semipublic/shared/resource_shared_spec.rb",
|
|
355
|
-
"spec/semipublic/shared/resource_state_shared_spec.rb",
|
|
356
|
-
"spec/semipublic/shared/subject_shared_spec.rb",
|
|
357
|
-
"spec/spec_helper.rb",
|
|
358
|
-
"spec/support/core_ext/hash.rb",
|
|
359
|
-
"spec/support/core_ext/inheritable_attributes.rb",
|
|
360
|
-
"spec/support/properties/huge_integer.rb",
|
|
361
|
-
"spec/unit/array_spec.rb",
|
|
362
|
-
"spec/unit/blank_spec.rb",
|
|
363
|
-
"spec/unit/data_mapper/ordered_set/append_spec.rb",
|
|
364
|
-
"spec/unit/data_mapper/ordered_set/clear_spec.rb",
|
|
365
|
-
"spec/unit/data_mapper/ordered_set/delete_spec.rb",
|
|
366
|
-
"spec/unit/data_mapper/ordered_set/each_spec.rb",
|
|
367
|
-
"spec/unit/data_mapper/ordered_set/empty_spec.rb",
|
|
368
|
-
"spec/unit/data_mapper/ordered_set/entries_spec.rb",
|
|
369
|
-
"spec/unit/data_mapper/ordered_set/eql_spec.rb",
|
|
370
|
-
"spec/unit/data_mapper/ordered_set/equal_value_spec.rb",
|
|
371
|
-
"spec/unit/data_mapper/ordered_set/hash_spec.rb",
|
|
372
|
-
"spec/unit/data_mapper/ordered_set/include_spec.rb",
|
|
373
|
-
"spec/unit/data_mapper/ordered_set/index_spec.rb",
|
|
374
|
-
"spec/unit/data_mapper/ordered_set/initialize_spec.rb",
|
|
375
|
-
"spec/unit/data_mapper/ordered_set/merge_spec.rb",
|
|
376
|
-
"spec/unit/data_mapper/ordered_set/shared/append_spec.rb",
|
|
377
|
-
"spec/unit/data_mapper/ordered_set/shared/clear_spec.rb",
|
|
378
|
-
"spec/unit/data_mapper/ordered_set/shared/delete_spec.rb",
|
|
379
|
-
"spec/unit/data_mapper/ordered_set/shared/each_spec.rb",
|
|
380
|
-
"spec/unit/data_mapper/ordered_set/shared/empty_spec.rb",
|
|
381
|
-
"spec/unit/data_mapper/ordered_set/shared/entries_spec.rb",
|
|
382
|
-
"spec/unit/data_mapper/ordered_set/shared/include_spec.rb",
|
|
383
|
-
"spec/unit/data_mapper/ordered_set/shared/index_spec.rb",
|
|
384
|
-
"spec/unit/data_mapper/ordered_set/shared/initialize_spec.rb",
|
|
385
|
-
"spec/unit/data_mapper/ordered_set/shared/merge_spec.rb",
|
|
386
|
-
"spec/unit/data_mapper/ordered_set/shared/size_spec.rb",
|
|
387
|
-
"spec/unit/data_mapper/ordered_set/shared/to_ary_spec.rb",
|
|
388
|
-
"spec/unit/data_mapper/ordered_set/size_spec.rb",
|
|
389
|
-
"spec/unit/data_mapper/ordered_set/to_ary_spec.rb",
|
|
390
|
-
"spec/unit/data_mapper/subject_set/append_spec.rb",
|
|
391
|
-
"spec/unit/data_mapper/subject_set/clear_spec.rb",
|
|
392
|
-
"spec/unit/data_mapper/subject_set/delete_spec.rb",
|
|
393
|
-
"spec/unit/data_mapper/subject_set/each_spec.rb",
|
|
394
|
-
"spec/unit/data_mapper/subject_set/empty_spec.rb",
|
|
395
|
-
"spec/unit/data_mapper/subject_set/entries_spec.rb",
|
|
396
|
-
"spec/unit/data_mapper/subject_set/get_spec.rb",
|
|
397
|
-
"spec/unit/data_mapper/subject_set/include_spec.rb",
|
|
398
|
-
"spec/unit/data_mapper/subject_set/named_spec.rb",
|
|
399
|
-
"spec/unit/data_mapper/subject_set/shared/append_spec.rb",
|
|
400
|
-
"spec/unit/data_mapper/subject_set/shared/clear_spec.rb",
|
|
401
|
-
"spec/unit/data_mapper/subject_set/shared/delete_spec.rb",
|
|
402
|
-
"spec/unit/data_mapper/subject_set/shared/each_spec.rb",
|
|
403
|
-
"spec/unit/data_mapper/subject_set/shared/empty_spec.rb",
|
|
404
|
-
"spec/unit/data_mapper/subject_set/shared/entries_spec.rb",
|
|
405
|
-
"spec/unit/data_mapper/subject_set/shared/get_spec.rb",
|
|
406
|
-
"spec/unit/data_mapper/subject_set/shared/include_spec.rb",
|
|
407
|
-
"spec/unit/data_mapper/subject_set/shared/named_spec.rb",
|
|
408
|
-
"spec/unit/data_mapper/subject_set/shared/size_spec.rb",
|
|
409
|
-
"spec/unit/data_mapper/subject_set/shared/to_ary_spec.rb",
|
|
410
|
-
"spec/unit/data_mapper/subject_set/shared/values_at_spec.rb",
|
|
411
|
-
"spec/unit/data_mapper/subject_set/size_spec.rb",
|
|
412
|
-
"spec/unit/data_mapper/subject_set/to_ary_spec.rb",
|
|
413
|
-
"spec/unit/data_mapper/subject_set/values_at_spec.rb",
|
|
414
|
-
"spec/unit/hash_spec.rb",
|
|
415
|
-
"spec/unit/hook_spec.rb",
|
|
416
|
-
"spec/unit/lazy_array_spec.rb",
|
|
417
|
-
"spec/unit/mash_spec.rb",
|
|
418
|
-
"spec/unit/module_spec.rb",
|
|
419
|
-
"spec/unit/object_spec.rb",
|
|
420
|
-
"spec/unit/try_dup_spec.rb"
|
|
421
|
-
]
|
|
276
|
+
s.rubyforge_project = "datamapper"
|
|
277
|
+
s.rubygems_version = "1.8.11"
|
|
278
|
+
s.summary = "An Object/Relational Mapper for Ruby"
|
|
422
279
|
|
|
423
280
|
if s.respond_to? :specification_version then
|
|
424
281
|
s.specification_version = 3
|
|
425
282
|
|
|
426
283
|
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
|
|
427
|
-
s.add_runtime_dependency(%q<addressable>, ["~> 2.2.
|
|
428
|
-
s.add_development_dependency(%q<jeweler>, ["~> 1.
|
|
429
|
-
s.add_development_dependency(%q<rake>, ["~> 0.
|
|
430
|
-
s.add_development_dependency(%q<rspec>, ["~> 1.3.
|
|
431
|
-
s.add_development_dependency(%q<yard>, ["~> 0.6"])
|
|
284
|
+
s.add_runtime_dependency(%q<addressable>, ["~> 2.2.6"])
|
|
285
|
+
s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
|
|
286
|
+
s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
|
|
287
|
+
s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
|
|
432
288
|
else
|
|
433
|
-
s.add_dependency(%q<addressable>, ["~> 2.2.
|
|
434
|
-
s.add_dependency(%q<jeweler>, ["~> 1.
|
|
435
|
-
s.add_dependency(%q<rake>, ["~> 0.
|
|
436
|
-
s.add_dependency(%q<rspec>, ["~> 1.3.
|
|
437
|
-
s.add_dependency(%q<yard>, ["~> 0.6"])
|
|
289
|
+
s.add_dependency(%q<addressable>, ["~> 2.2.6"])
|
|
290
|
+
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
|
|
291
|
+
s.add_dependency(%q<rake>, ["~> 0.9.2"])
|
|
292
|
+
s.add_dependency(%q<rspec>, ["~> 1.3.2"])
|
|
438
293
|
end
|
|
439
294
|
else
|
|
440
|
-
s.add_dependency(%q<addressable>, ["~> 2.2.
|
|
441
|
-
s.add_dependency(%q<jeweler>, ["~> 1.
|
|
442
|
-
s.add_dependency(%q<rake>, ["~> 0.
|
|
443
|
-
s.add_dependency(%q<rspec>, ["~> 1.3.
|
|
444
|
-
s.add_dependency(%q<yard>, ["~> 0.6"])
|
|
295
|
+
s.add_dependency(%q<addressable>, ["~> 2.2.6"])
|
|
296
|
+
s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
|
|
297
|
+
s.add_dependency(%q<rake>, ["~> 0.9.2"])
|
|
298
|
+
s.add_dependency(%q<rspec>, ["~> 1.3.2"])
|
|
445
299
|
end
|
|
446
300
|
end
|
|
447
301
|
|
|
@@ -208,8 +208,7 @@ module DataMapper
|
|
|
208
208
|
#
|
|
209
209
|
# @api semipublic
|
|
210
210
|
def attributes_as_fields(attributes)
|
|
211
|
-
|
|
212
|
-
DataMapper::Ext::Array.to_hash(pairs)
|
|
211
|
+
Hash[ attributes.map { |property, value| [ property.field, property.dump(value) ] } ]
|
|
213
212
|
end
|
|
214
213
|
|
|
215
214
|
private
|
|
@@ -124,6 +124,14 @@ module DataMapper
|
|
|
124
124
|
@links.freeze
|
|
125
125
|
end
|
|
126
126
|
|
|
127
|
+
# Initialize the chain for "many to many" relationships
|
|
128
|
+
#
|
|
129
|
+
# @api public
|
|
130
|
+
def finalize
|
|
131
|
+
through
|
|
132
|
+
via
|
|
133
|
+
end
|
|
134
|
+
|
|
127
135
|
# @api private
|
|
128
136
|
def source_scope(source)
|
|
129
137
|
{ through.inverse => source }
|
|
@@ -248,15 +256,13 @@ module DataMapper
|
|
|
248
256
|
target_key.valid?(source_key.get(source))
|
|
249
257
|
end
|
|
250
258
|
|
|
251
|
-
# @api semipublic
|
|
252
259
|
chainable do
|
|
260
|
+
# @api semipublic
|
|
253
261
|
def many_to_one_options
|
|
254
262
|
{ :parent_key => target_key.map { |property| property.name } }
|
|
255
263
|
end
|
|
256
|
-
end
|
|
257
264
|
|
|
258
|
-
|
|
259
|
-
chainable do
|
|
265
|
+
# @api semipublic
|
|
260
266
|
def one_to_many_options
|
|
261
267
|
{ :parent_key => source_key.map { |property| property.name } }
|
|
262
268
|
end
|
|
@@ -359,7 +365,7 @@ module DataMapper
|
|
|
359
365
|
end
|
|
360
366
|
|
|
361
367
|
each do |resource|
|
|
362
|
-
resource.
|
|
368
|
+
resource.persistence_state = Resource::PersistenceState::Immutable.new(resource)
|
|
363
369
|
end
|
|
364
370
|
|
|
365
371
|
clear
|
|
@@ -4,7 +4,7 @@ module DataMapper
|
|
|
4
4
|
# Relationship class with implementation specific
|
|
5
5
|
# to n side of 1 to n association
|
|
6
6
|
class Relationship < Associations::Relationship
|
|
7
|
-
OPTIONS = superclass::OPTIONS.dup << :required << :key
|
|
7
|
+
OPTIONS = superclass::OPTIONS.dup << :required << :key << :unique
|
|
8
8
|
|
|
9
9
|
# @api semipublic
|
|
10
10
|
alias_method :source_repository_name, :child_repository_name
|
|
@@ -31,6 +31,11 @@ module DataMapper
|
|
|
31
31
|
@key
|
|
32
32
|
end
|
|
33
33
|
|
|
34
|
+
# @api semipublic
|
|
35
|
+
def unique?
|
|
36
|
+
!!@unique
|
|
37
|
+
end
|
|
38
|
+
|
|
34
39
|
# @deprecated
|
|
35
40
|
def nullable?
|
|
36
41
|
raise "#{self.class}#nullable? is deprecated, use #{self.class}#required? instead (#{caller.first})"
|
|
@@ -64,6 +69,14 @@ module DataMapper
|
|
|
64
69
|
# @api semipublic
|
|
65
70
|
alias_method :source_key, :child_key
|
|
66
71
|
|
|
72
|
+
# Initialize the foreign key property this "many to one"
|
|
73
|
+
# relationship uses to persist itself
|
|
74
|
+
#
|
|
75
|
+
# @api public
|
|
76
|
+
def finalize
|
|
77
|
+
child_key
|
|
78
|
+
end
|
|
79
|
+
|
|
67
80
|
# Returns a hash of conditions that scopes query that fetches
|
|
68
81
|
# target object
|
|
69
82
|
#
|
|
@@ -193,6 +206,7 @@ module DataMapper
|
|
|
193
206
|
|
|
194
207
|
@required = options.fetch(:required, true)
|
|
195
208
|
@key = options.fetch(:key, false)
|
|
209
|
+
@unique = options.fetch(:unique, false)
|
|
196
210
|
target_model ||= DataMapper::Inflector.camelize(name)
|
|
197
211
|
options = { :min => @required ? 1 : 0, :max => 1 }.update(options)
|
|
198
212
|
super
|
|
@@ -248,7 +262,8 @@ module DataMapper
|
|
|
248
262
|
options = DataMapper::Ext::Hash.only(target_property.options, :length, :precision, :scale).update(
|
|
249
263
|
:index => name,
|
|
250
264
|
:required => required?,
|
|
251
|
-
:key => key
|
|
265
|
+
:key => key?,
|
|
266
|
+
:unique => @unique
|
|
252
267
|
)
|
|
253
268
|
|
|
254
269
|
if target_property.primitive == Integer
|
|
@@ -100,6 +100,22 @@ module DataMapper
|
|
|
100
100
|
end
|
|
101
101
|
end
|
|
102
102
|
|
|
103
|
+
# initialize the inverse "many to one" relationships explicitly before
|
|
104
|
+
# initializing other relationships. This makes sure that foreign key
|
|
105
|
+
# properties always appear in the order they were declared.
|
|
106
|
+
#
|
|
107
|
+
# @api public
|
|
108
|
+
def finalize
|
|
109
|
+
child_model.relationships.each do |relationship|
|
|
110
|
+
# TODO: should this check #inverse?
|
|
111
|
+
# relationship.child_key if inverse?(relationship)
|
|
112
|
+
if relationship.kind_of?(Associations::ManyToOne::Relationship)
|
|
113
|
+
relationship.finalize
|
|
114
|
+
end
|
|
115
|
+
end
|
|
116
|
+
inverse.finalize
|
|
117
|
+
end
|
|
118
|
+
|
|
103
119
|
# @api semipublic
|
|
104
120
|
def default_for(source)
|
|
105
121
|
collection_for(source).replace(Array(super))
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
require "dm-core/support/deprecate"
|
|
2
|
+
|
|
3
|
+
module DataMapper
|
|
4
|
+
module Resource
|
|
5
|
+
extend Deprecate
|
|
6
|
+
|
|
7
|
+
deprecate :persisted_state, :persistence_state
|
|
8
|
+
deprecate :persisted_state=, :persistence_state=
|
|
9
|
+
deprecate :persisted_state?, :persistence_state?
|
|
10
|
+
|
|
11
|
+
end # module Resource
|
|
12
|
+
|
|
13
|
+
end # module DataMapper
|
data/lib/dm-core/collection.rb
CHANGED
|
@@ -6,25 +6,22 @@ module DataMapper
|
|
|
6
6
|
module Property
|
|
7
7
|
Model.append_extensions self, DataMapper::Property::Lookup
|
|
8
8
|
|
|
9
|
-
extend Chainable
|
|
10
|
-
|
|
11
9
|
def self.extended(model)
|
|
12
10
|
model.instance_variable_set(:@properties, {})
|
|
13
11
|
model.instance_variable_set(:@field_naming_conventions, {})
|
|
14
12
|
end
|
|
15
13
|
|
|
16
|
-
chainable do
|
|
17
|
-
def inherited(model)
|
|
18
|
-
model.instance_variable_set(:@properties, {})
|
|
19
|
-
model.instance_variable_set(:@field_naming_conventions, @field_naming_conventions.dup)
|
|
20
14
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
end
|
|
15
|
+
def inherited(model)
|
|
16
|
+
model.instance_variable_set(:@properties, {})
|
|
17
|
+
model.instance_variable_set(:@field_naming_conventions, @field_naming_conventions.dup)
|
|
25
18
|
|
|
26
|
-
|
|
19
|
+
@properties.each do |repository_name, properties|
|
|
20
|
+
model_properties = model.properties(repository_name)
|
|
21
|
+
properties.each { |property| model_properties << property }
|
|
27
22
|
end
|
|
23
|
+
|
|
24
|
+
super
|
|
28
25
|
end
|
|
29
26
|
|
|
30
27
|
# Defines a Property on the Resource
|
|
@@ -64,13 +61,16 @@ module DataMapper
|
|
|
64
61
|
|
|
65
62
|
# Add property to the other mappings as well if this is for the default
|
|
66
63
|
# repository.
|
|
64
|
+
|
|
67
65
|
if repository_name == default_repository_name
|
|
68
|
-
DataMapper::Ext::Hash.except(@properties, default_repository_name)
|
|
66
|
+
other_repository_properties = DataMapper::Ext::Hash.except(@properties, default_repository_name)
|
|
67
|
+
|
|
68
|
+
other_repository_properties.each do |other_repository_name, properties|
|
|
69
69
|
next if properties.named?(name)
|
|
70
70
|
|
|
71
71
|
# make sure the property is created within the correct repository scope
|
|
72
72
|
DataMapper.repository(other_repository_name) do
|
|
73
|
-
properties << klass.new(self, name, options
|
|
73
|
+
properties << klass.new(self, name, options)
|
|
74
74
|
end
|
|
75
75
|
end
|
|
76
76
|
end
|
|
@@ -175,11 +175,10 @@ module DataMapper
|
|
|
175
175
|
|
|
176
176
|
# @api private
|
|
177
177
|
def key_conditions(repository, key)
|
|
178
|
-
|
|
179
|
-
DataMapper::Ext::Array.to_hash(conditions)
|
|
178
|
+
Hash[ self.key(repository.name).zip(key.nil? ? [] : key) ]
|
|
180
179
|
end
|
|
181
180
|
|
|
182
|
-
|
|
181
|
+
private
|
|
183
182
|
|
|
184
183
|
# Defines the anonymous module that is used to add properties.
|
|
185
184
|
# Using a single module here prevents having a very large number
|
|
@@ -207,7 +206,7 @@ module DataMapper
|
|
|
207
206
|
def #{name}
|
|
208
207
|
return #{instance_variable_name} if defined?(#{instance_variable_name})
|
|
209
208
|
property = properties[#{name.inspect}]
|
|
210
|
-
#{instance_variable_name} = property ?
|
|
209
|
+
#{instance_variable_name} = property ? persistence_state.get(property) : nil
|
|
211
210
|
end
|
|
212
211
|
RUBY
|
|
213
212
|
|
|
@@ -235,21 +234,19 @@ module DataMapper
|
|
|
235
234
|
#{writer_visibility}
|
|
236
235
|
def #{writer_name}(value)
|
|
237
236
|
property = properties[#{name.inspect}]
|
|
238
|
-
self.
|
|
239
|
-
|
|
237
|
+
self.persistence_state = persistence_state.set(property, value)
|
|
238
|
+
persistence_state.get(property)
|
|
240
239
|
end
|
|
241
240
|
RUBY
|
|
242
241
|
end
|
|
243
242
|
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
return property
|
|
249
|
-
end
|
|
250
|
-
|
|
251
|
-
super
|
|
243
|
+
# @api public
|
|
244
|
+
def method_missing(method, *args, &block)
|
|
245
|
+
if property = properties(repository_name)[method]
|
|
246
|
+
return property
|
|
252
247
|
end
|
|
248
|
+
|
|
249
|
+
super
|
|
253
250
|
end
|
|
254
251
|
end # module Property
|
|
255
252
|
end # module Model
|