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
@@ -1,29 +1,29 @@
1
1
  require 'active-fedora'
2
2
 
3
- class Seminar
4
-
3
+ class Seminar
4
+
5
5
  include ActiveFedora::Model
6
-
6
+
7
7
  # Imitating DataMapper ...
8
-
9
- relationship 'parts', :is_part_of, [:seminar_audio_file], :inbound => true
10
- #has n, :parts, {:predicate => :is_part_of, :likely_types => [:seminar_audio_file], :inbound => true}
8
+
9
+ relationship "parts", :is_part_of, [:seminar_audio_file], :inbound => true
10
+ #has n, :parts, {:predicate => :is_part_of, :likely_types => [:seminar_audio_file], :inbound => true}
11
11
  # OR
12
- # has_parts [:seminar_audio_file]
13
-
14
- property 'title_wylie', :text # Note: reserving title_tibetan for actual UTF-8 tibetan text
15
- property 'title_english', :text
16
- property 'original_media_format', :text
17
- property 'original_media_number_of_units', :integer
18
- property 'author_name_wylie', :text
19
- property 'author_name_english', :text
20
- property 'location', :string
21
- property 'date_recorded', :date
22
- property 'file_name', :string
23
- property 'duration', :string
24
- property 'file_size', :integer
25
- property 'restriction', :text
26
- property 'uri', :string
27
- property 'notes', :text
28
-
29
- end
12
+ # has_parts [:seminar_audio_file]
13
+
14
+ property "title_wylie", :text # Note: reserving title_tibetan for actual UTF-8 tibetan text
15
+ property "title_english", :text
16
+ property "original_media_format", :text
17
+ property "original_media_number_of_units", :integer
18
+ property "author_name_wylie", :text
19
+ property "author_name_english", :text
20
+ property "location", :string
21
+ property "date_recorded", :date
22
+ property "file_name", :string
23
+ property "duration", :string
24
+ property "file_size", :integer
25
+ property "restriction", :text
26
+ property "uri", :string
27
+ property "notes", :text
28
+
29
+ end
@@ -1,32 +1,32 @@
1
1
  require 'active-fedora'
2
2
 
3
3
  class SeminarAudioFile
4
-
4
+
5
5
  include ActiveFedora::Model
6
-
6
+
7
7
  # Imitating DataMapper ...
8
-
9
- relationship 'parent', :is_part_of, :seminar
8
+
9
+ relationship "parent", :is_part_of, :seminar
10
10
  #has n, :parents, {:predicate => :is_part_of, :likely_types => [:seminar]}
11
11
  # OR
12
12
  # is_part_of :seminar
13
-
14
- property 'date_recorded', :date
15
- property 'file_name', :string
16
- property 'duration', :string
17
- property 'uri', :string
18
- property 'notes', :text
13
+
14
+ property "date_recorded", :date
15
+ property "file_name", :string
16
+ property "duration", :string
17
+ property "uri", :string
18
+ property "notes", :text
19
19
 
20
20
  # TODO: Figure out how to declare access restrictions
21
21
  #property "restriction", :text
22
- set_restrictions ['public', 'private']
23
-
22
+ set_restrictions ["public", "private"]
23
+
24
24
  # A file_size property doesn't make sense when you have both compressed and uncompressed in the same object!
25
- # Probably better to rely on the file size in datastreamVersion "SIZE" attribute from Fedora anyway
25
+ # Probably better to rely on the file size in datastreamVersion "SIZE" attribute from Fedora anyway
26
26
  #property "file_size", :integer
27
27
 
28
- datastream 'compressed', ['audio/mpeg'], :multiple => true
29
- datastream 'uncompressed', ['audio/wav', 'audio/aiff'], :multiple => true
30
-
31
-
28
+ datastream "compressed", ["audio/mpeg"], :multiple => true
29
+ datastream "uncompressed", ["audio/wav", "audio/aiff"], :multiple => true
30
+
31
+
32
32
  end
