active-fedora 6.8.0 → 7.0.0.pre1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (215) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.travis.yml +15 -5
  4. data/CONTRIBUTING.md +2 -0
  5. data/Gemfile +0 -2
  6. data/History.txt +2 -32
  7. data/README.md +143 -0
  8. data/Rakefile +5 -7
  9. data/active-fedora.gemspec +9 -9
  10. data/gemfiles/rails3.gemfile +11 -0
  11. data/gemfiles/rails4.gemfile +10 -0
  12. data/lib/active_fedora.rb +31 -4
  13. data/lib/active_fedora/association_relation.rb +18 -0
  14. data/lib/active_fedora/associations.rb +38 -171
  15. data/lib/active_fedora/associations/association.rb +163 -0
  16. data/lib/active_fedora/associations/association_scope.rb +39 -0
  17. data/lib/active_fedora/associations/belongs_to_association.rb +47 -25
  18. data/lib/active_fedora/associations/builder/association.rb +55 -0
  19. data/lib/active_fedora/associations/builder/belongs_to.rb +100 -0
  20. data/lib/active_fedora/associations/builder/collection_association.rb +56 -0
  21. data/lib/active_fedora/associations/builder/has_and_belongs_to_many.rb +30 -0
  22. data/lib/active_fedora/associations/builder/has_many.rb +63 -0
  23. data/lib/active_fedora/associations/builder/singular_association.rb +32 -0
  24. data/lib/active_fedora/associations/{association_collection.rb → collection_association.rb} +203 -53
  25. data/lib/active_fedora/associations/collection_proxy.rb +862 -0
  26. data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb +35 -25
  27. data/lib/active_fedora/associations/has_many_association.rb +36 -11
  28. data/lib/active_fedora/associations/singular_association.rb +62 -0
  29. data/lib/active_fedora/attributes.rb +43 -139
  30. data/lib/active_fedora/autosave_association.rb +317 -0
  31. data/lib/active_fedora/base.rb +10 -327
  32. data/lib/active_fedora/callbacks.rb +1 -3
  33. data/lib/active_fedora/content_model.rb +16 -0
  34. data/lib/active_fedora/core.rb +151 -0
  35. data/lib/active_fedora/datastream_attribute.rb +76 -0
  36. data/lib/active_fedora/datastream_hash.rb +8 -13
  37. data/lib/active_fedora/datastreams.rb +39 -26
  38. data/lib/active_fedora/digital_object.rb +2 -2
  39. data/lib/active_fedora/fedora_attributes.rb +45 -0
  40. data/lib/active_fedora/fixture_loader.rb +1 -1
  41. data/lib/active_fedora/indexing.rb +6 -1
  42. data/lib/active_fedora/model.rb +0 -17
  43. data/lib/active_fedora/nested_attributes.rb +2 -2
  44. data/lib/active_fedora/null_relation.rb +7 -0
  45. data/lib/active_fedora/om_datastream.rb +3 -4
  46. data/lib/active_fedora/persistence.rb +41 -29
  47. data/lib/active_fedora/querying.rb +2 -163
  48. data/lib/active_fedora/rdf.rb +1 -0
  49. data/lib/active_fedora/rdf/indexing.rb +67 -0
  50. data/lib/active_fedora/rdf_datastream.rb +2 -50
  51. data/lib/active_fedora/rdf_node.rb +12 -7
  52. data/lib/active_fedora/rdf_node/term_proxy.rb +30 -21
  53. data/lib/active_fedora/rdfxml_rdf_datastream.rb +1 -1
  54. data/lib/active_fedora/reflection.rb +163 -20
  55. data/lib/active_fedora/relation.rb +33 -130
  56. data/lib/active_fedora/relation/calculations.rb +19 -0
  57. data/lib/active_fedora/relation/delegation.rb +22 -0
  58. data/lib/active_fedora/relation/finder_methods.rb +247 -0
  59. data/lib/active_fedora/relation/merger.rb +22 -0
  60. data/lib/active_fedora/relation/query_methods.rb +58 -0
  61. data/lib/active_fedora/relation/spawn_methods.rb +46 -0
  62. data/lib/active_fedora/relationship_graph.rb +0 -2
  63. data/lib/active_fedora/rels_ext_datastream.rb +1 -4
  64. data/lib/active_fedora/rubydora_connection.rb +1 -1
  65. data/lib/active_fedora/scoping.rb +20 -0
  66. data/lib/active_fedora/scoping/default.rb +38 -0
  67. data/lib/active_fedora/scoping/named.rb +32 -0
  68. data/lib/active_fedora/semantic_node.rb +54 -106
  69. data/lib/active_fedora/serialization.rb +19 -0
  70. data/lib/active_fedora/sharding.rb +58 -0
  71. data/lib/active_fedora/solr_digital_object.rb +15 -5
  72. data/lib/active_fedora/solr_instance_loader.rb +1 -1
  73. data/lib/active_fedora/solr_service.rb +1 -1
  74. data/lib/active_fedora/unsaved_digital_object.rb +6 -4
  75. data/lib/active_fedora/version.rb +1 -1
  76. data/lib/tasks/active_fedora.rake +3 -0
  77. data/lib/tasks/active_fedora_dev.rake +6 -5
  78. data/spec/config_helper.rb +14 -14
  79. data/spec/integration/associations_spec.rb +168 -455
  80. data/spec/integration/attributes_spec.rb +12 -11
  81. data/spec/integration/auditable_spec.rb +11 -11
  82. data/spec/integration/autosave_association_spec.rb +25 -0
  83. data/spec/integration/base_spec.rb +163 -163
  84. data/spec/integration/belongs_to_association_spec.rb +166 -0
  85. data/spec/integration/bug_spec.rb +7 -7
  86. data/spec/integration/collection_association_spec.rb +58 -0
  87. data/spec/integration/complex_rdf_datastream_spec.rb +88 -88
  88. data/spec/integration/datastream_collections_spec.rb +69 -69
  89. data/spec/integration/datastream_spec.rb +43 -43
  90. data/spec/integration/datastreams_spec.rb +63 -63
  91. data/spec/integration/delete_all_spec.rb +46 -39
  92. data/spec/integration/fedora_solr_sync_spec.rb +5 -5
  93. data/spec/integration/field_to_solr_name_spec.rb +34 -0
  94. data/spec/integration/full_featured_model_spec.rb +100 -101
  95. data/spec/integration/has_and_belongs_to_many_associations_spec.rb +341 -0
  96. data/spec/integration/has_many_associations_spec.rb +172 -24
  97. data/spec/integration/json_serialization_spec.rb +31 -0
  98. data/spec/integration/load_from_solr_spec.rb +48 -0
  99. data/spec/integration/model_spec.rb +35 -40
  100. data/spec/integration/nested_attribute_spec.rb +42 -43
  101. data/spec/integration/ntriples_datastream_spec.rb +131 -113
  102. data/spec/integration/om_datastream_spec.rb +67 -67
  103. data/spec/integration/persistence_spec.rb +7 -7
  104. data/spec/integration/rdf_nested_attributes_spec.rb +56 -56
  105. data/spec/integration/relation_delegation_spec.rb +26 -25
  106. data/spec/integration/relation_spec.rb +42 -0
  107. data/spec/integration/rels_ext_datastream_spec.rb +20 -20
  108. data/spec/integration/scoped_query_spec.rb +61 -51
  109. data/spec/integration/solr_instance_loader_spec.rb +5 -5
  110. data/spec/integration/solr_service_spec.rb +46 -46
  111. data/spec/samples/hydra-mods_article_datastream.rb +334 -334
  112. data/spec/samples/hydra-rights_metadata_datastream.rb +57 -57
  113. data/spec/samples/marpa-dc_datastream.rb +17 -17
  114. data/spec/samples/models/audio_record.rb +16 -16
  115. data/spec/samples/models/image.rb +2 -2
  116. data/spec/samples/models/mods_article.rb +5 -5
  117. data/spec/samples/models/oral_history.rb +18 -18
  118. data/spec/samples/models/seminar.rb +24 -24
  119. data/spec/samples/models/seminar_audio_file.rb +17 -17
  120. data/spec/samples/oral_history_sample_model.rb +21 -21
  121. data/spec/samples/special_thing.rb +14 -14
  122. data/spec/spec_helper.rb +11 -7
  123. data/spec/support/an_active_model.rb +2 -8
  124. data/spec/support/freeze_mocks.rb +12 -0
  125. data/spec/support/mock_fedora.rb +17 -16
  126. data/spec/unit/active_fedora_spec.rb +58 -60
  127. data/spec/unit/attributes_spec.rb +314 -0
  128. data/spec/unit/base_active_model_spec.rb +28 -27
  129. data/spec/unit/base_cma_spec.rb +5 -5
  130. data/spec/unit/base_datastream_management_spec.rb +27 -27
  131. data/spec/unit/base_extra_spec.rb +76 -48
  132. data/spec/unit/base_spec.rb +277 -348
  133. data/spec/unit/callback_spec.rb +18 -19
  134. data/spec/unit/code_configurator_spec.rb +17 -17
  135. data/spec/unit/config_spec.rb +8 -16
  136. data/spec/unit/content_model_spec.rb +79 -60
  137. data/spec/unit/datastream_collections_spec.rb +229 -229
  138. data/spec/unit/datastream_spec.rb +51 -63
  139. data/spec/unit/datastreams_spec.rb +87 -87
  140. data/spec/unit/file_configurator_spec.rb +217 -217
  141. data/spec/unit/has_and_belongs_to_many_collection_spec.rb +44 -25
  142. data/spec/unit/has_many_collection_spec.rb +26 -8
  143. data/spec/unit/inheritance_spec.rb +13 -12
  144. data/spec/unit/model_spec.rb +39 -45
  145. data/spec/unit/nom_datastream_spec.rb +15 -15
  146. data/spec/unit/ntriples_datastream_spec.rb +123 -118
  147. data/spec/unit/om_datastream_spec.rb +227 -233
  148. data/spec/unit/persistence_spec.rb +34 -15
  149. data/spec/unit/predicates_spec.rb +73 -73
  150. data/spec/unit/property_spec.rb +17 -9
  151. data/spec/unit/qualified_dublin_core_datastream_spec.rb +33 -33
  152. data/spec/unit/query_spec.rb +222 -198
  153. data/spec/unit/rdf_datastream_spec.rb +21 -28
  154. data/spec/unit/rdf_list_nested_attributes_spec.rb +34 -34
  155. data/spec/unit/rdf_list_spec.rb +65 -64
  156. data/spec/unit/rdf_node_spec.rb +7 -7
  157. data/spec/unit/rdf_xml_writer_spec.rb +10 -10
  158. data/spec/unit/rdfxml_rdf_datastream_spec.rb +27 -27
  159. data/spec/unit/relationship_graph_spec.rb +51 -51
  160. data/spec/unit/rels_ext_datastream_spec.rb +68 -74
  161. data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +15 -15
  162. data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +15 -15
  163. data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +15 -15
  164. data/spec/unit/rspec_matchers/match_fedora_datastream_matcher_spec.rb +12 -12
  165. data/spec/unit/rubydora_connection_spec.rb +5 -5
  166. data/spec/unit/semantic_node_spec.rb +48 -107
  167. data/spec/unit/serializers_spec.rb +4 -4
  168. data/spec/unit/service_definitions_spec.rb +26 -26
  169. data/spec/unit/simple_datastream_spec.rb +17 -17
  170. data/spec/unit/solr_config_options_spec.rb +29 -28
  171. data/spec/unit/solr_digital_object_spec.rb +17 -25
  172. data/spec/unit/solr_service_spec.rb +95 -82
  173. data/spec/unit/unsaved_digital_object_spec.rb +24 -23
  174. data/spec/unit/validations_spec.rb +21 -21
  175. metadata +110 -159
  176. data/.rspec +0 -1
  177. data/.rubocop.yml +0 -1
  178. data/.rubocop_todo.yml +0 -938
  179. data/CONSOLE_GETTING_STARTED.textile +0 -1
  180. data/NOKOGIRI_DATASTREAMS.textile +0 -1
  181. data/README.textile +0 -116
  182. data/lib/active_fedora/associations/association_proxy.rb +0 -178
  183. data/lib/active_fedora/delegating.rb +0 -72
  184. data/lib/active_fedora/nokogiri_datastream.rb +0 -11
  185. data/spec/integration/delegating_spec.rb +0 -59
  186. data/spec/rails3_test_app/.gitignore +0 -4
  187. data/spec/rails3_test_app/.rspec +0 -1
  188. data/spec/rails3_test_app/Gemfile +0 -40
  189. data/spec/rails3_test_app/Rakefile +0 -7
  190. data/spec/rails3_test_app/app/controllers/application_controller.rb +0 -3
  191. data/spec/rails3_test_app/app/helpers/application_helper.rb +0 -2
  192. data/spec/rails3_test_app/app/views/layouts/application.html.erb +0 -14
  193. data/spec/rails3_test_app/config.ru +0 -4
  194. data/spec/rails3_test_app/config/application.rb +0 -42
  195. data/spec/rails3_test_app/config/boot.rb +0 -6
  196. data/spec/rails3_test_app/config/database.yml +0 -22
  197. data/spec/rails3_test_app/config/environment.rb +0 -5
  198. data/spec/rails3_test_app/config/environments/development.rb +0 -25
  199. data/spec/rails3_test_app/config/environments/production.rb +0 -49
  200. data/spec/rails3_test_app/config/environments/test.rb +0 -35
  201. data/spec/rails3_test_app/config/initializers/backtrace_silencers.rb +0 -7
  202. data/spec/rails3_test_app/config/initializers/inflections.rb +0 -10
  203. data/spec/rails3_test_app/config/initializers/mime_types.rb +0 -5
  204. data/spec/rails3_test_app/config/initializers/secret_token.rb +0 -7
  205. data/spec/rails3_test_app/config/initializers/session_store.rb +0 -8
  206. data/spec/rails3_test_app/config/locales/en.yml +0 -5
  207. data/spec/rails3_test_app/config/routes.rb +0 -58
  208. data/spec/rails3_test_app/db/seeds.rb +0 -7
  209. data/spec/rails3_test_app/run_tests +0 -3
  210. data/spec/rails3_test_app/script/rails +0 -6
  211. data/spec/rails3_test_app/spec/spec_helper.rb +0 -27
  212. data/spec/rails3_test_app/spec/unit/rails_3_init.rb +0 -15
  213. data/spec/unit/association_proxy_spec.rb +0 -12
  214. data/spec/unit/base_delegate_spec.rb +0 -197
  215. data/spec/unit/base_delegate_to_spec.rb +0 -73
