active-fedora 10.1.0 → 11.1.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.
Files changed (208) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +1 -0
  3. data/.rubocop.yml +6 -7
  4. data/.rubocop_todo.yml +55 -0
  5. data/.solr_wrapper +6 -0
  6. data/.travis.yml +6 -9
  7. data/Gemfile +1 -0
  8. data/History.txt +34 -0
  9. data/README.md +1 -3
  10. data/active-fedora.gemspec +7 -13
  11. data/lib/active_fedora/aggregation/list_source.rb +2 -0
  12. data/lib/active_fedora/associations/association_scope.rb +1 -1
  13. data/lib/active_fedora/associations/builder/aggregation.rb +1 -1
  14. data/lib/active_fedora/associations/builder/association.rb +1 -1
  15. data/lib/active_fedora/associations/builder/orders.rb +11 -3
  16. data/lib/active_fedora/associations/collection_association.rb +5 -5
  17. data/lib/active_fedora/associations/collection_proxy.rb +10 -10
  18. data/lib/active_fedora/associations/contained_finder.rb +2 -2
  19. data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb +1 -1
  20. data/lib/active_fedora/associations/has_many_association.rb +2 -2
  21. data/lib/active_fedora/associations/has_subresource_association.rb +2 -2
  22. data/lib/active_fedora/associations/orders_association.rb +4 -0
  23. data/lib/active_fedora/associations/rdf.rb +2 -0
  24. data/lib/active_fedora/attribute_assignment.rb +0 -1
  25. data/lib/active_fedora/attribute_methods/dirty.rb +1 -1
  26. data/lib/active_fedora/attribute_methods.rb +1 -1
  27. data/lib/active_fedora/attributes.rb +1 -1
  28. data/lib/active_fedora/base.rb +4 -8
  29. data/lib/active_fedora/change_set.rb +6 -2
  30. data/lib/active_fedora/cleaner.rb +1 -1
  31. data/lib/active_fedora/containers/container.rb +1 -1
  32. data/lib/active_fedora/core.rb +33 -30
  33. data/lib/active_fedora/fedora.rb +6 -2
  34. data/lib/active_fedora/fedora_attributes.rb +1 -1
  35. data/lib/active_fedora/file/streaming.rb +1 -1
  36. data/lib/active_fedora/file.rb +2 -1
  37. data/lib/active_fedora/file_configurator.rb +3 -3
  38. data/lib/active_fedora/indexing.rb +1 -18
  39. data/lib/active_fedora/indexing_service.rb +0 -9
  40. data/lib/active_fedora/initializing_connection.rb +1 -1
  41. data/lib/active_fedora/loadable_from_json.rb +12 -1
  42. data/lib/active_fedora/model_classifier.rb +1 -1
  43. data/lib/active_fedora/nested_attributes.rb +2 -2
  44. data/lib/active_fedora/null_logger.rb +10 -0
  45. data/lib/active_fedora/orders/list_node.rb +2 -2
  46. data/lib/active_fedora/orders/ordered_list.rb +8 -4
  47. data/lib/active_fedora/orders/target_proxy.rb +4 -0
  48. data/lib/active_fedora/querying.rb +1 -1
  49. data/lib/active_fedora/railtie.rb +2 -2
  50. data/lib/active_fedora/rake_support.rb +1 -1
  51. data/lib/active_fedora/rdf/field_map_entry.rb +6 -0
  52. data/lib/active_fedora/rdf/persistence.rb +1 -0
  53. data/lib/active_fedora/rdf/value_caster.rb +15 -0
  54. data/lib/active_fedora/rdf.rb +1 -1
  55. data/lib/active_fedora/relation/delegation.rb +4 -0
  56. data/lib/active_fedora/relation/finder_methods.rb +3 -1
  57. data/lib/active_fedora/solr_hit.rb +1 -14
  58. data/lib/active_fedora/solr_query_builder.rb +17 -13
  59. data/lib/active_fedora/version.rb +1 -1
  60. data/lib/active_fedora/with_metadata/metadata_node.rb +2 -1
  61. data/lib/active_fedora.rb +1 -12
  62. data/lib/generators/active_fedora/config/solr/templates/solr/config/solrconfig.xml +11 -0
  63. data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml +1 -1
  64. data/lib/generators/active_fedora/model/model_generator.rb +1 -1
  65. data/lib/generators/active_fedora/model/templates/model.rb.erb +4 -4
  66. data/lib/tasks/active_fedora_dev.rake +1 -1
  67. data/spec/config_helper.rb +1 -1
  68. data/spec/integration/associations_spec.rb +23 -24
  69. data/spec/integration/attached_files_spec.rb +19 -9
  70. data/spec/integration/attributes_spec.rb +12 -16
  71. data/spec/integration/autosave_association_spec.rb +6 -6
  72. data/spec/integration/base_spec.rb +8 -8
  73. data/spec/integration/basic_contains_association_spec.rb +1 -1
  74. data/spec/integration/clean_connection_spec.rb +1 -1
  75. data/spec/integration/collection_association_spec.rb +2 -5
  76. data/spec/integration/date_time_properties_spec.rb +1 -17
  77. data/spec/integration/direct_container_spec.rb +12 -12
  78. data/spec/integration/directly_contains_one_association_spec.rb +11 -13
  79. data/spec/integration/eradicate_spec.rb +1 -1
  80. data/spec/integration/fedora_solr_sync_spec.rb +2 -2
  81. data/spec/integration/file_fixity_spec.rb +6 -8
  82. data/spec/integration/file_spec.rb +37 -39
  83. data/spec/integration/generators/solr_generator_spec.rb +7 -10
  84. data/spec/integration/has_and_belongs_to_many_associations_spec.rb +7 -7
  85. data/spec/integration/has_many_associations_spec.rb +9 -11
  86. data/spec/integration/indexing_spec.rb +2 -2
  87. data/spec/integration/indirect_container_spec.rb +11 -12
  88. data/spec/integration/json_serialization_spec.rb +4 -4
  89. data/spec/integration/query_result_builder_spec.rb +9 -21
  90. data/spec/integration/rdf_nested_attributes_spec.rb +7 -7
  91. data/spec/integration/relation_delegation_spec.rb +8 -10
  92. data/spec/integration/relation_spec.rb +13 -16
  93. data/spec/integration/scoped_query_spec.rb +3 -3
  94. data/spec/integration/scoping_spec.rb +3 -3
  95. data/spec/integration/solr_hit_spec.rb +4 -15
  96. data/spec/integration/versionable_spec.rb +73 -327
  97. data/spec/integration/with_metadata_spec.rb +1 -1
  98. data/spec/spec_helper.rb +52 -10
  99. data/spec/unit/active_fedora_spec.rb +1 -1
  100. data/spec/unit/aggregation/list_source_spec.rb +37 -37
  101. data/spec/unit/aggregation/ordered_reader_spec.rb +4 -4
  102. data/spec/unit/association_hash_spec.rb +17 -31
  103. data/spec/unit/attached_files_spec.rb +35 -32
  104. data/spec/unit/attributes_spec.rb +25 -25
  105. data/spec/unit/base_active_model_spec.rb +8 -8
  106. data/spec/unit/base_cma_spec.rb +1 -1
  107. data/spec/unit/base_extra_spec.rb +7 -22
  108. data/spec/unit/base_spec.rb +21 -27
  109. data/spec/unit/builder/has_and_belongs_to_many_spec.rb +1 -1
  110. data/spec/unit/callback_spec.rb +2 -2
  111. data/spec/unit/change_set_spec.rb +5 -5
  112. data/spec/unit/checksum_spec.rb +2 -2
  113. data/spec/unit/code_configurator_spec.rb +1 -1
  114. data/spec/unit/core/fedora_id_translator_spec.rb +2 -2
  115. data/spec/unit/core/fedora_uri_translator_spec.rb +2 -2
  116. data/spec/unit/core/logger_spec.rb +18 -0
  117. data/spec/unit/core_spec.rb +68 -32
  118. data/spec/unit/default_model_mapper_spec.rb +6 -6
  119. data/spec/unit/fedora_spec.rb +3 -4
  120. data/spec/unit/file_configurator_spec.rb +96 -96
  121. data/spec/unit/file_path_builder_spec.rb +3 -3
  122. data/spec/unit/file_spec.rb +93 -61
  123. data/spec/unit/files_hash_spec.rb +9 -9
  124. data/spec/unit/filter_spec.rb +3 -3
  125. data/spec/unit/finder_methods_spec.rb +3 -3
  126. data/spec/unit/forbidden_attributes_protection_spec.rb +2 -2
  127. data/spec/unit/has_and_belongs_to_many_association_spec.rb +14 -15
  128. data/spec/unit/has_many_association_spec.rb +28 -13
  129. data/spec/unit/indexers/global_indexer_spec.rb +6 -6
  130. data/spec/unit/indexing_service_spec.rb +5 -5
  131. data/spec/unit/indexing_spec.rb +8 -8
  132. data/spec/unit/inheritance_spec.rb +11 -7
  133. data/spec/unit/loadable_from_json_spec.rb +4 -4
  134. data/spec/unit/logger_spec.rb +1 -1
  135. data/spec/unit/model_classifier_spec.rb +5 -5
  136. data/spec/unit/ordered_spec.rb +144 -147
  137. data/spec/unit/orders/list_node_spec.rb +22 -22
  138. data/spec/unit/orders/ordered_list_spec.rb +96 -96
  139. data/spec/unit/orders/reflection_spec.rb +4 -4
  140. data/spec/unit/pathing_spec.rb +4 -4
  141. data/spec/unit/persistence_spec.rb +28 -28
  142. data/spec/unit/property_spec.rb +2 -2
  143. data/spec/unit/query_spec.rb +12 -12
  144. data/spec/unit/rdf/indexing_service_spec.rb +29 -29
  145. data/spec/unit/readonly_spec.rb +5 -4
  146. data/spec/unit/reflection_spec.rb +3 -3
  147. data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +9 -9
  148. data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +9 -9
  149. data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +9 -9
  150. data/spec/unit/schema_indexing_strategy_spec.rb +5 -5
  151. data/spec/unit/serializers_spec.rb +3 -4
  152. data/spec/unit/solr_config_options_spec.rb +13 -16
  153. data/spec/unit/solr_hit_spec.rb +9 -9
  154. data/spec/unit/solr_service_spec.rb +4 -10
  155. data/spec/unit/sparql_insert_spec.rb +2 -2
  156. data/spec/unit/validations_spec.rb +12 -12
  157. data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb +3 -2
  158. data/spec/unit/with_metadata/metadata_node_spec.rb +3 -2
  159. metadata +30 -130
  160. data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +0 -119
  161. data/lib/active_fedora/datastreams.rb +0 -6
  162. data/lib/active_fedora/nom_datastream.rb +0 -73
  163. data/lib/active_fedora/om_datastream.rb +0 -118
  164. data/lib/active_fedora/profile_indexing_service.rb +0 -11
  165. data/lib/active_fedora/qualified_dublin_core_datastream.rb +0 -158
  166. data/lib/active_fedora/rdf/datastream_indexing.rb +0 -49
  167. data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +0 -13
  168. data/lib/active_fedora/rdf/rdf_datastream.rb +0 -167
  169. data/lib/active_fedora/rdf/rdfxml_datastream.rb +0 -13
  170. data/lib/active_fedora/solr_instance_loader.rb +0 -47
  171. data/solr/config/_rest_managed.json +0 -3
  172. data/solr/config/admin-extra.html +0 -31
  173. data/solr/config/elevate.xml +0 -36
  174. data/solr/config/mapping-ISOLatin1Accent.txt +0 -246
  175. data/solr/config/protwords.txt +0 -21
  176. data/solr/config/schema.xml +0 -372
  177. data/solr/config/scripts.conf +0 -24
  178. data/solr/config/solrconfig.xml +0 -311
  179. data/solr/config/spellings.txt +0 -2
  180. data/solr/config/stopwords.txt +0 -58
  181. data/solr/config/stopwords_en.txt +0 -58
  182. data/solr/config/synonyms.txt +0 -31
  183. data/solr/config/xslt/example.xsl +0 -132
  184. data/solr/config/xslt/example_atom.xsl +0 -67
  185. data/solr/config/xslt/example_rss.xsl +0 -66
  186. data/solr/config/xslt/luke.xsl +0 -337
  187. data/spec/fixtures/damsObjectModel.xml +0 -38
  188. data/spec/fixtures/dublin_core_rdf_descMetadata.nt +0 -13
  189. data/spec/fixtures/mixed_rdf_descMetadata.nt +0 -7
  190. data/spec/fixtures/mods_articles/mods_article1.xml +0 -98
  191. data/spec/fixtures/solr_rdf_descMetadata.nt +0 -7
  192. data/spec/integration/complex_rdf_datastream_spec.rb +0 -228
  193. data/spec/integration/datastream_rdf_nested_attributes_spec.rb +0 -179
  194. data/spec/integration/ntriples_datastream_spec.rb +0 -203
  195. data/spec/integration/om_datastream_spec.rb +0 -78
  196. data/spec/integration/solr_instance_loader_spec.rb +0 -156
  197. data/spec/samples/hydra-mods_article_datastream.rb +0 -517
  198. data/spec/samples/models/mods_article.rb +0 -9
  199. data/spec/samples/oral_history_sample.xml +0 -38
  200. data/spec/samples/oral_history_xml.xml +0 -35
  201. data/spec/samples/samples.rb +0 -2
  202. data/spec/unit/nom_datastream_spec.rb +0 -60
  203. data/spec/unit/ntriples_datastream_spec.rb +0 -170
  204. data/spec/unit/om_datastream_spec.rb +0 -294
  205. data/spec/unit/qualified_dublin_core_datastream_spec.rb +0 -119
  206. data/spec/unit/rdf_datastream_spec.rb +0 -84
  207. data/spec/unit/rdf_resource_datastream_spec.rb +0 -204
  208. data/spec/unit/rdfxml_datastream_spec.rb +0 -106