@@ -1,30 +1,30 @@
1
- require 'active_fedora'
1
+ require "active_fedora"
2
2
  class OralHistorySampleModel < ActiveFedora::Base
3
3
 
4
4
  #has_relationship "parts", :is_part_of, :inbound => true
5
-
6
- has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream do |m|
7
- m.field 'narrator', :string
8
- m.field 'interviewer', :string
9
- m.field 'transcript_editor', :text
10
- m.field 'bio', :string
11
- m.field 'notes', :text
12
- m.field 'hard_copy_availability', :text
13
- m.field 'hard_copy_location', :text
14
- m.field 'other_contributor', :string
15
- m.field 'restrictions', :text
16
- m.field 'series', :string
17
- m.field 'location', :string
5
+
6
+ has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
7
+ m.field "narrator", :string
8
+ m.field "interviewer", :string
9
+ m.field "transcript_editor", :text
10
+ m.field "bio", :string
11
+ m.field "notes", :text
12
+ m.field "hard_copy_availability", :text
13
+ m.field "hard_copy_location", :text
14
+ m.field "other_contributor", :string
15
+ m.field "restrictions", :text
16
+ m.field "series", :string
17
+ m.field "location", :string
18
18
  end
19
+
20
+ has_metadata :name => "dublin_core", :type => ActiveFedora::QualifiedDublinCoreDatastream
19
21
 
20
- has_metadata :name => 'dublin_core', :type => ActiveFedora::QualifiedDublinCoreDatastream
21
-
22
- has_metadata :name => 'significant_passages', :type => ActiveFedora::SimpleDatastream do |m|
23
- m.field 'significant_passage', :text
22
+ has_metadata :name => "significant_passages", :type => ActiveFedora::SimpleDatastream do |m|
23
+ m.field "significant_passage", :text
24
24
  end
25
-
26
- has_metadata :name => 'sensitive_passages', :type => ActiveFedora::SimpleDatastream do |m|
27
- m.field 'sensitive_passage', :text
25
+
26
+ has_metadata :name => "sensitive_passages", :type => ActiveFedora::SimpleDatastream do |m|
27
+ m.field "sensitive_passage", :text
28
28
  end
29
29
 
30
30
  end
@@ -1,11 +1,11 @@
1
- require 'samples/marpa-dc_datastream.rb'
1
+ require "samples/marpa-dc_datastream.rb"
2
2
 
3
3
  # This is an example of an ActiveFedora Model
4
4
  #
5
- # Some of the datastream ids were chosen based on the Hydra modeling conventions. You don't have to follow them in your work.
5
+ # Some of the datastream ids were chosen based on the Hydra modeling conventions. You don't have to follow them in your work.
6
6
  # ActiveFedora itself has no notion of those conventions, but we do encourage you to use them.
7
7
  #
8
- # The Hydra conventions encourage you to have a datastream with this dsid whose contents are descriptive metadata like MODS or Dublin Core. They especially encourage MODS.
8
+ # The Hydra conventions encourage you to have a datastream with this dsid whose contents are descriptive metadata like MODS or Dublin Core. They especially encourage MODS.
9
9
  # The descMetadata dsid is a Hydra convention for a datastream with descriptive metadata contents, like MODS or Dublin Core. They especially encourage MODS.
10
10
  # The rightsMetadata dsid is also a convention provided by the Hydra Common Metadata "content model"
11
11
  #
@@ -13,32 +13,32 @@ require 'samples/marpa-dc_datastream.rb'
13
13
  # Note that on the wiki, "content model" is often used to refer to Fedora CModels and/or abstract/notional models. The Common Metadata content model is an example of this.
14
14
  # The wiki includes a page that attempts to shed some light on the question of "What is a content model?" https://wiki.duraspace.org/display/hydra/Don't+call+it+a+'content+model'!
15
15
  class SpecialThing < ActiveFedora::Base
16
-
16
+
17
17
  #