@@ -0,0 +1,163 @@
1
+ module ActiveFedora
2
+ module Associations
3
+ # This is the root class of all associations:
4
+ #
5
+ # Association
6
+ # BelongsToAssociation
7
+ # AssociationCollection
8
+ # HasManyAssociation
9
+ #
10
+ #
11
+ class Association
12
+ attr_reader :owner, :target, :reflection
13
+ delegate :options, :klass, to: :reflection
14
+
15
+ def initialize(owner, reflection)
16
+ #reflection.check_validity!
17
+ @owner, @reflection = owner, reflection
18
+ @updated = false
19
+ reset
20
+ # construct_scope
21
+ end
22
+
23
+ # Resets the \loaded flag to +false+ and sets the \target to +nil+.
24
+ def reset
25
+ @loaded = false
26
+ @target = nil
27
+ end
28
+
29
+ # Reloads the \target and returns +self+ on success.
30
+ def reload
31
+ reset
32
+ # construct_scope
33
+ load_target
34
+ self unless @target.nil?
35
+ end
36
+
37
+ # Has the \target been already \loaded?
38
+ def loaded?
39
+ @loaded
40
+ end
41
+
42
+ # Asserts the \target has been loaded setting the \loaded flag to +true+.
43
+ def loaded!
44
+ @loaded = true
45
+ @stale_state = stale_state
46
+ end
47
+
48
+ # The target is stale if the target no longer points to the record(s) that the
49
+ # relevant foreign_key(s) refers to. If stale, the association accessor method
50
+ # on the owner will reload the target. It's up to subclasses to implement the
51
+ # state_state method if relevant.
52
+ #
53
+ # Note that if the target has not been loaded, it is not considered stale.
54
+ def stale_target?
55
+ loaded? && @stale_state != stale_state
56
+ end
57
+
58
+ # Sets the target of this proxy to <tt>\target</tt>, and the \loaded flag to +true+.
59
+ def target=(target)
60
+ @target = target
61
+ loaded!
62
+ end
63
+
64
+ def scope
65
+ target_scope.merge(association_scope)
66
+ end
67
+
68
+ # The scope for this association.
69
+ #
70
+ # Note that the association_scope is merged into the target_scope only when the
71
+ # scope method is called. This is because at that point the call may be surrounded
72
+ # by scope.scoping { ... } or with_scope { ... } etc, which affects the scope which
73
+ # actually gets built.
74
+ def association_scope
75
+ if klass
76
+ @association_scope ||= AssociationScope.new(self).scope
77
+ end
78
+ end
79
+
80
+ # Set the inverse association, if possible
81
+ def set_inverse_instance(record)
82
+ if record && invertible_for?(record)
83
+ inverse = record.association(inverse_reflection_for(record).name)
84
+ inverse.target = owner
85
+ end
86
+ end
87
+
88
+
89
+ # Can be overridden (i.e. in ThroughAssociation) to merge in other scopes (i.e. the
90
+ # through association's scope)
91
+ def target_scope
92
+ klass.all
93
+ end
94
+
95
+ # Loads the \target if needed and returns it.
96
+ #
97
+ # This method is abstract in the sense that it relies on +find_target+,
98
+ # which is expected to be provided by descendants.
99
+ #
100
+ # If the \target is already \loaded it is just returned. Thus, you can call
101
+ # +load_target+ unconditionally to get the \target.
102
+ #
103
+ # ActiveFedora::ObjectNotFoundError is rescued within the method, and it is
104
+ # not reraised. The proxy is \reset and +nil+ is the return value.
105
+ def load_target
106
+ @target = find_target if (@stale_state && stale_target?) || find_target?
107
+ loaded! unless loaded?
108
+ target
109
+ end
110
+
111
+ private
112
+
113
+
114
+ def find_target?
115
+ !loaded? && (!owner.new_record? || foreign_key_present?) && klass
116
+ end
117
+
118
+ # Returns true if there is a foreign key present on the owner which
119
+ # references the target. This is used to determine whether we can load
120
+ # the target if the owner is currently a new record (and therefore
121
+ # without a key). If the owner is a new record then foreign_key must
122
+ # be present in order to load target.
123
+ #
124
+ # Currently implemented by belongs_to
125
+ def foreign_key_present?
126
+ false
127
+ end
128
+
129
+ # Raises ActiveFedora::AssociationTypeMismatch unless +record+ is of
130
+ # the kind of the class of the associated objects. Meant to be used as
131
+ # a sanity check when you are about to assign an associated record.
132
+ def raise_on_type_mismatch(record)
133
+ unless record.is_a?(@reflection.klass) || record.is_a?(@reflection.class_name.constantize)
134
+ message = "#{@reflection.class_name}(##{@reflection.klass.object_id}) expected, got #{record.class}(##{record.class.object_id})"
135
+ raise ActiveFedora::AssociationTypeMismatch, message
136
+ end
137
+ end
138
+
139
+ # Can be redefined by subclasses, notably polymorphic belongs_to
140
+ # The record parameter is necessary to support polymorphic inverses as we must check for
141
+ # the association in the specific class of the record.
142
+ def inverse_reflection_for(record)
143
+ reflection.inverse_of
144
+ end
145
+
146
+ # Returns true if inverse association on the given record needs to be set.
147
+ # This method is redefined by subclasses.
148
+ def invertible_for?(record)
149
+ inverse_reflection_for(record)
150
+ end
151
+
152
+
153
+ # This should be implemented to return the values of the relevant key(s) on the owner,
154
+ # so that when state_state is different from the value stored on the last find_target,
155
+ # the target is stale.
156
+ #
157
+ # This is only relevant to certain associations, which is why it returns nil by default.
158
+ def stale_state
159
+ end
160
+
161
+ end
162
+ end
163
+ end
@@ -0,0 +1,39 @@
1
+ module ActiveFedora
2
+ module Associations
3
+ class AssociationScope #:nodoc:
4
+
5
+ attr_reader :association
6
+
7
+ delegate :klass, :owner, :reflection, :interpolate, :to => :association
8
+ delegate :chain, :scope_chain, :options, :source_options, :active_record, :to => :reflection
9
+
10
+ def initialize(association)
11
+ @association = association
12
+ end
13
+
14
+
15
+ def scope
16
+ scope = klass.unscoped
17
+ add_constraints(scope)
18
+ end
19
+
20
+ private
21
+ def add_constraints(scope)
22
+ chain.each_with_index do |reflection, i|
23
+ if reflection.source_macro == :belongs_to
24
+ elsif reflection.source_macro == :has_and_belongs_to_many
25
+ else
26
+ scope = scope.where( association.send(:find_predicate) => owner.internal_uri)
27
+ end
28
+
29
+
30
+ is_first_chain = i == 0
31
+ klass = is_first_chain ? self.klass : reflection.klass
32
+ end
33
+
34
+ scope
35
+ end
36
+
37
+ end
38
+ end
39
+ end
@@ -1,70 +1,92 @@
1
1
  module ActiveFedora