@@ -2,7 +2,7 @@ require 'spec_helper'
2
2
  require 'config_helper'
3
3
 
4
4
  describe ActiveFedora::FileConfigurator do
5
- subject { ActiveFedora.configurator }
5
+ subject(:configurator) { ActiveFedora.configurator }
6
6
 
7
7
  after :all do
8
8
  unstub_rails
@@ -19,111 +19,111 @@ describe ActiveFedora::FileConfigurator do
19
19
 
20
20
  describe "#config_options" do
21
21
  before do
22
- subject.reset!
22
+ configurator.reset!
23
23
  end
24
24
  it "is an empty hash" do
25
- expect(subject.config_options).to eq({})
25
+ expect(configurator.config_options).to eq({})
26
26
  end
27
27
  end
28
28
 
29
29
  describe "#fedora_config" do
30
30
  before do
31
- subject.reset!
31
+ configurator.reset!
32
32
  end
33
33
  it "triggers configuration to load" do
34
- expect(subject).to receive(:load_fedora_config)
35
- subject.fedora_config
34
+ expect(configurator).to receive(:load_fedora_config)
35
+ configurator.fedora_config
36
36
  end
37
37
  end
38
38
  describe "#solr_config" do
39
39
  before do
40
- subject.reset!
40
+ configurator.reset!
41
41
  end