18
18
  # DATASTREAMS
19
19
  #
20
-
20
+
21
21
  # This declares a datastream with Datastream ID (dsid) of "descMetadata"
22
22
  # The descMetadata datastream is bound to the Hydra::ModsArticleDatastream class that's defined in lib/active_fedora/samples
23
23
  # Any time you load a Fedora object using an instance of SampleModel, the instance will assume its descMetadata datastream conforms to the assumptions in Hydra::ModsArticleDatastream class
24
- has_metadata :name => 'descMetadata', :type => Hydra::ModsArticleDatastream
25
-
24
+ has_metadata :name => "descMetadata", :type=> Hydra::ModsArticleDatastream
25
+
26
26
  # This declares a datastream with Datastream ID (dsid) of "rightsMetadata"
27
27
  # Like the descMetadata datastream, any time you load a Fedora object using an instance of SampleModel, the instance will assume its descMetadata datastream conforms to the assumptions in Hydra::RightsMetadataDatastream class
28
- has_metadata :name => 'rightsMetadata', :type => Hydra::RightsMetadataDatastream
29
-
28
+ has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadataDatastream
29
+
30
30
  # This is not part of the Hydra conventions
31
31
  # Adding an extra datastream called "extraMetadataForFun" that is bound to the Marpa::DcDatastream class
32
- has_metadata :name => 'extraMetadataForFun', :type => Marpa::DcDatastream
33
-
32
+ has_metadata :name => "extraMetadataForFun", :type => Marpa::DcDatastream
33
+
34
34
  #
35
35
  # RELATIONSHIPS
36
36
  #
37
-
37
+
38
38
  # This is an example of how you can add a custom relationship to a model
39
39
  # This will allow you to call .derivation on instances of the model to get the _outbound_ "hasDerivation" relationship in the RELS-EXT datastream
40
- belongs_to :derivation, :property => :has_derivation
40
+ belongs_to :derivation, :property=>:has_derivation
41
41
 
42
42
  # This will allow you to call .inspirations on instances of the model to get a list of all of the objects that assert "hasDerivation" relationships pointing at this object
43
- has_many :inspirations, :property => :has_derivation
43
+ has_many :inspirations, :property=>:has_derivation
44
44
  end
@@ -1,5 +1,5 @@
1
- ENV['environment'] ||= 'test'
2
- require 'bundler/setup'
1
+ ENV["environment"] ||= 'test'
2
+ require "bundler/setup"
3
3
 
4
4
 
5
5
  begin
@@ -17,27 +17,31 @@ require 'active-fedora'
17
17
  require 'rspec'
18
18
  require 'equivalent-xml/rspec_matchers'
19
19
 
20
- Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f }
20
+ Dir[File.expand_path("../support/**/*.rb", __FILE__)].each {|f| require f }
21
21
  require 'samples/samples'
22
22
 
23
23
 
24
24
  logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
25
- $VERBOSE = nil
25
+ $VERBOSE=nil
26
26
 
27
27
  # This loads the Fedora and Solr config info from /config/fedora.yml
28
28
  # You can load it from a different location by passing a file path as an argument.
29
29
  def restore_spec_configuration
30
- ActiveFedora.init(:fedora_config_path => File.join(File.dirname(__FILE__), '..', 'config', 'fedora.yml'))
30
+ ActiveFedora.init(:fedora_config_path=>File.join(File.dirname(__FILE__), "..", "config", "fedora.yml"))
31
31
  end
32
32
  restore_spec_configuration
33
33
 
34
34
  # Shut those Rails deprecation warnings up
35
- ActiveSupport::Deprecation.behavior = Proc.new { |message, callstack| }
35
+ ActiveSupport::Deprecation.behavior= Proc.new { |message, callstack| }
36
+
37
+ RSpec.configure do |config|
38
+ config.color_enabled = true
39
+ end
36
40
 
37
41
  def fixture(file)
