hydra-core 6.0.0.pre8 → 6.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. data/app/models/hydra/datastream/properties.rb +1 -1
  2. data/hydra-core.gemspec +0 -7
  3. data/lib/generators/hydra/templates/config/initializers/hydra_config.rb +4 -0
  4. data/lib/hydra-head/version.rb +1 -1
  5. data/spec/support/Gemfile +1 -1
  6. data/tasks/rspec.rake +13 -15
  7. metadata +27 -139
data/app/models/hydra/datastream/properties.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # properties datastream: catch-all for info that didn't have another home. Particularly depositor.
2
2
  module Hydra::Datastream
3
- class Properties < ActiveFedora::NokogiriDatastream
3
+ class Properties < ActiveFedora::OmDatastream
4
4
  set_terminology do |t|
5
5
  t.root(:path=>"fields", :xmlns => '', :namespace_prefix => nil)
6
6
 
data/hydra-core.gemspec CHANGED
@@ -21,21 +21,14 @@ Gem::Specification.new do |gem|
21
21
 
22
22
  gem.add_dependency "rails", '~>3.2.3'
23
23
  gem.add_dependency "blacklight", '~> 4.0'
24
- gem.add_dependency "devise"
25
24
  gem.add_dependency "active-fedora"
26
- gem.add_dependency 'RedCloth', '=4.2.9'
27
25
  gem.add_dependency 'block_helpers'
28
- gem.add_dependency 'sanitize'
29
- gem.add_dependency 'hydra-mods', ">= 0.0.6"
30
26
  gem.add_dependency 'deprecation', ">= 0.0.5"
31
- gem.add_dependency 'jquery-rails'
32
27
  gem.add_dependency 'hydra-access-controls', version
33
28
 
34
29
  gem.add_development_dependency 'sqlite3'
35
30
  gem.add_development_dependency 'yard'
36
31
  gem.add_development_dependency 'jettywrapper', ">=1.3.1"
37
32
  gem.add_development_dependency 'rspec-rails'
38
- gem.add_development_dependency 'cucumber-rails', '>=1.2.0'
39
33
  gem.add_development_dependency 'factory_girl_rails'
40
- gem.add_development_dependency 'solrizer-fedora', '>=2.1.0'
41
34
  end
data/lib/generators/hydra/templates/config/initializers/hydra_config.rb CHANGED
@@ -6,6 +6,10 @@
6
6
  # User.send(:include, MyLocalLDAPAttributes)
7
7
  # As long as your module includes methods for full_name, affiliation, and photo the personalization_helper should function correctly
8
8
  #
9
+
10
+ # windows doesn't properly require hydra-head (from the gemfile), so we need to require it explicitly here:
11
+ require 'hydra/head' unless defined? Hydra
12
+
9
13
  if Hydra.respond_to?(:configure)
10
14
  Hydra.configure(:shared) do |config|
11
15
  # This specifies the solr field names of permissions-related fields.
data/lib/hydra-head/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module HydraHead
2
- VERSION = "6.0.0.pre8"
2
+ VERSION = "6.0.0.rc1"
3
3
  end
4
4
 
data/spec/support/Gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
- gem 'rails', '3.2.11'
3
+ gem 'rails', '3.2.12'
4
4
 
5
5
  gem 'sqlite3'
6
6
 
data/tasks/rspec.rake CHANGED
@@ -2,11 +2,9 @@ ENV["RAILS_ROOT"] ||= 'spec/internal'
2
2
 
3
3
  desc "Run specs"
4
4
  task :spec => [:generate, :fixtures] do |t|
5
- Bundler.with_clean_env do
6
- within_test_app do
7
- system "rake myspec"
8
- abort "Error running hydra-core" unless $?.success?
9
- end
5
+ within_test_app do
6
+ system "rake myspec"
7
+ abort "Error running hydra-core" unless $?.success?
10
8
  end
11
9
  end
12
10
 
@@ -26,16 +24,14 @@ task :generate do
26
24
  `cp spec/support/Gemfile spec/internal`
27
25
  puts "Copying generator"
28
26
  `cp -r spec/support/lib/generators spec/internal/lib`
