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
data/app/models/concept/base.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.
|
|
@@ -40,13 +40,16 @@ class Concept::Relation::SKOS::Base < Concept::Relation::Base
|
|
|
40
40
|
end
|
|
41
41
|
end
|
|
42
42
|
|
|
43
|
-
def build_rdf(document, subject)
|
|
43
|
+
def build_rdf(document, subject, suppress_extra_labels = false)
|
|
44
44
|
subject.send(self.rdf_namespace.camelcase).send(self.rdf_predicate, IqRdf.build_uri(target.origin))
|
|
45
45
|
|
|
46
46
|
# Auto-include preferred labels for referenced concepts
|
|
47
|
-
|
|
48
|
-
target.
|
|
49
|
-
|
|
47
|
+
unless suppress_extra_labels
|
|
48
|
+
document << IqRdf::build_uri(target.origin) do |subject|
|
|
49
|
+
target.pref_labelings.each do |labeling|
|
|
50
|
+
subject.skos.send(labeling.rdf_predicate, labeling.target.value.to_s,
|
|
51
|
+
:lang => labeling.target.language)
|
|
52
|
+
end
|
|
50
53
|
end
|
|
51
54
|
end
|
|
52
55
|
end
|
data/app/models/label/base.rb
CHANGED
data/app/models/labeling/base.rb
CHANGED
data/app/models/match/base.rb
CHANGED
data/app/models/notation/base.rb
CHANGED
data/app/models/note/base.rb
CHANGED
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
# encoding: UTF-8
|
|
2
|
+
|
|
3
|
+
# Copyright 2011-2013 innoQ Deutschland GmbH
|
|
4
|
+
#
|
|
5
|
+
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
|
+
# you may not use this file except in compliance with the License.
|
|
7
|
+
# You may obtain a copy of the License at
|
|
8
|
+
#
|
|
9
|
+
# http://www.apache.org/licenses/LICENSE-2.0
|
|
10
|
+
#
|
|
11
|
+
# Unless required by applicable law or agreed to in writing, software
|
|
12
|
+
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
13
|
+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
14
|
+
# See the License for the specific language governing permissions and
|
|
15
|
+
# limitations under the License.
|
|
16
|
+
|
|
17
|
+
class Note::RDFS::SeeAlso < Note::SKOS::Base
|
|
18
|
+
self.rdf_namespace = 'rdfs'
|
|
19
|
+
self.rdf_predicate = 'seeAlso'
|
|
20
|
+
end
|
|
@@ -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.
|
|
@@ -48,19 +48,20 @@ class Note::SKOS::Base < Note::Base
|
|
|
48
48
|
end
|
|
49
49
|
|
|
50
50
|
def build_rdf(document, subject)
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
51
|
+
if annotations.any?
|
|
52
|
+
subject.send(rdf_namespace).build_predicate(rdf_predicate) do |blank_node|
|
|
53
|
+
blank_node.Rdfs::comment(value, :lang => language || nil) if value
|
|
54
|
+
annotations.each do |annotation|
|
|
55
|
+
if IqRdf::Namespace.find_namespace_class(annotation.namespace)
|
|
56
|
+
val = annotation.value =~ Iqvoc::RDFAPI::URI_REGEXP ? URI.parse(annotation.value) : annotation.value
|
|
57
|
+
blank_node.send(annotation.namespace.camelcase).send(annotation.predicate, val, :lang => annotation.language || nil)
|
|
58
|
+
else
|
|
59
|
+
raise "#{self.class}#build_rdf: can't find namespace '#{annotation.namespace}' for note annotation '#{annotation.id}'."
|
|
60
|
+
end
|
|
61
|
+
end
|
|
62
|
+
end
|
|
62
63
|
else
|
|
63
|
-
|
|
64
|
+
subject.send(rdf_namespace).send(rdf_predicate, value, :lang => language)
|
|
64
65
|
end
|
|
65
66
|
end
|
|
66
67
|
|
data/app/models/user.rb
CHANGED