38
42
  File.open(File.join(File.dirname(__FILE__), 'fixtures', file), 'rb')
39
43
  end
40
44
 
41
45
  def solr_uri(uri)
42
- uri.gsub(/(:)/, '\\:').gsub(/(\/)/, '\\/')
46
+ uri.gsub(/(:)/, "\\:").gsub(/(\/)/,"\\/")
43
47
  end
@@ -1,4 +1,4 @@
1
- shared_examples_for 'An ActiveModel' do
1
+ shared_examples_for "An ActiveModel" do
2
2
  begin
3
3
  require 'minitest/unit'
4
4
  include Minitest::Assertions
@@ -16,7 +16,7 @@ shared_examples_for 'An ActiveModel' do
16
16
  include ActiveModel::Lint::Tests
17
17
 
18
18
  ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
19
- example m.tr('_', ' ') do
19
+ example m.gsub('_',' ') do
20
20
  send m
21
21
  end
22
22
  end
@@ -25,10 +25,4 @@ shared_examples_for 'An ActiveModel' do
25
25
  subject
26
26
  end
27
27
 
28
- # Because minitest assumes a method #assertions that is an integer.
29
- attr_accessor :assertions
30
- def assertions
31
- @assertions ||= 0
32
- end
33
-
34
28
  end
@@ -0,0 +1,12 @@
1
+ # Don't raise errors if the object is frozen.
2
+ # Work around a bug in rspec-mocks 2.14.4
3
+ # https://github.com/rspec/rspec-mocks/issues/494
4
+ RSpec::Mocks::MethodDouble.class_eval do
5
+ alias_method :original_restore_original_method, :restore_original_method
6
+ def restore_original_method
7
+ original_restore_original_method
8
+ rescue => e
9
+ raise e unless object_singleton_class.frozen?
10
+ Kernel.warn "Unable to remove stub method #{@method_name} because the object was frozen"
11
+ end
12
+ end
@@ -1,44 +1,45 @@
1
1
  def mock_client
2
2
  return @mock_client if @mock_client
3
- @mock_client = double('client')
4
- @getter = double('getter')
5
- allow(@getter).to receive(:get).and_return('')
6
- allow(@mock_client).to receive(:[]).with('describe?xml=true').and_return('')
7
- @mock_client
3
+ @mock_client = double("client")
4
+ @getter = double("getter")
5
+ @getter.stub(:get).and_return('')
6
+ @mock_client.stub(:[]).with("describe?xml=true").and_return('')
7
+ @mock_client
8
8
  end
9
-
10
- def stub_get(pid, datastreams = nil, record_exists = false)
9
+
10
+ def stub_get(pid, datastreams=nil, record_exists=false)
11
11
  pid.gsub!(/:/, '%3A')
12
12
  if record_exists
13
- allow(mock_client).to receive(:[]).with("objects/#{pid}?format=xml").and_return(double('get getter', :get => 'foobar'))
13
+ mock_client.stub(:[]).with("objects/#{pid}?format=xml").and_return(double('get getter', :get=>'foobar'))
14
14
  else
15
- allow(mock_client).to receive(:[]).with("objects/#{pid}?format=xml").and_raise(RestClient::ResourceNotFound)
15
+ mock_client.stub(:[]).with("objects/#{pid}?format=xml").and_raise(RestClient::ResourceNotFound)
16
16
  end
17
- allow(mock_client).to receive(:[]).with("objects/#{pid}/datastreams?format=xml").and_return(@getter)
17
+ mock_client.stub(:[]).with("objects/#{pid}/datastreams?format=xml").and_return(@getter)
18
18
  datastreams ||= ['someData', 'withText', 'withText2', 'RELS-EXT']
19
19
  datastreams.each do |dsid|
