iqvoc_skosxl 2.7.0 → 2.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +1 -1
- data/Gemfile.lock +95 -90
- data/app/assets/stylesheets/iqvoc_skosxl/_manifest.scss +0 -1
- data/app/controllers/labels/versions_controller.rb +24 -22
- data/app/models/label/skosxl/validations.rb +4 -14
- data/app/views/labels/_form.html.erb +1 -0
- data/config/locales/de.yml +4 -1
- data/config/locales/en.yml +4 -1
- data/iqvoc_skosxl.gemspec +1 -1
- data/lib/iqvoc/skosxl/version.rb +1 -1
- data/lib/tasks/release.rake +15 -0
- data/test/integration/labels_order_test.rb +4 -4
- data/test/models/label_test.rb +2 -4
- metadata +5 -11
- data/app/assets/stylesheets/iqvoc_skosxl/_entity_select.scss +0 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 845ec6c18d4da7e36575f42941e51b2d188e7956
|
4
|
+
data.tar.gz: 4f982396806e732eece6fe4b21afe6bdacf133b0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3e7118156fbf98bba49249924b1913c5e1772a295821c167bd2a763f4b765ff19dfb7f1f7c34a3225304bb01c5637e9e24d62e24859e90f37bacf6fa777b2901
|
7
|
+
data.tar.gz: 1a04a05d4d693169a0d183e7f0bee609a00a7d66cc40d54068624b4f54ae6931d53b8571757e34cf33e169e9f1db9086ff3b98053ce8215da63c6add80138eb5
|
data/Gemfile
CHANGED
data/Gemfile.lock
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
GIT
|
2
2
|
remote: git://github.com/innoq/iqvoc.git
|
3
|
-
revision:
|
3
|
+
revision: 872456feda103f7f3df4e771ab1ba608a985cac6
|
4
4
|
branch: master
|
5
5
|
specs:
|
6
|
-
iqvoc (4.
|
7
|
-
apipie-rails
|
6
|
+
iqvoc (4.10.0)
|
7
|
+
apipie-rails (~> 0.3.5)
|
8
8
|
authlogic (~> 3.4.2)
|
9
9
|
autoprefixer-rails (~> 5.1.8)
|
10
10
|
bootstrap-sass (~> 3.3.1.0)
|
@@ -79,15 +79,15 @@ GEM
|
|
79
79
|
minitest (~> 5.1)
|
80
80
|
thread_safe (~> 0.3, >= 0.3.4)
|
81
81
|
tzinfo (~> 1.1)
|
82
|
-
addressable (2.
|
83
|
-
apipie-rails (0.3.
|
82
|
+
addressable (2.4.0)
|
83
|
+
apipie-rails (0.3.5)
|
84
84
|
json
|
85
85
|
arel (6.0.0)
|
86
|
-
authlogic (3.4.
|
86
|
+
authlogic (3.4.6)
|
87
87
|
activerecord (>= 3.2)
|
88
88
|
activesupport (>= 3.2)
|
89
89
|
request_store (~> 1.0)
|
90
|
-
scrypt (
|
90
|
+
scrypt (>= 1.2, < 3.0)
|
91
91
|
autoprefixer-rails (5.1.11)
|
92
92
|
execjs
|
93
93
|
json
|
@@ -98,7 +98,7 @@ GEM
|
|
98
98
|
sass (~> 3.2)
|
99
99
|
bootstrap_form (2.2.0)
|
100
100
|
builder (3.2.2)
|
101
|
-
cancancan (1.
|
101
|
+
cancancan (1.13.1)
|
102
102
|
capybara (2.4.4)
|
103
103
|
mime-types (>= 1.16)
|
104
104
|
nokogiri (>= 1.3.3)
|
@@ -112,22 +112,23 @@ GEM
|
|
112
112
|
mime-types (>= 1.16)
|
113
113
|
cliver (0.3.2)
|
114
114
|
coderay (1.1.0)
|
115
|
-
|
115
|
+
concurrent-ruby (1.0.0)
|
116
|
+
database_cleaner (1.5.1)
|
116
117
|
delayed_job (4.0.6)
|
117
118
|
activesupport (>= 3.0, < 5.0)
|
118
119
|
delayed_job_active_record (4.0.3)
|
119
120
|
activerecord (>= 3.0, < 5.0)
|
120
121
|
delayed_job (>= 3.0, < 4.1)
|
121
|
-
ebnf (0.
|
122
|
+
ebnf (1.0.0)
|
122
123
|
rdf (~> 1.1)
|
123
124
|
sxp (~> 0.1, >= 0.1.3)
|
124
125
|
equivalent-xml (0.6.0)
|
125
126
|
nokogiri (>= 1.4.3)
|
126
127
|
erubis (2.7.0)
|
127
|
-
execjs (2.
|
128
|
+
execjs (2.6.0)
|
128
129
|
faraday (0.9.0)
|
129
130
|
multipart-post (>= 1.2, < 3)
|
130
|
-
faraday_middleware (0.
|
131
|
+
faraday_middleware (0.10.0)
|
131
132
|
faraday (>= 0.7.4, < 0.10)
|
132
133
|
ffi (1.9.8)
|
133
134
|
ffi (1.9.8-java)
|
@@ -136,11 +137,11 @@ GEM
|
|
136
137
|
rake
|
137
138
|
font-awesome-rails (4.2.0.0)
|
138
139
|
railties (>= 3.2, < 5.0)
|
139
|
-
globalid (0.3.
|
140
|
+
globalid (0.3.6)
|
140
141
|
activesupport (>= 4.1.0)
|
141
|
-
haml (4.0.
|
142
|
+
haml (4.0.7)
|
142
143
|
tilt
|
143
|
-
htmlentities (4.3.
|
144
|
+
htmlentities (4.3.4)
|
144
145
|
i18n (0.7.0)
|
145
146
|
iq_rdf (0.1.15)
|
146
147
|
activesupport
|
@@ -152,8 +153,9 @@ GEM
|
|
152
153
|
jdbc-sqlite3 (3.8.7)
|
153
154
|
json (1.8.2)
|
154
155
|
json (1.8.2-java)
|
155
|
-
json-ld (1.
|
156
|
-
|
156
|
+
json-ld (1.99.0)
|
157
|
+
multi_json (~> 1.11)
|
158
|
+
rdf (~> 1.99)
|
157
159
|
kaminari (0.16.3)
|
158
160
|
actionpack (>= 3.0.0)
|
159
161
|
activesupport (>= 3.0.0)
|
@@ -161,28 +163,28 @@ GEM
|
|
161
163
|
kaminari (>= 0.13.0)
|
162
164
|
rails
|
163
165
|
link_header (0.0.8)
|
164
|
-
linkeddata (1.
|
165
|
-
equivalent-xml (~> 0.
|
166
|
-
json-ld (~> 1.
|
166
|
+
linkeddata (1.99.0)
|
167
|
+
equivalent-xml (~> 0.6)
|
168
|
+
json-ld (~> 1.99)
|
167
169
|
nokogiri (~> 1.6)
|
168
|
-
rdf (~> 1.
|
169
|
-
rdf-aggregate-repo (~> 1.
|
170
|
-
rdf-isomorphic (~> 1.
|
170
|
+
rdf (~> 1.99)
|
171
|
+
rdf-aggregate-repo (~> 1.99)
|
172
|
+
rdf-isomorphic (~> 1.99)
|
171
173
|
rdf-json (~> 1.1, >= 1.1.2)
|
172
|
-
rdf-microdata (~> 2.0, >= 2.0.
|
173
|
-
rdf-n3 (~> 1.
|
174
|
-
rdf-rdfa (~> 1.
|
175
|
-
rdf-rdfxml (~> 1.1, >= 1.1.
|
176
|
-
rdf-reasoner (~> 0.
|
177
|
-
rdf-tabular (~> 0.
|
178
|
-
rdf-trig (~> 1.
|
179
|
-
rdf-trix (~> 1.
|
180
|
-
rdf-turtle (~> 1.
|
181
|
-
rdf-vocab (~> 0.8)
|
182
|
-
rdf-xsd (~> 1.1, >= 1.1.
|
183
|
-
sparql (~> 1.
|
184
|
-
sparql-client (~> 1.
|
185
|
-
loofah (2.0.
|
174
|
+
rdf-microdata (~> 2.0, >= 2.0.2)
|
175
|
+
rdf-n3 (~> 1.99)
|
176
|
+
rdf-rdfa (~> 1.99)
|
177
|
+
rdf-rdfxml (~> 1.1, >= 1.1.5)
|
178
|
+
rdf-reasoner (~> 0.3)
|
179
|
+
rdf-tabular (~> 0.3)
|
180
|
+
rdf-trig (~> 1.99, >= 1.99.0.1)
|
181
|
+
rdf-trix (~> 1.99)
|
182
|
+
rdf-turtle (~> 1.99)
|
183
|
+
rdf-vocab (~> 0.8, >= 0.8.6)
|
184
|
+
rdf-xsd (~> 1.1, >= 1.1.5)
|
185
|
+
sparql (~> 1.99)
|
186
|
+
sparql-client (~> 1.99)
|
187
|
+
loofah (2.0.3)
|
186
188
|
nokogiri (>= 1.5.9)
|
187
189
|
mail (2.6.3)
|
188
190
|
mime-types (>= 1.16, < 3)
|
@@ -231,11 +233,11 @@ GEM
|
|
231
233
|
sprockets-rails
|
232
234
|
rails-deprecated_sanitizer (1.0.3)
|
233
235
|
activesupport (>= 4.2.0.alpha)
|
234
|
-
rails-dom-testing (1.0.
|
236
|
+
rails-dom-testing (1.0.7)
|
235
237
|
activesupport (>= 4.2.0.beta, < 5.0)
|
236
238
|
nokogiri (~> 1.6.0)
|
237
239
|
rails-deprecated_sanitizer (>= 1.0.1)
|
238
|
-
rails-html-sanitizer (1.0.
|
240
|
+
rails-html-sanitizer (1.0.3)
|
239
241
|
loofah (~> 2.0)
|
240
242
|
rails_autolink (1.1.6)
|
241
243
|
rails (> 3.1)
|
@@ -244,96 +246,99 @@ GEM
|
|
244
246
|
activesupport (= 4.2.1)
|
245
247
|
rake (>= 0.8.7)
|
246
248
|
thor (>= 0.18.1, < 2.0)
|
247
|
-
rake (
|
248
|
-
rdf (1.1
|
249
|
+
rake (11.1.2)
|
250
|
+
rdf (1.99.1)
|
249
251
|
link_header (~> 0.0, >= 0.0.8)
|
250
|
-
rdf-aggregate-repo (1.
|
251
|
-
rdf (
|
252
|
-
rdf-isomorphic (1.
|
253
|
-
rdf (
|
254
|
-
rdf-json (1.
|
255
|
-
rdf (~> 1.
|
256
|
-
rdf-microdata (2.0.
|
252
|
+
rdf-aggregate-repo (1.99.0)
|
253
|
+
rdf (~> 1.99)
|
254
|
+
rdf-isomorphic (1.99.0)
|
255
|
+
rdf (~> 1.99)
|
256
|
+
rdf-json (1.99.0)
|
257
|
+
rdf (~> 1.99)
|
258
|
+
rdf-microdata (2.0.2)
|
257
259
|
htmlentities (~> 4.3)
|
258
260
|
nokogiri (~> 1.6)
|
259
261
|
rdf (~> 1.1)
|
260
262
|
rdf-xsd (~> 1.1)
|
261
|
-
rdf-n3 (1.
|
262
|
-
rdf (~> 1.
|
263
|
-
rdf-rdfa (1.
|
263
|
+
rdf-n3 (1.99.0)
|
264
|
+
rdf (~> 1.99)
|
265
|
+
rdf-rdfa (1.99.0)
|
264
266
|
haml (~> 4.0)
|
265
267
|
htmlentities (~> 4.3)
|
266
|
-
rdf (~> 1.
|
268
|
+
rdf (~> 1.99)
|
267
269
|
rdf-aggregate-repo (~> 1.1)
|
268
270
|
rdf-xsd (~> 1.1)
|
269
|
-
rdf-rdfxml (1.
|
271
|
+
rdf-rdfxml (1.99.0)
|
270
272
|
htmlentities (~> 4.3)
|
271
|
-
rdf (~> 1.
|
272
|
-
rdf-rdfa (~> 1.
|
273
|
-
rdf-xsd (~> 1.
|
274
|
-
rdf-reasoner (0.
|
273
|
+
rdf (~> 1.99)
|
274
|
+
rdf-rdfa (~> 1.99)
|
275
|
+
rdf-xsd (~> 1.99)
|
276
|
+
rdf-reasoner (0.3.0)
|
275
277
|
rdf (~> 1.1, >= 1.1.4.2)
|
276
278
|
rdf-turtle (~> 1.1)
|
279
|
+
rdf-vocab (~> 0.8)
|
277
280
|
rdf-xsd (~> 1.1)
|
278
|
-
rdf-tabular (0.
|
281
|
+
rdf-tabular (0.3.0)
|
279
282
|
addressable (~> 2.3)
|
280
283
|
bcp47 (~> 0.3, >= 0.3.3)
|
281
284
|
json-ld (~> 1.1)
|
282
285
|
rdf (~> 1.1, >= 1.1.7)
|
286
|
+
rdf-vocab (~> 0.8)
|
283
287
|
rdf-xsd (~> 1.1)
|
284
|
-
rdf-trig (1.1
|
285
|
-
ebnf (~>
|
286
|
-
rdf (~> 1.
|
287
|
-
rdf-turtle (~> 1.
|
288
|
-
rdf-trix (1.
|
289
|
-
rdf (
|
290
|
-
rdf-turtle (1.
|
291
|
-
ebnf (~>
|
292
|
-
rdf (~> 1.
|
293
|
-
rdf-vocab (0.8.
|
288
|
+
rdf-trig (1.99.0.1)
|
289
|
+
ebnf (~> 1.0)
|
290
|
+
rdf (~> 1.99)
|
291
|
+
rdf-turtle (~> 1.99)
|
292
|
+
rdf-trix (1.99.0)
|
293
|
+
rdf (~> 1.1)
|
294
|
+
rdf-turtle (1.99.0)
|
295
|
+
ebnf (~> 1.0)
|
296
|
+
rdf (~> 1.99)
|
297
|
+
rdf-vocab (0.8.7.1)
|
294
298
|
rdf (~> 1.1, >= 1.1.10)
|
295
|
-
rdf-xsd (1.
|
296
|
-
rdf (~> 1.
|
297
|
-
request_store (1.1
|
298
|
-
sass (3.4.
|
299
|
-
sass-rails (5.0.
|
299
|
+
rdf-xsd (1.99.0)
|
300
|
+
rdf (~> 1.99)
|
301
|
+
request_store (1.3.1)
|
302
|
+
sass (3.4.21)
|
303
|
+
sass-rails (5.0.4)
|
300
304
|
railties (>= 4.0.0, < 5.0)
|
301
305
|
sass (~> 3.1)
|
302
306
|
sprockets (>= 2.8, < 4.0)
|
303
307
|
sprockets-rails (>= 2.0, < 4.0)
|
304
|
-
tilt (
|
305
|
-
scrypt (
|
308
|
+
tilt (>= 1.1, < 3)
|
309
|
+
scrypt (2.0.2)
|
306
310
|
ffi-compiler (>= 0.0.2)
|
307
311
|
rake
|
308
312
|
slop (3.6.0)
|
309
|
-
sparql (1.
|
313
|
+
sparql (1.99.0)
|
310
314
|
builder (~> 3.2)
|
311
|
-
ebnf (~>
|
312
|
-
rdf (~> 1.
|
313
|
-
rdf-aggregate-repo (~> 1.
|
315
|
+
ebnf (~> 1.0)
|
316
|
+
rdf (~> 1.99)
|
317
|
+
rdf-aggregate-repo (~> 1.99)
|
314
318
|
rdf-xsd (~> 1.1)
|
315
319
|
sparql-client (~> 1.1)
|
316
320
|
sxp (~> 0.1)
|
317
|
-
sparql-client (1.
|
321
|
+
sparql-client (1.99.0)
|
318
322
|
net-http-persistent (~> 2.9)
|
319
323
|
rdf (~> 1.1)
|
320
324
|
spoon (0.0.4)
|
321
325
|
ffi
|
322
|
-
sprockets (3.
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
326
|
+
sprockets (3.5.2)
|
327
|
+
concurrent-ruby (~> 1.0)
|
328
|
+
rack (> 1, < 3)
|
329
|
+
sprockets-rails (3.0.1)
|
330
|
+
actionpack (>= 4.0)
|
331
|
+
activesupport (>= 4.0)
|
332
|
+
sprockets (>= 3.0.0)
|
328
333
|
sqlite3 (1.3.10)
|
329
334
|
sxp (0.1.5)
|
330
335
|
thor (0.19.1)
|
331
336
|
thread_safe (0.3.5)
|
332
337
|
thread_safe (0.3.5-java)
|
333
|
-
tilt (
|
338
|
+
tilt (2.0.2)
|
334
339
|
tzinfo (1.2.2)
|
335
340
|
thread_safe (~> 0.1)
|
336
|
-
uglifier (2.7.
|
341
|
+
uglifier (2.7.2)
|
337
342
|
execjs (>= 0.3.0)
|
338
343
|
json (>= 1.8.0)
|
339
344
|
websocket-driver (0.5.1)
|
@@ -354,7 +359,7 @@ DEPENDENCIES
|
|
354
359
|
activerecord-jdbcsqlite3-adapter
|
355
360
|
awesome_print
|
356
361
|
capybara
|
357
|
-
iqvoc (~> 4.
|
362
|
+
iqvoc (~> 4.10.0)!
|
358
363
|
mysql2
|
359
364
|
pg
|
360
365
|
poltergeist (~> 1.5.0)
|
@@ -362,4 +367,4 @@ DEPENDENCIES
|
|
362
367
|
sqlite3
|
363
368
|
|
364
369
|
BUNDLED WITH
|
365
|
-
1.
|
370
|
+
1.11.2
|
@@ -1 +0,0 @@
|
|
1
|
-
@import 'iqvoc_skosxl/entity_select';
|
@@ -6,31 +6,33 @@ class Labels::VersionsController < ApplicationController
|
|
6
6
|
authorize! :merge, new_version
|
7
7
|
|
8
8
|
ActiveRecord::Base.transaction do
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
redirect_to label_path(id: new_version)
|
24
|
-
else
|
25
|
-
flash[:error] = t('txt.controllers.versioning.published_with_warning')
|
26
|
-
redirect_to label_path(id: new_version)
|
27
|
-
end
|
28
|
-
else
|
29
|
-
flash[:error] = t('txt.controllers.versioning.merged_publishing_error')
|
9
|
+
new_version.publish
|
10
|
+
new_version.unlock
|
11
|
+
if new_version.publishable?
|
12
|
+
new_version.save
|
13
|
+
begin
|
14
|
+
# TODO if RdfStore.update(new_version.rdf_uri, label_url(:id => new_version, :format => :ttl))
|
15
|
+
# new_version.update_attribute(:rdf_updated_at, 1.seconds.since)
|
16
|
+
# end
|
17
|
+
rescue Exception => e
|
18
|
+
handle_virtuoso_exception(e.message)
|
19
|
+
end
|
20
|
+
|
21
|
+
if current_label && !current_label.destroy
|
22
|
+
flash[:error] = t('txt.controllers.versioning.merged_delete_error')
|
30
23
|
redirect_to label_path(published: 0, id: new_version)
|
31
24
|
end
|
25
|
+
|
26
|
+
if new_version.has_concept_or_label_relations?
|
27
|
+
flash[:success] = t('txt.controllers.versioning.published')
|
28
|
+
redirect_to label_path(id: new_version)
|
29
|
+
else
|
30
|
+
flash[:error] = t('txt.controllers.versioning.published_with_warning')
|
31
|
+
redirect_to label_path(id: new_version)
|
32
|
+
end
|
33
|
+
|
32
34
|
else
|
33
|
-
flash[:error] = t('txt.controllers.versioning.
|
35
|
+
flash[:error] = t('txt.controllers.versioning.merged_publishing_error')
|
34
36
|
redirect_to label_path(published: 0, id: new_version)
|
35
37
|
end
|
36
38
|
end
|
@@ -8,9 +8,7 @@ module Label
|
|
8
8
|
validates :origin, uniqueness: { scope: :rev }
|
9
9
|
validate :origin_has_to_be_escaped
|
10
10
|
|
11
|
-
validate :
|
12
|
-
validates :value, uniqueness: { scope: [:language, :rev] },
|
13
|
-
if: :validatable_for_publishing?
|
11
|
+
validate :pref_label_language, if: :validatable_for_publishing?
|
14
12
|
validates :value, presence: true, if: :validatable_for_publishing?
|
15
13
|
end
|
16
14
|
|
@@ -20,17 +18,9 @@ module Label
|
|
20
18
|
end
|
21
19
|
end
|
22
20
|
|
23
|
-
def
|
24
|
-
|
25
|
-
|
26
|
-
# check published concepts which use the current label as a pref label
|
27
|
-
concepts.published.each do |concept|
|
28
|
-
# pref labels without the current published one
|
29
|
-
labels = concept.pref_labels.reject{ |l| l == published_label }
|
30
|
-
|
31
|
-
unless labels.map(&:language).map(&:to_s).include?(Iqvoc::Concept.pref_labeling_languages.first.to_s)
|
32
|
-
errors.add :base, I18n.t('txt.models.label.referenced_concepts_invalid')
|
33
|
-
end
|
21
|
+
def pref_label_language
|
22
|
+
if language != ::Iqvoc::Concept.pref_labeling_languages.first.to_s && concepts_for_labeling_class(::Iqvoc::Concept::pref_labeling_class).any?
|
23
|
+
errors.add :base, I18n.t('txt.models.label.pref_label_language')
|
34
24
|
end
|
35
25
|
end
|
36
26
|
|
data/config/locales/de.yml
CHANGED
@@ -4,8 +4,11 @@ de:
|
|
4
4
|
layouts:
|
5
5
|
sections:
|
6
6
|
concepts: Konzepte
|
7
|
+
instance_configuration:
|
8
|
+
settings:
|
9
|
+
languages_further_labelings_Labeling::SKOSXL::AltLabel: Sprachen für alternative Labels
|
7
10
|
models:
|
8
11
|
label:
|
9
12
|
uri: Label-URI
|
10
13
|
origin_invalid: enthält ungültige Zeichen.
|
11
|
-
|
14
|
+
pref_label_language: "Es muss ein bevorzugtes Label in der Hauptsprache des Thesaurus vorliegen."
|
data/config/locales/en.yml
CHANGED
@@ -4,8 +4,11 @@ en:
|
|
4
4
|
layouts:
|
5
5
|
sections:
|
6
6
|
concepts: Concepts
|
7
|
+
instance_configuration:
|
8
|
+
settings:
|
9
|
+
languages_further_labelings_Labeling::SKOSXL::AltLabel: Languages for alternative labels
|
7
10
|
models:
|
8
11
|
label:
|
9
12
|
uri: Label URI
|
10
13
|
origin_invalid: Origin contains invalid characters.
|
11
|
-
|
14
|
+
pref_label_language: There must be a prefered label in thesaurus main language.
|
data/iqvoc_skosxl.gemspec
CHANGED
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
|
|
13
13
|
s.license = 'Apache License 2.0'
|
14
14
|
s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'
|
15
15
|
|
16
|
-
s.add_dependency 'iqvoc', '
|
16
|
+
s.add_dependency 'iqvoc', '~> 4.10.0'
|
17
17
|
s.add_development_dependency 'bundler', '~> 1.6'
|
18
18
|
|
19
19
|
s.files = %w(README.md Gemfile Gemfile.lock Rakefile iqvoc_skosxl.gemspec) +
|
data/lib/iqvoc/skosxl/version.rb
CHANGED
@@ -0,0 +1,15 @@
|
|
1
|
+
# namespace :release do
|
2
|
+
# desc 'Builds a new .gem release'
|
3
|
+
# task :build => :environment do
|
4
|
+
# system 'rm iqvoc_skosxl-*.gem'
|
5
|
+
# system 'gem build iqvoc_skosxl.gemspec'
|
6
|
+
# end
|
7
|
+
#
|
8
|
+
# desc 'Builds, tags and pushes a new iqvoc_skosxl release to Rubygems'
|
9
|
+
# task :push => :environment do
|
10
|
+
# Rake::Task['release:build'].invoke
|
11
|
+
# system %(git tag `grep VERSION lib/iqvoc/skosxl/version.rb | sed -e 's/.*= /v/' -e 's/"//g'`)
|
12
|
+
# system 'git push origin master --tags'
|
13
|
+
# system 'gem push iqvoc_skosxl-*.gem'
|
14
|
+
# end
|
15
|
+
# end
|
@@ -35,9 +35,9 @@ class LabelsOrderTest < ActionDispatch::IntegrationTest
|
|
35
35
|
data = JSON.parse(@response.body)
|
36
36
|
|
37
37
|
assert_response :success
|
38
|
-
assert_equal 'aaa', data[0]['name']
|
39
|
-
assert_equal 'abc', data[1]['name']
|
40
|
-
assert_equal 'ABC', data[2]['name'] # XXX: do we care about order of "ABC" vs. "abc"?
|
41
|
-
assert_equal 'bbb', data[3]['name']
|
38
|
+
assert_equal 'aaa (en)', data[0]['name'] # hacky test fix "(en)" will be injected by javascript widget
|
39
|
+
assert_equal 'abc (en)', data[1]['name']
|
40
|
+
assert_equal 'ABC (en)', data[2]['name'] # XXX: do we care about order of "ABC" vs. "abc"?
|
41
|
+
assert_equal 'bbb (en)', data[3]['name']
|
42
42
|
end
|
43
43
|
end
|
data/test/models/label_test.rb
CHANGED
@@ -14,15 +14,13 @@ class LabelTest < ActiveSupport::TestCase
|
|
14
14
|
active: true)
|
15
15
|
end
|
16
16
|
|
17
|
-
test 'should
|
17
|
+
test 'should create two similar labels' do
|
18
18
|
@current_label = Iqvoc::XLLabel.base_class.create(
|
19
19
|
language: 'en', value: 'Forest', published_at: 3.days.ago)
|
20
|
+
|
20
21
|
duplicate = Iqvoc::XLLabel.base_class.new(
|
21
22
|
language: 'en', value: 'Forest')
|
22
23
|
assert duplicate.save
|
23
|
-
refute duplicate.publishable?
|
24
|
-
|
25
|
-
duplicate.value = 'Forest2'
|
26
24
|
assert duplicate.publishable?
|
27
25
|
end
|
28
26
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: iqvoc_skosxl
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.
|
4
|
+
version: 2.8.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert Glaser
|
@@ -10,28 +10,22 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date:
|
13
|
+
date: 2016-05-19 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: iqvoc
|
17
17
|
requirement: !ruby/object:Gem::Requirement
|
18
18
|
requirements:
|
19
|
-
- - ">="
|
20
|
-
- !ruby/object:Gem::Version
|
21
|
-
version: 4.8.0
|
22
19
|
- - "~>"
|
23
20
|
- !ruby/object:Gem::Version
|
24
|
-
version:
|
21
|
+
version: 4.10.0
|
25
22
|
type: :runtime
|
26
23
|
prerelease: false
|
27
24
|
version_requirements: !ruby/object:Gem::Requirement
|
28
25
|
requirements:
|
29
|
-
- - ">="
|
30
|
-
- !ruby/object:Gem::Version
|
31
|
-
version: 4.8.0
|
32
26
|
- - "~>"
|
33
27
|
- !ruby/object:Gem::Version
|
34
|
-
version:
|
28
|
+
version: 4.10.0
|
35
29
|
- !ruby/object:Gem::Dependency
|
36
30
|
name: bundler
|
37
31
|
requirement: !ruby/object:Gem::Requirement
|
@@ -60,7 +54,6 @@ files:
|
|
60
54
|
- Rakefile
|
61
55
|
- app/assets/javascripts/iqvoc_skosxl/manifest.js
|
62
56
|
- app/assets/javascripts/manifest.js
|
63
|
-
- app/assets/stylesheets/iqvoc_skosxl/_entity_select.scss
|
64
57
|
- app/assets/stylesheets/iqvoc_skosxl/_manifest.scss
|
65
58
|
- app/assets/stylesheets/manifest.css.scss
|
66
59
|
- app/controllers/labels/versions_controller.rb
|
@@ -135,6 +128,7 @@ files:
|
|
135
128
|
- lib/iqvoc/skosxl/version.rb
|
136
129
|
- lib/iqvoc/xllabel.rb
|
137
130
|
- lib/iqvoc_skosxl.rb
|
131
|
+
- lib/tasks/release.rake
|
138
132
|
- test/controllers/routing_test.rb
|
139
133
|
- test/fixtures/hobbies.nt
|
140
134
|
- test/integration/concept_label_language_test.rb
|