42
42
  it "triggers configuration to load" do
43
- expect(subject).to receive(:load_solr_config)
44
- subject.solr_config
43
+ expect(configurator).to receive(:load_solr_config)
44
+ configurator.solr_config
45
45
  end
46
46
  end
47
47
 
48
48
  describe "#reset!" do
49
- before { subject.reset! }
49
+ before { configurator.reset! }
50
50
  it "clears @fedora_config" do
51
- expect(subject.instance_variable_get(:@fedora_config)).to eq({})
51
+ expect(configurator.instance_variable_get(:@fedora_config)).to eq({})
52
52
  end
53
53
  it "clears @solr_config" do
54
- expect(subject.instance_variable_get(:@solr_config)).to eq({})
54
+ expect(configurator.instance_variable_get(:@solr_config)).to eq({})
55
55
  end
56
56
  it "clears @config_options" do
57
- expect(subject.instance_variable_get(:@config_options)).to eq({})
57
+ expect(configurator.instance_variable_get(:@config_options)).to eq({})
58
58
  end
59
59
  end
60
60
 
61
61
  describe "initialization methods" do
62
62
  describe "config_path(:fedora)" do
63
63
  it "uses the config_options[:config_path] if it exists" do
64
- expect(subject).to receive(:config_options).and_return(fedora_config_path: "/path/to/fedora.yml")
64
+ expect(configurator).to receive(:config_options).and_return(fedora_config_path: "/path/to/fedora.yml")
65
65
  expect(File).to receive(:file?).with("/path/to/fedora.yml").and_return(true)
