active-fedora 8.7.0 → 9.0.0.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.travis.yml +8 -15
- data/Gemfile +5 -5
- data/History.txt +0 -80
- data/README.md +1 -0
- data/Rakefile +0 -3
- data/active-fedora.gemspec +8 -7
- data/config/fedora.yml +5 -4
- data/config/predicate_mappings.yml +5 -5
- data/gemfiles/rails4.1.gemfile +10 -0
- data/gemfiles/rails4.2.beta.gemfile +10 -0
- data/lib/active_fedora.rb +151 -117
- data/lib/active_fedora/associations.rb +47 -15
- data/lib/active_fedora/associations/association.rb +29 -8
- data/lib/active_fedora/associations/association_scope.rb +5 -5
- data/lib/active_fedora/associations/belongs_to_association.rb +20 -63
- data/lib/active_fedora/associations/builder/association.rb +61 -25
- data/lib/active_fedora/associations/builder/belongs_to.rb +7 -94
- data/lib/active_fedora/associations/builder/collection_association.rb +11 -43
- data/lib/active_fedora/associations/builder/contains.rb +28 -0
- data/lib/active_fedora/associations/builder/has_and_belongs_to_many.rb +13 -3
- data/lib/active_fedora/associations/builder/has_many.rb +16 -10
- data/lib/active_fedora/associations/builder/property.rb +14 -0
- data/lib/active_fedora/associations/builder/singular_association.rb +14 -18
- data/lib/active_fedora/associations/builder/singular_property.rb +12 -0
- data/lib/active_fedora/associations/collection_association.rb +57 -80
- data/lib/active_fedora/associations/contains_association.rb +50 -0
- data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb +44 -24
- data/lib/active_fedora/associations/has_many_association.rb +46 -14
- data/lib/active_fedora/associations/rdf.rb +86 -0
- data/lib/active_fedora/associations/singular_association.rb +4 -8
- data/lib/active_fedora/associations/singular_rdf.rb +15 -0
- data/lib/active_fedora/attached_files.rb +195 -0
- data/lib/active_fedora/attribute_methods.rb +122 -0
- data/lib/active_fedora/attribute_methods/dirty.rb +16 -0
- data/lib/active_fedora/attribute_methods/read.rb +61 -0
- data/lib/active_fedora/attribute_methods/write.rb +47 -0
- data/lib/active_fedora/attributes.rb +93 -44
- data/lib/active_fedora/attributes/primary_key.rb +12 -0
- data/lib/active_fedora/autosave_association.rb +2 -2
- data/lib/active_fedora/base.rb +16 -15
- data/lib/active_fedora/callbacks.rb +7 -7
- data/lib/active_fedora/change_set.rb +34 -0
- data/lib/active_fedora/cleaner.rb +62 -0
- data/lib/active_fedora/config.rb +4 -22
- data/lib/active_fedora/core.rb +173 -99
- data/lib/active_fedora/datastream.rb +4 -117
- data/lib/active_fedora/datastreams.rb +2 -263
- data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +28 -51
- data/lib/active_fedora/{datastream_attribute.rb → delegated_attribute.rb} +57 -26
- data/lib/active_fedora/errors.rb +61 -0
- data/lib/active_fedora/fedora.rb +19 -0
- data/lib/active_fedora/fedora_attributes.rb +58 -26
- data/lib/active_fedora/file.rb +318 -0
- data/lib/active_fedora/file_configurator.rb +32 -32
- data/lib/active_fedora/file_path_builder.rb +24 -0
- data/lib/active_fedora/files_hash.rb +82 -0
- data/lib/active_fedora/fixity_service.rb +40 -0
- data/lib/active_fedora/indexing.rb +55 -82
- data/lib/active_fedora/indexing_service.rb +70 -0
- data/lib/active_fedora/ldp_resource.rb +26 -0
- data/lib/active_fedora/loadable_from_json.rb +112 -0
- data/lib/active_fedora/model.rb +5 -19
- data/lib/active_fedora/nested_attributes.rb +5 -6
- data/lib/active_fedora/nom_datastream.rb +15 -25
- data/lib/active_fedora/om_datastream.rb +26 -197
- data/lib/active_fedora/persistence.rb +95 -71
- data/lib/active_fedora/predicates.rb +4 -4
- data/lib/active_fedora/qualified_dublin_core_datastream.rb +17 -18
- data/lib/active_fedora/querying.rb +3 -4
- data/lib/active_fedora/railtie.rb +3 -6
- data/lib/active_fedora/rdf.rb +3 -1
- data/lib/active_fedora/rdf/datastream_indexing.rb +11 -0
- data/lib/active_fedora/rdf/fcrepo.rb +10 -324
- data/lib/active_fedora/rdf/indexing.rb +20 -16
- data/lib/active_fedora/rdf/ldp.rb +6 -0
- data/lib/active_fedora/rdf/ntriples_rdf_datastream.rb +1 -1
- data/lib/active_fedora/rdf/persistence.rb +5 -6
- data/lib/active_fedora/rdf/rdf_datastream.rb +44 -37
- data/lib/active_fedora/rdf/rdfxml_datastream.rb +13 -0
- data/lib/active_fedora/rdf/rels_ext.rb +26 -0
- data/lib/active_fedora/reflection.rb +256 -199
- data/lib/active_fedora/relation.rb +18 -6
- data/lib/active_fedora/relation/finder_methods.rb +69 -38
- data/lib/active_fedora/relation/query_methods.rb +7 -3
- data/lib/active_fedora/rspec_matchers/belong_to_associated_active_fedora_object_matcher.rb +7 -7
- data/lib/active_fedora/rspec_matchers/have_many_associated_active_fedora_objects_matcher.rb +8 -8
- data/lib/active_fedora/rspec_matchers/have_predicate_matcher.rb +9 -11
- data/lib/active_fedora/simple_datastream.rb +18 -13
- data/lib/active_fedora/solr_instance_loader.rb +18 -38
- data/lib/active_fedora/solr_service.rb +37 -20
- data/lib/active_fedora/sparql_insert.rb +45 -0
- data/lib/active_fedora/test_support.rb +1 -22
- data/lib/active_fedora/version.rb +1 -1
- data/lib/active_fedora/versionable.rb +90 -0
- data/lib/active_fedora/with_metadata.rb +37 -0
- data/lib/active_fedora/with_metadata/metadata_node.rb +70 -0
- data/lib/generators/active_fedora/config/config_generator.rb +0 -1
- data/lib/generators/active_fedora/config/solr/solr_generator.rb +1 -1
- data/lib/generators/active_fedora/model/model_generator.rb +5 -5
- data/lib/generators/active_fedora/model/templates/datastream_spec.rb.erb +1 -1
- data/lib/generators/active_fedora/model/templates/model_spec.rb.erb +2 -2
- data/lib/tasks/active_fedora_dev.rake +21 -27
- data/spec/config_helper.rb +1 -1
- data/spec/fixtures/mixed_rdf_descMetadata.nt +6 -6
- data/spec/fixtures/rails_root/config/predicate_mappings.yml +3 -19
- data/spec/fixtures/solr_rdf_descMetadata.nt +6 -6
- data/spec/integration/associations_spec.rb +133 -153
- data/spec/integration/attached_files_spec.rb +164 -0
- data/spec/integration/attributes_spec.rb +73 -12
- data/spec/integration/autosave_association_spec.rb +3 -3
- data/spec/integration/base_spec.rb +57 -351
- data/spec/integration/belongs_to_association_spec.rb +86 -76
- data/spec/integration/bug_spec.rb +3 -3
- data/spec/integration/collection_association_spec.rb +4 -4
- data/spec/integration/complex_rdf_datastream_spec.rb +54 -56
- data/spec/integration/delete_all_spec.rb +18 -15
- data/spec/integration/eradicate_spec.rb +54 -0
- data/spec/integration/fedora_solr_sync_spec.rb +7 -5
- data/spec/integration/field_to_solr_name_spec.rb +5 -5
- data/spec/integration/file_fixity_spec.rb +40 -0
- data/spec/integration/file_spec.rb +122 -0
- data/spec/integration/full_featured_model_spec.rb +53 -63
- data/spec/integration/has_and_belongs_to_many_associations_spec.rb +141 -114
- data/spec/integration/has_many_associations_spec.rb +142 -64
- data/spec/integration/json_serialization_spec.rb +50 -8
- data/spec/integration/model_spec.rb +12 -29
- data/spec/integration/nested_attribute_spec.rb +28 -20
- data/spec/integration/ntriples_datastream_spec.rb +60 -57
- data/spec/integration/om_datastream_spec.rb +51 -140
- data/spec/integration/rdf_nested_attributes_spec.rb +16 -14
- data/spec/integration/relation_delegation_spec.rb +7 -9
- data/spec/integration/relation_spec.rb +9 -7
- data/spec/integration/scoped_query_spec.rb +26 -26
- data/spec/integration/solr_instance_loader_spec.rb +69 -53
- data/spec/integration/solr_service_spec.rb +12 -73
- data/spec/integration/versionable_spec.rb +477 -0
- data/spec/integration/with_metadata_spec.rb +52 -0
- data/spec/samples/hydra-mods_article_datastream.rb +10 -6
- data/spec/samples/models/mods_article.rb +6 -2
- data/spec/samples/oral_history_sample.xml +1 -1
- data/spec/samples/oral_history_xml.xml +1 -1
- data/spec/samples/special_thing.rb +3 -3
- data/spec/spec_helper.rb +22 -12
- data/spec/support/an_active_model.rb +3 -7
- data/spec/unit/active_fedora_spec.rb +20 -17
- data/spec/unit/attached_files_spec.rb +203 -0
- data/spec/unit/attributes_spec.rb +286 -207
- data/spec/unit/base_active_model_spec.rb +8 -8
- data/spec/unit/base_datastream_management_spec.rb +11 -24
- data/spec/unit/base_extra_spec.rb +17 -67
- data/spec/unit/base_spec.rb +163 -428
- data/spec/unit/builder/has_and_belongs_to_many_spec.rb +2 -2
- data/spec/unit/callback_spec.rb +38 -23
- data/spec/unit/change_set_spec.rb +46 -0
- data/spec/unit/code_configurator_spec.rb +5 -5
- data/spec/unit/config_spec.rb +9 -14
- data/spec/unit/core_spec.rb +59 -8
- data/spec/unit/file_configurator_spec.rb +55 -53
- data/spec/unit/file_path_builder_spec.rb +18 -0
- data/spec/unit/file_spec.rb +221 -0
- data/spec/unit/files_hash_spec.rb +53 -0
- data/spec/unit/fixity_service_spec.rb +34 -0
- data/spec/unit/has_and_belongs_to_many_association_spec.rb +134 -0
- data/spec/unit/has_many_association_spec.rb +51 -0
- data/spec/unit/indexing_service_spec.rb +23 -0
- data/spec/unit/indexing_spec.rb +26 -0
- data/spec/unit/inheritance_spec.rb +9 -10
- data/spec/unit/model_spec.rb +15 -33
- data/spec/unit/nom_datastream_spec.rb +13 -10
- data/spec/unit/ntriples_datastream_spec.rb +81 -96
- data/spec/unit/om_datastream_spec.rb +137 -227
- data/spec/unit/persistence_spec.rb +28 -34
- data/spec/unit/predicates_spec.rb +29 -29
- data/spec/unit/property_spec.rb +1 -3
- data/spec/unit/qualified_dublin_core_datastream_spec.rb +27 -32
- data/spec/unit/query_spec.rb +116 -149
- data/spec/unit/rdf_datastream_spec.rb +25 -43
- data/spec/unit/rdf_resource_datastream_spec.rb +24 -123
- data/spec/unit/{rdfxml_rdf_datastream_spec.rb → rdfxml_datastream_spec.rb} +21 -25
- data/spec/unit/readonly_spec.rb +23 -0
- data/spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb +6 -6
- data/spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb +6 -6
- data/spec/unit/rspec_matchers/have_predicate_matcher_spec.rb +6 -6
- data/spec/unit/serializers_spec.rb +1 -1
- data/spec/unit/simple_datastream_spec.rb +12 -23
- data/spec/unit/solr_config_options_spec.rb +14 -17
- data/spec/unit/solr_service_spec.rb +38 -77
- data/spec/unit/sparql_insert_spec.rb +32 -0
- data/spec/unit/validations_spec.rb +8 -11
- metadata +96 -121
- data/lib/active_fedora/auditable.rb +0 -9
- data/lib/active_fedora/content_model.rb +0 -70
- data/lib/active_fedora/datastream_collections.rb +0 -302
- data/lib/active_fedora/datastream_hash.rb +0 -35
- data/lib/active_fedora/digital_object.rb +0 -55
- data/lib/active_fedora/fixture_exporter.rb +0 -33
- data/lib/active_fedora/fixture_loader.rb +0 -48
- data/lib/active_fedora/rdf/identifiable.rb +0 -66
- data/lib/active_fedora/rdf/project_hydra.rb +0 -12
- data/lib/active_fedora/rdf/rdfxml_rdf_datastream.rb +0 -13
- data/lib/active_fedora/rdf_xml_writer.rb +0 -49
- data/lib/active_fedora/relationship_graph.rb +0 -101
- data/lib/active_fedora/reload_on_save.rb +0 -16
- data/lib/active_fedora/rels_ext_datastream.rb +0 -100
- data/lib/active_fedora/rspec_matchers/match_fedora_datastream_matcher.rb +0 -41
- data/lib/active_fedora/rubydora_connection.rb +0 -35
- data/lib/active_fedora/semantic_node.rb +0 -164
- data/lib/active_fedora/service_definitions.rb +0 -88
- data/lib/active_fedora/sharding.rb +0 -58
- data/lib/active_fedora/solr_digital_object.rb +0 -68
- data/lib/active_fedora/unsaved_digital_object.rb +0 -58
- data/lib/generators/active_fedora/config/fedora/fedora_generator.rb +0 -12
- data/lib/generators/active_fedora/config/fedora/templates/fedora.yml +0 -38
- data/lib/generators/active_fedora/config/fedora/templates/fedora_conf/conf/development/fedora.fcfg +0 -953
- data/lib/generators/active_fedora/config/fedora/templates/fedora_conf/conf/test/fedora.fcfg +0 -953
- data/lib/tasks/active_fedora.rake +0 -83
- data/spec/fixtures/sharded_fedora.yml +0 -11
- data/spec/integration/auditable_spec.rb +0 -29
- data/spec/integration/datastream_collections_spec.rb +0 -127
- data/spec/integration/datastream_spec.rb +0 -90
- data/spec/integration/datastreams_spec.rb +0 -173
- data/spec/integration/load_from_solr_spec.rb +0 -66
- data/spec/integration/rels_ext_datastream_spec.rb +0 -82
- data/spec/support/mock_fedora.rb +0 -44
- data/spec/unit/content_model_spec.rb +0 -86
- data/spec/unit/datastream_collections_spec.rb +0 -420
- data/spec/unit/datastream_spec.rb +0 -83
- data/spec/unit/datastreams_spec.rb +0 -243
- data/spec/unit/has_and_belongs_to_many_collection_spec.rb +0 -96
- data/spec/unit/has_many_collection_spec.rb +0 -35
- data/spec/unit/rdf_vocab_spec.rb +0 -30
- data/spec/unit/rdf_xml_writer_spec.rb +0 -63
- data/spec/unit/relationship_graph_spec.rb +0 -115
- data/spec/unit/reload_on_save_spec.rb +0 -24
- data/spec/unit/rels_ext_datastream_spec.rb +0 -170
- data/spec/unit/rspec_matchers/match_fedora_datastream_matcher_spec.rb +0 -44
- data/spec/unit/rubydora_connection_spec.rb +0 -12
- data/spec/unit/semantic_node_spec.rb +0 -112
- data/spec/unit/service_definitions_spec.rb +0 -63
- data/spec/unit/solr_digital_object_spec.rb +0 -97
- data/spec/unit/unsaved_digital_object_spec.rb +0 -48
@@ -1,83 +0,0 @@
|
|
1
|
-
require "active-fedora"
|
2
|
-
require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections
|
3
|
-
|
4
|
-
ZIP_FILE = 'https://github.com/projecthydra/hydra-jetty/archive/v5.2.0.zip'
|
5
|
-
|
6
|
-
namespace :repo do
|
7
|
-
|
8
|
-
desc "Delete and re-import the object identified by pid"
|
9
|
-
task :refresh => [:delete,:load]
|
10
|
-
|
11
|
-
desc "Delete the object identified by pid. Example: rake repo:delete pid=demo:12"
|
12
|
-
task :delete => :environment do
|
13
|
-
if ENV["pid"].nil?
|
14
|
-
puts "You must specify a valid pid. Example: rake repo:delete pid=demo:12"
|
15
|
-
else
|
16
|
-
pid = ENV["pid"]
|
17
|
-
result = ActiveFedora::FixtureLoader.delete(pid)
|
18
|
-
puts "Deleted '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}" if result == 1
|
19
|
-
end
|
20
|
-
end
|
21
|
-
|
22
|
-
desc "Delete a range of objects in a given namespace. ie 'rake repo:delete_range namespace=demo start=22 stop=50' will delete demo:22 through demo:50"
|
23
|
-
task :delete_range => :environment do |t, args|
|
24
|
-
namespace = ENV["namespace"]
|
25
|
-
start_point = ENV["start"].to_i
|
26
|
-
stop_point = ENV["stop"].to_i
|
27
|
-
unless start_point <= stop_point
|
28
|
-
raise StandardError "start point must be less that end point."
|
29
|
-
end
|
30
|
-
puts "Deleting #{stop_point - start_point + 1} objects from #{namespace}:#{start_point.to_s} to #{namespace}:#{stop_point.to_s}"
|
31
|
-
i = start_point
|
32
|
-
while i <= stop_point do
|
33
|
-
pid = namespace + ":" + i.to_s
|
34
|
-
result = ActiveFedora::FixtureLoader.delete(pid)
|
35
|
-
puts "Deleted '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}" if result == 1
|
36
|
-
i += 1
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
desc "Export the object identified by pid into spec/fixtures. Example:rake repo:export pid=demo:12"
|
41
|
-
task :export => :environment do
|
42
|
-
if ENV["pid"].nil?
|
43
|
-
puts "You must specify a valid pid. Example: rake repo:export pid=demo:12"
|
44
|
-
else
|
45
|
-
pid = ENV["pid"]
|
46
|
-
puts "Exporting '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
|
47
|
-
if !ENV["dir"].nil?
|
48
|
-
dir = ENV["dir"]
|
49
|
-
else
|
50
|
-
dir = File.join('spec', 'fixtures')
|
51
|
-
end
|
52
|
-
filename = ActiveFedora::FixtureExporter.export_to_path(pid, dir)
|
53
|
-
puts "The object has been saved as #{filename}" if filename
|
54
|
-
end
|
55
|
-
end
|
56
|
-
|
57
|
-
desc "Load the object located at the provided path or identified by pid. Example: rake repo:load foxml=spec/fixtures/demo_12.foxml.xml"
|
58
|
-
task :load => :environment do
|
59
|
-
if !ENV["foxml"].nil? and File.file?(ENV["foxml"])
|
60
|
-
filename = ENV["foxml"]
|
61
|
-
pid = ActiveFedora::FixtureLoader.import_to_fedora(filename)
|
62
|
-
ActiveFedora::FixtureLoader.index(pid)
|
63
|
-
elsif !ENV["pid"].nil?
|
64
|
-
pid = ENV["pid"]
|
65
|
-
if !ENV["dir"].nil? and File.directory?(ENV["dir"])
|
66
|
-
loader = ActiveFedora::FixtureLoader.new(ENV["dir"])
|
67
|
-
else
|
68
|
-
loader = ActiveFedora::FixtureLoader.new(File.join("spec", "fixtures"))
|
69
|
-
end
|
70
|
-
loader.import_and_index(pid)
|
71
|
-
else
|
72
|
-
puts "You must specify the foxml path or provide its pid. Example: rake repo:load foxml=spec/fixtures/demo_12.foxml.xml"
|
73
|
-
end
|
74
|
-
puts "Loaded '#{pid}' into #{ActiveFedora::Base.connection_for_pid(pid).client.url}" if pid
|
75
|
-
end
|
76
|
-
|
77
|
-
|
78
|
-
end
|
79
|
-
|
80
|
-
task :environment do
|
81
|
-
# This task is overridden (chained) in hydra-head.
|
82
|
-
end
|
83
|
-
|
@@ -1,29 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe ActiveFedora::Auditable do
|
4
|
-
|
5
|
-
before(:all) do
|
6
|
-
class AuditableModel < ActiveFedora::Base
|
7
|
-
include ActiveFedora::Auditable
|
8
|
-
end
|
9
|
-
@test_object = AuditableModel.create
|
10
|
-
@test_object.reload
|
11
|
-
end
|
12
|
-
after(:all) do
|
13
|
-
@test_object.delete
|
14
|
-
end
|
15
|
-
it "should have the correct number of audit records" do
|
16
|
-
expect(@test_object.audit_trail.records.length).to eq(1)
|
17
|
-
end
|
18
|
-
it "should return all the data from each audit record" do
|
19
|
-
record = @test_object.audit_trail.records.last
|
20
|
-
expect(record.id).to eq("AUDREC1")
|
21
|
-
expect(record.process_type).to eq("Fedora API-M")
|
22
|
-
expect(record.action).to eq("addDatastream")
|
23
|
-
expect(record.component_id).to eq("RELS-EXT")
|
24
|
-
expect(record.responsibility).to eq("fedoraAdmin")
|
25
|
-
expect(DateTime.parse(record.date)).to eq DateTime.parse(@test_object.modified_date)
|
26
|
-
expect(record.justification).to eq("")
|
27
|
-
end
|
28
|
-
|
29
|
-
end
|
@@ -1,127 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
describe ActiveFedora::DatastreamCollections do
|
4
|
-
before(:all) do
|
5
|
-
class MockAFBaseDatastream < ActiveFedora::Base
|
6
|
-
include ActiveFedora::DatastreamCollections
|
7
|
-
has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
|
8
|
-
has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
|
9
|
-
end
|
10
|
-
end
|
11
|
-
|
12
|
-
#
|
13
|
-
# Named datastream specs
|
14
|
-
#
|
15
|
-
describe '#add_named_datastream' do
|
16
|
-
it 'should add a datastream with the given name to the object in fedora' do
|
17
|
-
@test_object2 = MockAFBaseDatastream.new
|
18
|
-
f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
|
19
|
-
f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
|
20
|
-
allow(f2).to receive(:original_filename).and_return("dino.jpg")
|
21
|
-
allow(f).to receive(:content_type).and_return("image/jpeg")
|
22
|
-
@test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})
|
23
|
-
@test_object2.add_named_datastream("high",{:content_type=>"image/jpeg",:blob=>f2})
|
24
|
-
ds = @test_object2.thumbnail.first
|
25
|
-
ds2 = @test_object2.high.first
|
26
|
-
@test_object2.save
|
27
|
-
@test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
|
28
|
-
expect(@test_object2.named_datastreams.keys.size).to eq(2)
|
29
|
-
expect(@test_object2.named_datastreams.keys.include?("thumbnail")).to eq(true)
|
30
|
-
expect(@test_object2.named_datastreams.keys.include?("high")).to eq(true)
|
31
|
-
expect(@test_object2.named_datastreams["thumbnail"].size).to eq(1)
|
32
|
-
expect(@test_object2.named_datastreams["high"].size).to eq(1)
|
33
|
-
t2_thumb1 = @test_object2.named_datastreams["thumbnail"].first
|
34
|
-
expect(t2_thumb1.dsid).to eq(ds.dsid)
|
35
|
-
expect(t2_thumb1.mimeType).to eq(ds.mimeType)
|
36
|
-
expect(t2_thumb1.pid).to eq(ds.pid)
|
37
|
-
expect(t2_thumb1.dsLabel).to eq(ds.dsLabel)
|
38
|
-
expect(t2_thumb1.controlGroup).to eq(ds.controlGroup)
|
39
|
-
t2_high1 = @test_object2.named_datastreams["high"].first
|
40
|
-
expect(t2_high1.dsid).to eq(ds2.dsid)
|
41
|
-
expect(t2_high1.mimeType).to eq(ds2.mimeType)
|
42
|
-
expect(t2_high1.pid).to eq(ds2.pid)
|
43
|
-
expect(t2_high1.dsLabel).to eq(ds2.dsLabel)
|
44
|
-
expect(t2_high1.controlGroup).to eq(ds2.controlGroup)
|
45
|
-
end
|
46
|
-
end
|
47
|
-
|
48
|
-
describe '#add_named_file_datastream' do
|
49
|
-
it 'should add a file datastream with the given name to the object in fedora' do
|
50
|
-
@test_object2 = MockAFBaseDatastream.new
|
51
|
-
f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
|
52
|
-
allow(f).to receive(:content_type).and_return("image/jpeg")
|
53
|
-
@test_object2.add_named_file_datastream("thumbnail",f)
|
54
|
-
ds = @test_object2.thumbnail.first
|
55
|
-
@test_object2.save
|
56
|
-
@test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
|
57
|
-
expect(@test_object2.named_datastreams["thumbnail"].size).to eq(1)
|
58
|
-
t2_thumb1 = @test_object2.named_datastreams["thumbnail"].first
|
59
|
-
expect(t2_thumb1.dsid).to eq("THUMB1")
|
60
|
-
expect(t2_thumb1.mimeType).to eq("image/jpeg")
|
61
|
-
expect(t2_thumb1.pid).to eq(@test_object2.pid)
|
62
|
-
expect(t2_thumb1.dsLabel).to eq("minivan.jpg")
|
63
|
-
expect(t2_thumb1.controlGroup).to eq("M")
|
64
|
-
end
|
65
|
-
end
|
66
|
-
|
67
|
-
describe '#update_named_datastream' do
|
68
|
-
it 'should update a named datastream to have a new file' do
|
69
|
-
@test_object2 = MockAFBaseDatastream.new
|
70
|
-
f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
|
71
|
-
minivan = f.read
|
72
|
-
f.rewind
|
73
|
-
f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
|
74
|
-
dino = f2.read
|
75
|
-
f2.rewind
|
76
|
-
allow(f).to receive(:content_type).and_return("image/jpeg")
|
77
|
-
allow(f).to receive(:original_filename).and_return("minivan.jpg")
|
78
|
-
allow(f2).to receive(:content_type).and_return("image/jpeg")
|
79
|
-
allow(f2).to receive(:original_filename).and_return("dino.jpg")
|
80
|
-
#check raise exception if dsid not supplied
|
81
|
-
@test_object2.add_named_datastream("thumbnail",{:file=>f})
|
82
|
-
@test_object2.save
|
83
|
-
@test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
|
84
|
-
|
85
|
-
expect(@test_object2.thumbnail.size).to eq(1)
|
86
|
-
@test_object2.thumbnail_ids == ["THUMB1"]
|
87
|
-
ds = @test_object2.thumbnail.first
|
88
|
-
expect(ds.dsid).to eq("THUMB1")
|
89
|
-
expect(ds.mimeType).to eq("image/jpeg")
|
90
|
-
expect(ds.pid).to eq(@test_object2.pid)
|
91
|
-
expect(ds.dsLabel).to eq("minivan.jpg")
|
92
|
-
expect(ds.controlGroup).to eq("M")
|
93
|
-
|
94
|
-
expect(ds.content).to eq(minivan)
|
95
|
-
@test_object2.update_named_datastream("thumbnail",{:file=>f2,:dsid=>"THUMB1"})
|
96
|
-
@test_object2.save
|
97
|
-
@test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
|
98
|
-
expect(@test_object2.thumbnail.size).to eq(1)
|
99
|
-
@test_object2.thumbnail_ids == ["THUMB1"]
|
100
|
-
ds2 = @test_object2.thumbnail.first
|
101
|
-
expect(ds2.dsid).to eq("THUMB1")
|
102
|
-
expect(ds2.mimeType).to eq("image/jpeg")
|
103
|
-
expect(ds2.pid).to eq(@test_object2.pid)
|
104
|
-
expect(ds2.dsLabel).to eq("dino.jpg")
|
105
|
-
expect(ds2.controlGroup).to eq("M")
|
106
|
-
expect(ds2.content == dino).to be_truthy
|
107
|
-
end
|
108
|
-
end
|
109
|
-
|
110
|
-
describe '#named_datastreams_ids' do
|
111
|
-
it 'should return a hash of datastream name to an array of dsids' do
|
112
|
-
@test_object2 = MockAFBaseDatastream.new
|
113
|
-
f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
|
114
|
-
f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
|
115
|
-
@test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f})
|
116
|
-
@test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f2})
|
117
|
-
@test_object2.save
|
118
|
-
@test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
|
119
|
-
named_datastreams_ids = @test_object2.named_datastreams_ids
|
120
|
-
|
121
|
-
expect(named_datastreams_ids.keys.sort).to eq(['high', 'thumbnail'])
|
122
|
-
expect(named_datastreams_ids['high']).to eq([])
|
123
|
-
expect(named_datastreams_ids['thumbnail'].sort).to eq(["THUMB1", "THUMB2"])
|
124
|
-
end
|
125
|
-
end
|
126
|
-
|
127
|
-
end
|
@@ -1,90 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
require 'active_fedora'
|
4
|
-
require "rexml/document"
|
5
|
-
|
6
|
-
describe ActiveFedora::Datastream do
|
7
|
-
|
8
|
-
before(:all) do
|
9
|
-
class MockAFBase < ActiveFedora::Base
|
10
|
-
has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream, :autocreate => true
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
before(:each) do
|
15
|
-
@test_object = MockAFBase.new
|
16
|
-
@test_object.save
|
17
|
-
end
|
18
|
-
|
19
|
-
after(:each) do
|
20
|
-
@test_object.delete
|
21
|
-
end
|
22
|
-
|
23
|
-
it "should be able to access Datastreams using datastreams method" do
|
24
|
-
descMetadata = @test_object.datastreams["descMetadata"]
|
25
|
-
expect(descMetadata).to be_a_kind_of(ActiveFedora::Datastream)
|
26
|
-
expect(descMetadata.dsid).to eql("descMetadata")
|
27
|
-
end
|
28
|
-
|
29
|
-
it "should be able to access Datastream content using content method" do
|
30
|
-
descMetadata = @test_object.datastreams["descMetadata"].content
|
31
|
-
expect(descMetadata).not_to be_nil
|
32
|
-
end
|
33
|
-
|
34
|
-
it "should be able to update XML Datastream content and save to Fedora" do
|
35
|
-
xml_content = Nokogiri::XML::Document.parse(@test_object.datastreams["descMetadata"].content)
|
36
|
-
title = Nokogiri::XML::Element.new "title", xml_content
|
37
|
-
title.content = "Test Title"
|
38
|
-
xml_content.root.add_child title
|
39
|
-
|
40
|
-
allow(@test_object.datastreams["descMetadata"]).to receive(:before_save)
|
41
|
-
@test_object.datastreams["descMetadata"].content = xml_content.to_s
|
42
|
-
@test_object.datastreams["descMetadata"].save
|
43
|
-
|
44
|
-
found = Nokogiri::XML::Document.parse(@test_object.class.find(@test_object.pid).datastreams['descMetadata'].content)
|
45
|
-
expect(found.xpath('//dc/title/text()').first.inner_text).to eq(title.content)
|
46
|
-
end
|
47
|
-
|
48
|
-
it "should be able to update Blob Datastream content and save to Fedora" do
|
49
|
-
dsid = "ds#{Time.now.to_i}"
|
50
|
-
ds = ActiveFedora::Datastream.new(@test_object.inner_object, dsid)
|
51
|
-
ds.content = fixture('dino.jpg')
|
52
|
-
expect(@test_object.add_datastream(ds)).to be_truthy
|
53
|
-
@test_object.save
|
54
|
-
expect(@test_object.datastreams[dsid]).not_to be_changed
|
55
|
-
to = ActiveFedora::Base.find(@test_object.pid)
|
56
|
-
expect(to).not_to be_nil
|
57
|
-
expect(to.datastreams[dsid]).not_to be_nil
|
58
|
-
expect(to.datastreams[dsid].content).to eq(fixture('dino.jpg').read)
|
59
|
-
end
|
60
|
-
|
61
|
-
it "should be able to set the versionable attribute" do
|
62
|
-
dsid = "ds#{Time.now.to_i}"
|
63
|
-
v1 = "<version1>data</version1>"
|
64
|
-
v2 = "<version2>data</version2>"
|
65
|
-
ds = ActiveFedora::Datastream.new(@test_object.inner_object, dsid)
|
66
|
-
ds.content = v1
|
67
|
-
ds.versionable = false
|
68
|
-
expect(@test_object.add_datastream(ds)).to be_truthy
|
69
|
-
@test_object.save
|
70
|
-
to = ActiveFedora::Base.find(@test_object.pid)
|
71
|
-
ds = to.datastreams[dsid]
|
72
|
-
expect(ds.versionable).to be_falsey
|
73
|
-
ds.versionable = true
|
74
|
-
to.save
|
75
|
-
ds.content = v2
|
76
|
-
to.save
|
77
|
-
versions = ds.versions
|
78
|
-
expect(versions.length).to eq(2)
|
79
|
-
# order of versions not guaranteed
|
80
|
-
if versions[0].content == v2
|
81
|
-
expect(versions[1].content).to eq(v1)
|
82
|
-
expect(versions[0].asOfDateTime).to be >= versions[1].asOfDateTime
|
83
|
-
else
|
84
|
-
expect(versions[0].content).to eq(v1)
|
85
|
-
expect(versions[1].content).to eq(v2)
|
86
|
-
expect(versions[1].asOfDateTime).to be >= versions[0].asOfDateTime
|
87
|
-
end
|
88
|
-
expect(ds.content).to eq(v2)
|
89
|
-
end
|
90
|
-
end
|
@@ -1,173 +0,0 @@
|
|
1
|
-
require 'spec_helper'
|
2
|
-
|
3
|
-
require 'active_fedora'
|
4
|
-
require "rexml/document"
|
5
|
-
|
6
|
-
describe ActiveFedora::Datastreams do
|
7
|
-
describe "serializing datastreams" do
|
8
|
-
before :all do
|
9
|
-
class TestingMetadataSerializing < ActiveFedora::Base
|
10
|
-
has_metadata name: "nokogiri_autocreate_on", autocreate: true, type: ActiveFedora::OmDatastream
|
11
|
-
has_metadata name: "nokogiri_autocreate_off", autocreate: false, type: ActiveFedora::OmDatastream
|
12
|
-
end
|
13
|
-
end
|
14
|
-
|
15
|
-
after :all do
|
16
|
-
Object.send(:remove_const, :TestingMetadataSerializing)
|
17
|
-
end
|
18
|
-
|
19
|
-
subject { TestingMetadataSerializing.new }
|
20
|
-
|
21
|
-
it "should work" do
|
22
|
-
subject.save(validate: false)
|
23
|
-
expect(subject.nokogiri_autocreate_on).not_to be_new
|
24
|
-
expect(subject.nokogiri_autocreate_off).to be_new
|
25
|
-
end
|
26
|
-
end
|
27
|
-
|
28
|
-
|
29
|
-
describe "#has_metadata" do
|
30
|
-
before :all do
|
31
|
-
class HasMetadata < ActiveFedora::Base
|
32
|
-
has_metadata name: "with_versions", autocreate: true, label: "Versioned DS", type: ActiveFedora::SimpleDatastream
|
33
|
-
has_metadata name: "without_versions", autocreate: true, versionable: false, type: ActiveFedora::SimpleDatastream
|
34
|
-
end
|
35
|
-
end
|
36
|
-
after :all do
|
37
|
-
Object.send(:remove_const, :HasMetadata)
|
38
|
-
end
|
39
|
-
before do
|
40
|
-
@base = ActiveFedora::Base.new(pid:"test:has_metadata_base")
|
41
|
-
@base.add_datastream(@base.create_datastream(ActiveFedora::Datastream, "testDS", dsLabel: "Test DS"))
|
42
|
-
@base.datastreams["testDS"].content = "blah blah blah"
|
43
|
-
@base.save
|
44
|
-
@test = HasMetadata.new(pid:"test:has_metadata_model")
|
45
|
-
@test.save
|
46
|
-
end
|
47
|
-
|
48
|
-
after do
|
49
|
-
@base.delete
|
50
|
-
@test.delete
|
51
|
-
end
|
52
|
-
|
53
|
-
it "should create datastreams from the spec on new objects" do
|
54
|
-
expect(@test.without_versions.versionable).to be_falsey
|
55
|
-
expect(@test.with_versions.versionable).to be_truthy
|
56
|
-
expect(@test.with_versions.dsLabel).to eql "Versioned DS"
|
57
|
-
@test.without_versions.content= "blah blah blah"
|
58
|
-
@test.save
|
59
|
-
expect(HasMetadata.find(@test.pid).without_versions.versionable).to be_falsey
|
60
|
-
end
|
61
|
-
|
62
|
-
it "should use ds_specs and preserve existing datastreams on migrated objects" do
|
63
|
-
test_obj = HasMetadata.find(@base.pid, cast: false)
|
64
|
-
expect(test_obj.datastreams["testDS"].dsLabel).to eql "Test DS"
|
65
|
-
expect(test_obj.datastreams["testDS"].new?).to be_falsey
|
66
|
-
expect(test_obj.with_versions.dsLabel).to eql "Versioned DS"
|
67
|
-
expect(test_obj.without_versions.versionable).to be_falsey
|
68
|
-
expect(test_obj.with_versions.new?).to be_truthy
|
69
|
-
end
|
70
|
-
|
71
|
-
end
|
72
|
-
|
73
|
-
describe "#has_file_datastream" do
|
74
|
-
before :all do
|
75
|
-
class HasFile < ActiveFedora::Base
|
76
|
-
has_file_datastream name: "file_ds", versionable: false
|
77
|
-
has_file_datastream name: "file_ds2", versionable: false, autocreate: false
|
78
|
-
end
|
79
|
-
end
|
80
|
-
after :all do
|
81
|
-
Object.send(:remove_const, :HasFile)
|
82
|
-
end
|
83
|
-
before do
|
84
|
-
@base = ActiveFedora::Base.new(pid:"test:ds_versionable_base")
|
85
|
-
@base.save
|
86
|
-
@base2 = ActiveFedora::Base.new(pid:"test:ds_versionable_base2")
|
87
|
-
@base2.add_datastream(@base2.create_datastream(ActiveFedora::Datastream,"file_ds", versionable:true,dsLabel:"Pre-existing DS"))
|
88
|
-
@base2.datastreams["file_ds"].content = "blah blah blah"
|
89
|
-
@base2.save
|
90
|
-
@has_file = HasFile.new(pid:"test:ds_versionable_has_file")
|
91
|
-
@has_file.save
|
92
|
-
end
|
93
|
-
|
94
|
-
after do
|
95
|
-
@base.delete
|
96
|
-
@base2.delete
|
97
|
-
@has_file.delete
|
98
|
-
end
|
99
|
-
|
100
|
-
it "should create datastreams from the spec on new objects" do
|
101
|
-
expect(@has_file.file_ds.versionable).to be_falsey
|
102
|
-
@has_file.file_ds.content = "blah blah blah"
|
103
|
-
expect(@has_file.file_ds.changed?).to be_truthy
|
104
|
-
expect(@has_file.file_ds2.changed?).to be_falsey # no autocreate
|
105
|
-
expect(@has_file.file_ds2.new?).to be_truthy
|
106
|
-
@has_file.save
|
107
|
-
expect(@has_file.file_ds.versionable).to be_falsey
|
108
|
-
test_obj = HasFile.find(@has_file.pid)
|
109
|
-
expect(test_obj.file_ds.versionable).to be_falsey
|
110
|
-
expect(test_obj.rels_ext.changed?).to be_falsey
|
111
|
-
expect(test_obj.file_ds.changed?).to be_falsey
|
112
|
-
expect(test_obj.file_ds2.changed?).to be_falsey
|
113
|
-
expect(test_obj.file_ds2.new?).to be_truthy
|
114
|
-
end
|
115
|
-
|
116
|
-
it "should use ds_specs on migrated objects" do
|
117
|
-
test_obj = HasFile.find(@base.pid, cast: false)
|
118
|
-
expect(test_obj.file_ds.versionable).to be_falsey
|
119
|
-
expect(test_obj.file_ds.new?).to be_truthy
|
120
|
-
test_obj.file_ds.content = "blah blah blah"
|
121
|
-
test_obj.save
|
122
|
-
expect(test_obj.file_ds.versionable).to be_falsey
|
123
|
-
# look it up again to check datastream profile
|
124
|
-
test_obj = HasFile.find(@base.pid, cast: false)
|
125
|
-
expect(test_obj.file_ds.versionable).to be_falsey
|
126
|
-
expect(test_obj.file_ds.dsLabel).to eql "File Datastream"
|
127
|
-
test_obj = HasFile.find(@base2.pid, cast: false)
|
128
|
-
expect(test_obj.file_ds.versionable).to be_truthy
|
129
|
-
expect(test_obj.file_ds.dsLabel).to eql "Pre-existing DS"
|
130
|
-
end
|
131
|
-
end
|
132
|
-
|
133
|
-
describe "#create_datastream" do
|
134
|
-
before do
|
135
|
-
@base = ActiveFedora::Base.new(pid:"test:create_datastream")
|
136
|
-
@base.save
|
137
|
-
@ds_location = ActiveFedora.solr_config[:url] + "/admin/file/?file=schema.xml"
|
138
|
-
open(@ds_location) do |f|
|
139
|
-
@ds_content = f.read
|
140
|
-
end
|
141
|
-
end
|
142
|
-
|
143
|
-
after do
|
144
|
-
@base.delete
|
145
|
-
end
|
146
|
-
# external file datastreams require changes to XACML policies, but http URIs should work
|
147
|
-
it "should create external datastreams" do
|
148
|
-
# we should be albe to reliably download the solr schema
|
149
|
-
ds_opts = {mimeType:'text/xml',controlGroup:'E',dsLabel:'Some metadata',
|
150
|
-
dsLocation:@ds_location}
|
151
|
-
ds = @base.create_datastream('ActiveFedora::Datastream', 'someMetadata', ds_opts)
|
152
|
-
@base.add_datastream(ds)
|
153
|
-
@base.save
|
154
|
-
expect(@base.datastreams.keys.include?('someMetadata')).to be_truthy
|
155
|
-
test_obj = ActiveFedora::Base.find(@base.pid)
|
156
|
-
expect(test_obj.datastreams['someMetadata'].content).to eql @ds_content
|
157
|
-
expect(test_obj.datastreams['someMetadata'].controlGroup).to eql 'E'
|
158
|
-
end
|
159
|
-
|
160
|
-
# file:// URIs require changes to XACML policies, but http URIs should work
|
161
|
-
it "should create managed datastreams from a given URL" do
|
162
|
-
ds_opts = {mimeType:'text/xml',controlGroup:'M',dsLabel:'Some metadata',
|
163
|
-
dsLocation:@ds_location}
|
164
|
-
ds = @base.create_datastream('ActiveFedora::Datastream', 'someMetadata', ds_opts)
|
165
|
-
@base.add_datastream(ds)
|
166
|
-
@base.save
|
167
|
-
expect(@base.datastreams.keys.include?('someMetadata')).to be_truthy
|
168
|
-
test_obj = ActiveFedora::Base.find(@base.pid)
|
169
|
-
expect(test_obj.datastreams['someMetadata'].content).to eql @ds_content
|
170
|
-
expect(test_obj.datastreams['someMetadata'].controlGroup).to eql 'M'
|
171
|
-
end
|
172
|
-
end
|
173
|
-
end
|