cul_scv_hydra 0.4.3 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/lib/cul_scv_hydra/active_fedora/model/common.rb +1 -2
  2. data/lib/cul_scv_hydra/active_fedora/model/resource.rb +24 -20
  3. data/lib/cul_scv_hydra/om/scv_mods_document.rb +3 -3
  4. data/lib/cul_scv_hydra/version.rb +1 -1
  5. metadata +197 -209
data/lib/cul_scv_hydra/active_fedora/model/common.rb CHANGED
@@ -194,11 +194,10 @@ module Common
194
194
  old_values.each_index {|ix| indexed_values[ix.to_s] = old_values[ix] }
195
195
  indexed_values.each {|k,v|
196
196
  new_val = values.delete(k)
197
- puts "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
198
197
  logger.debug "old: #{v} new: #{new_val} changed? #{!(v.eql? new_val)}"
199
198
  changed ||= !(v.eql? new_val)
200
199
  }
201
- puts "remaining values! #{values.inspect}" if values.length > 0
200
+ logger.debug "remaining values! #{values.inspect}" if values.length > 0
202
201
  changed || (values.length > 0)
203
202
  end
204
203
 
data/lib/cul_scv_hydra/active_fedora/model/resource.rb CHANGED
@@ -40,27 +40,31 @@ module Resource
40
40
  if IMAGE_MIME_TYPES.include? mime
41
41
  blob.rewind
42
42
  # retrieve Nokogiri of image property RDF