2
2
  module Associations
3
- class BelongsToAssociation < AssociationProxy #:nodoc:
3
+ class BelongsToAssociation < SingularAssociation #:nodoc:
4
4
 
5
- def create(attributes = {})
6
- replace(@reflection.create_association(attributes))
5
+ def id_writer(id)
6
+ remove_matching_property_relationship
7
+ return if id.blank? or id == ActiveFedora::UnsavedDigitalObject::PLACEHOLDER
8
+ @owner.add_relationship(@reflection.options[:property], ActiveFedora::Base.internal_uri(id))
7
9
  end
8
10
 
9
- def build(attributes = {})
10
- replace(@reflection.build_association(attributes))
11
+ def id_reader
12
+ # need to find the id with the correct class
13
+ ids = @owner.ids_for_outbound(@reflection.options[:property])
14
+
15
+ return if ids.empty?
16
+ # This incurs a lot of overhead, but it's necessary if the users use one property for more than one association.
17
+ # e.g.
18
+ # belongs_to :author, :property=>:has_member, :class_name=>'Person'
19
+ # belongs_to :publisher, :property=>:has_member
20
+ results = SolrService.query(ActiveFedora::SolrService.construct_query_for_pids(ids))
21
+ results.each do |result|
22
+ return result['id'] if SolrService.class_from_solr_document(result) == klass
23
+ end
24
+ return nil
11
25
  end
