active-fedora 5.4.0 → 5.5.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +0 -1
- data/active-fedora.gemspec +2 -1
- data/config/solr_mappings_af_0.1.yml +1 -1
- data/config/solr_mappings_bl_2.4.yml +1 -1
- data/lib/active_fedora.rb +6 -2
- data/lib/active_fedora/datastream.rb +1 -2
- data/lib/active_fedora/file_configurator.rb +22 -3
- data/lib/active_fedora/nokogiri_datastream.rb +1 -1
- data/lib/active_fedora/nom_datastream.rb +8 -3
- data/lib/active_fedora/qualified_dublin_core_datastream.rb +2 -0
- data/lib/active_fedora/rdf_datastream.rb +41 -262
- data/lib/active_fedora/rdf_node.rb +283 -0
- data/lib/active_fedora/rdf_object.rb +32 -0
- data/lib/active_fedora/simple_datastream.rb +8 -0
- data/lib/active_fedora/solr_service.rb +0 -2
- data/lib/active_fedora/version.rb +1 -1
- data/spec/fixtures/solr_rdf_descMetadata.nt +1 -1
- data/spec/integration/complex_rdf_datastream_spec.rb +122 -0
- data/spec/integration/ntriples_datastream_spec.rb +54 -6
- data/spec/samples/hydra-mods_article_datastream.rb +1 -1
- data/spec/unit/active_fedora_spec.rb +2 -0
- data/spec/unit/base_spec.rb +23 -24
- data/spec/unit/file_configurator_spec.rb +8 -0
- data/spec/unit/nom_datastream_spec.rb +32 -1
- data/spec/unit/ntriples_datastream_spec.rb +21 -125
- data/spec/unit/om_datastream_spec.rb +0 -4
- data/spec/unit/solr_config_options_spec.rb +10 -10
- metadata +27 -11
- data/config/solr_mappings.yml +0 -16
@@ -22,17 +22,17 @@ describe ActiveFedora do
|
|
22
22
|
describe "field name mappings" do
|
23
23
|
after(:all) do
|
24
24
|
# Revert to default mappings after running tests
|
25
|
-
ActiveFedora::SolrService.load_mappings
|
26
|
-
end
|
27
|
-
it "should default to using the mappings for the current schema" do
|
28
|
-
from_default_yml = YAML::load(File.open(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings.yml")))
|
29
|
-
ActiveFedora::SolrService.mappings[:searchable].data_types[:date].opts[:suffix].should == from_default_yml["searchable"]["date"]
|
30
|
-
end
|
31
|
-
it "should allow you to provide your own mappings file" do
|
32
|
-
ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
|
33
|
-
ActiveFedora::SolrService.mappings[:searchable].data_types[:date].opts[:suffix].should == "_date"
|
34
|
-
ActiveFedora::SolrService.mappings[:searchable].data_types[:default].opts[:suffix].should == "_field"
|
25
|
+
# ActiveFedora::SolrService.load_mappings
|
35
26
|
end
|
27
|
+
# it "should default to using the mappings for the current schema" do
|
28
|
+
# from_default_yml = YAML::load(File.open(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings.yml")))
|
29
|
+
# ActiveFedora::SolrService.mappings[:searchable].data_types[:date].opts[:suffix].should == from_default_yml["searchable"]["date"]
|
30
|
+
# end
|
31
|
+
# it "should allow you to provide your own mappings file" do
|
32
|
+
# ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
|
33
|
+
# ActiveFedora::SolrService.mappings[:searchable].data_types[:date].opts[:suffix].should == "_date"
|
34
|
+
# ActiveFedora::SolrService.mappings[:searchable].data_types[:default].opts[:suffix].should == "_field"
|
35
|
+
# end
|
36
36
|
end
|
37
37
|
|
38
38
|
describe "SOLR_DOCUMENT_ID" do
|
metadata
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: active-fedora
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.
|
5
|
-
prerelease:
|
4
|
+
version: 5.5.0.rc1
|
5
|
+
prerelease: 6
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Matt Zumwalt
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2013-01-
|
14
|
+
date: 2013-01-15 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: rsolr
|
@@ -45,6 +45,22 @@ dependencies:
|
|
45
45
|
- - ~>
|
46
46
|
- !ruby/object:Gem::Version
|
47
47
|
version: 1.8.0
|
48
|
+
- !ruby/object:Gem::Dependency
|
49
|
+
name: nom-xml
|
50
|
+
requirement: !ruby/object:Gem::Requirement
|
51
|
+
none: false
|
52
|
+
requirements:
|
53
|
+
- - ! '>='
|
54
|
+
- !ruby/object:Gem::Version
|
55
|
+
version: 0.5.1
|
56
|
+
type: :runtime
|
57
|
+
prerelease: false
|
58
|
+
version_requirements: !ruby/object:Gem::Requirement
|
59
|
+
none: false
|
60
|
+
requirements:
|
61
|
+
- - ! '>='
|
62
|
+
- !ruby/object:Gem::Version
|
63
|
+
version: 0.5.1
|
48
64
|
- !ruby/object:Gem::Dependency
|
49
65
|
name: solrizer
|
50
66
|
requirement: !ruby/object:Gem::Requirement
|
@@ -52,7 +68,7 @@ dependencies:
|
|
52
68
|
requirements:
|
53
69
|
- - ~>
|
54
70
|
- !ruby/object:Gem::Version
|
55
|
-
version: 2.0.
|
71
|
+
version: 2.1.0.rc1
|
56
72
|
type: :runtime
|
57
73
|
prerelease: false
|
58
74
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -60,7 +76,7 @@ dependencies:
|
|
60
76
|
requirements:
|
61
77
|
- - ~>
|
62
78
|
- !ruby/object:Gem::Version
|
63
|
-
version: 2.0.
|
79
|
+
version: 2.1.0.rc1
|
64
80
|
- !ruby/object:Gem::Dependency
|
65
81
|
name: activeresource
|
66
82
|
requirement: !ruby/object:Gem::Requirement
|
@@ -310,7 +326,6 @@ files:
|
|
310
326
|
- config/predicate_mappings.yml
|
311
327
|
- config/service_mappings.yml
|
312
328
|
- config/solr.yml
|
313
|
-
- config/solr_mappings.yml
|
314
329
|
- config/solr_mappings_af_0.1.yml
|
315
330
|
- config/solr_mappings_bl_2.4.yml
|
316
331
|
- lib/active-fedora.rb
|
@@ -353,6 +368,8 @@ files:
|
|
353
368
|
- lib/active_fedora/querying.rb
|
354
369
|
- lib/active_fedora/railtie.rb
|
355
370
|
- lib/active_fedora/rdf_datastream.rb
|
371
|
+
- lib/active_fedora/rdf_node.rb
|
372
|
+
- lib/active_fedora/rdf_object.rb
|
356
373
|
- lib/active_fedora/rdf_xml_writer.rb
|
357
374
|
- lib/active_fedora/rdfxml_rdf_datastream.rb
|
358
375
|
- lib/active_fedora/reflection.rb
|
@@ -417,6 +434,7 @@ files:
|
|
417
434
|
- spec/integration/base_file_management_spec.rb
|
418
435
|
- spec/integration/base_spec.rb
|
419
436
|
- spec/integration/bug_spec.rb
|
437
|
+
- spec/integration/complex_rdf_datastream_spec.rb
|
420
438
|
- spec/integration/datastream_collections_spec.rb
|
421
439
|
- spec/integration/datastream_spec.rb
|
422
440
|
- spec/integration/datastreams_spec.rb
|
@@ -540,12 +558,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
540
558
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
541
559
|
none: false
|
542
560
|
requirements:
|
543
|
-
- - ! '
|
561
|
+
- - ! '>'
|
544
562
|
- !ruby/object:Gem::Version
|
545
|
-
version:
|
546
|
-
segments:
|
547
|
-
- 0
|
548
|
-
hash: -973629088555411606
|
563
|
+
version: 1.3.1
|
549
564
|
requirements: []
|
550
565
|
rubyforge_project: rubyfedora
|
551
566
|
rubygems_version: 1.8.24
|
@@ -578,6 +593,7 @@ test_files:
|
|
578
593
|
- spec/integration/base_file_management_spec.rb
|
579
594
|
- spec/integration/base_spec.rb
|
580
595
|
- spec/integration/bug_spec.rb
|
596
|
+
- spec/integration/complex_rdf_datastream_spec.rb
|
581
597
|
- spec/integration/datastream_collections_spec.rb
|
582
598
|
- spec/integration/datastream_spec.rb
|
583
599
|
- spec/integration/datastreams_spec.rb
|
data/config/solr_mappings.yml
DELETED
@@ -1,16 +0,0 @@
|
|
1
|
-
id: id
|
2
|
-
default: searchable
|
3
|
-
searchable:
|
4
|
-
date: _dt
|
5
|
-
string: _t
|
6
|
-
text: _t
|
7
|
-
symbol: _s
|
8
|
-
integer: _i
|
9
|
-
long: _l
|
10
|
-
boolean: _b
|
11
|
-
float: _f
|
12
|
-
double: _d
|
13
|
-
displayable: _display
|
14
|
-
facetable: _facet
|
15
|
-
sortable: _sort
|
16
|
-
unstemmed_searchable: _unstem_search
|