active-fedora 9.7.0 → 9.8.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.
- checksums.yaml +4 -4
- data/.gitignore +1 -0
- data/.rubocop.yml +10 -9
- data/History.txt +18 -0
- data/README.md +12 -13
- data/Rakefile +1 -1
- data/active-fedora.gemspec +2 -1
- data/config/fedora.yml +2 -2
- data/config/solr.yml +5 -5
- data/lib/active_fedora/association_hash.rb +2 -2
- data/lib/active_fedora/associations/builder/collection_association.rb +1 -1
- data/lib/active_fedora/associations/builder/has_many.rb +1 -1
- data/lib/active_fedora/associations/collection_association.rb +1 -1
- data/lib/active_fedora/associations/collection_proxy.rb +4 -4
- data/lib/active_fedora/associations/directly_contains_one_association.rb +3 -7
- data/lib/active_fedora/associations/has_many_association.rb +22 -29
- data/lib/active_fedora/associations/indirectly_contains_association.rb +1 -1
- data/lib/active_fedora/autosave_association.rb +1 -1
- data/lib/active_fedora/base.rb +1 -1
- data/lib/active_fedora/callbacks.rb +1 -1
- data/lib/active_fedora/change_set.rb +1 -2
- data/lib/active_fedora/datastreams/nokogiri_datastreams.rb +6 -6
- data/lib/active_fedora/file.rb +5 -4
- data/lib/active_fedora/file_configurator.rb +6 -11
- data/lib/active_fedora/fixity_service.rb +1 -1
- data/lib/active_fedora/indexing/map.rb +2 -1
- data/lib/active_fedora/indexing_service.rb +3 -3
- data/lib/active_fedora/ldp_cache.rb +1 -1
- data/lib/active_fedora/model.rb +9 -10
- data/lib/active_fedora/nested_attributes.rb +1 -1
- data/lib/active_fedora/nom_datastream.rb +5 -5
- data/lib/active_fedora/om_datastream.rb +2 -2
- data/lib/active_fedora/persistence.rb +2 -2
- data/lib/active_fedora/qualified_dublin_core_datastream.rb +1 -1
- data/lib/active_fedora/rdf/fcrepo.rb +6 -0
- data/lib/active_fedora/rdf/field_map.rb +4 -2
- data/lib/active_fedora/rdf/persistence.rb +2 -2
- data/lib/active_fedora/rdf/rdf_datastream.rb +1 -1
- data/lib/active_fedora/reflection.rb +3 -3
- data/lib/active_fedora/relation.rb +2 -2
- data/lib/active_fedora/solr_query_builder.rb +93 -91
- data/lib/active_fedora/solr_service.rb +2 -2
- data/lib/active_fedora/version.rb +1 -1
- data/lib/active_fedora/versionable.rb +14 -12
- data/lib/active_fedora/versions_graph.rb +1 -1
- data/lib/active_fedora.rb +2 -2
- data/lib/generators/active_fedora/config/fedora/templates/fedora.yml +2 -2
- data/lib/generators/active_fedora/config/solr/solr_generator.rb +0 -1
- data/lib/generators/active_fedora/config/solr/templates/solr.yml +2 -2
- data/lib/tasks/active_fedora_dev.rake +13 -8
- data/solr/config/_rest_managed.json +3 -0
- data/solr/config/admin-extra.html +31 -0
- data/solr/config/elevate.xml +36 -0
- data/solr/config/mapping-ISOLatin1Accent.txt +246 -0
- data/solr/config/protwords.txt +21 -0
- data/solr/config/schema.xml +372 -0
- data/solr/config/scripts.conf +24 -0
- data/solr/config/solrconfig.xml +419 -0
- data/solr/config/spellings.txt +2 -0
- data/solr/config/stopwords.txt +58 -0
- data/solr/config/stopwords_en.txt +58 -0
- data/solr/config/synonyms.txt +31 -0
- data/solr/config/xslt/example.xsl +132 -0
- data/solr/config/xslt/example_atom.xsl +67 -0
- data/solr/config/xslt/example_rss.xsl +66 -0
- data/solr/config/xslt/luke.xsl +337 -0
- data/spec/integration/complex_rdf_datastream_spec.rb +8 -8
- data/spec/integration/full_featured_model_spec.rb +1 -1
- data/spec/integration/ntriples_datastream_spec.rb +12 -1
- data/spec/integration/rdf_nested_attributes_spec.rb +51 -20
- data/spec/integration/scoped_query_spec.rb +2 -2
- data/spec/integration/versionable_spec.rb +1 -3
- data/spec/unit/active_fedora_spec.rb +0 -3
- data/spec/unit/base_spec.rb +1 -1
- data/spec/unit/forbidden_attributes_protection_spec.rb +1 -1
- data/spec/unit/ntriples_datastream_spec.rb +21 -11
- data/spec/unit/persistence_spec.rb +1 -1
- data/spec/unit/predicates_spec.rb +1 -1
- data/spec/unit/qualified_dublin_core_datastream_spec.rb +1 -1
- data/spec/unit/solr_config_options_spec.rb +3 -3
- data/spec/unit/sparql_insert_spec.rb +1 -1
- metadata +38 -11
- data/config/solr_mappings_af_0.1.yml +0 -9
- data/config/solr_mappings_bl_2.4.yml +0 -17
- data/lib/generators/active_fedora/config/solr/templates/jetty.yml +0 -6
|
@@ -49,12 +49,23 @@ describe ActiveFedora::NtriplesRDFDatastream do
|
|
|
49
49
|
@subject.save
|
|
50
50
|
end
|
|
51
51
|
|
|
52
|
+
let(:remote_content) do
|
|
53
|
+
<<EOF
|
|
54
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://purl.org/dc/terms/created> "2010-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
|
|
55
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://purl.org/dc/terms/title> "Title of work" .
|
|
56
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://purl.org/dc/terms/publisher> "Penn State" .
|
|
57
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://xmlns.com/foaf/0.1/based_near> "New York, NY, US" .
|
|
58
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://google.com/> .
|
|
59
|
+
<#{ActiveFedora.fedora.host}/test/test:1/content> <http://purl.org/dc/terms/title> "Title of datastream" .
|
|
60
|
+
EOF
|
|
61
|
+
end
|
|
62
|
+
|
|
52
63
|
it "saves content properly upon save" do
|
|
53
64
|
foo = RdfTest.new('test:1') # ID needs to match the subject in the loaded file
|
|
54
65
|
foo.title = 'Hamlet'
|
|
55
66
|
foo.save
|
|
56
67
|
expect(foo.title).to eq 'Hamlet'
|
|
57
|
-
foo.rdf.content =
|
|
68
|
+
foo.rdf.content = remote_content
|
|
58
69
|
foo.save
|
|
59
70
|
expect(foo.title).to eq 'Title of work'
|
|
60
71
|
end
|
|
@@ -4,10 +4,25 @@ describe "Nesting attribute behavior of RDF resources" do
|
|
|
4
4
|
before do
|
|
5
5
|
class DummyMADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
|
|
6
6
|
property :Topic
|
|
7
|
+
property :Name
|
|
8
|
+
property :Source
|
|
9
|
+
end
|
|
10
|
+
|
|
11
|
+
class CustomName < ActiveFedora::Base
|
|
12
|
+
property :pref_label, predicate: ::RDF::SKOS.prefLabel, multiple: false
|
|
13
|
+
end
|
|
14
|
+
|
|
15
|
+
class CustomSource < ActiveFedora::Base
|
|
7
16
|
end
|
|
8
17
|
|
|
9
18
|
class ComplexResource < ActiveFedora::Base
|
|
10
19
|
property :topic, predicate: DummyMADS.Topic, class_name: "ComplexResource::Topic"
|
|
20
|
+
property :name, predicate: DummyMADS.Name, class_name: "CustomName" do |index|
|
|
21
|
+
index.as :stored_searchable, using: :pref_label
|
|
22
|
+
end
|
|
23
|
+
property :source, predicate: DummyMADS.Source, class_name: "CustomSource" do |index|
|
|
24
|
+
index.as :stored_searchable
|
|
25
|
+
end
|
|
11
26
|
|
|
12
27
|
class Topic < ActiveTriples::Resource
|
|
13
28
|
property :subject, predicate: ::RDF::Vocab::DC.subject
|
|
@@ -18,37 +33,53 @@ describe "Nesting attribute behavior of RDF resources" do
|
|
|
18
33
|
after do
|
|
19
34
|
Object.send(:remove_const, :ComplexResource)
|
|
20
35
|
Object.send(:remove_const, :DummyMADS)
|
|
36
|
+
Object.send(:remove_const, :CustomName)
|
|
37
|
+
Object.send(:remove_const, :CustomSource)
|
|
21
38
|
end
|
|
22
39
|
|
|
23
|
-
|
|
40
|
+
context "with an AT resource as a property" do
|
|
41
|
+
subject { ComplexResource.new }
|
|
24
42
|
|
|
25
|
-
|
|
43
|
+
let(:params) { [{ subject: 'Foo' }, { subject: 'Bar' }] }
|
|
26
44
|
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
45
|
+
before do
|
|
46
|
+
ComplexResource.accepts_nested_attributes_for(*args)
|
|
47
|
+
subject.topic_attributes = params
|
|
48
|
+
end
|
|
49
|
+
|
|
50
|
+
context "when no options are set" do
|
|
51
|
+
let(:args) { [:topic] }
|
|
31
52
|
|
|
32
|
-
|
|
33
|
-
|
|
53
|
+
it "sets the attributes" do
|
|
54
|
+
expect(subject.topic.size).to eq 2
|
|
55
|
+
expect(subject.topic.map(&:subject)).to eq [['Foo'], ['Bar']]
|
|
56
|
+
end
|
|
34
57
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
58
|
+
it "marks the attributes as changed" do
|
|
59
|
+
expect(subject.changed_attributes).to eq('topic' => [])
|
|
60
|
+
end
|
|
38
61
|
end
|
|
39
62
|
|
|
40
|
-
|
|
41
|
-
|
|
63
|
+
context "when reject_if is set" do
|
|
64
|
+
let(:args) { [:topic, reject_if: reject_proc] }
|
|
65
|
+
let(:reject_proc) { lambda { |attributes| attributes[:subject] == 'Bar' } }
|
|
66
|
+
let(:params) { [{ subject: 'Foo' }, { subject: 'Bar' }] }
|
|
67
|
+
|
|
68
|
+
it "does not add terms for which the proc is true" do
|
|
69
|
+
expect(subject.topic.map(&:subject)).to eq [['Foo']]
|
|
70
|
+
end
|
|
42
71
|
end
|
|
43
72
|
end
|
|
44
73
|
|
|
45
|
-
context "
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
74
|
+
context "with an AF::Base object as a property" do
|
|
75
|
+
describe "#to_solr" do
|
|
76
|
+
let(:name) { CustomName.create(pref_label: "Joe Schmo") }
|
|
77
|
+
let(:source) { CustomSource.create }
|
|
78
|
+
let(:solr_doc) { ComplexResource.new(name: [name], source: [source]).to_solr }
|
|
79
|
+
it "indexes the value of the properties accordingly" do
|
|
80
|
+
expect(solr_doc).to include("name_tesim" => ["Joe Schmo"])
|
|
81
|
+
expect(solr_doc).to include("source_tesim" => [source.uri])
|
|
82
|
+
end
|
|
52
83
|
end
|
|
53
84
|
end
|
|
54
85
|
end
|
|
@@ -40,7 +40,7 @@ describe ActiveFedora::Querying do
|
|
|
40
40
|
expect(result).to be_instance_of(Array)
|
|
41
41
|
# this test is meaningless if the array length is zero
|
|
42
42
|
expect(result.length > 0).to be true
|
|
43
|
-
expect(result).to all(be_an
|
|
43
|
+
expect(result).to all(be_an(ModelIntegrationSpec::Basic))
|
|
44
44
|
end
|
|
45
45
|
end
|
|
46
46
|
|
|
@@ -90,7 +90,7 @@ describe ActiveFedora::Querying do
|
|
|
90
90
|
first_condition = { ActiveFedora::SolrQueryBuilder.solr_name('bar', type: :string) => 'Peanuts' }
|
|
91
91
|
second_condition = "foo_tesim:bar"
|
|
92
92
|
where_values = ModelIntegrationSpec::Basic.where(first_condition)
|
|
93
|
-
|
|
93
|
+
.where(second_condition).where_values
|
|
94
94
|
expect(where_values).to eq ["bar_tesim:Peanuts",
|
|
95
95
|
"(foo_tesim:bar)"]
|
|
96
96
|
end
|
|
@@ -75,9 +75,7 @@ describe ActiveFedora::Versionable do
|
|
|
75
75
|
subject.create_version
|
|
76
76
|
end
|
|
77
77
|
|
|
78
|
-
it
|
|
79
|
-
expect(subject.reload.model_type).to include ::RDF::URI.new('http://www.jcp.org/jcr/mix/1.0versionable')
|
|
80
|
-
end
|
|
78
|
+
it { is_expected.to have_versions }
|
|
81
79
|
|
|
82
80
|
it "has one version" do
|
|
83
81
|
expect(subject.versions).to be_kind_of ActiveFedora::VersionsGraph
|
|
@@ -99,7 +99,6 @@ describe ActiveFedora do
|
|
|
99
99
|
solr_config_path = File.expand_path(File.join(File.dirname(__FILE__), "../fixtures/rails_root/config/solr.yml"))
|
|
100
100
|
allow(File).to receive(:open).with(fedora_config_path).and_return(fedora_config)
|
|
101
101
|
allow(File).to receive(:open).with(solr_config_path).and_return(solr_config)
|
|
102
|
-
allow(ActiveFedora::SolrService).to receive(:load_mappings) # For the solrizer solr_mappings.yml
|
|
103
102
|
|
|
104
103
|
described_class.init(fedora_config_path: fedora_config_path, solr_config_path: solr_config_path)
|
|
105
104
|
expect(described_class.solr.class).to eq ActiveFedora::SolrService
|
|
@@ -108,8 +107,6 @@ describe ActiveFedora do
|
|
|
108
107
|
|
|
109
108
|
describe "with no explicit config path" do
|
|
110
109
|
it "looks for the file in the path defined at Rails.root" do
|
|
111
|
-
allow(ActiveFedora::SolrService).to receive(:load_mappings) # necessary or else it will load the solrizer config and it breaks other tests in the suite.
|
|
112
|
-
|
|
113
110
|
stub_rails(root: File.join(File.dirname(__FILE__), "../fixtures/rails_root"))
|
|
114
111
|
described_class.init
|
|
115
112
|
expect(described_class.config.credentials[:url]).to eq "http://testhost.com:8983/fedora"
|
data/spec/unit/base_spec.rb
CHANGED
|
@@ -204,7 +204,7 @@ describe ActiveFedora::Base do
|
|
|
204
204
|
context "when its saved" do
|
|
205
205
|
before do
|
|
206
206
|
allow(@test_object).to receive(:new_record?).and_return(false)
|
|
207
|
-
allow(@test_object).to receive(:uri).and_return(
|
|
207
|
+
allow(@test_object).to receive(:uri).and_return("#{ActiveFedora.fedora.host}/test/one/two/three")
|
|
208
208
|
end
|
|
209
209
|
|
|
210
210
|
context "#to_param" do
|
|
@@ -4,7 +4,7 @@ describe ActiveFedora::Attributes, ".new" do
|
|
|
4
4
|
before(:all) do
|
|
5
5
|
class ProtectedParams < ActiveSupport::HashWithIndifferentAccess
|
|
6
6
|
attr_accessor :permitted
|
|
7
|
-
|
|
7
|
+
alias permitted? permitted
|
|
8
8
|
|
|
9
9
|
def initialize(attributes)
|
|
10
10
|
super(attributes)
|
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
require 'spec_helper'
|
|
2
2
|
|
|
3
3
|
describe ActiveFedora::NtriplesRDFDatastream do
|
|
4
|
+
let(:remote_content) do
|
|
5
|
+
<<EOF
|
|
6
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://purl.org/dc/terms/created> "2010-12-31"^^<http://www.w3.org/2001/XMLSchema#date> .
|
|
7
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://purl.org/dc/terms/title> "Title of work" .
|
|
8
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://purl.org/dc/terms/publisher> "Penn State" .
|
|
9
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://xmlns.com/foaf/0.1/based_near> "New York, NY, US" .
|
|
10
|
+
<#{ActiveFedora.fedora.host}/test/test:1> <http://www.w3.org/2000/01/rdf-schema#seeAlso> <http://google.com/> .
|
|
11
|
+
<#{ActiveFedora.fedora.host}/test/test:1/content> <http://purl.org/dc/terms/title> "Title of datastream" .
|
|
12
|
+
EOF
|
|
13
|
+
end
|
|
14
|
+
|
|
4
15
|
describe "an instance with content" do
|
|
5
16
|
before do
|
|
6
17
|
class MyDatastream < ActiveFedora::NtriplesRDFDatastream
|
|
@@ -12,14 +23,14 @@ describe ActiveFedora::NtriplesRDFDatastream do
|
|
|
12
23
|
property :based_near, predicate: ::RDF::FOAF.based_near
|
|
13
24
|
property :related_url, predicate: ::RDF::RDFS.seeAlso
|
|
14
25
|
end
|
|
15
|
-
@subject = MyDatastream.new(ActiveFedora::Base.id_to_uri
|
|
16
|
-
@subject.content =
|
|
26
|
+
@subject = MyDatastream.new(ActiveFedora::Base.id_to_uri('/test:1/descMetadata'))
|
|
27
|
+
@subject.content = remote_content
|
|
17
28
|
end
|
|
18
29
|
after do
|
|
19
30
|
Object.send(:remove_const, :MyDatastream)
|
|
20
31
|
end
|
|
21
32
|
it "has a subject" do
|
|
22
|
-
expect(@subject.rdf_subject).to eq "
|
|
33
|
+
expect(@subject.rdf_subject).to eq "#{ActiveFedora.fedora.host}/test/test:1"
|
|
23
34
|
end
|
|
24
35
|
it "has mime_type" do
|
|
25
36
|
expect(@subject.mime_type).to eq 'text/plain'
|
|
@@ -83,7 +94,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
|
|
|
83
94
|
describe "an instance with a custom subject" do
|
|
84
95
|
before do
|
|
85
96
|
class MyDatastream < ActiveFedora::NtriplesRDFDatastream
|
|
86
|
-
rdf_subject { |ds| "
|
|
97
|
+
rdf_subject { |ds| "#{ActiveFedora.fedora.host}/test/#{ds.id}/content" }
|
|
87
98
|
property :created, predicate: ::RDF::Vocab::DC.created
|
|
88
99
|
property :title, predicate: ::RDF::Vocab::DC.title
|
|
89
100
|
property :publisher, predicate: ::RDF::Vocab::DC.publisher
|
|
@@ -96,10 +107,6 @@ describe ActiveFedora::NtriplesRDFDatastream do
|
|
|
96
107
|
allow(@subject).to receive(:remote_content).and_return remote_content
|
|
97
108
|
end
|
|
98
109
|
|
|
99
|
-
let(:remote_content) do
|
|
100
|
-
File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
|
|
101
|
-
end
|
|
102
|
-
|
|
103
110
|
after do
|
|
104
111
|
Object.send(:remove_const, :MyDatastream)
|
|
105
112
|
end
|
|
@@ -109,20 +116,22 @@ describe ActiveFedora::NtriplesRDFDatastream do
|
|
|
109
116
|
end
|
|
110
117
|
|
|
111
118
|
it "has a custom subject" do
|
|
112
|
-
expect(@subject.rdf_subject).to eq
|
|
119
|
+
expect(@subject.rdf_subject).to eq "#{ActiveFedora.fedora.host}/test/test:1/content"
|
|
113
120
|
end
|
|
114
121
|
end
|
|
115
122
|
|
|
116
123
|
describe "a new instance" do
|
|
117
|
-
before
|
|
124
|
+
before do
|
|
118
125
|
class MyDatastream < ActiveFedora::NtriplesRDFDatastream
|
|
119
126
|
property :publisher, predicate: ::RDF::Vocab::DC.publisher
|
|
120
127
|
end
|
|
121
128
|
@subject = MyDatastream.new
|
|
122
129
|
end
|
|
123
|
-
|
|
130
|
+
|
|
131
|
+
after do
|
|
124
132
|
Object.send(:remove_const, :MyDatastream)
|
|
125
133
|
end
|
|
134
|
+
|
|
126
135
|
it "supports to_s method" do
|
|
127
136
|
expect(@subject.publisher.to_s).to eq [].to_s
|
|
128
137
|
@subject.publisher = "Bob"
|
|
@@ -183,6 +192,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
|
|
|
183
192
|
doc = {}
|
|
184
193
|
expect(@subject.to_solr(doc)).to eq doc
|
|
185
194
|
end
|
|
195
|
+
|
|
186
196
|
describe "with an actual object" do
|
|
187
197
|
before(:each) do
|
|
188
198
|
class Foo < ActiveFedora::Base
|
|
@@ -19,7 +19,7 @@ describe ActiveFedora::Persistence do
|
|
|
19
19
|
context 'when a block is provided' do
|
|
20
20
|
it 'passes the block to initialize' do
|
|
21
21
|
expect_any_instance_of(ActiveFedora::Base).to receive(:save)
|
|
22
|
-
expect { |b| ActiveFedora::Base.create(&b) }.to yield_with_args(an_instance_of
|
|
22
|
+
expect { |b| ActiveFedora::Base.create(&b) }.to yield_with_args(an_instance_of(ActiveFedora::Base))
|
|
23
23
|
end
|
|
24
24
|
end
|
|
25
25
|
end
|
|
@@ -77,7 +77,7 @@ describe ActiveFedora::Predicates do
|
|
|
77
77
|
expect(described_class.predicate_lookup(:is_part_of)).to eq "isPartOf"
|
|
78
78
|
expect(described_class.predicate_lookup(:is_member_of)).to eq "isMemberOf"
|
|
79
79
|
expect(described_class.predicate_lookup("isPartOfCollection")).to eq "isPartOfCollection"
|
|
80
|
-
described_class.predicate_config[:predicate_mapping]
|
|
80
|
+
described_class.predicate_config[:predicate_mapping]["some_namespace"] = { has_foo: "hasFOO" }
|
|
81
81
|
expect(described_class.find_predicate(:has_foo)).to eq ["hasFOO", "some_namespace"]
|
|
82
82
|
expect(described_class.predicate_lookup(:has_foo, "some_namespace")).to eq "hasFOO"
|
|
83
83
|
expect(lambda { described_class.predicate_lookup(:has_foo) }).to raise_error ActiveFedora::UnregisteredPredicateError
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
require 'spec_helper'
|
|
2
2
|
|
|
3
3
|
describe ActiveFedora::QualifiedDublinCoreDatastream do
|
|
4
|
-
DC_ELEMENTS = [:contributor, :coverage, :creator, :date, :description, :identifier, :language, :publisher, :relation, :rights, :source]
|
|
4
|
+
DC_ELEMENTS = [:contributor, :coverage, :creator, :date, :description, :identifier, :language, :publisher, :relation, :rights, :source].freeze
|
|
5
5
|
|
|
6
6
|
let(:sample_xml) do "<dc xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:dcterms='http://purl.org/dc/terms/'>
|
|
7
7
|
<dcterms:type xsi:type='DCMITYPE'>sound</dcterms:type>
|
|
@@ -14,14 +14,14 @@ describe ActiveFedora do
|
|
|
14
14
|
|
|
15
15
|
describe "SOLR_DOCUMENT_ID" do
|
|
16
16
|
before(:all) do
|
|
17
|
-
SOLR_DOCUMENT_ID = "MY_SAMPLE_ID"
|
|
17
|
+
SOLR_DOCUMENT_ID = "MY_SAMPLE_ID".freeze
|
|
18
18
|
end
|
|
19
19
|
after(:all) do
|
|
20
|
-
SOLR_DOCUMENT_ID = "id"
|
|
20
|
+
SOLR_DOCUMENT_ID = "id".freeze
|
|
21
21
|
end
|
|
22
22
|
it "is used by ActiveFedora::Base.to_solr" do
|
|
23
23
|
allow(@test_object).to receive(:id).and_return('changeme:123')
|
|
24
|
-
SOLR_DOCUMENT_ID = "MY_SAMPLE_ID"
|
|
24
|
+
SOLR_DOCUMENT_ID = "MY_SAMPLE_ID".freeze
|
|
25
25
|
expect(@test_object.to_solr[SOLR_DOCUMENT_ID.to_sym]).to eq 'changeme:123'
|
|
26
26
|
expect(@test_object.to_solr[:id]).to be_nil
|
|
27
27
|
end
|
|
@@ -25,7 +25,7 @@ describe ActiveFedora::SparqlInsert do
|
|
|
25
25
|
let(:base) { Book.create }
|
|
26
26
|
|
|
27
27
|
it "returns the string" do
|
|
28
|
-
expect(subject.build).to eq "DELETE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . }\n WHERE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . } ;\nDELETE { <> <http://purl.org/dc/terms/title> ?change . }\n WHERE { <> <http://purl.org/dc/terms/title> ?change . } ;\nINSERT { \n<> <info:fedora/fedora-system:def/relations-external#hasConstituent>
|
|
28
|
+
expect(subject.build).to eq "DELETE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . }\n WHERE { <> <info:fedora/fedora-system:def/relations-external#hasConstituent> ?change . } ;\nDELETE { <> <http://purl.org/dc/terms/title> ?change . }\n WHERE { <> <http://purl.org/dc/terms/title> ?change . } ;\nINSERT { \n<> <info:fedora/fedora-system:def/relations-external#hasConstituent> <#{ActiveFedora.fedora.host}/test/foo> .\n<> <http://purl.org/dc/terms/title> \"bar\" .\n}\n WHERE { }"
|
|
29
29
|
end
|
|
30
30
|
end
|
|
31
31
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: active-fedora
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 9.
|
|
4
|
+
version: 9.8.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Matt Zumwalt
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date:
|
|
13
|
+
date: 2016-02-05 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rsolr
|
|
@@ -181,19 +181,33 @@ dependencies:
|
|
|
181
181
|
- !ruby/object:Gem::Version
|
|
182
182
|
version: '0'
|
|
183
183
|
- !ruby/object:Gem::Dependency
|
|
184
|
-
name:
|
|
184
|
+
name: solr_wrapper
|
|
185
185
|
requirement: !ruby/object:Gem::Requirement
|
|
186
186
|
requirements:
|
|
187
|
-
- - "
|
|
187
|
+
- - "~>"
|
|
188
188
|
- !ruby/object:Gem::Version
|
|
189
|
-
version:
|
|
189
|
+
version: '0.4'
|
|
190
190
|
type: :development
|
|
191
191
|
prerelease: false
|
|
192
192
|
version_requirements: !ruby/object:Gem::Requirement
|
|
193
193
|
requirements:
|
|
194
|
-
- - "
|
|
194
|
+
- - "~>"
|
|
195
|
+
- !ruby/object:Gem::Version
|
|
196
|
+
version: '0.4'
|
|
197
|
+
- !ruby/object:Gem::Dependency
|
|
198
|
+
name: fcrepo_wrapper
|
|
199
|
+
requirement: !ruby/object:Gem::Requirement
|
|
200
|
+
requirements:
|
|
201
|
+
- - "~>"
|
|
202
|
+
- !ruby/object:Gem::Version
|
|
203
|
+
version: '0.1'
|
|
204
|
+
type: :development
|
|
205
|
+
prerelease: false
|
|
206
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
207
|
+
requirements:
|
|
208
|
+
- - "~>"
|
|
195
209
|
- !ruby/object:Gem::Version
|
|
196
|
-
version:
|
|
210
|
+
version: '0.1'
|
|
197
211
|
- !ruby/object:Gem::Dependency
|
|
198
212
|
name: rspec
|
|
199
213
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -307,8 +321,6 @@ files:
|
|
|
307
321
|
- config/predicate_mappings.yml
|
|
308
322
|
- config/service_mappings.yml
|
|
309
323
|
- config/solr.yml
|
|
310
|
-
- config/solr_mappings_af_0.1.yml
|
|
311
|
-
- config/solr_mappings_bl_2.4.yml
|
|
312
324
|
- lib/active-fedora.rb
|
|
313
325
|
- lib/active_fedora.rb
|
|
314
326
|
- lib/active_fedora/association_hash.rb
|
|
@@ -466,7 +478,6 @@ files:
|
|
|
466
478
|
- lib/generators/active_fedora/config/fedora/fedora_generator.rb
|
|
467
479
|
- lib/generators/active_fedora/config/fedora/templates/fedora.yml
|
|
468
480
|
- lib/generators/active_fedora/config/solr/solr_generator.rb
|
|
469
|
-
- lib/generators/active_fedora/config/solr/templates/jetty.yml
|
|
470
481
|
- lib/generators/active_fedora/config/solr/templates/solr.yml
|
|
471
482
|
- lib/generators/active_fedora/config/solr/templates/solr_conf/conf/schema.xml
|
|
472
483
|
- lib/generators/active_fedora/config/solr/templates/solr_conf/conf/solrconfig.xml
|
|
@@ -481,6 +492,22 @@ files:
|
|
|
481
492
|
- script/console
|
|
482
493
|
- script/destroy
|
|
483
494
|
- script/generate
|
|
495
|
+
- solr/config/_rest_managed.json
|
|
496
|
+
- solr/config/admin-extra.html
|
|
497
|
+
- solr/config/elevate.xml
|
|
498
|
+
- solr/config/mapping-ISOLatin1Accent.txt
|
|
499
|
+
- solr/config/protwords.txt
|
|
500
|
+
- solr/config/schema.xml
|
|
501
|
+
- solr/config/scripts.conf
|
|
502
|
+
- solr/config/solrconfig.xml
|
|
503
|
+
- solr/config/spellings.txt
|
|
504
|
+
- solr/config/stopwords.txt
|
|
505
|
+
- solr/config/stopwords_en.txt
|
|
506
|
+
- solr/config/synonyms.txt
|
|
507
|
+
- solr/config/xslt/example.xsl
|
|
508
|
+
- solr/config/xslt/example_atom.xsl
|
|
509
|
+
- solr/config/xslt/example_rss.xsl
|
|
510
|
+
- solr/config/xslt/luke.xsl
|
|
484
511
|
- spec/config_helper.rb
|
|
485
512
|
- spec/fixtures/damsObjectModel.xml
|
|
486
513
|
- spec/fixtures/dino.jpg
|
|
@@ -638,7 +665,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
638
665
|
version: '0'
|
|
639
666
|
requirements: []
|
|
640
667
|
rubyforge_project:
|
|
641
|
-
rubygems_version: 2.4.
|
|
668
|
+
rubygems_version: 2.4.5.1
|
|
642
669
|
signing_key:
|
|
643
670
|
specification_version: 4
|
|
644
671
|
summary: A convenience libary for manipulating documents in the Fedora Repository.
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
id: id
|
|
2
|
-
default: searchable
|
|
3
|
-
searchable:
|
|
4
|
-
id: id
|
|
5
|
-
date: _dt
|
|
6
|
-
string: _t
|
|
7
|
-
text: _t
|
|
8
|
-
symbol: _s
|
|
9
|
-
integer: _i
|
|
10
|
-
long: _l
|
|
11
|
-
boolean: _b
|
|
12
|
-
float: _f
|
|
13
|
-
double: _d
|
|
14
|
-
displayable: _display
|
|
15
|
-
facetable: _facet
|
|
16
|
-
sortable: _sort
|
|
17
|
-
unstemmed_searchable: _unstem_search
|