12
26
 
13
27
  def replace(record)
14
28
  if record.nil?
15
- remove_matching_property_relationship
29
+ id_writer(nil)
16
30
  else
17
31
  raise_on_type_mismatch(record)
18
-
19
- remove_matching_property_relationship
20
-
21
- @target = (AssociationProxy === record ? record.target : record)
22
- @owner.add_relationship(@reflection.options[:property], record) unless record.new_record?
32
+ id_writer(record.id)
23
33
  @updated = true
34
+
35
+ #= (AssociationProxy === record ? record.target : record)
24
36
  end
37
+ self.target = record
25
38
 
26
- loaded
39
+ loaded!
27
40
  record
28
41
  end
29
42
 
43
+ def reset
44
+ super
45
+ @updated = false
46
+ end
47
+
48
+ def updated?
49
+ @updated
50
+ end
51
+
30
52
  private
31
53
  def find_target
32
- pid = @owner.ids_for_outbound(@reflection.options[:property])
33
- return if pid.empty?
34
- class_name = @reflection.options[:class_name] ? @reflection.options[:class_name] : @reflection.class_name
35
- query = construct_query(pid, class_name)
36
- solr_result = SolrService.query(query)
54
+ pid = id_reader
55
+ return unless pid
56
+ solr_result = SolrService.query(construct_query(pid))
37
57
  return ActiveFedora::SolrService.reify_solr_results(solr_result).first