66
- expect(subject.config_path(:fedora)).to eql("/path/to/fedora.yml")
66
+ expect(configurator.config_path(:fedora)).to eql("/path/to/fedora.yml")
67
67
  end
68
68
 
69
69
  it "looks in Rails.root/config/fedora.yml if it exists and no fedora_config_path passed in" do
70
- expect(subject).to receive(:config_options).and_return({})
70
+ expect(configurator).to receive(:config_options).and_return({})
71
71
  stub_rails(root: "/rails/root")
72
72
  expect(File).to receive(:file?).with("/rails/root/config/fedora.yml").and_return(true)
73
- expect(subject.config_path(:fedora)).to eql("/rails/root/config/fedora.yml")
73
+ expect(configurator.config_path(:fedora)).to eql("/rails/root/config/fedora.yml")
74
74
  unstub_rails
75
75
  end
76
76
 
77
77
  it "looks in ./config/fedora.yml if neither rails.root nor :fedora_config_path are set" do
78
- expect(subject).to receive(:config_options).and_return({})
78
+ expect(configurator).to receive(:config_options).and_return({})
79
79
  allow(Dir).to receive(:getwd).and_return("/current/working/directory")
80
80
  expect(File).to receive(:file?).with("/current/working/directory/config/fedora.yml").and_return(true)
81
- expect(subject.config_path(:fedora)).to eql("/current/working/directory/config/fedora.yml")
81
+ expect(configurator.config_path(:fedora)).to eql("/current/working/directory/config/fedora.yml")
82
82
  end
83
83
 
84
84
  it "returns default fedora.yml that ships with active-fedora if none of the above" do