43
- image_prop_nodes = Cul::Image::Properties.identify(blob).nodeset
44
- relsext = datastreams['RELS-EXT']
45
- image_prop_nodes.each { |node|
46
- if node["resource"]
47
- is_literal = false
48
- object = RDF::URI.new(node["resource"])
49
- else
50
- is_literal = true
51
- object = RDF::Literal(node.text)
52
- end
53
- subject = RDF::URI(internal_uri)
54
- predicate = RDF::URI("#{node.namespace.href}#{node.name}")
55
- query = RDF::Query.new({ :subject => {predicate => :object}})
56
- relationships(predicate).dup.each { |stmt|
57
- relationships.delete(stmt)
43
+ image_properties = Cul::Image::Properties.identify(blob)
44
+ if image_properties
45
+ image_prop_nodes = image_properties.nodeset
46
+ puts image_properties.instance_variable_get(:@ng_xml).to_xml
47
+ relsext = datastreams['RELS-EXT']
48
+ image_prop_nodes.each { |node|
49
+ if node["resource"]
50
+ is_literal = false
51
+ object = RDF::URI.new(node["resource"])
52
+ else
53
+ is_literal = true
54
+ object = RDF::Literal(node.text)
55
+ end
56
+ subject = RDF::URI(internal_uri)
57
+ predicate = RDF::URI("#{node.namespace.href}#{node.name}")
58
+ query = RDF::Query.new({ :subject => {predicate => :object}})
59
+ relationships(predicate).dup.each { |stmt|
60
+ relationships.delete(stmt)
61
+ }
62
+ add_relationship(predicate,object, is_literal)
63
+ relationships_are_dirty=true
58
64
  }
59
- add_relationship(predicate,object, is_literal)
60
- relationships_are_dirty=true
61
- }
62
- # add mimetype to DC:format values
63
- self.datastreams['DC'].update_values({[:format] => mime})
65
+ # add mimetype to DC:format values
66
+ self.datastreams['DC'].update_values({[:format] => mime})
67
+ end
64
68
  end
65
69
  blob.rewind
66
70
  end
data/lib/cul_scv_hydra/om/scv_mods_document.rb CHANGED
@@ -15,10 +15,11 @@ module Om
15
15
  t.root(:path=>"mods",
16
16
  :xmlns=>"http://www.loc.gov/mods/v3",
17
17
  :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-4.xsd")
18
-
18
+
19
19
  t.main_title_info(:path=>'titleInfo', :index_as=>[:not_searchable], :attributes=>{:type=>:none}){
20
- t.main_title(:path=>"title", :index_as=>[:displayable,:searchable, :sortable])
20
+ t.main_title(:path=>"title", :index_as=>[:not_searchable])
21
21
  }
22
+ t.title(:proxy=>[:mods, :main_title_info, :main_title], :index_as=>[:displayable, :searchable, :sortable])
22
23
 
23
24
  t.search_title_info(:path=>'titleInfo', :index_as=>[:not_searchable]){
24
25
  t.search_title(:path=>'title', :index_as=>[:searchable])
@@ -34,7 +35,6 @@ module Om
34
35
  t.lib_collection(:path=>'title', :index_as=>[:facetable, :displayable])
35
36
  }
36
37
  }
37
- t.title(:proxy=>[:mods,:main_title_info,:main_title], :index_as=>[:displayable,:searchable, :sortable])
38
38
  t.lib_project(:proxy=>[:project,:project_title_info, :lib_project])
39
39
  t.lib_collection(:proxy=>[:collection,:collection_title_info, :lib_collection])
40
40
  # pattern matches
data/lib/cul_scv_hydra/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Cul
2
2
  module Scv
3
3
  module Hydra
4
- VERSION = '0.4.3'
4
+ VERSION = '0.5.0'
5
5
  def self.version
6
6
  VERSION
7
7
  end
metadata CHANGED
@@ -1,265 +1,263 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: cul_scv_hydra
3
- version: !ruby/object:Gem::Version
4
- hash: 9
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.5.0
5
5
  prerelease:
6
- segments:
7
- - 0
8
- - 4
9
- - 3
10
- version: 0.4.3
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Benjamin Armintor
14
9
  autorequire:
15
10
  bindir: bin
16
11
  cert_chain: []
17
-
18
- date: 2012-06-11 00:00:00 Z
19
- dependencies:
20
- - !ruby/object:Gem::Dependency
12
+ date: 2012-06-19 00:00:00.000000000 Z
13
+ dependencies:
14
+ - !ruby/object:Gem::Dependency
21
15
  name: cul_image_props
22
- prerelease: false
23
- requirement: &id001 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
24
17
  none: false
25
- requirements:
26
- - - ">="
27
- - !ruby/object:Gem::Version
28
- hash: 3
29
- segments:
30
- - 0
31
- version: "0"
18
+ requirements:
19
+ - - ! '>='
20
+ - !ruby/object:Gem::Version
21
+ version: '0'
32
22
  type: :runtime
33
- version_requirements: *id001
34
- - !ruby/object:Gem::Dependency
35
- name: blacklight
36
23
  prerelease: false
37
- requirement: &id002 !ruby/object:Gem::Requirement
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
30
+ - !ruby/object:Gem::Dependency
31
+ name: blacklight
32
+ requirement: !ruby/object:Gem::Requirement
38
33
  none: false
39
- requirements:
34
+ requirements:
40
35
  - - ~>
41
- - !ruby/object:Gem::Version
42
- hash: 1
43
- segments:
44
- - 3
45
- - 3
46
- version: "3.3"
36
+ - !ruby/object:Gem::Version
37
+ version: '3.3'
47
38
  type: :runtime
48
- version_requirements: *id002
49
- - !ruby/object:Gem::Dependency
50
- name: rails
51
39
  prerelease: false
52
- requirement: &id003 !ruby/object:Gem::Requirement
40
+ version_requirements: !ruby/object:Gem::Requirement
53
41
  none: false
54
- requirements:
42
+ requirements:
55
43
  - - ~>
56
- - !ruby/object:Gem::Version
57
- hash: 3
58
- segments:
59
- - 3
60
- - 2
61
- version: "3.2"
44
+ - !ruby/object:Gem::Version
45
+ version: '3.3'
46
+ - !ruby/object:Gem::Dependency
47
+ name: rails
48
+ requirement: !ruby/object:Gem::Requirement
49
+ none: false
50
+ requirements:
51
+ - - '='
52
+ - !ruby/object:Gem::Version
53
+ version: 3.2.5
62
54
  type: :runtime
63
- version_requirements: *id003
64
- - !ruby/object:Gem::Dependency
65
- name: active-fedora
66
55
  prerelease: false
67
- requirement: &id004 !ruby/object:Gem::Requirement
56
+ version_requirements: !ruby/object:Gem::Requirement
68
57
  none: false
69
- requirements:
58
+ requirements:
59
+ - - '='
60
+ - !ruby/object:Gem::Version
61
+ version: 3.2.5
62
+ - !ruby/object:Gem::Dependency
63
+ name: active-fedora
64
+ requirement: !ruby/object:Gem::Requirement
65
+ none: false
66
+ requirements:
70
67
  - - ~>
71
- - !ruby/object:Gem::Version
72
- hash: 27
73
- segments:
74
- - 4
75
- - 0
76
- version: "4.0"
68
+ - !ruby/object:Gem::Version
69
+ version: '4.0'
77
70
  type: :runtime
78
- version_requirements: *id004
79
- - !ruby/object:Gem::Dependency
80
- name: rubydora
81
71
  prerelease: false
82
- requirement: &id005 !ruby/object:Gem::Requirement
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ~>
76
+ - !ruby/object:Gem::Version
77
+ version: '4.0'
78
+ - !ruby/object:Gem::Dependency
79
+ name: rubydora
80
+ requirement: !ruby/object:Gem::Requirement
83
81
  none: false
84
- requirements:
82
+ requirements:
85
83
  - - ~>
86
- - !ruby/object:Gem::Version
87
- hash: 27
88
- segments:
89
- - 0
90
- - 5
91
- - 8
84
+ - !ruby/object:Gem::Version
92
85
  version: 0.5.8
93
86
  type: :runtime
94
- version_requirements: *id005
95
- - !ruby/object:Gem::Dependency
96
- name: hydra-mods
97
87
  prerelease: false
98
- requirement: &id006 !ruby/object:Gem::Requirement
88
+ version_requirements: !ruby/object:Gem::Requirement
99
89
  none: false
100
- requirements:
101
- - - ">="
102
- - !ruby/object:Gem::Version
103
- hash: 23
104
- segments:
105
- - 0
106
- - 0
107
- - 4
90
+ requirements:
91
+ - - ~>
92
+ - !ruby/object:Gem::Version
93
+ version: 0.5.8
94
+ - !ruby/object:Gem::Dependency
95
+ name: hydra-mods
96
+ requirement: !ruby/object:Gem::Requirement
97
+ none: false
98
+ requirements:
99
+ - - ! '>='
100
+ - !ruby/object:Gem::Version
108
101
  version: 0.0.4
109
102
  type: :runtime
110
- version_requirements: *id006
111
- - !ruby/object:Gem::Dependency
112
- name: hydra-head
113
103
  prerelease: false
114
- requirement: &id007 !ruby/object:Gem::Requirement
104
+ version_requirements: !ruby/object:Gem::Requirement
115
105
  none: false
116
- requirements:
106
+ requirements:
107
+ - - ! '>='
108
+ - !ruby/object:Gem::Version
109
+ version: 0.0.4
110
+ - !ruby/object:Gem::Dependency
111
+ name: hydra-head
112
+ requirement: !ruby/object:Gem::Requirement
113
+ none: false
114
+ requirements:
117
115
  - - ~>
118
- - !ruby/object:Gem::Version
119
- hash: 27
120
- segments:
121
- - 4
122
- - 0
123
- version: "4.0"
116
+ - !ruby/object:Gem::Version
117
+ version: '4.0'
124
118
  type: :runtime
125
- version_requirements: *id007
126
- - !ruby/object:Gem::Dependency
127
- name: nokogiri
128
119
  prerelease: false
129
- requirement: &id008 !ruby/object:Gem::Requirement
120
+ version_requirements: !ruby/object:Gem::Requirement
130
121
  none: false
131
- requirements:
132
- - - ">="
133
- - !ruby/object:Gem::Version
134
- hash: 3
135
- segments:
136
- - 1
137
- - 4
138
- - 2
122
+ requirements:
123
+ - - ~>
124
+ - !ruby/object:Gem::Version
125
+ version: '4.0'
126
+ - !ruby/object:Gem::Dependency
127
+ name: nokogiri
128
+ requirement: !ruby/object:Gem::Requirement
129
+ none: false
130
+ requirements:
131
+ - - ! '>='
132
+ - !ruby/object:Gem::Version
139
133
  version: 1.4.2
140
134
  type: :runtime
141
- version_requirements: *id008
142
- - !ruby/object:Gem::Dependency
143
- name: om
144
135
  prerelease: false
145
- requirement: &id009 !ruby/object:Gem::Requirement
136
+ version_requirements: !ruby/object:Gem::Requirement
137
+ none: false
138
+ requirements:
139
+ - - ! '>='
140
+ - !ruby/object:Gem::Version
141
+ version: 1.4.2
142
+ - !ruby/object:Gem::Dependency
143
+ name: om
144
+ requirement: !ruby/object:Gem::Requirement
146
145
  none: false
147
- requirements:
146
+ requirements:
148
147
  - - ~>
149
- - !ruby/object:Gem::Version
150
- hash: 15
151
- segments:
152
- - 1
153
- - 6
154
- - 0
148
+ - !ruby/object:Gem::Version
155
149
  version: 1.6.0
156
150
  type: :runtime
157
- version_requirements: *id009
158
- - !ruby/object:Gem::Dependency
159
- name: solrizer
160
151
  prerelease: false
161
- requirement: &id010 !ruby/object:Gem::Requirement
152
+ version_requirements: !ruby/object:Gem::Requirement
153
+ none: false
154
+ requirements:
155
+ - - ~>
156
+ - !ruby/object:Gem::Version
157
+ version: 1.6.0
158
+ - !ruby/object:Gem::Dependency
159
+ name: solrizer
160
+ requirement: !ruby/object:Gem::Requirement
162
161
  none: false
163
- requirements:
162
+ requirements:
164
163
  - - ~>
165
- - !ruby/object:Gem::Version
166
- hash: 31
167
- segments:
168
- - 1
169
- - 2
170
- - 0
164
+ - !ruby/object:Gem::Version
171
165
  version: 1.2.0
172
166
  type: :runtime
173
- version_requirements: *id010
174
- - !ruby/object:Gem::Dependency
175
- name: rspec
176
167
  prerelease: false
177
- requirement: &id011 !ruby/object:Gem::Requirement
168
+ version_requirements: !ruby/object:Gem::Requirement
178
169
  none: false
179
- requirements:
170
+ requirements:
180
171
  - - ~>
181
- - !ruby/object:Gem::Version
182
- hash: 39
183
- segments:
184
- - 2
185
- - 10
186
- - 0
172
+ - !ruby/object:Gem::Version
173
+ version: 1.2.0
174
+ - !ruby/object:Gem::Dependency
175
+ name: rspec
176
+ requirement: !ruby/object:Gem::Requirement
177
+ none: false
178
+ requirements:
179
+ - - ~>
180
+ - !ruby/object:Gem::Version
187
181
  version: 2.10.0
188
182
  type: :development
189
- version_requirements: *id011
190
- - !ruby/object:Gem::Dependency
191
- name: rspec-rails
192
183
  prerelease: false
193
- requirement: &id012 !ruby/object:Gem::Requirement
184
+ version_requirements: !ruby/object:Gem::Requirement
185
+ none: false
186
+ requirements:
187
+ - - ~>
188
+ - !ruby/object:Gem::Version
189
+ version: 2.10.0
190
+ - !ruby/object:Gem::Dependency
191
+ name: rspec-rails
192
+ requirement: !ruby/object:Gem::Requirement
194
193
  none: false
195
- requirements:
194
+ requirements:
196
195
  - - ~>
197
- - !ruby/object:Gem::Version
198
- hash: 39
199
- segments:
200
- - 2
201
- - 10
202
- - 0
196
+ - !ruby/object:Gem::Version
203
197
  version: 2.10.0
204
198
  type: :development
205
- version_requirements: *id012
206
- - !ruby/object:Gem::Dependency
207
- name: mocha
208
199
  prerelease: false
209
- requirement: &id013 !ruby/object:Gem::Requirement
200
+ version_requirements: !ruby/object:Gem::Requirement
201
+ none: false
202
+ requirements:
203
+ - - ~>
204
+ - !ruby/object:Gem::Version
205
+ version: 2.10.0
206
+ - !ruby/object:Gem::Dependency
207
+ name: mocha
208
+ requirement: !ruby/object:Gem::Requirement
210
209
  none: false
211
- requirements:
212
- - - ">="
213
- - !ruby/object:Gem::Version
214
- hash: 43
215
- segments:
216
- - 0
217
- - 9
218
- - 8
210
+ requirements:
211
+ - - ! '>='
212
+ - !ruby/object:Gem::Version
219
213
  version: 0.9.8
220
214
  type: :development
221
- version_requirements: *id013
222
- - !ruby/object:Gem::Dependency
223
- name: equivalent-xml
224
215
  prerelease: false
225
- requirement: &id014 !ruby/object:Gem::Requirement
216
+ version_requirements: !ruby/object:Gem::Requirement
226
217
  none: false
227
- requirements:
228
- - - ">="
229
- - !ruby/object:Gem::Version
230
- hash: 31
231
- segments:
232
- - 0
233
- - 2
234
- - 4
218
+ requirements:
219
+ - - ! '>='
220
+ - !ruby/object:Gem::Version
221
+ version: 0.9.8
222
+ - !ruby/object:Gem::Dependency
223
+ name: equivalent-xml
224
+ requirement: !ruby/object:Gem::Requirement
225
+ none: false
226
+ requirements:
227
+ - - ! '>='
228
+ - !ruby/object:Gem::Version
235
229
  version: 0.2.4
236
230
  type: :development
237
- version_requirements: *id014
238
- - !ruby/object:Gem::Dependency
239
- name: rbx-require-relative
240
231
  prerelease: false
241
- requirement: &id015 !ruby/object:Gem::Requirement
232
+ version_requirements: !ruby/object:Gem::Requirement
242
233
  none: false
243
- requirements:
244
- - - "="
245
- - !ruby/object:Gem::Version
246
- hash: 21
247
- segments:
248
- - 0
249
- - 0
250
- - 5
251
- version: 0.0.5
234
+ requirements:
235
+ - - ! '>='
236
+ - !ruby/object:Gem::Version
237
+ version: 0.2.4
238
+ - !ruby/object:Gem::Dependency
239
+ name: rbx-require-relative
240
+ requirement: !ruby/object:Gem::Requirement
241
+ none: false
242
+ requirements:
243
+ - - ! '>='
244
+ - !ruby/object:Gem::Version
245
+ version: '0'
252
246
  type: :development
253
- version_requirements: *id015
254
- description: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer
247
+ prerelease: false
248
+ version_requirements: !ruby/object:Gem::Requirement
249
+ none: false
250
+ requirements:
251
+ - - ! '>='
252
+ - !ruby/object:Gem::Version
253
+ version: '0'
254
+ description: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection
255
+ Viewer
255
256
  email: armintor@gmail.com
256
257
  executables: []
257
-
258
258
  extensions: []
259
-
260
259
  extra_rdoc_files: []
261
-
262
- files:
260
+ files:
263
261
  - lib/cul_scv_hydra/access_controls_enforcement.rb
264
262
  - lib/cul_scv_hydra/active_fedora/model/aggregator.rb
265
263
  - lib/cul_scv_hydra/active_fedora/model/common.rb
@@ -313,36 +311,26 @@ files:
313
311
  - config/solr_value_maps.yml
314
312
  homepage: https://github.com/cul/cul_scv_hydra
315
313
  licenses: []
316
-
317
314
  post_install_message:
318
315
  rdoc_options: []
319
-
320
- require_paths:
316
+ require_paths:
321
317
  - lib
322
- required_ruby_version: !ruby/object:Gem::Requirement
318
+ required_ruby_version: !ruby/object:Gem::Requirement
323
319
  none: false
324
- requirements:
325
- - - ">="
326
- - !ruby/object:Gem::Version
327
- hash: 3
328
- segments:
329
- - 0
330
- version: "0"
331
- required_rubygems_version: !ruby/object:Gem::Requirement
320
+ requirements:
321
+ - - ! '>='
322
+ - !ruby/object:Gem::Version
323
+ version: '0'
324
+ required_rubygems_version: !ruby/object:Gem::Requirement
332
325
  none: false
333
- requirements:
334
- - - ">="
335
- - !ruby/object:Gem::Version
336
- hash: 3
337
- segments:
338
- - 0
339
- version: "0"
326
+ requirements:
327
+ - - ! '>='
328
+ - !ruby/object:Gem::Version
329
+ version: '0'
340
330
  requirements: []
341
-
342
331
  rubyforge_project:
343
332
  rubygems_version: 1.8.24
344
333
  signing_key:
345
334
  specification_version: 3
346
335
  summary: ActiveFedora, OM, and Solrizer implementations for CUL Staff Collection Viewer
347
336
  test_files: []
348
-