20
- allow(mock_client).to receive(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").and_return(@getter)
20
+ mock_client.stub(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").and_return(@getter)
21
21
  end
22
22
  end
23
23
 
24
- def stub_ingest(pid = nil)
24
+ def stub_ingest(pid=nil)
25
25
  n = pid ? pid.gsub(/:/, '%3A') : nil
26
- expect(mock_client).to receive(:[]).with("objects/#{n || 'new'}").and_return(double('ingester', :post => pid))
26
+ mock_client.should_receive(:[]).with("objects/#{n || 'new'}").and_return(double("ingester", :post=>pid))
27
27
  end
28
28
 
29
29
  def stub_add_ds(pid, dsids)
30
30
  pid.gsub!(/:/, '%3A')
31
31
  dsids.each do |dsid|
32
- client = allow(mock_client).to receive(:[]).with(no_args) do |params|
32
+ client = mock_client.stub(:[]).with do |params|
33
33
  /objects\/#{pid}\/datastreams\/#{dsid}/.match(params)
34
34
  end
35
- client.and_return(double('ds_adder', :post => pid, :get => ''))
35
+ client.and_return(double("ds_adder", :post=>pid, :get=>''))
36
36
  end
37
37
  end
38
38
 
39
39
  def stub_get_content(pid, dsids)
40
40
  pid.gsub!(/:/, '%3A')
41
41
  dsids.each do |dsid|
42
- allow(mock_client).to receive(:[]).with(no_args) { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.and_return(double('content_accessor', :post => pid, :get => ''))
42
+ mock_client.stub(:[]).with { |params| /objects\/#{pid}\/datastreams\/#{dsid}\/content/.match(params)}.and_return(double("content_accessor", :post=>pid, :get=>''))
43
43
  end
44
44
  end
45
+
@@ -4,106 +4,104 @@ require 'config_helper'
4
4
  # For testing Module-level methods like ActiveFedora.init
5
5
 
6
6
  describe ActiveFedora do
7
-
7
+
8
8
  after :all do
9
9
  unstub_rails
10
10
  # Restore to default fedora configs
11
11
  restore_spec_configuration
12
12
  end
13
13
 
14
- describe 'initialization methods' do
15
- describe 'environment' do
16
- it 'should use config_options[:environment] if set' do
17
- ActiveFedora.stub(:config_options => {:environment => 'ballyhoo'})
18
- expect(ActiveFedora.environment).to eql('ballyhoo')
14
+ describe "initialization methods" do
15
+ describe "environment" do
16
+ it "should use config_options[:environment] if set" do
17
+ ActiveFedora.stub(:config_options => {:environment=>"ballyhoo"})
18
+ ActiveFedora.environment.should eql("ballyhoo")
19
19
  end
20
20
 
21
- it 'should use Rails.env if no config_options and Rails.env is set' do
22
- stub_rails(:env => 'bedbugs')
21
+ it "should use Rails.env if no config_options and Rails.env is set" do
22
+ stub_rails(:env => "bedbugs")
23
23
  ActiveFedora.stub(:config_options => {})
24
- expect(ActiveFedora.environment).to eql('bedbugs')
24
+ ActiveFedora.environment.should eql("bedbugs")
25
25
  unstub_rails
26
26
  end
27
27
 
28
28
  it "should use ENV['environment'] if neither config_options nor Rails.env are set" do
29
- ENV['environment'] = 'wichita'
29
+ ENV['environment'] = "wichita"
30
30
  ActiveFedora.stub(:config_options => {})
31
- expect(ActiveFedora.environment).to eql('wichita')
32
- ENV['environment'] = 'test'
31
+ ActiveFedora.environment.should eql("wichita")
32
+ ENV['environment']='test'
33
33
  end
34
34
 
35
35
  it "should use ENV['RAILS_ENV'] and log a warning if none of the above are set" do
36
- ENV['environment'] = nil
37
- ENV['RAILS_ENV'] = 'rails_env'
38
- expect {ActiveFedora.environment}.to raise_error(RuntimeError, "You're depending on RAILS_ENV for setting your environment. Please use ENV['environment'] for non-rails environment setting: 'rake foo:bar environment=test'")
39
- ENV['environment'] = 'test'
36
+ ENV['environment']=nil
37
+ ENV['RAILS_ENV'] = "rails_env"
38
+ lambda {ActiveFedora.environment}.should raise_error(RuntimeError, "You're depending on RAILS_ENV for setting your environment. Please use ENV['environment'] for non-rails environment setting: 'rake foo:bar environment=test'")
39
+ ENV['environment']='test'
40
40
  end
41
41
 
42
- it 'should be development if none of the above are present' do
43
- ENV['environment'] = nil
42
+ it "should be development if none of the above are present" do
43
+ ENV['environment']=nil
44
44
  ENV['RAILS_ENV'] = nil
45
45
  ActiveFedora.stub(:config_options => {})
46
- expect(ActiveFedora.environment).to eq('development')
47
- ENV['environment'] = 'test'
46
+ ActiveFedora.environment.should == 'development'
47
+ ENV['environment']="test"
48
48
  end
49
49
  end
50
50
  end
51
-
52
- describe '.init' do
53
-
51
+
52
+ describe ".init" do
53
+
54
54
  after(:all) do
55
55
  # Restore to default fedora configs
56
- ActiveFedora.init(:environment => 'test', :fedora_config_path => File.join(File.dirname(__FILE__), '..', '..', 'config', 'fedora.yml'))
56
+ ActiveFedora.init(:environment => "test", :fedora_config_path => File.join(File.dirname(__FILE__), "..", "..", "config", "fedora.yml"))
57
57
  end
58
58
 
59
- describe 'outside of rails' do
60
- it 'should load the passed config if explicit config passed in as a string' do
61
- ActiveFedora.init(:fedora_config_path => './spec/fixtures/rails_root/config/fedora.yml', :environment => 'test')
62
- expect(ActiveFedora.config.credentials).to eq({:url => 'http://testhost.com:8983/fedora', :user => 'fedoraAdmin', :password => 'fedoraAdmin'})
59
+ describe "outside of rails" do
60
+ it "should load the passed config if explicit config passed in as a string" do
61
+ ActiveFedora.init(:fedora_config_path=>'./spec/fixtures/rails_root/config/fedora.yml', :environment => 'test')
62
+ ActiveFedora.config.credentials.should == {:url=> "http://testhost.com:8983/fedora", :user=>'fedoraAdmin', :password=>'fedoraAdmin'}
63
63
  end
64
64
  end
65
65
 
66
- describe 'within rails' do
66
+ describe "within rails" do
67
67
 
68
68
  after(:all) do
69
69
  unstub_rails
70
70
  end
71
71
 
72
- describe 'versions prior to 3.0' do
73
- describe 'with explicit config path passed in' do
74
- it 'should load the specified config path' do
75
- fedora_config = "test:\n url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
72
+ describe "versions prior to 3.0" do
73
+ describe "with explicit config path passed in" do
74
+ it "should load the specified config path" do
75
+ fedora_config="test:\n url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora"
76
76
  solr_config = "test:\n default:\n url: http://foosolr:8983"
77
77
 
78
- fedora_config_path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/rails_root/config/fedora.yml'))
79
- solr_config_path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/rails_root/config/solr.yml'))
80
- pred_config_path = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/rails_root/config/predicate_mappings.yml'))
81
-
82
- allow(File).to receive(:open).with(fedora_config_path).and_return(fedora_config)
83
- allow(File).to receive(:open).with(solr_config_path).and_return(solr_config)
84
- allow(ActiveFedora::SolrService).to receive(:load_mappings) #For the solrizer solr_mappings.yml
78
+ fedora_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/fedora.yml"))
79
+ solr_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/solr.yml"))
80
+ pred_config_path = File.expand_path(File.join(File.dirname(__FILE__),"../fixtures/rails_root/config/predicate_mappings.yml"))
81
+
82
+ File.stub(:open).with(fedora_config_path).and_return(fedora_config)
83
+ File.stub(:open).with(solr_config_path).and_return(solr_config)
84
+ ActiveFedora::SolrService.stub(:load_mappings) #For the solrizer solr_mappings.yml
85
85
 
86
-
87
- # ActiveSupport::Deprecation.should_receive(:warn).with("Configuring fedora with \":url\" without :user and :password is no longer supported.")
88
- ActiveFedora.init(:fedora_config_path => fedora_config_path, :solr_config_path => solr_config_path)
89
- expect(ActiveFedora.solr.class).to eq(ActiveFedora::SolrService)
86
+ ActiveFedora.init(:fedora_config_path=>fedora_config_path,:solr_config_path=>solr_config_path)
87
+ ActiveFedora.solr.class.should == ActiveFedora::SolrService
90
88
  end
91
89
  end
92
90
 
93
- describe 'with no explicit config path' do
94
- it 'should look for the file in the path defined at Rails.root' do
95
- allow(ActiveFedora::SolrService).to receive(:load_mappings) #necessary or else it will load the solrizer config and it breaks other tests in the suite.
96
-
97
- stub_rails(:root => File.join(File.dirname(__FILE__), '../fixtures/rails_root'))
91
+ describe "with no explicit config path" do
92
+ it "should look for the file in the path defined at Rails.root" do
93
+ ActiveFedora::SolrService.stub(:load_mappings) #necessary or else it will load the solrizer config and it breaks other tests in the suite.
94
+
95
+ stub_rails(:root=>File.join(File.dirname(__FILE__),"../fixtures/rails_root"))
98
96
  ActiveFedora.init()
99
- expect(ActiveFedora.config.credentials[:url]).to eq('http://testhost.com:8983/fedora')
97
+ ActiveFedora.config.credentials[:url].should == "http://testhost.com:8983/fedora"
100
98
  end
101
99
  end
102
100
  end
103
101
  end
104
102
  end
105
-
106
- describe '#class_from_string' do
103
+
104
+ describe "#class_from_string" do
107
105
  before do
108
106
  module ParentClass
109
107
  class SiblingClass
@@ -112,20 +110,20 @@ describe ActiveFedora do
112
110
  end
113
111
  end
114
112
  end
115
- it 'should return class constants based on strings' do
116
- expect(ActiveFedora.class_from_string('Om')).to eq(Om)
117
- expect(ActiveFedora.class_from_string('ActiveFedora::RdfNode::TermProxy')).to eq(ActiveFedora::RdfNode::TermProxy)
118
- expect(ActiveFedora.class_from_string('TermProxy', ActiveFedora::RdfNode)).to eq(ActiveFedora::RdfNode::TermProxy)
113
+ it "should return class constants based on strings" do
114
+ ActiveFedora.class_from_string("Om").should == Om
115
+ ActiveFedora.class_from_string("ActiveFedora::RdfNode::TermProxy").should == ActiveFedora::RdfNode::TermProxy
116
+ ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode).should == ActiveFedora::RdfNode::TermProxy
119
117
  end
120
118
 
121
- it 'should find sibling classes' do
122
- expect(ActiveFedora.class_from_string('SiblingClass', ParentClass::OtherSiblingClass)).to eq(ParentClass::SiblingClass)
119
+ it "should find sibling classes" do
120
+ ActiveFedora.class_from_string("SiblingClass", ParentClass::OtherSiblingClass).should == ParentClass::SiblingClass
123
121
  end
124
122
 
125
123
  it "should raise a NameError if the class isn't found" do
126
124
  expect {
127
- ActiveFedora.class_from_string('FooClass', ParentClass::OtherSiblingClass)
128
- }.to raise_error NameError, /uninitialized constant FooClass/
125
+ ActiveFedora.class_from_string("FooClass", ParentClass::OtherSiblingClass)
126
+ }.to raise_error NameError, "uninitialized constant FooClass"
129
127
  end
130
128
  end
131
129
  end