38
58
  end
39
59
 
40
- def construct_query pid, class_name
41
- if class_name && class_name != "ActiveFedora::Base"
60
+ def construct_query pid
61
+ if klass != ActiveFedora::Base
42
62
  clauses = {}
43
- clauses[:has_model] = class_name.constantize.to_class_uri
44
- query = ActiveFedora::SolrService.construct_query_for_rel(clauses) + " AND (" + ActiveFedora::SolrService.construct_query_for_pids(pid) + ")"
63
+ clauses[:has_model] = klass.to_class_uri
64
+ query = ActiveFedora::SolrService.construct_query_for_rel(clauses) + " AND (" + ActiveFedora::SolrService.construct_query_for_pids([pid]) + ")"
45
65
  else
46
66
  query = ActiveFedora::SolrService.construct_query_for_pids(pid)
47
67
  end
48
68
  end
49
69
 
50
70
  def remove_matching_property_relationship
51
- class_name = @reflection.options[:class_name] ? @reflection.options[:class_name] : @reflection.class_name
52
71
  ids = @owner.ids_for_outbound(@reflection.options[:property])
53
72
  return if ids.empty?
54
73
  ids.each do |id|
55
74
  result = SolrService.query(ActiveFedora::SolrService.construct_query_for_pids([id]))