85
- expect(subject).to receive(:config_options).and_return({})
85
+ expect(configurator).to receive(:config_options).and_return({})
86
86
  expect(Dir).to receive(:getwd).and_return("/current/working/directory")
87
87
  expect(File).to receive(:file?).with("/current/working/directory/config/fedora.yml").and_return(false)
88
88
  expect(File).to receive(:file?).with(File.expand_path(File.join(File.dirname("__FILE__"), 'config', 'fedora.yml'))).and_return(true)
89
89
  expect(ActiveFedora::Base.logger).to receive(:warn).with("Using the default fedora.yml that comes with active-fedora. If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml') - or set Rails.root and put fedora.yml into \#{Rails.root}/config.")
90
- expect(subject.config_path(:fedora)).to eql(File.expand_path(File.join(File.dirname("__FILE__"), 'config', 'fedora.yml')))
90
+ expect(configurator.config_path(:fedora)).to eql(File.expand_path(File.join(File.dirname("__FILE__"), 'config', 'fedora.yml')))
91
91
  end
92
92
  end
93
93
 
94
94
  describe "config_path(:solr)" do
95
95
  it "returns the solr_config_path if set in config_options hash" do
96
- allow(subject).to receive(:config_options).and_return(solr_config_path: "/path/to/solr.yml")
96
+ allow(configurator).to receive(:config_options).and_return(solr_config_path: "/path/to/solr.yml")
97
97
  expect(File).to receive(:file?).with("/path/to/solr.yml").and_return(true)
98
- expect(subject.config_path(:solr)).to eql("/path/to/solr.yml")
98
+ expect(configurator.config_path(:solr)).to eql("/path/to/solr.yml")
99
99
  end
100
100
 
101
101
  it "returns the solr.yml file in the same directory as the fedora.yml if it exists" do
102
- expect(subject).to receive(:path).and_return("/path/to/fedora/config/fedora.yml")
102
+ expect(configurator).to receive(:path).and_return("/path/to/fedora/config/fedora.yml")
103
103
  expect(File).to receive(:file?).with("/path/to/fedora/config/solr.yml").and_return(true)
104
- expect(subject.config_path(:solr)).to eql("/path/to/fedora/config/solr.yml")
104
+ expect(configurator.config_path(:solr)).to eql("/path/to/fedora/config/solr.yml")
105
105
  end
106
106
 
107
107
  context "no solr.yml in same directory as fedora.yml and fedora.yml does not contain solr url" do
108
- before :each do
109
- allow(subject).to receive(:config_options).and_return({})
110
- expect(subject).to receive(:path).and_return("/path/to/fedora/config/fedora.yml")
108
+ before do
109
+ allow(configurator).to receive(:config_options).and_return({})
110
+ expect(configurator).to receive(:path).and_return("/path/to/fedora/config/fedora.yml")
111
111
  expect(File).to receive(:file?).with("/path/to/fedora/config/solr.yml").and_return(false)
112
112
  end
113
- after :each do
113
+ after do
114
114
  unstub_rails
115
115
  end
116
116
 
117
117
  it "does not raise an error if there is not a solr.yml in the same directory as the fedora.yml and the fedora.yml has a solr url defined and look in rails.root" do
118
118
  stub_rails(root: "/rails/root")
119
119
  expect(File).to receive(:file?).with("/rails/root/config/solr.yml").and_return(true)
120
- expect(subject.config_path(:solr)).to eql("/rails/root/config/solr.yml")
120
+ expect(configurator.config_path(:solr)).to eql("/rails/root/config/solr.yml")
121
121
  end
122
122
 
123
123
  it "looks in ./config/solr.yml if no rails root" do
124
124
  allow(Dir).to receive(:getwd).and_return("/current/working/directory")
125
125
  expect(File).to receive(:file?).with("/current/working/directory/config/solr.yml").and_return(true)
126
- expect(subject.config_path(:solr)).to eql("/current/working/directory/config/solr.yml")
126
+ expect(configurator.config_path(:solr)).to eql("/current/working/directory/config/solr.yml")
127
127
  end
128
128
 
129
129
  it "returns the default solr.yml file that ships with active-fedora if no other option is set" do
@@ -131,109 +131,109 @@ describe ActiveFedora::FileConfigurator do
131
131
  expect(File).to receive(:file?).with("/current/working/directory/config/solr.yml").and_return(false)
132
132
  expect(File).to receive(:file?).with(File.expand_path(File.join(File.dirname("__FILE__"), 'config', 'solr.yml'))).and_return(true)
133
133
  expect(ActiveFedora::Base.logger).to receive(:warn).with("Using the default solr.yml that comes with active-fedora. If you want to override this, pass the path to solr.yml to ActiveFedora - ie. ActiveFedora.init(:solr_config_path => '/path/to/solr.yml') - or set Rails.root and put solr.yml into \#{Rails.root}/config.")
