iqvoc_skosxl 1.1.4 → 1.2.0
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +3 -3
- data/Gemfile.lock +53 -55
- data/app/models/concept/skosxl/extension.rb +7 -11
- data/app/models/label/relation/base.rb +1 -1
- data/config/environments/development.rb +4 -50
- data/config/environments/production.rb +4 -60
- data/config/environments/test.rb +5 -40
- data/config/initializers/secret_token.rb +9 -0
- data/db/schema.rb +10 -4
- data/iqvoc_skosxl.gemspec +1 -1
- data/lib/iqvoc/skosxl/version.rb +1 -1
- data/lib/iqvoc/xllabel.rb +2 -2
- data/lib/iqvoc_skosxl.rb +10 -4
- data/test/integration/concept_label_language_test.rb +3 -3
- data/test/integration/dashboard_test.rb +0 -1
- data/test/integration/edit_labels_test.rb +0 -1
- data/test/test_helper.rb +0 -2
- metadata +9 -8
data/Gemfile
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
source "http://rubygems.org"
|
2
2
|
|
3
|
-
gem 'rails', '3.1
|
4
|
-
gem 'iqvoc', '~> 3.
|
3
|
+
gem 'rails', '3.2.1'
|
4
|
+
gem 'iqvoc', '~> 3.5.1' #, :path => '../iqvoc'
|
5
5
|
|
6
6
|
group :development do
|
7
7
|
gem 'awesome_print'
|
8
8
|
end
|
9
9
|
|
10
10
|
group :assets do
|
11
|
-
gem 'uglifier'
|
11
|
+
gem 'uglifier', '>= 1.0.3'
|
12
12
|
end
|
13
13
|
|
14
14
|
group :development, :test do
|
data/Gemfile.lock
CHANGED
@@ -1,35 +1,34 @@
|
|
1
1
|
GEM
|
2
2
|
remote: http://rubygems.org/
|
3
3
|
specs:
|
4
|
-
actionmailer (3.1
|
5
|
-
actionpack (= 3.1
|
6
|
-
mail (~> 2.
|
7
|
-
actionpack (3.1
|
8
|
-
activemodel (= 3.1
|
9
|
-
activesupport (= 3.1
|
4
|
+
actionmailer (3.2.1)
|
5
|
+
actionpack (= 3.2.1)
|
6
|
+
mail (~> 2.4.0)
|
7
|
+
actionpack (3.2.1)
|
8
|
+
activemodel (= 3.2.1)
|
9
|
+
activesupport (= 3.2.1)
|
10
10
|
builder (~> 3.0.0)
|
11
11
|
erubis (~> 2.7.0)
|
12
|
-
|
13
|
-
rack (~> 1.
|
12
|
+
journey (~> 1.0.1)
|
13
|
+
rack (~> 1.4.0)
|
14
14
|
rack-cache (~> 1.1)
|
15
|
-
rack-mount (~> 0.8.2)
|
16
15
|
rack-test (~> 0.6.1)
|
17
|
-
sprockets (~> 2.
|
18
|
-
activemodel (3.1
|
19
|
-
activesupport (= 3.1
|
16
|
+
sprockets (~> 2.1.2)
|
17
|
+
activemodel (3.2.1)
|
18
|
+
activesupport (= 3.2.1)
|
20
19
|
builder (~> 3.0.0)
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
arel (~> 2.2.1)
|
20
|
+
activerecord (3.2.1)
|
21
|
+
activemodel (= 3.2.1)
|
22
|
+
activesupport (= 3.2.1)
|
23
|
+
arel (~> 3.0.0)
|
26
24
|
tzinfo (~> 0.3.29)
|
27
|
-
activeresource (3.1
|
28
|
-
activemodel (= 3.1
|
29
|
-
activesupport (= 3.1
|
30
|
-
activesupport (3.1
|
25
|
+
activeresource (3.2.1)
|
26
|
+
activemodel (= 3.2.1)
|
27
|
+
activesupport (= 3.2.1)
|
28
|
+
activesupport (3.2.1)
|
29
|
+
i18n (~> 0.6)
|
31
30
|
multi_json (~> 1.0)
|
32
|
-
arel (
|
31
|
+
arel (3.0.0)
|
33
32
|
authlogic (3.1.0)
|
34
33
|
activerecord (>= 3.0.7)
|
35
34
|
activerecord (>= 3.0.7)
|
@@ -43,38 +42,39 @@ GEM
|
|
43
42
|
rack-test (>= 0.5.4)
|
44
43
|
selenium-webdriver (~> 2.0)
|
45
44
|
xpath (~> 0.1.4)
|
46
|
-
childprocess (0.
|
45
|
+
childprocess (0.3.0)
|
47
46
|
ffi (~> 1.0.6)
|
48
|
-
database_cleaner (0.7.
|
47
|
+
database_cleaner (0.7.1)
|
49
48
|
erubis (2.7.0)
|
50
|
-
execjs (1.
|
49
|
+
execjs (1.3.0)
|
51
50
|
multi_json (~> 1.0)
|
52
|
-
factory_girl (2.
|
51
|
+
factory_girl (2.5.0)
|
53
52
|
activesupport
|
54
|
-
factory_girl_rails (1.
|
55
|
-
factory_girl (~> 2.
|
53
|
+
factory_girl_rails (1.6.0)
|
54
|
+
factory_girl (~> 2.5.0)
|
56
55
|
railties (>= 3.0.0)
|
57
56
|
ffi (1.0.11)
|
58
57
|
hike (1.2.1)
|
59
58
|
i18n (0.6.0)
|
60
|
-
iq_rdf (0.1.
|
59
|
+
iq_rdf (0.1.2)
|
61
60
|
builder
|
62
61
|
bundler
|
63
|
-
iqvoc (3.
|
62
|
+
iqvoc (3.5.1)
|
64
63
|
authlogic
|
65
64
|
bundler
|
66
65
|
cancan
|
67
|
-
iq_rdf (~> 0.1.
|
66
|
+
iq_rdf (~> 0.1.2)
|
68
67
|
json
|
69
68
|
kaminari
|
70
|
-
rails (~> 3.1
|
69
|
+
rails (~> 3.2.1)
|
71
70
|
rails_autolink
|
72
|
-
|
71
|
+
journey (1.0.1)
|
72
|
+
json (1.6.5)
|
73
73
|
kaminari (0.13.0)
|
74
74
|
actionpack (>= 3.0.0)
|
75
75
|
activesupport (>= 3.0.0)
|
76
76
|
railties (>= 3.0.0)
|
77
|
-
mail (2.
|
77
|
+
mail (2.4.1)
|
78
78
|
i18n (>= 0.4.0)
|
79
79
|
mime-types (~> 1.16)
|
80
80
|
treetop (~> 1.4.8)
|
@@ -83,28 +83,26 @@ GEM
|
|
83
83
|
mysql2 (0.3.11)
|
84
84
|
nokogiri (1.5.0)
|
85
85
|
polyglot (0.3.3)
|
86
|
-
rack (1.
|
86
|
+
rack (1.4.1)
|
87
87
|
rack-cache (1.1)
|
88
88
|
rack (>= 0.4)
|
89
|
-
rack-mount (0.8.3)
|
90
|
-
rack (>= 1.0.0)
|
91
89
|
rack-ssl (1.3.2)
|
92
90
|
rack
|
93
91
|
rack-test (0.6.1)
|
94
92
|
rack (>= 1.0)
|
95
|
-
rails (3.1
|
96
|
-
actionmailer (= 3.1
|
97
|
-
actionpack (= 3.1
|
98
|
-
activerecord (= 3.1
|
99
|
-
activeresource (= 3.1
|
100
|
-
activesupport (= 3.1
|
93
|
+
rails (3.2.1)
|
94
|
+
actionmailer (= 3.2.1)
|
95
|
+
actionpack (= 3.2.1)
|
96
|
+
activerecord (= 3.2.1)
|
97
|
+
activeresource (= 3.2.1)
|
98
|
+
activesupport (= 3.2.1)
|
101
99
|
bundler (~> 1.0)
|
102
|
-
railties (= 3.1
|
103
|
-
rails_autolink (1.0.
|
104
|
-
rails (
|
105
|
-
railties (3.1
|
106
|
-
actionpack (= 3.1
|
107
|
-
activesupport (= 3.1
|
100
|
+
railties (= 3.2.1)
|
101
|
+
rails_autolink (1.0.5)
|
102
|
+
rails (~> 3.1)
|
103
|
+
railties (3.2.1)
|
104
|
+
actionpack (= 3.2.1)
|
105
|
+
activesupport (= 3.2.1)
|
108
106
|
rack-ssl (~> 1.3.2)
|
109
107
|
rake (>= 0.8.7)
|
110
108
|
rdoc (~> 3.4)
|
@@ -113,12 +111,12 @@ GEM
|
|
113
111
|
rdoc (3.12)
|
114
112
|
json (~> 1.4)
|
115
113
|
rubyzip (0.9.5)
|
116
|
-
selenium-webdriver (2.
|
114
|
+
selenium-webdriver (2.18.0)
|
117
115
|
childprocess (>= 0.2.5)
|
118
116
|
ffi (~> 1.0.9)
|
119
117
|
multi_json (~> 1.0.4)
|
120
118
|
rubyzip
|
121
|
-
sprockets (2.
|
119
|
+
sprockets (2.1.2)
|
122
120
|
hike (~> 1.2)
|
123
121
|
rack (~> 1.0)
|
124
122
|
tilt (~> 1.1, != 1.3.0)
|
@@ -129,7 +127,7 @@ GEM
|
|
129
127
|
polyglot
|
130
128
|
polyglot (>= 0.3.1)
|
131
129
|
tzinfo (0.3.31)
|
132
|
-
uglifier (1.2.
|
130
|
+
uglifier (1.2.3)
|
133
131
|
execjs (>= 0.3.0)
|
134
132
|
multi_json (>= 1.0.2)
|
135
133
|
xpath (0.1.4)
|
@@ -146,9 +144,9 @@ DEPENDENCIES
|
|
146
144
|
capybara
|
147
145
|
database_cleaner
|
148
146
|
factory_girl_rails
|
149
|
-
iqvoc (~> 3.
|
147
|
+
iqvoc (~> 3.5.1)
|
150
148
|
mysql2
|
151
149
|
nokogiri (~> 1.5.0)
|
152
|
-
rails (= 3.1
|
150
|
+
rails (= 3.2.1)
|
153
151
|
sqlite3
|
154
|
-
uglifier
|
152
|
+
uglifier (>= 1.0.3)
|
@@ -43,18 +43,14 @@ module Concept
|
|
43
43
|
|
44
44
|
end
|
45
45
|
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
@labelings_by_id = hash
|
50
|
-
end
|
51
|
-
|
52
|
-
def labelings_by_id(relation_name, language)
|
53
|
-
(@labelings_by_id && @labelings_by_id[relation_name] && @labelings_by_id[relation_name][language]) ||
|
54
|
-
self.send(relation_name).by_label_language(language).
|
55
|
-
map { |l| l.target.origin }.join(Iqvoc::InlineDataHelper::Joiner)
|
56
|
-
end
|
46
|
+
def labelings_by_id=(hash)
|
47
|
+
@labelings_by_id = hash
|
48
|
+
end
|
57
49
|
|
50
|
+
def labelings_by_id(relation_name, language)
|
51
|
+
(@labelings_by_id && @labelings_by_id[relation_name] && @labelings_by_id[relation_name][language]) ||
|
52
|
+
self.send(relation_name).by_label_language(language).
|
53
|
+
map { |l| l.target.origin }.join(Iqvoc::InlineDataHelper::Joiner)
|
58
54
|
end
|
59
55
|
|
60
56
|
end
|
@@ -4,7 +4,7 @@ class Label::Relation::Base < ActiveRecord::Base
|
|
4
4
|
self.rdf_namespace = nil
|
5
5
|
self.rdf_predicate = nil
|
6
6
|
|
7
|
-
|
7
|
+
self.table_name ='label_relations'
|
8
8
|
|
9
9
|
belongs_to :domain, :class_name => "Label::Base"
|
10
10
|
belongs_to :range, :class_name => "Label::Base"
|
@@ -1,55 +1,9 @@
|
|
1
|
+
require 'debug'
|
2
|
+
require 'iqvoc/environments/development'
|
3
|
+
|
1
4
|
if Iqvoc::SKOSXL.const_defined?(:Application)
|
2
5
|
Iqvoc::SKOSXL::Application.configure do
|
3
6
|
# Settings specified here will take precedence over those in config/environment.rb
|
4
|
-
|
5
|
-
# In the development environment your application's code is reloaded on
|
6
|
-
# every request. This slows down response time but is perfect for development
|
7
|
-
# since you don't have to restart the webserver when you make code changes.
|
8
|
-
config.cache_classes = false
|
9
|
-
|
10
|
-
# Log error messages when you accidentally call methods on nil.
|
11
|
-
config.whiny_nils = true
|
12
|
-
|
13
|
-
# Show full error reports and disable caching
|
14
|
-
config.consider_all_requests_local = true
|
15
|
-
config.action_controller.perform_caching = false
|
16
|
-
|
17
|
-
# Don't care if the mailer can't send
|
18
|
-
config.action_mailer.raise_delivery_errors = false
|
19
|
-
|
20
|
-
# Print deprecation notices to the Rails logger
|
21
|
-
config.active_support.deprecation = :log
|
22
|
-
|
23
|
-
# Only use best-standards-support built into browsers
|
24
|
-
config.action_dispatch.best_standards_support = :builtin
|
25
|
-
|
26
|
-
# Do not compress assets
|
27
|
-
config.assets.compress = false
|
28
|
-
|
29
|
-
# Expands the lines which load the assets
|
30
|
-
config.assets.debug = true
|
31
|
-
|
32
|
-
# The default URI prefix for RDF data. This will be followed by a document
|
33
|
-
# specific shnippet like (specimenType) and the id.
|
34
|
-
|
35
|
-
# The JDBC driver url for the coinnection to the virtuoso triple store.
|
36
|
-
# Login crdentials have to be stored here too. See
|
37
|
-
# http://docs.openlinksw.com/virtuoso/VirtuosoDriverJDBC.html#jdbcurl4mat for
|
38
|
-
# more details.
|
39
|
-
# Example: "jdbc:virtuoso://localhost:1111/UID=dba/PWD=dba"
|
40
|
-
# Use nil to disable virtuoso triple synchronization
|
41
|
-
# Rails.application.config.virtuoso_jdbc_driver_url = "jdbc:virtuoso://virtuoso.dyndns.org:1111/UID=iqvoc/PWD=vocpass!/charset=UTF-8"
|
42
|
-
config.virtuoso_jdbc_driver_url = nil
|
43
|
-
|
44
|
-
# Set up the virtuoso synchronization (which is a triggered pull from the
|
45
|
-
# virtuoso server) to be run in a new thread.
|
46
|
-
# This is needed in environments where the webserver only runs in a single
|
47
|
-
# process/thread (mostly in development environments).
|
48
|
-
# When a synchronizaion would be triggered e.g. from a running
|
49
|
-
# update action in the UPB, the update would trigger virtuoso to do a HTTP GET
|
50
|
-
# back to the UPB to fetch the RDF data. But the only process in the UPB would be
|
51
|
-
# blocked by the update... => Deadlock. You can avoid this by using the threaded
|
52
|
-
# mode.
|
53
|
-
config.virtuoso_sync_threaded = false
|
7
|
+
Iqvoc::Environments.setup_development(config)
|
54
8
|
end
|
55
9
|
end
|
@@ -1,64 +1,8 @@
|
|
1
|
-
|
1
|
+
require 'iqvoc/environments/production'
|
2
|
+
|
3
|
+
if Iqvoc::SKOSXL.const_defined?(:Application)
|
2
4
|
Iqvoc::SKOSXL::Application.configure do
|
3
5
|
# Settings specified here will take precedence over those in config/environment.rb
|
4
|
-
|
5
|
-
# The production environment is meant for finished, "live" apps.
|
6
|
-
# Code is not reloaded between requests
|
7
|
-
config.cache_classes = true
|
8
|
-
|
9
|
-
# Full error reports are disabled and caching is turned on
|
10
|
-
config.consider_all_requests_local = false
|
11
|
-
config.action_controller.perform_caching = true
|
12
|
-
|
13
|
-
# Specifies the header that your server uses for sending files
|
14
|
-
config.action_dispatch.x_sendfile_header = "X-Sendfile"
|
15
|
-
|
16
|
-
# For nginx:
|
17
|
-
# config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
|
18
|
-
|
19
|
-
# If you have no front-end server that supports something like X-Sendfile,
|
20
|
-
# just comment this out and Rails will serve the files
|
21
|
-
|
22
|
-
# See everything in the log (default is :info)
|
23
|
-
# config.log_level = :debug
|
24
|
-
|
25
|
-
# Use a different logger for distributed setups
|
26
|
-
# config.logger = SyslogLogger.new
|
27
|
-
|
28
|
-
# Use a different cache store in production
|
29
|
-
# config.cache_store = :mem_cache_store
|
30
|
-
|
31
|
-
# Disable Rails's static asset server
|
32
|
-
# In production, Apache or nginx will already do this
|
33
|
-
config.serve_static_assets = false
|
34
|
-
|
35
|
-
# Disable Rails's static asset server
|
36
|
-
# In production, Apache or nginx will already do this
|
37
|
-
config.serve_static_assets = false
|
38
|
-
|
39
|
-
# Compress JavaScripts and CSS
|
40
|
-
config.assets.compress = true
|
41
|
-
|
42
|
-
# Don't fallback to assets pipeline if a precompiled asset is missed
|
43
|
-
config.assets.compile = false
|
44
|
-
|
45
|
-
# Generate digests for assets URLs
|
46
|
-
config.assets.digest = true
|
47
|
-
|
48
|
-
# Enable serving of images, stylesheets, and javascripts from an asset server
|
49
|
-
# config.action_controller.asset_host = "http://assets.example.com"
|
50
|
-
|
51
|
-
# Disable delivery errors, bad email addresses will be ignored
|
52
|
-
# config.action_mailer.raise_delivery_errors = false
|
53
|
-
|
54
|
-
# Enable threaded mode
|
55
|
-
# config.threadsafe!
|
56
|
-
|
57
|
-
# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
|
58
|
-
# the I18n.default_locale when a translation can not be found)
|
59
|
-
config.i18n.fallbacks = true
|
60
|
-
|
61
|
-
# Send deprecation notices to registered listeners
|
62
|
-
config.active_support.deprecation = :notify
|
6
|
+
Iqvoc::Environments.setup_production(config)
|
63
7
|
end
|
64
8
|
end
|
data/config/environments/test.rb
CHANGED
@@ -1,44 +1,9 @@
|
|
1
|
-
|
1
|
+
require 'debug'
|
2
|
+
require 'iqvoc/environments/test'
|
3
|
+
|
4
|
+
if Iqvoc::SKOSXL.const_defined?(:Application)
|
2
5
|
Iqvoc::SKOSXL::Application.configure do
|
3
6
|
# Settings specified here will take precedence over those in config/environment.rb
|
4
|
-
|
5
|
-
# The test environment is used exclusively to run your application's
|
6
|
-
# test suite. You never need to work with it otherwise. Remember that
|
7
|
-
# your test database is "scratch space" for the test suite and is wiped
|
8
|
-
# and recreated between test runs. Don't rely on the data there!
|
9
|
-
config.cache_classes = true
|
10
|
-
|
11
|
-
# Log error messages when you accidentally call methods on nil.
|
12
|
-
config.whiny_nils = true
|
13
|
-
|
14
|
-
# Show full error reports and disable caching
|
15
|
-
config.consider_all_requests_local = true
|
16
|
-
config.action_controller.perform_caching = false
|
17
|
-
|
18
|
-
# Raise exceptions instead of rendering exception templates
|
19
|
-
config.action_dispatch.show_exceptions = false
|
20
|
-
|
21
|
-
# Disable request forgery protection in test environment
|
22
|
-
config.action_controller.allow_forgery_protection = false
|
23
|
-
|
24
|
-
# Tell Action Mailer not to deliver emails to the real world.
|
25
|
-
# The :test delivery method accumulates sent emails in the
|
26
|
-
# ActionMailer::Base.deliveries array.
|
27
|
-
config.action_mailer.delivery_method = :test
|
28
|
-
|
29
|
-
# Use SQL instead of Active Record's schema dumper when creating the test database.
|
30
|
-
# This is necessary if your schema can't be completely dumped by the schema dumper,
|
31
|
-
# like if you have constraints or database-specific column types
|
32
|
-
# config.active_record.schema_format = :sql
|
33
|
-
|
34
|
-
# Print deprecation notices to the stderr
|
35
|
-
config.active_support.deprecation = :stderr
|
36
|
-
|
37
|
-
# Configure static asset server for tests with Cache-Control for performance
|
38
|
-
config.serve_static_assets = true
|
39
|
-
config.static_cache_control = "public, max-age=3600"
|
40
|
-
|
41
|
-
# Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
|
42
|
-
config.assets.allow_debugging = true
|
7
|
+
Iqvoc::Environments.setup_test(config)
|
43
8
|
end
|
44
9
|
end
|
@@ -0,0 +1,9 @@
|
|
1
|
+
# Be sure to restart your server when you modify this file.
|
2
|
+
|
3
|
+
# Your secret key for verifying the integrity of signed cookies.
|
4
|
+
# If you change this key, all old signed cookies will become invalid!
|
5
|
+
# Make sure the secret is at least 30 characters and all random,
|
6
|
+
# no regular words or you'll be exposed to dictionary attacks.
|
7
|
+
if Iqvoc::SKOSXL.const_defined?(:Application)
|
8
|
+
Iqvoc::SKOSXL::Application.config.secret_token = '1cf4863673a83d39f30e77670978adaa9009fc27e6869066c67157ef6790c4b79a4eb4c32029987a3444483b73cb01606291c272a32d6201c06f4ca75dcd5b14'
|
9
|
+
end
|
data/db/schema.rb
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
+
# encoding: UTF-8
|
1
2
|
# This file is auto-generated from the current state of the database. Instead
|
2
3
|
# of editing this file, please use the migrations feature of Active Record to
|
3
4
|
# incrementally modify your database, and then regenerate this schema definition.
|
@@ -10,7 +11,7 @@
|
|
10
11
|
#
|
11
12
|
# It's strongly recommended to check this file into your version control system.
|
12
13
|
|
13
|
-
ActiveRecord::Schema.define(:version =>
|
14
|
+
ActiveRecord::Schema.define(:version => 20120119000000) do
|
14
15
|
|
15
16
|
create_table "collection_members", :force => true do |t|
|
16
17
|
t.integer "collection_id"
|
@@ -48,6 +49,11 @@ ActiveRecord::Schema.define(:version => 20110615134040) do
|
|
48
49
|
add_index "concepts", ["origin"], :name => "ix_concepts_on_origin", :length => {"origin"=>255}
|
49
50
|
add_index "concepts", ["published_version_id"], :name => "ix_concepts_publ_version_id"
|
50
51
|
|
52
|
+
create_table "configuration_settings", :force => true do |t|
|
53
|
+
t.string "key"
|
54
|
+
t.string "value"
|
55
|
+
end
|
56
|
+
|
51
57
|
create_table "label_relations", :force => true do |t|
|
52
58
|
t.string "type"
|
53
59
|
t.integer "domain_id"
|
@@ -56,8 +62,8 @@ ActiveRecord::Schema.define(:version => 20110615134040) do
|
|
56
62
|
t.datetime "updated_at"
|
57
63
|
end
|
58
64
|
|
59
|
-
add_index "label_relations", ["domain_id", "range_id", "type"], :name => "
|
60
|
-
add_index "label_relations", ["type"], :name => "
|
65
|
+
add_index "label_relations", ["domain_id", "range_id", "type"], :name => "ix_label_rel_dom_rng_type"
|
66
|
+
add_index "label_relations", ["type"], :name => "ix_label_relations_on_type"
|
61
67
|
|
62
68
|
create_table "labelings", :force => true do |t|
|
63
69
|
t.string "type"
|
@@ -77,9 +83,9 @@ ActiveRecord::Schema.define(:version => 20110615134040) do
|
|
77
83
|
t.string "value", :limit => 1024
|
78
84
|
t.datetime "created_at"
|
79
85
|
t.datetime "updated_at"
|
86
|
+
t.date "published_at"
|
80
87
|
t.integer "rev", :default => 1
|
81
88
|
t.integer "published_version_id"
|
82
|
-
t.date "published_at"
|
83
89
|
t.integer "locked_by"
|
84
90
|
t.date "expired_at"
|
85
91
|
t.date "follow_up"
|
data/iqvoc_skosxl.gemspec
CHANGED
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.summary = "iQvoc SKOS-XL extension"
|
13
13
|
s.description = ""
|
14
14
|
|
15
|
-
s.add_dependency "iqvoc"
|
15
|
+
s.add_dependency "iqvoc", "~> 3.5.1"
|
16
16
|
s.add_dependency "bundler"
|
17
17
|
|
18
18
|
s.files = %w(README.md Gemfile Gemfile.lock Rakefile iqvoc_skosxl.gemspec) + Dir.glob("{app,config,db,public,lib,test}/**/*")
|
data/lib/iqvoc/skosxl/version.rb
CHANGED
data/lib/iqvoc/xllabel.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
module Iqvoc
|
2
2
|
|
3
|
-
module XLLabel #
|
3
|
+
module XLLabel # These are the settings when using SKOS-XL
|
4
4
|
|
5
5
|
Iqvoc.first_level_class_configuration_modules << self
|
6
6
|
|
@@ -12,7 +12,7 @@ module Iqvoc
|
|
12
12
|
:has_additional_base_data,
|
13
13
|
:searchable_class_names
|
14
14
|
|
15
|
-
self.base_class_name
|
15
|
+
self.base_class_name = 'Label::SKOSXL::Base'
|
16
16
|
|
17
17
|
self.relation_class_names = ['Label::Relation::SKOSXL::Base']
|
18
18
|
|
data/lib/iqvoc_skosxl.rb
CHANGED
@@ -3,7 +3,16 @@ module IqvocSKOSXL
|
|
3
3
|
require File.join(File.dirname(__FILE__), '../config/engine') unless Iqvoc.const_defined?(:SKOSXL) && Iqvoc::SKOSXL.const_defined?(:Application)
|
4
4
|
|
5
5
|
ActiveSupport.on_load(:after_iqvoc_config) do
|
6
|
-
require
|
6
|
+
require 'iqvoc'
|
7
|
+
|
8
|
+
Iqvoc.config do |cfg|
|
9
|
+
prefix = "languages.further_labelings."
|
10
|
+
cfg.deregister_setting("#{prefix}Labeling::SKOS::AltLabel") # iQvoc core default
|
11
|
+
cfg.register_settings({
|
12
|
+
"title" => "iQvoc SKOS-XL",
|
13
|
+
"#{prefix}Labeling::SKOSXL::AltLabel" => ["en", "de"]
|
14
|
+
})
|
15
|
+
end
|
7
16
|
|
8
17
|
Iqvoc.rdf_namespaces[:skosxl] = "http://www.w3.org/2008/05/skos-xl#" unless Iqvoc.rdf_namespaces[:skosxl]
|
9
18
|
|
@@ -12,9 +21,6 @@ module IqvocSKOSXL
|
|
12
21
|
Iqvoc::Concept.include_module_names << "Concept::SKOSXL::Extension"
|
13
22
|
|
14
23
|
Iqvoc::Concept.pref_labeling_class_name = 'Labeling::SKOSXL::PrefLabel'
|
15
|
-
Iqvoc::Concept.further_labeling_class_names = {
|
16
|
-
'Labeling::SKOSXL::AltLabel' => [ :de, :en ]
|
17
|
-
}
|
18
24
|
|
19
25
|
# TODO Iqvoc.searchable_class_names = Iqvoc::Concept.labeling_class_names.keys + Iqvoc::Concept.note_class_names
|
20
26
|
end
|
@@ -40,7 +40,7 @@ class ConceptLabelLanguageTest < ActionDispatch::IntegrationTest
|
|
40
40
|
click_button "Speichern"
|
41
41
|
|
42
42
|
assert page.has_css?(".flash_error")
|
43
|
-
assert page.has_css?("#
|
43
|
+
assert page.has_css?("#new_concept")
|
44
44
|
assert page.source.include?( # XXX: page.has_content? didn't work
|
45
45
|
I18n.t("txt.controllers.versioned_concept.label_error") % "Deutsch")
|
46
46
|
|
@@ -59,7 +59,7 @@ class ConceptLabelLanguageTest < ActionDispatch::IntegrationTest
|
|
59
59
|
click_button "Speichern"
|
60
60
|
|
61
61
|
assert page.has_css?(".flash_error")
|
62
|
-
assert page.has_css?("#
|
62
|
+
assert page.has_css?("#new_concept")
|
63
63
|
assert page.source.include?( # XXX: page.has_content? didn't work
|
64
64
|
I18n.t("txt.controllers.versioned_concept.label_error") % "Deutsch")
|
65
65
|
|
@@ -86,7 +86,7 @@ class ConceptLabelLanguageTest < ActionDispatch::IntegrationTest
|
|
86
86
|
click_button "Speichern"
|
87
87
|
|
88
88
|
assert page.has_css?(".flash_error")
|
89
|
-
assert page.has_css?("#
|
89
|
+
assert page.has_css?("#edit_concept")
|
90
90
|
assert page.source.include?( # XXX: page.has_content? didn't work
|
91
91
|
I18n.t("txt.controllers.versioned_concept.label_error") % "English")
|
92
92
|
assert page.source.include?( # XXX: page.has_content? didn't work
|
data/test/test_helper.rb
CHANGED
@@ -2,8 +2,6 @@ ENV["RAILS_ENV"] = "test"
|
|
2
2
|
require File.expand_path('../../config/environment', __FILE__)
|
3
3
|
require 'rails/test_help'
|
4
4
|
|
5
|
-
require Rails.root.join("test/factories")
|
6
|
-
|
7
5
|
class ActiveSupport::TestCase
|
8
6
|
# Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
|
9
7
|
#
|
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: 1.
|
4
|
+
version: 1.2.0
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -11,22 +11,22 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2012-01
|
14
|
+
date: 2012-02-01 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: iqvoc
|
18
|
-
requirement: &
|
18
|
+
requirement: &70319992012880 !ruby/object:Gem::Requirement
|
19
19
|
none: false
|
20
20
|
requirements:
|
21
|
-
- -
|
21
|
+
- - ~>
|
22
22
|
- !ruby/object:Gem::Version
|
23
|
-
version:
|
23
|
+
version: 3.5.1
|
24
24
|
type: :runtime
|
25
25
|
prerelease: false
|
26
|
-
version_requirements: *
|
26
|
+
version_requirements: *70319992012880
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: bundler
|
29
|
-
requirement: &
|
29
|
+
requirement: &70319992012460 !ruby/object:Gem::Requirement
|
30
30
|
none: false
|
31
31
|
requirements:
|
32
32
|
- - ! '>='
|
@@ -34,7 +34,7 @@ dependencies:
|
|
34
34
|
version: '0'
|
35
35
|
type: :runtime
|
36
36
|
prerelease: false
|
37
|
-
version_requirements: *
|
37
|
+
version_requirements: *70319992012460
|
38
38
|
description: ''
|
39
39
|
email:
|
40
40
|
- till.schulte-coerne@innoq.com
|
@@ -96,6 +96,7 @@ files:
|
|
96
96
|
- config/environments/test.rb
|
97
97
|
- config/initializers/iqvoc.rb
|
98
98
|
- config/initializers/iqvoc_skosxl.rb
|
99
|
+
- config/initializers/secret_token.rb
|
99
100
|
- config/initializers/secret_token.rb.template
|
100
101
|
- config/initializers/session_store.rb
|
101
102
|
- config/locales/activerecord.de.yml
|