29
- Bundler.with_clean_env do
30
- within_test_app do
31
- puts "Bundle install"
32
- `bundle install`
33
- puts "running test_app_generator"
34
- system "rails generate test_app"
27
+ within_test_app do
28
+ puts "Bundle install"
29
+ `bundle install`
30
+ puts "running test_app_generator"
31
+ system "rails generate test_app"
35
32
 
36
- puts "running migrations"
37
- puts `rake db:migrate db:test:prepare`
38
- end
33
+ puts "running migrations"
34
+ puts `rake db:migrate db:test:prepare`
39
35
  end
40
36
  end
41
37
  puts "Running specs"
@@ -49,6 +45,8 @@ end
49
45
 
50
46
  def within_test_app
51
47
  FileUtils.cd('spec/internal')
52
- yield
48
+ Bundler.with_clean_env do
49
+ yield
50
+ end
53
51
  FileUtils.cd('../..')
54
52
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hydra-core
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.0.pre8
4
+ version: 6.0.0.rc1
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -10,14 +10,14 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2013-02-10 00:00:00.000000000 Z
13
+ date: 2013-02-15 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
17
  requirement: !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
- - - "~>"
20
+ - - ~>
21
21
  - !ruby/object:Gem::Version
22
22
  version: 3.2.3
23
23
  type: :runtime
@@ -25,7 +25,7 @@ dependencies:
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  none: false
27
27
  requirements:
28
- - - "~>"
28
+ - - ~>
29
29
  - !ruby/object:Gem::Version
30
30
  version: 3.2.3
31
31
  - !ruby/object:Gem::Dependency
@@ -33,7 +33,7 @@ dependencies:
33
33
  requirement: !ruby/object:Gem::Requirement
34
34
  none: false
35
35
  requirements:
36
- - - "~>"
36
+ - - ~>
37
37
  - !ruby/object:Gem::Version
38
38
  version: '4.0'
39
39
  type: :runtime
@@ -41,31 +41,15 @@ dependencies:
41
41
  version_requirements: !ruby/object:Gem::Requirement
42
42
  none: false
43
43
  requirements:
44
- - - "~>"
44
+ - - ~>
45
45
  - !ruby/object:Gem::Version
46
46
  version: '4.0'
47
- - !ruby/object:Gem::Dependency
48
- name: devise
49
- requirement: !ruby/object:Gem::Requirement
50
- none: false
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
- type: :runtime
56
- prerelease: false
57
- version_requirements: !ruby/object:Gem::Requirement
58
- none: false
59
- requirements:
60
- - - ">="
61
- - !ruby/object:Gem::Version
62
- version: '0'
63
47
  - !ruby/object:Gem::Dependency
64
48
  name: active-fedora
65
49
  requirement: !ruby/object:Gem::Requirement
66
50
  none: false
67
51
  requirements:
68
- - - ">="
52
+ - - ! '>='
69
53
  - !ruby/object:Gem::Version
70
54
  version: '0'
71
55
  type: :runtime
@@ -73,31 +57,15 @@ dependencies:
73
57
  version_requirements: !ruby/object:Gem::Requirement
74
58
  none: false
75
59
  requirements:
76
- - - ">="
60
+ - - ! '>='
77
61
  - !ruby/object:Gem::Version
78
62
  version: '0'
79
- - !ruby/object:Gem::Dependency
80
- name: RedCloth
81
- requirement: !ruby/object:Gem::Requirement
82
- none: false
83
- requirements:
84
- - - '='
85
- - !ruby/object:Gem::Version
86
- version: 4.2.9
87
- type: :runtime
88
- prerelease: false
89
- version_requirements: !ruby/object:Gem::Requirement
90
- none: false
91
- requirements:
92
- - - '='
93
- - !ruby/object:Gem::Version
94
- version: 4.2.9
95
63
  - !ruby/object:Gem::Dependency
96
64
  name: block_helpers
97
65
  requirement: !ruby/object:Gem::Requirement
98
66
  none: false
99
67
  requirements:
100
- - - ">="
68
+ - - ! '>='
101
69
  - !ruby/object:Gem::Version
102
70
  version: '0'
103
71
  type: :runtime
@@ -105,47 +73,15 @@ dependencies:
105
73
  version_requirements: !ruby/object:Gem::Requirement
106
74
  none: false
107
75
  requirements:
108
- - - ">="
76
+ - - ! '>='
109
77
  - !ruby/object:Gem::Version