134
- expect(subject.config_path(:solr)).to eql(File.expand_path(File.join(File.dirname("__FILE__"), 'config', 'solr.yml')))
134
+ expect(configurator.config_path(:solr)).to eql(File.expand_path(File.join(File.dirname("__FILE__"), 'config', 'solr.yml')))
135
135
  end
136
136
  end
137
137
  end
138
138
 
139
139
  describe "load_fedora_config" do
140
- before(:each) do
141
- subject.reset!
140
+ before do
141
+ configurator.reset!
142
142
  end
143
143
  it "loads the file specified in fedora_config_path" do
144
- allow(subject).to receive(:load_solrizer_config)
145
- expect(subject).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
146
- expect(subject).to receive(:load_solr_config)
144
+ allow(configurator).to receive(:load_solrizer_config)
145
+ expect(configurator).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
146
+ expect(configurator).to receive(:load_solr_config)
147
147
  expect(IO).to receive(:read).with("/path/to/fedora.yml").and_return("development:\n url: http://devfedora:8983\ntest:\n url: http://myfedora:8080")
148
- expect(subject.load_fedora_config).to eq(url: "http://myfedora:8080")
149
- expect(subject.fedora_config).to eq(url: "http://myfedora:8080")
148
+ expect(configurator.load_fedora_config).to eq(url: "http://myfedora:8080")
149
+ expect(configurator.fedora_config).to eq(url: "http://myfedora:8080")
150
150
  end
151
151
 
152
152
  it "allows sharding" do
153
- allow(subject).to receive(:load_solrizer_config)
154
- expect(subject).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
155
- expect(subject).to receive(:load_solr_config)
153
+ allow(configurator).to receive(:load_solrizer_config)
154
+ expect(configurator).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
155
+ expect(configurator).to receive(:load_solr_config)
156
156
  expect(IO).to receive(:read).with("/path/to/fedora.yml").and_return("development:\n url: http://devfedora:8983\ntest:\n- url: http://myfedora:8080\n- url: http://myfedora:8081")
157
- expect(subject.load_fedora_config).to eq [{ url: "http://myfedora:8080" }, { url: "http://myfedora:8081" }]
158
- expect(subject.fedora_config).to eq [{ url: "http://myfedora:8080" }, { url: "http://myfedora:8081" }]
157
+ expect(configurator.load_fedora_config).to eq [{ url: "http://myfedora:8080" }, { url: "http://myfedora:8081" }]
158
+ expect(configurator.fedora_config).to eq [{ url: "http://myfedora:8080" }, { url: "http://myfedora:8081" }]
159
159
  end
160
160
 
161
161
  it "parses the file using ERb" do
162
- allow(subject).to receive(:load_solrizer_config)
163
- expect(subject).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
164
- expect(subject).to receive(:load_solr_config)
162
+ allow(configurator).to receive(:load_solrizer_config)
163
+ expect(configurator).to receive(:config_path).with(:fedora).and_return("/path/to/fedora.yml")
164
+ expect(configurator).to receive(:load_solr_config)
165
165
  expect(IO).to receive(:read).with("/path/to/fedora.yml").and_return("development:\n url: http://devfedora:<%= 8983 %>\ntest:\n url: http://myfedora:<%= 8081 %>")
166
- expect(subject.load_fedora_config).to eq(url: "http://myfedora:8081")
167
- expect(subject.fedora_config).to eq(url: "http://myfedora:8081")
166
+ expect(configurator.load_fedora_config).to eq(url: "http://myfedora:8081")
167
+ expect(configurator.fedora_config).to eq(url: "http://myfedora:8081")
168
168
  end
169
169
  end
170
170
 
171
171
  describe "load_solr_config" do
172
- before(:each) do
173
- subject.reset!
172
+ before do
173
+ configurator.reset!
174
174
  end
175
175
  it "loads the file specified in solr_config_path" do
176
- allow(subject).to receive(:load_solrizer_config)
177
- expect(subject).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
178
- expect(subject).to receive(:load_fedora_config)
176
+ allow(configurator).to receive(:load_solrizer_config)
177
+ expect(configurator).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
178
+ expect(configurator).to receive(:load_fedora_config)
179
179
  expect(IO).to receive(:read).with("/path/to/solr.yml").and_return("development:\n default:\n url: http://devsolr:8983\ntest:\n default:\n url: http://mysolr:8080")
180
- expect(subject.load_solr_config).to eq(url: "http://mysolr:8080")
181
- expect(subject.solr_config).to eq(url: "http://mysolr:8080")
180
+ expect(configurator.load_solr_config).to eq(url: "http://mysolr:8080")
181
+ expect(configurator.solr_config).to eq(url: "http://mysolr:8080")
182
182
  end
