iqvoc 4.1.0 → 4.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/Gemfile +3 -3
- data/Gemfile.lock +7 -5
- data/LICENSE +1 -1
- data/README.md +1 -1
- data/Rakefile +1 -1
- data/app/controllers/application_controller.rb +1 -1
- data/app/controllers/collections_controller.rb +1 -1
- data/app/controllers/concepts/alphabetical_controller.rb +1 -1
- data/app/controllers/concepts/expired_controller.rb +1 -1
- data/app/controllers/concepts/hierarchical_controller.rb +3 -14
- data/app/controllers/concepts/scheme_controller.rb +1 -1
- data/app/controllers/concepts/untranslated_controller.rb +1 -1
- data/app/controllers/concepts/versions_controller.rb +1 -1
- data/app/controllers/concepts_controller.rb +1 -1
- data/app/controllers/dashboard_controller.rb +1 -1
- data/app/controllers/frontpage_controller.rb +1 -1
- data/app/controllers/hierarchy_controller.rb +3 -3
- data/app/controllers/import_controller.rb +1 -1
- data/app/controllers/instance_configuration_controller.rb +1 -1
- data/app/controllers/pages_controller.rb +1 -1
- data/app/controllers/rdf_controller.rb +1 -1
- data/app/controllers/search_results_controller.rb +1 -1
- data/app/controllers/triplestore_sync_controller.rb +1 -1
- data/app/controllers/user_sessions_controller.rb +1 -1
- data/app/controllers/users_controller.rb +1 -1
- data/app/helpers/application_helper.rb +1 -1
- data/app/helpers/concepts_helper.rb +2 -3
- data/app/helpers/dashboard_helper.rb +1 -1
- data/app/helpers/rdf_helper.rb +3 -3
- data/app/helpers/search_results_helper.rb +1 -1
- data/app/models/collection/base.rb +1 -1
- data/app/models/collection/member/base.rb +1 -1
- data/app/models/collection/skos/unordered.rb +1 -1
- data/app/models/collection/unordered.rb +1 -1
- data/app/models/concept/base.rb +1 -1
- data/app/models/concept/relation/base.rb +1 -1
- data/app/models/concept/relation/reverse_relation_extension.rb +1 -1
- data/app/models/concept/relation/skos/base.rb +8 -5
- data/app/models/concept/relation/skos/broader/base.rb +1 -1
- data/app/models/concept/relation/skos/broader/mono.rb +1 -1
- data/app/models/concept/relation/skos/broader/poly.rb +1 -1
- data/app/models/concept/relation/skos/narrower/base.rb +1 -1
- data/app/models/concept/relation/skos/related.rb +1 -1
- data/app/models/concept/skos/base.rb +1 -1
- data/app/models/concept/skos/scheme.rb +1 -1
- data/app/models/configuration_setting.rb +1 -1
- data/app/models/label/base.rb +1 -1
- data/app/models/label/skos/base.rb +1 -1
- data/app/models/labeling/base.rb +1 -1
- data/app/models/labeling/skos/alt_label.rb +1 -1
- data/app/models/labeling/skos/base.rb +1 -1
- data/app/models/labeling/skos/hidden_label.rb +1 -1
- data/app/models/labeling/skos/pref_label.rb +1 -1
- data/app/models/match/base.rb +1 -1
- data/app/models/match/skos/base.rb +1 -1
- data/app/models/match/skos/broad_match.rb +1 -1
- data/app/models/match/skos/close_match.rb +1 -1
- data/app/models/match/skos/exact_match.rb +1 -1
- data/app/models/match/skos/mapping_relation.rb +1 -1
- data/app/models/match/skos/narrow_match.rb +1 -1
- data/app/models/match/skos/related_match.rb +1 -1
- data/app/models/notation/base.rb +1 -1
- data/app/models/note/annotated/base.rb +1 -1
- data/app/models/note/base.rb +1 -1
- data/app/models/note/rdfs/see_also.rb +20 -0
- data/app/models/note/skos/base.rb +14 -13
- data/app/models/note/skos/change_note.rb +1 -1
- data/app/models/note/skos/definition.rb +1 -1
- data/app/models/note/skos/editorial_note.rb +1 -1
- data/app/models/note/skos/example.rb +1 -1
- data/app/models/note/skos/history_note.rb +1 -1
- data/app/models/note/skos/scope_note.rb +1 -1
- data/app/models/search_extension.rb +1 -1
- data/app/models/user.rb +1 -1
- data/app/models/user_session.rb +1 -1
- data/app/views/concepts/hierarchical/_treeview.html.erb +8 -10
- data/app/views/concepts/hierarchical/index.json.jbuilder +15 -0
- data/app/views/concepts/index.iqrdf +1 -1
- data/config/application.rb +1 -1
- data/config/boot.rb +1 -1
- data/config/environment.rb +1 -1
- data/config/environments/development.rb +1 -1
- data/config/environments/heroku.rb +1 -1
- data/config/environments/production.rb +1 -1
- data/config/environments/test.rb +1 -1
- data/config/initializers/action_view.rb +1 -1
- data/config/initializers/active_record.rb +1 -1
- data/config/initializers/backtrace_silencers.rb +1 -1
- data/config/initializers/heroku.rb +1 -1
- data/config/initializers/inflections.rb +1 -1
- data/config/initializers/iqvoc.rb +1 -1
- data/config/initializers/jdbc.rb +1 -1
- data/config/initializers/mime_types.rb +1 -1
- data/config/initializers/secret_token.rb.template +1 -1
- data/config/initializers/secret_token_configurator.rb +1 -1
- data/config/initializers/session_store.rb +1 -1
- data/config/locales/activerecord.de.yml +1 -1
- data/config/locales/activerecord.en.yml +1 -1
- data/config/locales/activerecord.pt.yml +1 -1
- data/config/locales/authlogic.de.yml +1 -1
- data/config/locales/authlogic.en.yml +1 -1
- data/config/locales/authlogic.pt.yml +1 -1
- data/config/locales/de.yml +12 -12
- data/config/locales/defaults.de.yml +1 -1
- data/config/locales/en.yml +11 -11
- data/config/locales/pt.yml +1 -1
- data/config/routes.rb +2 -2
- data/config/warble.rb +1 -1
- data/db/migrate/20100927101502_create_schema.rb +1 -1
- data/db/migrate/20101125141218_add_collection_tables.rb +1 -1
- data/db/migrate/20101129161528_add_type_to_collections.rb +1 -1
- data/db/migrate/20101202094602_add_origin_to_collections.rb +1 -1
- data/db/migrate/20101202135420_rename_collection_contents_to_collection_members.rb +1 -1
- data/db/migrate/20101208103531_add_type_to_collection_contents.rb +1 -1
- data/db/migrate/20101210153916_add_indexes_to_collections.rb +1 -1
- data/db/migrate/20110204121244_create_collection_labels.rb +1 -1
- data/db/migrate/20110208084250_change_origin_lengths.rb +1 -1
- data/db/migrate/20110328124300_discard_collection_specifics.rb +1 -1
- data/db/migrate/20130418093837_add_language_to_note_annotations.rb +5 -0
- data/db/schema.rb +2 -1
- data/db/seeds.rb +1 -1
- data/iqvoc.gemspec +1 -0
- data/lib/iqvoc.rb +1 -1
- data/lib/iqvoc/configuration/core.rb +2 -2
- data/lib/iqvoc/deep_cloning.rb +1 -1
- data/lib/iqvoc/inline_data_helper.rb +1 -1
- data/lib/iqvoc/instance_configuration.rb +7 -6
- data/lib/iqvoc/origin.rb +1 -1
- data/lib/iqvoc/rdfapi.rb +3 -1
- data/lib/iqvoc/version.rb +2 -2
- data/lib/iqvoc/versioning.rb +1 -1
- data/lib/string.rb +1 -1
- data/test/factories.rb +1 -1
- data/test/functional/hierarchy_test.rb +1 -2
- data/test/functional/rdf_test.rb +98 -0
- data/test/integration/alphabetical_test.rb +1 -1
- data/test/integration/authentication_test.rb +1 -1
- data/test/integration/browse_concepts_and_labels_test.rb +1 -1
- data/test/integration/client_augmentation_test.rb +1 -1
- data/test/integration/client_edit_concept_test.rb +1 -1
- data/test/integration/collection_circularity_test.rb +1 -1
- data/test/integration/concept_scheme_test.rb +1 -1
- data/test/integration/concept_test.rb +1 -1
- data/test/integration/edit_concepts_test.rb +1 -1
- data/test/integration/instance_configuration_test.rb +1 -1
- data/test/integration/note_annotations_test.rb +27 -1
- data/test/integration/search_test.rb +1 -1
- data/test/integration/tree_test.rb +1 -1
- data/test/integration/untranslated_test.rb +1 -1
- data/test/integration_test_helper.rb +1 -1
- data/test/performance/browsing_test.rb +1 -1
- data/test/test_helper.rb +6 -12
- data/test/unit/concept_scheme_test.rb +1 -1
- data/test/unit/concept_test.rb +1 -1
- data/test/unit/hygiene_test.rb +2 -2
- data/test/unit/inline_data_test.rb +1 -1
- data/test/unit/instance_configuration_test.rb +1 -1
- data/test/unit/note_test.rb +1 -1
- data/test/unit/origin_test.rb +1 -1
- data/test/unit/rdf_sync_test.rb +1 -1
- data/test/unit/skos_import_test.rb +1 -1
- metadata +21 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1e2d49b763b438c0af1ef7b6c84b7c703f0a7710
|
|
4
|
+
data.tar.gz: 6b33d6fef2694cb17b3896e6ec6dff382f95d63a
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: eb47c5803045f513ed1568c3a7c86ef44f7dde8aba215d169442f3be32cb4c94bbc10db6471451f1195e91ad61713d37aa1a281ba613e20dcc549bc93096390d
|
|
7
|
+
data.tar.gz: 024a5aae4e2f017f1c78374ef5369e84aa3468cd09dfbec1ecd63c9bfcba3ef0cf0aa049e4b305c4947fe3c6b2cde97142de0b5498f9c8909ee262c2d8e71437
|
data/CHANGELOG.md
CHANGED
data/Gemfile
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# encoding: UTF-8
|
|
2
2
|
|
|
3
|
-
# Copyright 2011 innoQ Deutschland GmbH
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
4
|
#
|
|
5
5
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
# you may not use this file except in compliance with the License.
|
|
@@ -36,6 +36,7 @@ gem 'json'
|
|
|
36
36
|
gem 'rails_autolink'
|
|
37
37
|
gem 'jruby-openssl', :platforms => :jruby
|
|
38
38
|
gem 'simple_form'
|
|
39
|
+
gem 'jbuilder'
|
|
39
40
|
|
|
40
41
|
group :development do
|
|
41
42
|
gem 'heroku'
|
|
@@ -51,6 +52,7 @@ group :development, :test do
|
|
|
51
52
|
gem 'mysql2'
|
|
52
53
|
gem 'sqlite3'
|
|
53
54
|
|
|
55
|
+
gem 'zeus'
|
|
54
56
|
gem 'pry'
|
|
55
57
|
gem 'pry-rails'
|
|
56
58
|
gem 'pry-debugger'
|
|
@@ -72,8 +74,6 @@ group :test do
|
|
|
72
74
|
gem 'capybara-webkit', '~> 0.14.2'
|
|
73
75
|
gem 'database_cleaner'
|
|
74
76
|
gem 'factory_girl_rails'
|
|
75
|
-
gem 'spork'
|
|
76
|
-
gem 'spork-testunit'
|
|
77
77
|
gem 'turn'
|
|
78
78
|
gem 'minitest'
|
|
79
79
|
gem 'webmock'
|
data/Gemfile.lock
CHANGED
|
@@ -106,6 +106,9 @@ GEM
|
|
|
106
106
|
builder
|
|
107
107
|
bundler
|
|
108
108
|
iq_triplestorage (0.2.2)
|
|
109
|
+
jbuilder (1.3.0)
|
|
110
|
+
activesupport (>= 3.0.0)
|
|
111
|
+
multi_json (>= 1.2.0)
|
|
109
112
|
jdbc-mysql (5.1.13)
|
|
110
113
|
jdbc-sqlite3 (3.7.2)
|
|
111
114
|
journey (1.0.4)
|
|
@@ -195,9 +198,6 @@ GEM
|
|
|
195
198
|
activemodel (~> 3.0)
|
|
196
199
|
slop (3.3.3)
|
|
197
200
|
spoon (0.0.1)
|
|
198
|
-
spork (0.9.2)
|
|
199
|
-
spork-testunit (0.0.8)
|
|
200
|
-
spork (>= 0.6.0)
|
|
201
201
|
sprockets (2.2.2)
|
|
202
202
|
hike (~> 1.2)
|
|
203
203
|
multi_json (~> 1.0)
|
|
@@ -226,6 +226,8 @@ GEM
|
|
|
226
226
|
websocket (1.0.7)
|
|
227
227
|
xpath (1.0.0)
|
|
228
228
|
nokogiri (~> 1.3)
|
|
229
|
+
zeus (0.13.3)
|
|
230
|
+
method_source (>= 0.6.7)
|
|
229
231
|
|
|
230
232
|
PLATFORMS
|
|
231
233
|
java
|
|
@@ -249,6 +251,7 @@ DEPENDENCIES
|
|
|
249
251
|
hirb-unicode
|
|
250
252
|
iq_rdf
|
|
251
253
|
iq_triplestorage
|
|
254
|
+
jbuilder
|
|
252
255
|
jruby-openssl
|
|
253
256
|
json
|
|
254
257
|
kaminari
|
|
@@ -264,11 +267,10 @@ DEPENDENCIES
|
|
|
264
267
|
rails_autolink
|
|
265
268
|
sass-rails (~> 3.2.5)
|
|
266
269
|
simple_form
|
|
267
|
-
spork
|
|
268
|
-
spork-testunit
|
|
269
270
|
sqlite3
|
|
270
271
|
therubyracer
|
|
271
272
|
turn
|
|
272
273
|
uglifier (>= 1.0.3)
|
|
273
274
|
view_marker
|
|
274
275
|
webmock
|
|
276
|
+
zeus
|
data/LICENSE
CHANGED
data/README.md
CHANGED
data/Rakefile
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# encoding: UTF-8
|
|
2
2
|
|
|
3
|
-
# Copyright 2011 innoQ Deutschland GmbH
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
4
|
#
|
|
5
5
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
# you may not use this file except in compliance with the License.
|
|
@@ -22,7 +22,7 @@ class Concepts::HierarchicalController < ConceptsController
|
|
|
22
22
|
scope = Iqvoc::Concept.base_class
|
|
23
23
|
scope = params[:published] == "0" ? scope.editor_selectable : scope.published
|
|
24
24
|
|
|
25
|
-
#
|
|
25
|
+
# only select unexpired concepts
|
|
26
26
|
scope = scope.not_expired
|
|
27
27
|
|
|
28
28
|
# if params[:broader] is given, the action is handling the reversed tree
|
|
@@ -54,18 +54,7 @@ class Concepts::HierarchicalController < ConceptsController
|
|
|
54
54
|
|
|
55
55
|
respond_to do |format|
|
|
56
56
|
format.html
|
|
57
|
-
format.json
|
|
58
|
-
@concepts.map! do |c|
|
|
59
|
-
{
|
|
60
|
-
:id => c.id,
|
|
61
|
-
:url => concept_path(:id => c, :format => :html),
|
|
62
|
-
:text => CGI.escapeHTML(c.pref_label.to_s),
|
|
63
|
-
:hasChildren => (params[:broader] ? c.broader_relations.any? : c.narrower_relations.any?),
|
|
64
|
-
:additionalText => (" (#{c.additional_info})" if c.additional_info.present?)
|
|
65
|
-
}
|
|
66
|
-
end
|
|
67
|
-
render :json => @concepts.to_json
|
|
68
|
-
end
|
|
57
|
+
format.json # Treeview data
|
|
69
58
|
end
|
|
70
59
|
end
|
|
71
60
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# encoding: UTF-8
|
|
2
2
|
|
|
3
|
-
# Copyright 2011 innoQ Deutschland GmbH
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
4
|
#
|
|
5
5
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
# you may not use this file except in compliance with the License.
|
|
@@ -78,8 +78,8 @@ class HierarchyController < ApplicationController
|
|
|
78
78
|
|
|
79
79
|
# returns a hash of concept/relations pairs of arbitrary nesting depth
|
|
80
80
|
# NB: recursive, triggering one database query per iteration
|
|
81
|
-
def populate_hierarchy(root_concept, scope, max_depth, current_depth=0,
|
|
82
|
-
include_siblings=false)
|
|
81
|
+
def populate_hierarchy(root_concept, scope, max_depth, current_depth = 0,
|
|
82
|
+
include_siblings = false)
|
|
83
83
|
current_depth += 1
|
|
84
84
|
return {} if current_depth > max_depth
|
|
85
85
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# encoding: UTF-8
|
|
2
2
|
|
|
3
|
-
# Copyright 2011 innoQ Deutschland GmbH
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
4
|
#
|
|
5
5
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
# you may not use this file except in compliance with the License.
|
|
@@ -18,8 +18,7 @@ module ConceptsHelper
|
|
|
18
18
|
|
|
19
19
|
# if `broader` is supplied, the tree's direction is reversed (descendants represent broader relations)
|
|
20
20
|
def treeview(concepts, broader = false)
|
|
21
|
-
render
|
|
22
|
-
:locals => { :concepts => concepts, :broader => broader }
|
|
21
|
+
render "concepts/hierarchical/treeview", :concepts => concepts, :broader => broader
|
|
23
22
|
end
|
|
24
23
|
|
|
25
24
|
# turns a hash of concept/relations pairs of arbitrary nesting depth into the
|
data/app/helpers/rdf_helper.rb
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# encoding: UTF-8
|
|
2
2
|
|
|
3
|
-
# Copyright 2011 innoQ Deutschland GmbH
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
4
|
#
|
|
5
5
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
6
|
# you may not use this file except in compliance with the License.
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
module RdfHelper
|
|
18
18
|
|
|
19
|
-
def render_concept(document, concept)
|
|
19
|
+
def render_concept(document, concept, suppress_extra_labels = false)
|
|
20
20
|
|
|
21
21
|
# You can not eager load polymorphic associations. That's why we're loading
|
|
22
22
|
# the collections _one_ time and remember them for further _render_concept_
|
|
@@ -44,7 +44,7 @@ module RdfHelper
|
|
|
44
44
|
end
|
|
45
45
|
|
|
46
46
|
concept.relations.each do |relation|
|
|
47
|
-
relation.build_rdf(document, c)
|
|
47
|
+
relation.build_rdf(document, c, suppress_extra_labels)
|
|
48
48
|
end
|
|
49
49
|
|
|
50
50
|
concept.notes.each do |note|
|