56
75
  hit = ActiveFedora::SolrService.reify_solr_results(result).first
57
76
  # We remove_relationship on subjects that match the same class, or if the subject is nil
58
- if hit.class.to_s == class_name || hit.nil?
77
+ if hit.class == klass || hit.nil?
59
78
  @owner.remove_relationship(@reflection.options[:property], hit)
60
79
  end
61
80
  end
62
81
  end
63
82
 
64
- def foreign_key_present
65
- !@owner.send(@reflection.primary_key_name).nil?
83
+ def foreign_key_present?
84
+ owner[reflection.foreign_key]
66
85
  end
67
86
 
87
+ def stale_state
88
+ owner[reflection.foreign_key]
89
+ end
68
90
  end
69
91
  end
70
92
  end
@@ -0,0 +1,55 @@
1
+ module ActiveFedora::Associations::Builder
2
+ class Association #:nodoc:
3
+ class_attribute :valid_options
4
+ self.valid_options = [:class_name, :property]
5
+
6
+ # Set by subclasses
7
+ class_attribute :macro
8
+
9
+ attr_reader :model, :name, :options, :reflection, :mixin
10
+
11
+ def self.build(model, name, options)
12
+ new(model, name, options).build
13
+ end
14
+
15
+ def initialize(model, name, options)
16
+ @model, @name, @options = model, name, options
17
+ @mixin = Module.new
18
+ @model.__send__(:include, @mixin)
19
+ end
20
+
21
+ def build
22
+ validate_options
23
+ reflection = model.create_reflection(self.class.macro, name, options, model)
24
+ define_accessors
25
+ reflection
26
+ end
27
+
28
+ private
29
+
30
+ def validate_options
31
+ options.assert_valid_keys(self.class.valid_options)
32
+ end
33
+
34
+ def define_accessors
35
+ define_readers
36
+ define_writers
37
+ end
38
+
39
+ def define_readers
40
+ name = self.name
41
+
42
+ mixin.send(:define_method, name) do |*params|
43
+ association(name).reader(*params)
44
+ end
45
+ end
46
+
47
+ def define_writers
48
+ name = self.name
49
+
50
+ mixin.send(:define_method, "#{name}=") do |value|
51
+ association(name).writer(value)
52
+ end
53
+ end
54
+ end
55
+ end
@@ -0,0 +1,100 @@
1
+ module ActiveFedora::Associations::Builder
2
+ class BelongsTo < SingularAssociation #:nodoc:
3
+ self.macro = :belongs_to
4
+
5
+ self.valid_options += [:touch]
6
+
7
+
8
+ def build
9
+ reflection = super
10
+ add_counter_cache_callbacks(reflection) if options[:counter_cache]
11
+ add_touch_callbacks(reflection) if options[:touch]
12
+ configure_dependency
13
+ reflection
14
+ end
15
+
16
+ private
17
+
18
+ def add_counter_cache_callbacks(reflection)
19
+ cache_column = reflection.counter_cache_column
20
+ name = self.name
21
+
22
+ method_name = "belongs_to_counter_cache_after_create_for_#{name}"
23
+ mixin.redefine_method(method_name) do
24
+ record = send(name)
25
+ record.class.increment_counter(cache_column, record.id) unless record.nil?
26
+ end
27
+ model.after_create(method_name)
28
+
29
+ method_name = "belongs_to_counter_cache_before_destroy_for_#{name}"
30
+ mixin.redefine_method(method_name) do
31
+ record = send(name)
32
+ record.class.decrement_counter(cache_column, record.id) unless record.nil?
33
+ end
34
+ model.before_destroy(method_name)
35
+
36
+ model.send(:module_eval,
37
+ "#{reflection.class_name}.send(:attr_readonly,\"#{cache_column}\".intern) if defined?(#{reflection.class_name}) && #{reflection.class_name}.respond_to?(:attr_readonly)", __FILE__, __LINE__
38
+ )
39
+ end
40
+
41
+ def add_touch_callbacks(reflection)
42
+ name = self.name
43
+ method_name = "belongs_to_touch_after_save_or_destroy_for_#{name}"
44
+ touch = options[:touch]
45
+
46
+ mixin.redefine_method(method_name) do
47
+ record = send(name)
48
+
49
+ unless record.nil?
50
+ if touch == true
51
+ record.touch
52
+ else
53
+ record.touch(touch)
54
+ end
55
+ end
56
+ end
57
+
58
+ model.after_save(method_name)
59
+ model.after_touch(method_name)
60
+ model.after_destroy(method_name)
61
+ end
62
+
63
+ def configure_dependency
64
+ if options[:dependent]
65
+ unless [:destroy, :delete].include?(options[:dependent])
66
+ raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{options[:dependent].inspect})"
67
+ end
68
+
69
+ method_name = "belongs_to_dependent_#{options[:dependent]}_for_#{name}"
70
+ model.send(:class_eval, <<-eoruby, __FILE__, __LINE__ + 1)
71
+ def #{method_name}
72
+ association = #{name}
73
+ association.#{options[:dependent]} if association
74
+ end
75
+ eoruby
76
+ model.after_destroy method_name
77
+ end
78
+ end
79
+
80
+ def define_readers
81
+ super
82
+ name = self.name
83
+ accessor_name = "#{name}_id"
84
+ model.find_or_create_defined_attribute(accessor_name, 'RELS-EXT', {})
85
+ mixin.redefine_method(accessor_name) do
86
+ association(name).id_reader
87
+ end
88
+ end
89
+
90
+ def define_writers
91
+ super
92
+ name = self.name
93
+ writer_name = "#{name}_id"
94
+ model.find_or_create_defined_attribute(writer_name, 'RELS-EXT', {})
95
+ mixin.redefine_method("#{writer_name}=") do |id|
96
+ association(name).id_writer(id)
97
+ end
98
+ end
99
+ end
100
+ end