183
183
 
184
184
  it "parses the file using ERb" do
185
- allow(subject).to receive(:load_solrizer_config)
186
- expect(subject).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
187
- expect(subject).to receive(:load_fedora_config)
185
+ allow(configurator).to receive(:load_solrizer_config)
186
+ expect(configurator).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
187
+ expect(configurator).to receive(:load_fedora_config)
188
188
  expect(IO).to receive(:read).with("/path/to/solr.yml").and_return("development:\n default:\n url: http://devsolr:<%= 8983 %>\ntest:\n default:\n url: http://mysolr:<%= 8081 %>")
189
- expect(subject.load_solr_config).to eq(url: "http://mysolr:8081")
190
- expect(subject.solr_config).to eq(url: "http://mysolr:8081")
189
+ expect(configurator.load_solr_config).to eq(url: "http://mysolr:8081")
190
+ expect(configurator.solr_config).to eq(url: "http://mysolr:8081")
191
191
  end
192
192
 
193
193
  it "includes update_path and select_path in solr_config" do
194
- allow(subject).to receive(:load_solrizer_config)
195
- expect(subject).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
196
- expect(subject).to receive(:load_fedora_config)
194
+ allow(configurator).to receive(:load_solrizer_config)
195
+ expect(configurator).to receive(:config_path).with(:solr).and_return("/path/to/solr.yml")
196
+ expect(configurator).to receive(:load_fedora_config)
197
197
  expect(IO).to receive(:read).with("/path/to/solr.yml").and_return("test:\n url: http://mysolr:8080\n update_path: update_test\n select_path: select_test\n")
198
- expect(subject.solr_config[:update_path]).to eq('update_test')
199
- expect(subject.solr_config[:select_path]).to eq('select_test')
198
+ expect(configurator.solr_config[:update_path]).to eq('update_test')
199
+ expect(configurator.solr_config[:select_path]).to eq('select_test')
200
200
  end
201
201
  end
202
202
 
203
203
  describe "load_configs" do
204
204
  describe "when config is not loaded" do
205
205
  before do
206
- subject.instance_variable_set :@config_loaded, nil
206
+ configurator.instance_variable_set :@config_loaded, nil
207
207
  end
208
208
  it "loads the fedora and solr configs" do
209
- expect(subject).to_not be_config_loaded
210
- subject.load_configs
211
- expect(subject).to be_config_loaded
209
+ expect(configurator).to_not be_config_loaded
210
+ configurator.load_configs
211
+ expect(configurator).to be_config_loaded
212
212
  end
213
213
  end
214
214
  describe "when config is loaded" do
215
215
  before do
216
- subject.instance_variable_set :@config_loaded, true
216
+ configurator.instance_variable_set :@config_loaded, true
217
217
  end
218
218
  it "loads the fedora and solr configs" do
219
- expect(subject).to receive(:load_config).never
220
- expect(subject).to be_config_loaded
221
- subject.load_configs
222
- expect(subject).to be_config_loaded
219
+ expect(configurator).to receive(:load_config).never
220
+ expect(configurator).to be_config_loaded
221
+ configurator.load_configs
222
+ expect(configurator).to be_config_loaded
223
223
  end
224
224
  end
225
225
  end
226
226
 
227
227
  describe "check_fedora_path_for_solr" do
228
228
  it "finds the solr.yml file and return it if it exists" do
229
- expect(subject).to receive(:path).and_return("/path/to/fedora/fedora.yml")
229
+ expect(configurator).to receive(:path).and_return("/path/to/fedora/fedora.yml")
230
230
  expect(File).to receive(:file?).with("/path/to/fedora/solr.yml").and_return(true)
231
- expect(subject.check_fedora_path_for_solr).to eq "/path/to/fedora/solr.yml"
231
+ expect(configurator.check_fedora_path_for_solr).to eq "/path/to/fedora/solr.yml"
232
232
  end
233
233
  it "returns nil if the solr.yml file is not there" do
234
- expect(subject).to receive(:path).and_return("/path/to/fedora/fedora.yml")
234
+ expect(configurator).to receive(:path).and_return("/path/to/fedora/fedora.yml")
235
235
  expect(File).to receive(:file?).with("/path/to/fedora/solr.yml").and_return(false)
236
- expect(subject.check_fedora_path_for_solr).to be_nil
236
+ expect(configurator.check_fedora_path_for_solr).to be_nil
237
237
  end
238
238
  end
239
239
  end
@@ -250,32 +250,32 @@ describe ActiveFedora::FileConfigurator do
250
250
  end
251
251
 
252
252
  it "can tell its config paths" do