110
78
  version: '0'
111
- - !ruby/object:Gem::Dependency
112
- name: sanitize
113
- requirement: !ruby/object:Gem::Requirement
114
- none: false
115
- requirements:
116
- - - ">="
117
- - !ruby/object:Gem::Version
118
- version: '0'
119
- type: :runtime
120
- prerelease: false
121
- version_requirements: !ruby/object:Gem::Requirement
122
- none: false
123
- requirements:
124
- - - ">="
125
- - !ruby/object:Gem::Version
126
- version: '0'
127
- - !ruby/object:Gem::Dependency
128
- name: hydra-mods
129
- requirement: !ruby/object:Gem::Requirement
130
- none: false
131
- requirements:
132
- - - ">="
133
- - !ruby/object:Gem::Version
134
- version: 0.0.6
135
- type: :runtime
136
- prerelease: false
137
- version_requirements: !ruby/object:Gem::Requirement
138
- none: false
139
- requirements:
140
- - - ">="
141
- - !ruby/object:Gem::Version
142
- version: 0.0.6
143
79
  - !ruby/object:Gem::Dependency
144
80
  name: deprecation
145
81
  requirement: !ruby/object:Gem::Requirement
146
82
  none: false
147
83
  requirements:
148
- - - ">="
84
+ - - ! '>='
149
85
  - !ruby/object:Gem::Version
150
86
  version: 0.0.5
151
87
  type: :runtime
@@ -153,25 +89,9 @@ dependencies:
153
89
  version_requirements: !ruby/object:Gem::Requirement
154
90
  none: false
155
91
  requirements:
156
- - - ">="
92
+ - - ! '>='
157
93
  - !ruby/object:Gem::Version
158
94
  version: 0.0.5
159
- - !ruby/object:Gem::Dependency
160
- name: jquery-rails
161
- requirement: !ruby/object:Gem::Requirement
162
- none: false
163
- requirements:
164
- - - ">="
165
- - !ruby/object:Gem::Version
166
- version: '0'
167
- type: :runtime
168
- prerelease: false
169
- version_requirements: !ruby/object:Gem::Requirement
170
- none: false
171
- requirements:
172
- - - ">="
173
- - !ruby/object:Gem::Version
174
- version: '0'
175
95
  - !ruby/object:Gem::Dependency
176
96
  name: hydra-access-controls
177
97
  requirement: !ruby/object:Gem::Requirement
@@ -179,7 +99,7 @@ dependencies:
179
99
  requirements:
180
100
  - - '='
181
101
  - !ruby/object:Gem::Version
182
- version: 6.0.0.pre8
102
+ version: 6.0.0.rc1
183
103
  type: :runtime
184
104
  prerelease: false
185
105
  version_requirements: !ruby/object:Gem::Requirement
@@ -187,13 +107,13 @@ dependencies:
187
107
  requirements:
188
108
  - - '='
189
109
  - !ruby/object:Gem::Version
190
- version: 6.0.0.pre8
110
+ version: 6.0.0.rc1
191
111
  - !ruby/object:Gem::Dependency
192
112
  name: sqlite3
193
113
  requirement: !ruby/object:Gem::Requirement
194
114
  none: false
195
115
  requirements:
196
- - - ">="
116
+ - - ! '>='
197
117
  - !ruby/object:Gem::Version
198
118
  version: '0'
199
119
  type: :development
@@ -201,7 +121,7 @@ dependencies:
201
121
  version_requirements: !ruby/object:Gem::Requirement
202
122
  none: false
203
123
  requirements:
204
- - - ">="
124
+ - - ! '>='
205
125
  - !ruby/object:Gem::Version
206
126
  version: '0'
207
127
  - !ruby/object:Gem::Dependency
@@ -209,7 +129,7 @@ dependencies:
209
129
  requirement: !ruby/object:Gem::Requirement
210
130
  none: false
211
131
  requirements:
212
- - - ">="
132
+ - - ! '>='
213
133
  - !ruby/object:Gem::Version
214
134
  version: '0'
215
135
  type: :development
@@ -217,7 +137,7 @@ dependencies:
217
137
  version_requirements: !ruby/object:Gem::Requirement
218
138
  none: false
219
139
  requirements:
220
- - - ">="
140
+ - - ! '>='
221
141
  - !ruby/object:Gem::Version
222
142
  version: '0'
223
143
  - !ruby/object:Gem::Dependency
@@ -225,7 +145,7 @@ dependencies:
225
145
  requirement: !ruby/object:Gem::Requirement
226
146
  none: false
227
147
  requirements:
228
- - - ">="
148
+ - - ! '>='
229
149
  - !ruby/object:Gem::Version
230
150
  version: 1.3.1
231
151
  type: :development
@@ -233,7 +153,7 @@ dependencies:
233
153
  version_requirements: !ruby/object:Gem::Requirement
234
154
  none: false
235
155
  requirements:
236
- - - ">="
156
+ - - ! '>='
237
157
  - !ruby/object:Gem::Version
238
158
  version: 1.3.1
239
159
  - !ruby/object:Gem::Dependency
@@ -241,7 +161,7 @@ dependencies:
241
161
  requirement: !ruby/object:Gem::Requirement
242
162
  none: false
243
163
  requirements:
244
- - - ">="
164
+ - - ! '>='
245
165
  - !ruby/object:Gem::Version
246
166
  version: '0'
247
167
  type: :development
@@ -249,31 +169,15 @@ dependencies:
249
169
  version_requirements: !ruby/object:Gem::Requirement
250
170
  none: false
251
171
  requirements:
252
- - - ">="
172
+ - - ! '>='
253
173
  - !ruby/object:Gem::Version
254
174
  version: '0'
255
- - !ruby/object:Gem::Dependency
256
- name: cucumber-rails
257
- requirement: !ruby/object:Gem::Requirement
258
- none: false
259
- requirements:
260
- - - ">="
261
- - !ruby/object:Gem::Version
262
- version: 1.2.0
263
- type: :development
264
- prerelease: false
265
- version_requirements: !ruby/object:Gem::Requirement
266
- none: false
267
- requirements:
268
- - - ">="
269
- - !ruby/object:Gem::Version
270
- version: 1.2.0
271
175
  - !ruby/object:Gem::Dependency
272
176
  name: factory_girl_rails
273
177
  requirement: !ruby/object:Gem::Requirement
274
178
  none: false
275
179
  requirements:
276
- - - ">="
180
+ - - ! '>='
277
181
  - !ruby/object:Gem::Version
278
182
  version: '0'
279
183
  type: :development
@@ -281,25 +185,9 @@ dependencies:
281
185
  version_requirements: !ruby/object:Gem::Requirement
282
186
  none: false
283
187
  requirements:
284
- - - ">="
188
+ - - ! '>='
285
189
  - !ruby/object:Gem::Version
286
190
  version: '0'
287
- - !ruby/object:Gem::Dependency
288
- name: solrizer-fedora
289
- requirement: !ruby/object:Gem::Requirement
290
- none: false
291
- requirements:
292
- - - ">="
293
- - !ruby/object:Gem::Version
294
- version: 2.1.0
295
- type: :development
296
- prerelease: false
297
- version_requirements: !ruby/object:Gem::Requirement
298
- none: false
299
- requirements:
300
- - - ">="
301
- - !ruby/object:Gem::Version
302
- version: 2.1.0
303
191
  description: ! 'Hydra-Head is a Rails Engine containing the core code for a Hydra
304
192
  application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora,
305
193
  solrizer, and om'
@@ -309,7 +197,7 @@ executables: []
309
197
  extensions: []
310
198
  extra_rdoc_files: []
311
199
  files:
312
- - ".gitignore"
200
+ - .gitignore
313
201
  - Rakefile
314
202
  - app/helpers/blacklight_helper.rb
315
203
  - app/helpers/facets_helper.rb
@@ -401,13 +289,13 @@ require_paths:
401
289
  required_ruby_version: !ruby/object:Gem::Requirement
402
290
  none: false
403
291
  requirements:
404
- - - ">="
292
+ - - ! '>='
405
293
  - !ruby/object:Gem::Version
406
294
  version: 1.9.3
407
295
  required_rubygems_version: !ruby/object:Gem::Requirement
408
296
  none: false
409
297
  requirements:
410
- - - ">"
298
+ - - ! '>'
411
299
  - !ruby/object:Gem::Version
412
300
  version: 1.3.1
413
301
  requirements: []