active-fedora 4.5.0 → 4.5.1
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.
- data/.gitignore +2 -1
- data/History.txt +5 -0
- data/lib/active_fedora/base.rb +1 -1
- data/lib/active_fedora/datastreams.rb +1 -16
- data/lib/active_fedora/digital_object.rb +23 -6
- data/lib/active_fedora/solr_digital_object.rb +3 -1
- data/lib/active_fedora/solr_service.rb +1 -1
- data/lib/active_fedora/unsaved_digital_object.rb +1 -0
- data/lib/active_fedora/version.rb +1 -1
- data/spec/integration/datastreams_spec.rb +101 -0
- data/spec/unit/solr_service_spec.rb +4 -4
- metadata +126 -42
- data/.rvmrc +0 -33
- data/Gemfile.lock +0 -156
data/.gitignore
CHANGED
data/History.txt
CHANGED
@@ -1,3 +1,8 @@
|
|
1
|
+
4.5.1
|
2
|
+
Removes .rvmrc and Gemfile.lock from version control (devs should deal with these themselves)
|
3
|
+
HYDRA-837: ActiveFedora::Datastreams#has_file_datastream should support :versionable argument (re-opened)
|
4
|
+
HYDRA-838: Solr connection timeout is now 120 seconds
|
5
|
+
|
1
6
|
4.5.0
|
2
7
|
HYDRA-837: ActiveFedora::Datastreams#has_file_datastream should support :versionable argument
|
3
8
|
implement per-class and per-instance defaults from rubydora 0.5.13
|
data/lib/active_fedora/base.rb
CHANGED
@@ -145,7 +145,7 @@ module ActiveFedora
|
|
145
145
|
|
146
146
|
|
147
147
|
def self.datastream_class_for_name(dsid)
|
148
|
-
ds_specs[dsid] ? ds_specs[dsid]
|
148
|
+
ds_specs[dsid] ? ds_specs[dsid].fetch(:type, ActiveFedora::Datastream) : ActiveFedora::Datastream
|
149
149
|
end
|
150
150
|
|
151
151
|
def self.create(args = {})
|
@@ -77,22 +77,7 @@ module ActiveFedora
|
|
77
77
|
end
|
78
78
|
|
79
79
|
def datastream_from_spec(ds_spec, name)
|
80
|
-
|
81
|
-
attributes = {}
|
82
|
-
|
83
|
-
attributes[:dsLabel] = ds_spec[:label] if ds_spec[:label].present?
|
84
|
-
attributes[:controlGroup] = ds_spec[:control_group] if ds_spec[:control_group].present?
|
85
|
-
attributes[:versionable] = ds_spec[:versionable] unless ds_spec[:versionable].nil?
|
86
|
-
if attributes[:controlGroup]=='E'
|
87
|
-
if !ds_spec[:disseminator].present? && ds_spec[:url].present?
|
88
|
-
attributes[:dsLocation]= ds_spec[:url]
|
89
|
-
end
|
90
|
-
elsif attributes[:controlGroup]=='R'
|
91
|
-
attributes[:dsLocation]= ds_spec[:url]
|
92
|
-
end
|
93
|
-
ds.default_attributes = attributes
|
94
|
-
ds.datastream_will_change! if ds_spec[:autocreate]
|
95
|
-
ds
|
80
|
+
inner_object.datastream_object_for name, ds_spec
|
96
81
|
end
|
97
82
|
|
98
83
|
def load_datastreams
|
@@ -3,6 +3,29 @@ module ActiveFedora
|
|
3
3
|
class DigitalObject < Rubydora::DigitalObject
|
4
4
|
attr_accessor :original_class
|
5
5
|
|
6
|
+
module DatastreamBootstrap
|
7
|
+
def datastream_object_for dsid, ds_spec=nil
|
8
|
+
ds_spec ||= original_class.ds_specs[dsid] || {}
|
9
|
+
ds = ds_spec.fetch(:type, ActiveFedora::Datastream).new(self, dsid)
|
10
|
+
attributes = {}
|
11
|
+
attributes[:asOfDateTime] ||= asOfDateTime if self.respond_to? :asOfDateTime
|
12
|
+
attributes[:dsLabel] = ds_spec[:label] if ds_spec[:label].present?
|
13
|
+
attributes[:controlGroup] = ds_spec[:control_group] if ds_spec[:control_group].present?
|
14
|
+
attributes[:versionable] = ds_spec[:versionable] unless ds_spec[:versionable].nil?
|
15
|
+
if attributes[:controlGroup]=='E'
|
16
|
+
if !ds_spec[:disseminator].present? && ds_spec[:url].present?
|
17
|
+
attributes[:dsLocation]= ds_spec[:url]
|
18
|
+
end
|
19
|
+
elsif attributes[:controlGroup]=='R'
|
20
|
+
attributes[:dsLocation]= ds_spec[:url]
|
21
|
+
end
|
22
|
+
ds.default_attributes = attributes
|
23
|
+
ds.datastream_will_change! if ds_spec[:autocreate]
|
24
|
+
ds
|
25
|
+
end
|
26
|
+
end
|
27
|
+
include DatastreamBootstrap
|
28
|
+
|
6
29
|
def self.find(original_class, pid)
|
7
30
|
conn = original_class.connection_for_pid(pid)
|
8
31
|
obj = Deprecation.silence(Rubydora::DigitalObject) do
|
@@ -19,11 +42,5 @@ module ActiveFedora
|
|
19
42
|
obj.original_class = original_class
|
20
43
|
obj
|
21
44
|
end
|
22
|
-
|
23
|
-
def datastream_object_for dsid
|
24
|
-
klass = original_class.datastream_class_for_name(dsid)
|
25
|
-
klass.new self, dsid
|
26
|
-
end
|
27
|
-
|
28
45
|
end
|
29
46
|
end
|
@@ -1,7 +1,8 @@
|
|
1
1
|
module ActiveFedora
|
2
2
|
class SolrDigitalObject
|
3
|
+
include DigitalObject::DatastreamBootstrap
|
3
4
|
attr_reader :pid, :label, :state, :ownerId, :profile, :datastreams, :solr_doc
|
4
|
-
|
5
|
+
attr_accessor :original_class
|
5
6
|
def initialize(solr_doc, profile_hash, klass=ActiveFedora::Base)
|
6
7
|
@solr_doc = solr_doc
|
7
8
|
@pid = solr_doc[SOLR_DOCUMENT_ID]
|
@@ -13,6 +14,7 @@ module ActiveFedora
|
|
13
14
|
@datastreams = {}
|
14
15
|
|
15
16
|
dsids = profile_hash['datastreams'].keys
|
17
|
+
original_class = klass
|
16
18
|
missing = dsids - klass.ds_specs.keys
|
17
19
|
missing.each do |dsid|
|
18
20
|
#Initialize the datastreams that are in the solr document, but not found in the classes spec.
|
@@ -1,6 +1,7 @@
|
|
1
1
|
module ActiveFedora
|
2
2
|
# Helps Rubydora create datastreams of the type defined by the ActiveFedora::Base#datastream_class_for_name
|
3
3
|
class UnsavedDigitalObject
|
4
|
+
include DigitalObject::DatastreamBootstrap
|
4
5
|
attr_accessor :original_class, :ownerId, :datastreams, :label, :namespace
|
5
6
|
|
6
7
|
def initialize(original_class, namespace, pid=nil)
|
@@ -0,0 +1,101 @@
|
|
1
|
+
require 'spec_helper'
|
2
|
+
|
3
|
+
require 'active_fedora'
|
4
|
+
require "rexml/document"
|
5
|
+
|
6
|
+
describe ActiveFedora::Datastreams do
|
7
|
+
describe "#has_metadata" do
|
8
|
+
before :all do
|
9
|
+
class HasMetadata < ActiveFedora::Base
|
10
|
+
has_metadata :name => "with_versions", :label => "Versioned DS", :type => ActiveFedora::SimpleDatastream
|
11
|
+
has_metadata :name => "without_versions", :versionable => false, :type => ActiveFedora::SimpleDatastream
|
12
|
+
end
|
13
|
+
end
|
14
|
+
after :all do
|
15
|
+
Object.send(:remove_const, :HasMetadata)
|
16
|
+
end
|
17
|
+
before :each do
|
18
|
+
@base = ActiveFedora::Base.new(:pid=>"test:has_metadata_base")
|
19
|
+
@base.add_datastream(@base.create_datastream(ActiveFedora::Datastream, "testDS", :dsLabel => "Test DS"))
|
20
|
+
@base.datastreams["testDS"].content = "blah blah blah"
|
21
|
+
@base.save
|
22
|
+
@test = HasMetadata.new(:pid=>"test:has_metadata_model")
|
23
|
+
@test.save
|
24
|
+
end
|
25
|
+
|
26
|
+
after :each do
|
27
|
+
@base.delete
|
28
|
+
@test.delete
|
29
|
+
end
|
30
|
+
|
31
|
+
it "should create datastreams from the spec on new objects" do
|
32
|
+
@test.without_versions.versionable.should be_false
|
33
|
+
@test.with_versions.versionable.should be_true
|
34
|
+
@test.with_versions.dsLabel.should == "Versioned DS"
|
35
|
+
@test.without_versions.content= "blah blah blah"
|
36
|
+
@test.save
|
37
|
+
HasMetadata.find(@test.pid).without_versions.versionable.should be_false
|
38
|
+
end
|
39
|
+
|
40
|
+
it "should use ds_specs and preserve existing datastreams on migrated objects" do
|
41
|
+
test_obj = HasMetadata.find(@base.pid)
|
42
|
+
test_obj.datastreams["testDS"].dsLabel.should == "Test DS"
|
43
|
+
test_obj.datastreams["testDS"].new?.should be_false
|
44
|
+
test_obj.with_versions.dsLabel.should == "Versioned DS"
|
45
|
+
test_obj.without_versions.versionable.should be_false
|
46
|
+
test_obj.with_versions.new?.should be_true
|
47
|
+
end
|
48
|
+
|
49
|
+
end
|
50
|
+
|
51
|
+
describe "#has_file_datastream" do
|
52
|
+
before :all do
|
53
|
+
class HasFile < ActiveFedora::Base
|
54
|
+
has_file_datastream :name => "file_ds", :versionable => false
|
55
|
+
end
|
56
|
+
end
|
57
|
+
after :all do
|
58
|
+
Object.send(:remove_const, :HasFile)
|
59
|
+
end
|
60
|
+
before :each do
|
61
|
+
@base = ActiveFedora::Base.new(:pid=>"test:ds_versionable_base")
|
62
|
+
@base.save
|
63
|
+
@base2 = ActiveFedora::Base.new(:pid=>"test:ds_versionable_base2")
|
64
|
+
@base2.add_datastream(@base2.create_datastream(ActiveFedora::Datastream,"file_ds", :versionable=>true,:dsLabel=>"Pre-existing DS"))
|
65
|
+
@base2.datastreams["file_ds"].content = "blah blah blah"
|
66
|
+
@base2.save
|
67
|
+
@has_file = HasFile.new(:pid=>"test:ds_versionable_has_file")
|
68
|
+
@has_file.save
|
69
|
+
end
|
70
|
+
|
71
|
+
after :each do
|
72
|
+
@base.delete
|
73
|
+
@base2.delete
|
74
|
+
@has_file.delete
|
75
|
+
end
|
76
|
+
|
77
|
+
it "should create datastreams from the spec on new objects" do
|
78
|
+
@has_file.file_ds.versionable.should be_false
|
79
|
+
@has_file.file_ds.content = "blah blah blah"
|
80
|
+
@has_file.save
|
81
|
+
@has_file.file_ds.versionable.should be_false
|
82
|
+
HasFile.find(@has_file.pid).file_ds.versionable.should be_false
|
83
|
+
end
|
84
|
+
|
85
|
+
it "should use ds_specs on migrated objects" do
|
86
|
+
test_obj = HasFile.find(@base.pid)
|
87
|
+
test_obj.file_ds.versionable.should be_false
|
88
|
+
test_obj.file_ds.new?.should be_true
|
89
|
+
test_obj.file_ds.content = "blah blah blah"
|
90
|
+
test_obj.save
|
91
|
+
test_obj.file_ds.versionable.should be_false
|
92
|
+
# look it up again to check datastream profile
|
93
|
+
test_obj = HasFile.find(@base.pid)
|
94
|
+
test_obj.file_ds.versionable.should be_false
|
95
|
+
test_obj.file_ds.dsLabel.should == "File Datastream"
|
96
|
+
test_obj = HasFile.find(@base2.pid)
|
97
|
+
test_obj.file_ds.versionable.should be_true
|
98
|
+
test_obj.file_ds.dsLabel.should == "Pre-existing DS"
|
99
|
+
end
|
100
|
+
end
|
101
|
+
end
|
@@ -10,20 +10,20 @@ describe ActiveFedora::SolrService do
|
|
10
10
|
end
|
11
11
|
|
12
12
|
it "should take a narg constructor and configure for localhost" do
|
13
|
-
RSolr.expects(:connect).with(:url => 'http://localhost:8080/solr')
|
13
|
+
RSolr.expects(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr')
|
14
14
|
ActiveFedora::SolrService.register
|
15
15
|
end
|
16
16
|
it "should accept host arg into constructor" do
|
17
|
-
RSolr.expects(:connect).with(:url => 'http://fubar')
|
17
|
+
RSolr.expects(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://fubar')
|
18
18
|
ActiveFedora::SolrService.register('http://fubar')
|
19
19
|
end
|
20
20
|
it "should clobber options" do
|
21
|
-
RSolr.expects(:connect).with(:url => 'http://localhost:8080/solr', :autocommit=>:off, :foo=>:bar)
|
21
|
+
RSolr.expects(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr', :autocommit=>:off, :foo=>:bar)
|
22
22
|
ActiveFedora::SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
|
23
23
|
end
|
24
24
|
|
25
25
|
it "should set the threadlocal solr service" do
|
26
|
-
RSolr.expects(:connect).with(:url => 'http://localhost:8080/solr', :autocommit=>:off, :foo=>:bar)
|
26
|
+
RSolr.expects(:connect).with(:read_timeout => 120, :open_timeout => 120, :url => 'http://localhost:8080/solr', :autocommit=>:off, :foo=>:bar)
|
27
27
|
ss = ActiveFedora::SolrService.register(nil, {:autocommit=>:off, :foo=>:bar})
|
28
28
|
Thread.current[:solr_service].should == ss
|
29
29
|
ActiveFedora::SolrService.instance.should == ss
|
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: 4.5.
|
4
|
+
version: 4.5.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -11,11 +11,11 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2012-
|
14
|
+
date: 2012-08-16 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: rsolr
|
18
|
-
requirement:
|
18
|
+
requirement: !ruby/object:Gem::Requirement
|
19
19
|
none: false
|
20
20
|
requirements:
|
21
21
|
- - ! '>='
|
@@ -23,10 +23,15 @@ dependencies:
|
|
23
23
|
version: '0'
|
24
24
|
type: :runtime
|
25
25
|
prerelease: false
|
26
|
-
version_requirements:
|
26
|
+
version_requirements: !ruby/object:Gem::Requirement
|
27
|
+
none: false
|
28
|
+
requirements:
|
29
|
+
- - ! '>='
|
30
|
+
- !ruby/object:Gem::Version
|
31
|
+
version: '0'
|
27
32
|
- !ruby/object:Gem::Dependency
|
28
33
|
name: om
|
29
|
-
requirement:
|
34
|
+
requirement: !ruby/object:Gem::Requirement
|
30
35
|
none: false
|
31
36
|
requirements:
|
32
37
|
- - ~>
|
@@ -34,10 +39,15 @@ dependencies:
|
|
34
39
|
version: 1.6.0
|
35
40
|
type: :runtime
|
36
41
|
prerelease: false
|
37
|
-
version_requirements:
|
42
|
+
version_requirements: !ruby/object:Gem::Requirement
|
43
|
+
none: false
|
44
|
+
requirements:
|
45
|
+
- - ~>
|
46
|
+
- !ruby/object:Gem::Version
|
47
|
+
version: 1.6.0
|
38
48
|
- !ruby/object:Gem::Dependency
|
39
49
|
name: solrizer
|
40
|
-
requirement:
|
50
|
+
requirement: !ruby/object:Gem::Requirement
|
41
51
|
none: false
|
42
52
|
requirements:
|
43
53
|
- - ~>
|
@@ -45,10 +55,15 @@ dependencies:
|
|
45
55
|
version: 1.2.0
|
46
56
|
type: :runtime
|
47
57
|
prerelease: false
|
48
|
-
version_requirements:
|
58
|
+
version_requirements: !ruby/object:Gem::Requirement
|
59
|
+
none: false
|
60
|
+
requirements:
|
61
|
+
- - ~>
|
62
|
+
- !ruby/object:Gem::Version
|
63
|
+
version: 1.2.0
|
49
64
|
- !ruby/object:Gem::Dependency
|
50
65
|
name: activeresource
|
51
|
-
requirement:
|
66
|
+
requirement: !ruby/object:Gem::Requirement
|
52
67
|
none: false
|
53
68
|
requirements:
|
54
69
|
- - ! '>='
|
@@ -56,10 +71,15 @@ dependencies:
|
|
56
71
|
version: 3.0.0
|
57
72
|
type: :runtime
|
58
73
|
prerelease: false
|
59
|
-
version_requirements:
|
74
|
+
version_requirements: !ruby/object:Gem::Requirement
|
75
|
+
none: false
|
76
|
+
requirements:
|
77
|
+
- - ! '>='
|
78
|
+
- !ruby/object:Gem::Version
|
79
|
+
version: 3.0.0
|
60
80
|
- !ruby/object:Gem::Dependency
|
61
81
|
name: activesupport
|
62
|
-
requirement:
|
82
|
+
requirement: !ruby/object:Gem::Requirement
|
63
83
|
none: false
|
64
84
|
requirements:
|
65
85
|
- - ! '>='
|
@@ -67,10 +87,15 @@ dependencies:
|
|
67
87
|
version: 3.0.0
|
68
88
|
type: :runtime
|
69
89
|
prerelease: false
|
70
|
-
version_requirements:
|
90
|
+
version_requirements: !ruby/object:Gem::Requirement
|
91
|
+
none: false
|
92
|
+
requirements:
|
93
|
+
- - ! '>='
|
94
|
+
- !ruby/object:Gem::Version
|
95
|
+
version: 3.0.0
|
71
96
|
- !ruby/object:Gem::Dependency
|
72
97
|
name: mediashelf-loggable
|
73
|
-
requirement:
|
98
|
+
requirement: !ruby/object:Gem::Requirement
|
74
99
|
none: false
|
75
100
|
requirements:
|
76
101
|
- - ! '>='
|
@@ -78,10 +103,15 @@ dependencies:
|
|
78
103
|
version: '0'
|
79
104
|
type: :runtime
|
80
105
|
prerelease: false
|
81
|
-
version_requirements:
|
106
|
+
version_requirements: !ruby/object:Gem::Requirement
|
107
|
+
none: false
|
108
|
+
requirements:
|
109
|
+
- - ! '>='
|
110
|
+
- !ruby/object:Gem::Version
|
111
|
+
version: '0'
|
82
112
|
- !ruby/object:Gem::Dependency
|
83
113
|
name: equivalent-xml
|
84
|
-
requirement:
|
114
|
+
requirement: !ruby/object:Gem::Requirement
|
85
115
|
none: false
|
86
116
|
requirements:
|
87
117
|
- - ! '>='
|
@@ -89,10 +119,15 @@ dependencies:
|
|
89
119
|
version: '0'
|
90
120
|
type: :runtime
|
91
121
|
prerelease: false
|
92
|
-
version_requirements:
|
122
|
+
version_requirements: !ruby/object:Gem::Requirement
|
123
|
+
none: false
|
124
|
+
requirements:
|
125
|
+
- - ! '>='
|
126
|
+
- !ruby/object:Gem::Version
|
127
|
+
version: '0'
|
93
128
|
- !ruby/object:Gem::Dependency
|
94
129
|
name: rubydora
|
95
|
-
requirement:
|
130
|
+
requirement: !ruby/object:Gem::Requirement
|
96
131
|
none: false
|
97
132
|
requirements:
|
98
133
|
- - ~>
|
@@ -100,10 +135,15 @@ dependencies:
|
|
100
135
|
version: 0.5.13
|
101
136
|
type: :runtime
|
102
137
|
prerelease: false
|
103
|
-
version_requirements:
|
138
|
+
version_requirements: !ruby/object:Gem::Requirement
|
139
|
+
none: false
|
140
|
+
requirements:
|
141
|
+
- - ~>
|
142
|
+
- !ruby/object:Gem::Version
|
143
|
+
version: 0.5.13
|
104
144
|
- !ruby/object:Gem::Dependency
|
105
145
|
name: rdf
|
106
|
-
requirement:
|
146
|
+
requirement: !ruby/object:Gem::Requirement
|
107
147
|
none: false
|
108
148
|
requirements:
|
109
149
|
- - ! '>='
|
@@ -111,10 +151,15 @@ dependencies:
|
|
111
151
|
version: '0'
|
112
152
|
type: :runtime
|
113
153
|
prerelease: false
|
114
|
-
version_requirements:
|
154
|
+
version_requirements: !ruby/object:Gem::Requirement
|
155
|
+
none: false
|
156
|
+
requirements:
|
157
|
+
- - ! '>='
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: '0'
|
115
160
|
- !ruby/object:Gem::Dependency
|
116
161
|
name: rdf-rdfxml
|
117
|
-
requirement:
|
162
|
+
requirement: !ruby/object:Gem::Requirement
|
118
163
|
none: false
|
119
164
|
requirements:
|
120
165
|
- - ~>
|
@@ -122,10 +167,15 @@ dependencies:
|
|
122
167
|
version: 0.3.8
|
123
168
|
type: :runtime
|
124
169
|
prerelease: false
|
125
|
-
version_requirements:
|
170
|
+
version_requirements: !ruby/object:Gem::Requirement
|
171
|
+
none: false
|
172
|
+
requirements:
|
173
|
+
- - ~>
|
174
|
+
- !ruby/object:Gem::Version
|
175
|
+
version: 0.3.8
|
126
176
|
- !ruby/object:Gem::Dependency
|
127
177
|
name: deprecation
|
128
|
-
requirement:
|
178
|
+
requirement: !ruby/object:Gem::Requirement
|
129
179
|
none: false
|
130
180
|
requirements:
|
131
181
|
- - ! '>='
|
@@ -133,10 +183,15 @@ dependencies:
|
|
133
183
|
version: '0'
|
134
184
|
type: :runtime
|
135
185
|
prerelease: false
|
136
|
-
version_requirements:
|
186
|
+
version_requirements: !ruby/object:Gem::Requirement
|
187
|
+
none: false
|
188
|
+
requirements:
|
189
|
+
- - ! '>='
|
190
|
+
- !ruby/object:Gem::Version
|
191
|
+
version: '0'
|
137
192
|
- !ruby/object:Gem::Dependency
|
138
193
|
name: yard
|
139
|
-
requirement:
|
194
|
+
requirement: !ruby/object:Gem::Requirement
|
140
195
|
none: false
|
141
196
|
requirements:
|
142
197
|
- - ! '>='
|
@@ -144,10 +199,15 @@ dependencies:
|
|
144
199
|
version: '0'
|
145
200
|
type: :development
|
146
201
|
prerelease: false
|
147
|
-
version_requirements:
|
202
|
+
version_requirements: !ruby/object:Gem::Requirement
|
203
|
+
none: false
|
204
|
+
requirements:
|
205
|
+
- - ! '>='
|
206
|
+
- !ruby/object:Gem::Version
|
207
|
+
version: '0'
|
148
208
|
- !ruby/object:Gem::Dependency
|
149
209
|
name: RedCloth
|
150
|
-
requirement:
|
210
|
+
requirement: !ruby/object:Gem::Requirement
|
151
211
|
none: false
|
152
212
|
requirements:
|
153
213
|
- - ! '>='
|
@@ -155,10 +215,15 @@ dependencies:
|
|
155
215
|
version: '0'
|
156
216
|
type: :development
|
157
217
|
prerelease: false
|
158
|
-
version_requirements:
|
218
|
+
version_requirements: !ruby/object:Gem::Requirement
|
219
|
+
none: false
|
220
|
+
requirements:
|
221
|
+
- - ! '>='
|
222
|
+
- !ruby/object:Gem::Version
|
223
|
+
version: '0'
|
159
224
|
- !ruby/object:Gem::Dependency
|
160
225
|
name: rake
|
161
|
-
requirement:
|
226
|
+
requirement: !ruby/object:Gem::Requirement
|
162
227
|
none: false
|
163
228
|
requirements:
|
164
229
|
- - ! '>='
|
@@ -166,10 +231,15 @@ dependencies:
|
|
166
231
|
version: '0'
|
167
232
|
type: :development
|
168
233
|
prerelease: false
|
169
|
-
version_requirements:
|
234
|
+
version_requirements: !ruby/object:Gem::Requirement
|
235
|
+
none: false
|
236
|
+
requirements:
|
237
|
+
- - ! '>='
|
238
|
+
- !ruby/object:Gem::Version
|
239
|
+
version: '0'
|
170
240
|
- !ruby/object:Gem::Dependency
|
171
241
|
name: jettywrapper
|
172
|
-
requirement:
|
242
|
+
requirement: !ruby/object:Gem::Requirement
|
173
243
|
none: false
|
174
244
|
requirements:
|
175
245
|
- - ! '>='
|
@@ -177,10 +247,15 @@ dependencies:
|
|
177
247
|
version: 1.2.0
|
178
248
|
type: :development
|
179
249
|
prerelease: false
|
180
|
-
version_requirements:
|
250
|
+
version_requirements: !ruby/object:Gem::Requirement
|
251
|
+
none: false
|
252
|
+
requirements:
|
253
|
+
- - ! '>='
|
254
|
+
- !ruby/object:Gem::Version
|
255
|
+
version: 1.2.0
|
181
256
|
- !ruby/object:Gem::Dependency
|
182
257
|
name: rspec
|
183
|
-
requirement:
|
258
|
+
requirement: !ruby/object:Gem::Requirement
|
184
259
|
none: false
|
185
260
|
requirements:
|
186
261
|
- - ! '>='
|
@@ -188,18 +263,28 @@ dependencies:
|
|
188
263
|
version: 2.9.0
|
189
264
|
type: :development
|
190
265
|
prerelease: false
|
191
|
-
version_requirements:
|
266
|
+
version_requirements: !ruby/object:Gem::Requirement
|
267
|
+
none: false
|
268
|
+
requirements:
|
269
|
+
- - ! '>='
|
270
|
+
- !ruby/object:Gem::Version
|
271
|
+
version: 2.9.0
|
192
272
|
- !ruby/object:Gem::Dependency
|
193
273
|
name: mocha
|
194
|
-
requirement:
|
274
|
+
requirement: !ruby/object:Gem::Requirement
|
195
275
|
none: false
|
196
276
|
requirements:
|
197
|
-
- - =
|
277
|
+
- - '='
|
198
278
|
- !ruby/object:Gem::Version
|
199
279
|
version: 0.10.5
|
200
280
|
type: :development
|
201
281
|
prerelease: false
|
202
|
-
version_requirements:
|
282
|
+
version_requirements: !ruby/object:Gem::Requirement
|
283
|
+
none: false
|
284
|
+
requirements:
|
285
|
+
- - '='
|
286
|
+
- !ruby/object:Gem::Version
|
287
|
+
version: 0.10.5
|
203
288
|
description: ActiveFedora provides for creating and managing objects in the Fedora
|
204
289
|
Repository Architecture.
|
205
290
|
email:
|
@@ -213,12 +298,10 @@ files:
|
|
213
298
|
- .document
|
214
299
|
- .gitignore
|
215
300
|
- .gitmodules
|
216
|
-
- .rvmrc
|
217
301
|
- CONSOLE_GETTING_STARTED.textile
|
218
302
|
- COPYING.txt
|
219
303
|
- COYING.LESSER.txt
|
220
304
|
- Gemfile
|
221
|
-
- Gemfile.lock
|
222
305
|
- History.txt
|
223
306
|
- LICENSE
|
224
307
|
- License.txt
|
@@ -325,6 +408,7 @@ files:
|
|
325
408
|
- spec/integration/bug_spec.rb
|
326
409
|
- spec/integration/datastream_collections_spec.rb
|
327
410
|
- spec/integration/datastream_spec.rb
|
411
|
+
- spec/integration/datastreams_spec.rb
|
328
412
|
- spec/integration/full_featured_model_spec.rb
|
329
413
|
- spec/integration/metadata_datastream_helper_spec.rb
|
330
414
|
- spec/integration/metadata_datastream_spec.rb
|
@@ -438,7 +522,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
438
522
|
version: '0'
|
439
523
|
segments:
|
440
524
|
- 0
|
441
|
-
hash:
|
525
|
+
hash: 580091629
|
442
526
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
443
527
|
none: false
|
444
528
|
requirements:
|
@@ -447,10 +531,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
447
531
|
version: '0'
|
448
532
|
segments:
|
449
533
|
- 0
|
450
|
-
hash:
|
534
|
+
hash: 580091629
|
451
535
|
requirements: []
|
452
536
|
rubyforge_project: rubyfedora
|
453
|
-
rubygems_version: 1.8.
|
537
|
+
rubygems_version: 1.8.24
|
454
538
|
signing_key:
|
455
539
|
specification_version: 3
|
456
540
|
summary: A convenience libary for manipulating documents in the Fedora Repository.
|
data/.rvmrc
DELETED
@@ -1,33 +0,0 @@
|
|
1
|
-
#!/usr/bin/env bash
|
2
|
-
|
3
|
-
# This is an RVM Project .rvmrc file, used to automatically load the ruby
|
4
|
-
# development environment upon cd'ing into the directory
|
5
|
-
|
6
|
-
ruby_string="1.9.3-p194"
|
7
|
-
gemset_name="active_fedora_4.0"
|
8
|
-
|
9
|
-
# Install rubies when used instead of only displaying a warning and exiting
|
10
|
-
rvm_install_on_use_flag=1
|
11
|
-
|
12
|
-
# Specify our desired <ruby>[@<gemset>], the @gemset name is optional.
|
13
|
-
environment_id="${ruby_string}@${gemset_name}"
|
14
|
-
|
15
|
-
# First, attempt to load the desired environment directly from the environment
|
16
|
-
# file. This is very fast and efficient compared to running through the entire
|
17
|
-
# CLI and selector. If you want feedback on which environment was used then
|
18
|
-
# insert the word 'use' after --create as this triggers verbose mode.
|
19
|
-
#
|
20
|
-
if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
|
21
|
-
&& -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]] ; then
|
22
|
-
\. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
|
23
|
-
else
|
24
|
-
# If the environment file has not yet been created, use the RVM CLI to select.
|
25
|
-
rvm --create "$environment_id"
|
26
|
-
fi
|
27
|
-
|
28
|
-
# Ensure that Bundler is installed, install it if it is not.
|
29
|
-
if ! (command -v bundle > /dev/null) ; then
|
30
|
-
printf "The rubygem 'bundler' is not installed, installing it now.\n"
|
31
|
-
gem install bundler
|
32
|
-
fi
|
33
|
-
|
data/Gemfile.lock
DELETED
@@ -1,156 +0,0 @@
|
|
1
|
-
PATH
|
2
|
-
remote: .
|
3
|
-
specs:
|
4
|
-
active-fedora (4.5.0)
|
5
|
-
activeresource (>= 3.0.0)
|
6
|
-
activesupport (>= 3.0.0)
|
7
|
-
deprecation
|
8
|
-
equivalent-xml
|
9
|
-
mediashelf-loggable
|
10
|
-
om (~> 1.6.0)
|
11
|
-
rdf
|
12
|
-
rdf-rdfxml (~> 0.3.8)
|
13
|
-
rsolr
|
14
|
-
rubydora (~> 0.5.13)
|
15
|
-
solrizer (~> 1.2.0)
|
16
|
-
|
17
|
-
GEM
|
18
|
-
remote: http://rubygems.org/
|
19
|
-
specs:
|
20
|
-
RedCloth (4.2.9)
|
21
|
-
activemodel (3.2.6)
|
22
|
-
activesupport (= 3.2.6)
|
23
|
-
builder (~> 3.0.0)
|
24
|
-
activeresource (3.2.6)
|
25
|
-
activemodel (= 3.2.6)
|
26
|
-
activesupport (= 3.2.6)
|
27
|
-
activesupport (3.2.6)
|
28
|
-
i18n (~> 0.6)
|
29
|
-
multi_json (~> 1.0)
|
30
|
-
addressable (2.3.2)
|
31
|
-
akami (1.2.0)
|
32
|
-
gyoku (>= 0.4.0)
|
33
|
-
nokogiri (>= 1.4.0)
|
34
|
-
backports (2.6.2)
|
35
|
-
builder (3.0.0)
|
36
|
-
childprocess (0.3.4)
|
37
|
-
ffi (~> 1.0, >= 1.0.6)
|
38
|
-
columnize (0.3.6)
|
39
|
-
daemons (1.1.8)
|
40
|
-
deprecation (0.0.5)
|
41
|
-
activesupport
|
42
|
-
diff-lcs (1.1.3)
|
43
|
-
equivalent-xml (0.2.9)
|
44
|
-
nokogiri (>= 1.4.3)
|
45
|
-
fastercsv (1.5.5)
|
46
|
-
ffi (1.1.0)
|
47
|
-
gyoku (0.4.6)
|
48
|
-
builder (>= 2.1.2)
|
49
|
-
hooks (0.2.0)
|
50
|
-
httpi (1.1.1)
|
51
|
-
rack
|
52
|
-
i18n (0.6.0)
|
53
|
-
jettywrapper (1.3.1)
|
54
|
-
activesupport (>= 3.0.0)
|
55
|
-
childprocess
|
56
|
-
i18n
|
57
|
-
logger
|
58
|
-
mediashelf-loggable
|
59
|
-
linecache (0.46)
|
60
|
-
rbx-require-relative (> 0.0.4)
|
61
|
-
logger (1.2.8)
|
62
|
-
mediashelf-loggable (0.4.9)
|
63
|
-
metaclass (0.0.1)
|
64
|
-
mime-types (1.19)
|
65
|
-
mocha (0.10.5)
|
66
|
-
metaclass (~> 0.0.1)
|
67
|
-
multi_json (1.3.6)
|
68
|
-
nokogiri (1.5.5)
|
69
|
-
nori (1.1.3)
|
70
|
-
om (1.6.1)
|
71
|
-
mediashelf-loggable
|
72
|
-
nokogiri (>= 1.4.2)
|
73
|
-
rack (1.4.1)
|
74
|
-
rake (0.9.2.2)
|
75
|
-
rbx-require-relative (0.0.9)
|
76
|
-
rcov (1.0.0)
|
77
|
-
rdf (0.3.7)
|
78
|
-
addressable (>= 2.2.6)
|
79
|
-
rdf-rdfxml (0.3.8)
|
80
|
-
rdf (>= 0.3.4)
|
81
|
-
rdf-xsd (>= 0.3.5)
|
82
|
-
rdf-xsd (0.3.7)
|
83
|
-
backports
|
84
|
-
nokogiri (>= 1.5.0)
|
85
|
-
rdf (>= 0.3.4)
|
86
|
-
rest-client (1.6.7)
|
87
|
-
mime-types (>= 1.16)
|
88
|
-
rsolr (1.0.8)
|
89
|
-
builder (>= 2.1.2)
|
90
|
-
rspec (2.11.0)
|
91
|
-
rspec-core (~> 2.11.0)
|
92
|
-
rspec-expectations (~> 2.11.0)
|
93
|
-
rspec-mocks (~> 2.11.0)
|
94
|
-
rspec-core (2.11.1)
|
95
|
-
rspec-expectations (2.11.1)
|
96
|
-
diff-lcs (~> 1.1.3)
|
97
|
-
rspec-mocks (2.11.1)
|
98
|
-
ruby-debug (0.10.4)
|
99
|
-
columnize (>= 0.1)
|
100
|
-
ruby-debug-base (~> 0.10.4.0)
|
101
|
-
ruby-debug-base (0.10.4)
|
102
|
-
linecache (>= 0.3)
|
103
|
-
rubydora (0.5.13)
|
104
|
-
activemodel
|
105
|
-
activesupport
|
106
|
-
deprecation
|
107
|
-
fastercsv
|
108
|
-
hooks
|
109
|
-
mime-types
|
110
|
-
nokogiri
|
111
|
-
rest-client
|
112
|
-
savon
|
113
|
-
savon (1.1.0)
|
114
|
-
akami (~> 1.2.0)
|
115
|
-
builder (>= 2.1.2)
|
116
|
-
gyoku (~> 0.4.5)
|
117
|
-
httpi (~> 1.1.0)
|
118
|
-
nokogiri (>= 1.4.0)
|
119
|
-
nori (~> 1.1.0)
|
120
|
-
wasabi (~> 2.5.0)
|
121
|
-
simplecov (0.6.4)
|
122
|
-
multi_json (~> 1.0)
|
123
|
-
simplecov-html (~> 0.5.3)
|
124
|
-
simplecov-html (0.5.3)
|
125
|
-
simplecov-rcov (0.2.3)
|
126
|
-
simplecov (>= 0.4.1)
|
127
|
-
solrizer (1.2.2)
|
128
|
-
daemons
|
129
|
-
mediashelf-loggable (~> 0.4.7)
|
130
|
-
nokogiri
|
131
|
-
om (>= 1.5.0)
|
132
|
-
stomp
|
133
|
-
xml-simple
|
134
|
-
stomp (1.2.4)
|
135
|
-
wasabi (2.5.0)
|
136
|
-
httpi (~> 1.0)
|
137
|
-
nokogiri (>= 1.4.0)
|
138
|
-
xml-simple (1.1.1)
|
139
|
-
yard (0.8.2.1)
|
140
|
-
|
141
|
-
PLATFORMS
|
142
|
-
ruby
|
143
|
-
|
144
|
-
DEPENDENCIES
|
145
|
-
RedCloth
|
146
|
-
active-fedora!
|
147
|
-
jettywrapper (>= 1.2.0)
|
148
|
-
jruby-openssl
|
149
|
-
mocha (= 0.10.5)
|
150
|
-
rake
|
151
|
-
rcov
|
152
|
-
rspec (>= 2.9.0)
|
153
|
-
ruby-debug
|
154
|
-
simplecov
|
155
|
-
simplecov-rcov
|
156
|
-
yard
|