253
- subject.init
254
- expect(subject).to respond_to(:solr_config_path)
253
+ configurator.init
254
+ expect(configurator).to respond_to(:solr_config_path)
255
255
  end
256
256
 
257
257
  it "loads a config from the current working directory as a second choice" do
258
- allow(subject).to receive(:load_solrizer_config)
258
+ allow(configurator).to receive(:load_solrizer_config)
259
259
  allow(Dir).to receive(:getwd).and_return(@fake_rails_root)
260
- subject.init
261
- expect(subject.config_path(:fedora)).to eql("#{@fake_rails_root}/config/fedora.yml")
262
- expect(subject.solr_config_path).to eql("#{@fake_rails_root}/config/solr.yml")
260
+ configurator.init
261
+ expect(configurator.config_path(:fedora)).to eql("#{@fake_rails_root}/config/fedora.yml")
262
+ expect(configurator.solr_config_path).to eql("#{@fake_rails_root}/config/solr.yml")
263
263
  end
264
264
 
265
265
  it "loads the config that ships with this gem as a last choice" do
266
266
  allow(Dir).to receive(:getwd).and_return("/fake/path")
267
- allow(subject).to receive(:load_solrizer_config)
267
+ allow(configurator).to receive(:load_solrizer_config)
268
268
  expect(ActiveFedora::Base.logger).to receive(:warn).with("Using the default fedora.yml that comes with active-fedora. If you want to override this, pass the path to fedora.yml to ActiveFedora - ie. ActiveFedora.init(:fedora_config_path => '/path/to/fedora.yml') - or set Rails.root and put fedora.yml into \#{Rails.root}/config.").exactly(3).times
269
- subject.init
269
+ configurator.init
270
270
  expected_config = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config"))
271
- expect(subject.config_path(:fedora)).to eql(expected_config + '/fedora.yml')
272
- expect(subject.solr_config_path).to eql(expected_config + '/solr.yml')
271
+ expect(configurator.config_path(:fedora)).to eql(expected_config + '/fedora.yml')
272
+ expect(configurator.solr_config_path).to eql(expected_config + '/solr.yml')
273
273
  end
274
274
  it "raises an error if you pass in a string" do
275
- expect(lambda { subject.init("#{@fake_rails_root}/config/fake_fedora.yml") }).to raise_exception(ArgumentError)
275
+ expect(lambda { configurator.init("#{@fake_rails_root}/config/fake_fedora.yml") }).to raise_exception(ArgumentError)
276
276
  end
277
277
  it "raises an error if you pass in a non-existant config file" do
278
- expect(lambda { subject.init(fedora_config_path: "really_fake_fedora.yml") }).to raise_exception(ActiveFedora::ConfigurationError)
278
+ expect(lambda { configurator.init(fedora_config_path: "really_fake_fedora.yml") }).to raise_exception(ActiveFedora::ConfigurationError)
279
279
  end
280
280
 
281
281
  describe "within Rails" do
@@ -288,15 +288,15 @@ describe ActiveFedora::FileConfigurator do
288
288
  end
289
289
 
290
290
  it "loads a config from Rails.root as a first choice" do
291
- allow(subject).to receive(:load_solrizer_config)
292
- subject.init
293
- expect(subject.config_path(:fedora)).to eql("#{Rails.root}/config/fedora.yml")
294
- expect(subject.solr_config_path).to eql("#{Rails.root}/config/solr.yml")
291
+ allow(configurator).to receive(:load_solrizer_config)
292
+ configurator.init
293
+ expect(configurator.config_path(:fedora)).to eql("#{Rails.root}/config/fedora.yml")
294
+ expect(configurator.solr_config_path).to eql("#{Rails.root}/config/solr.yml")
295
295
  end
296
296
 
297
297
  it "can tell what environment it is set to run in" do
298
298
  stub_rails(env: "development")
299
- subject.init
299
+ configurator.init
300
300
  expect(ActiveFedora.environment).to eql("development")
301
301
  end
302
302
  end
@@ -5,14 +5,14 @@ describe ActiveFedora::FilePathBuilder do
5
5
  let(:parent) { ActiveFedora::Base.new(id: '1234') }
6
6
  subject { described_class.build(parent, nil, 'FOO') }
7
7
 
8
- it { should eq 'FOO1' }
8
+ it { is_expected.to eq 'FOO1' }
9
9
 
10
10
  context "when some datastreams exist" do
11
11
  before do
12
- allow(parent).to receive(:attached_files).and_return('FOO56' => double)
12
+ allow(parent).to receive(:attached_files).and_return('FOO56' => instance_double(ActiveFedora::File))
13
13
  end
14
14
 
15
- it { should eq 'FOO57' }
15
+ it { is_expected.to eq 'FOO57' }
16
16
  end
17
17
  end
18
18
  end