iqvoc 3.5.6 → 3.5.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (82) hide show
  1. data/CHANGELOG.md +9 -0
  2. data/Gemfile +3 -2
  3. data/Gemfile.lock +71 -65
  4. data/README.md +5 -4
  5. data/app/assets/javascripts/framework.js +1 -1
  6. data/app/assets/javascripts/iqvoc/entityselect.js.erb +20 -19
  7. data/app/assets/javascripts/iqvoc/entityselect_qualified.js.erb +45 -0
  8. data/app/assets/javascripts/iqvoc/iqvoc.js +2 -2
  9. data/app/assets/javascripts/iqvoc/manifest.js +1 -0
  10. data/app/assets/stylesheets/framework.css +1 -1
  11. data/app/assets/stylesheets/iqvoc/iqvoc.css.erb +28 -22
  12. data/app/controllers/collections/hierarchical_controller.rb +2 -2
  13. data/app/controllers/collections_controller.rb +0 -1
  14. data/app/controllers/concepts/alphabetical_controller.rb +0 -1
  15. data/app/controllers/concepts/hierarchical_controller.rb +0 -1
  16. data/app/controllers/concepts/untranslated_controller.rb +0 -1
  17. data/app/controllers/concepts_controller.rb +0 -1
  18. data/app/controllers/instance_configuration_controller.rb +2 -2
  19. data/app/controllers/pages_controller.rb +0 -1
  20. data/app/controllers/rdf_controller.rb +0 -2
  21. data/app/controllers/search_results_controller.rb +0 -1
  22. data/app/controllers/user_sessions_controller.rb +5 -4
  23. data/app/helpers/application_helper.rb +8 -4
  24. data/app/helpers/widget_helper.rb +39 -0
  25. data/app/models/collection/base.rb +4 -0
  26. data/app/models/concept/base.rb +59 -10
  27. data/app/models/concept/relation/base.rb +20 -0
  28. data/app/models/concept/relation/reverse_relation_extension.rb +4 -3
  29. data/app/models/concept/skos/base.rb +1 -1
  30. data/app/views/collections/_collection.html.erb +5 -0
  31. data/app/views/concepts/_visualization.html.erb +1 -1
  32. data/app/views/errors/access_denied.html.erb +6 -2
  33. data/app/views/layouts/_controls.html.erb +1 -1
  34. data/app/views/layouts/application.html.erb +2 -3
  35. data/app/views/pages/about.html.erb +2 -0
  36. data/app/views/partials/concept/relation/_base.html.erb +1 -1
  37. data/app/views/partials/concept/relation/_edit_base.html.erb +2 -5
  38. data/app/views/partials/concept/relation/_edit_ranked.html.erb +13 -0
  39. data/app/views/partials/concept/relation/_ranked.html.erb +12 -0
  40. data/app/views/partials/concept/relation/skos/broader/_mono.html.erb +1 -1
  41. data/app/views/partials/note/_base.html.erb +1 -1
  42. data/app/views/user_sessions/_form.html.erb +10 -0
  43. data/app/views/user_sessions/new.html.erb +1 -9
  44. data/config/application.rb +4 -1
  45. data/config/database.yml +8 -0
  46. data/config/initializers/heroku.rb +24 -0
  47. data/config/initializers/iqvoc.rb +2 -2
  48. data/config/locales/activerecord.en.yml +1 -1
  49. data/config/locales/de.yml +1 -3
  50. data/config/locales/en.yml +1 -3
  51. data/db/migrate/20101208103531_add_type_to_collection_contents.rb +0 -2
  52. data/db/migrate/20120326102037_add_rank_to_concept_relations.rb +5 -0
  53. data/db/schema.rb +12 -1
  54. data/lib/iqvoc/ability.rb +3 -1
  55. data/lib/iqvoc/controller_extensions.rb +12 -29
  56. data/lib/iqvoc/environments/production.rb +2 -0
  57. data/lib/iqvoc/environments/test.rb +0 -3
  58. data/lib/iqvoc/{data_helper.rb → inline_data_helper.rb} +1 -3
  59. data/lib/iqvoc/maker.rb +2 -1
  60. data/lib/iqvoc/origin.rb +23 -24
  61. data/lib/iqvoc/rankable.rb +34 -0
  62. data/lib/iqvoc/version.rb +1 -1
  63. data/test/factories.rb +1 -1
  64. data/test/integration/alphabetical_test.rb +2 -1
  65. data/test/integration/authentication_test.rb +1 -1
  66. data/test/integration/browse_concepts_and_labels_test.rb +2 -1
  67. data/test/integration/concept_scheme_test.rb +1 -1
  68. data/test/integration/edit_concepts_test.rb +1 -1
  69. data/test/integration/instance_configuration_test.rb +1 -1
  70. data/test/integration/search_test.rb +6 -5
  71. data/test/integration/tree_test.rb +1 -1
  72. data/test/integration/untranslated_test.rb +2 -1
  73. data/test/integration_test_helper.rb +0 -29
  74. data/test/unit/concept_test.rb +17 -6
  75. data/test/unit/hygiene_test.rb +15 -5
  76. data/test/unit/origin_test.rb +7 -4
  77. data/vendor/assets/javascripts/{jquery-ui-1.8.16.custom.js → jquery-ui-1.8.20.custom.js} +146 -71
  78. data/vendor/assets/stylesheets/{jquery-ui-1.8.16.custom.css → jquery-ui-1.8.20.custom.css} +16 -19
  79. metadata +32 -27
  80. data/app/views/errors/multiple_choices.html.erb +0 -11
  81. data/lib/iqvoc/rdf_helper.rb +0 -67
  82. data/lib/ojdbc14.jar +0 -0
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: iqvoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.5.6
4
+ version: 3.5.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,11 +11,11 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2012-03-07 00:00:00.000000000 Z
14
+ date: 2012-05-24 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
18
- requirement: &70105304325980 !ruby/object:Gem::Requirement
18
+ requirement: &70148591424620 !ruby/object:Gem::Requirement
19
19
  none: false
20
20
  requirements:
21
21
  - - ~>
@@ -23,10 +23,10 @@ dependencies:
23
23
  version: 3.2.1
24
24
  type: :runtime
25
25
  prerelease: false
26
- version_requirements: *70105304325980
26
+ version_requirements: *70148591424620
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bundler
29
- requirement: &70105304325580 !ruby/object:Gem::Requirement
29
+ requirement: &70148591422160 !ruby/object:Gem::Requirement
30
30
  none: false
31
31
  requirements:
32
32
  - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
34
34
  version: '0'
35
35
  type: :runtime
36
36
  prerelease: false
37
- version_requirements: *70105304325580
37
+ version_requirements: *70148591422160
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: kaminari
40
- requirement: &70105304325060 !ruby/object:Gem::Requirement
40
+ requirement: &70148591421540 !ruby/object:Gem::Requirement
41
41
  none: false
42
42
  requirements:
43
43
  - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
45
45
  version: '0'
46
46
  type: :runtime
47
47
  prerelease: false
48
- version_requirements: *70105304325060
48
+ version_requirements: *70148591421540
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: authlogic
51
- requirement: &70105304324600 !ruby/object:Gem::Requirement
51
+ requirement: &70148591421120 !ruby/object:Gem::Requirement
52
52
  none: false
53
53
  requirements:
54
54
  - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
56
56
  version: '0'
57
57
  type: :runtime
58
58
  prerelease: false
59
- version_requirements: *70105304324600
59
+ version_requirements: *70148591421120
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: cancan
62
- requirement: &70105304324180 !ruby/object:Gem::Requirement
62
+ requirement: &70148591420620 !ruby/object:Gem::Requirement
63
63
  none: false
64
64
  requirements:
65
65
  - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
67
67
  version: '0'
68
68
  type: :runtime
69
69
  prerelease: false
70
- version_requirements: *70105304324180
70
+ version_requirements: *70148591420620
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: iq_rdf
73
- requirement: &70105304323680 !ruby/object:Gem::Requirement
73
+ requirement: &70148591436220 !ruby/object:Gem::Requirement
74
74
  none: false
75
75
  requirements:
76
76
  - - ~>
@@ -78,10 +78,10 @@ dependencies:
78
78
  version: 0.1.2
79
79
  type: :runtime
80
80
  prerelease: false
81
- version_requirements: *70105304323680
81
+ version_requirements: *70148591436220
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: json
84
- requirement: &70105304323240 !ruby/object:Gem::Requirement
84
+ requirement: &70148591435480 !ruby/object:Gem::Requirement
85
85
  none: false
86
86
  requirements:
87
87
  - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
89
89
  version: '0'
90
90
  type: :runtime
91
91
  prerelease: false
92
- version_requirements: *70105304323240
92
+ version_requirements: *70148591435480
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: rails_autolink
95
- requirement: &70105304322720 !ruby/object:Gem::Requirement
95
+ requirement: &70148591434740 !ruby/object:Gem::Requirement
96
96
  none: false
97
97
  requirements:
98
98
  - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
100
100
  version: '0'
101
101
  type: :runtime
102
102
  prerelease: false
103
- version_requirements: *70105304322720
103
+ version_requirements: *70148591434740
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: fastercsv
106
- requirement: &70105304322280 !ruby/object:Gem::Requirement
106
+ requirement: &70148591433860 !ruby/object:Gem::Requirement
107
107
  none: false
108
108
  requirements:
109
109
  - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
111
111
  version: '0'
112
112
  type: :runtime
113
113
  prerelease: false
114
- version_requirements: *70105304322280
114
+ version_requirements: *70148591433860
115
115
  description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
116
116
  Web
117
117
  email:
@@ -162,6 +162,7 @@ files:
162
162
  - app/assets/images/unfinished.png
163
163
  - app/assets/javascripts/framework.js
164
164
  - app/assets/javascripts/iqvoc/entityselect.js.erb
165
+ - app/assets/javascripts/iqvoc/entityselect_qualified.js.erb
165
166
  - app/assets/javascripts/iqvoc/iqvoc.js
166
167
  - app/assets/javascripts/iqvoc/langselect.js
167
168
  - app/assets/javascripts/iqvoc/manifest.js
@@ -196,6 +197,7 @@ files:
196
197
  - app/helpers/dashboard_helper.rb
197
198
  - app/helpers/rdf_helper.rb
198
199
  - app/helpers/search_results_helper.rb
200
+ - app/helpers/widget_helper.rb
199
201
  - app/models/collection/base.rb
200
202
  - app/models/collection/member/base.rb
201
203
  - app/models/collection/member/collection.rb
@@ -264,7 +266,6 @@ files:
264
266
  - app/views/concepts/untranslated/index.html.erb
265
267
  - app/views/dashboard/index.html.erb
266
268
  - app/views/errors/access_denied.html.erb
267
- - app/views/errors/multiple_choices.html.erb
268
269
  - app/views/errors/not_found.html.erb
269
270
  - app/views/import/import.html.erb
270
271
  - app/views/import/index.html.erb
@@ -283,6 +284,8 @@ files:
283
284
  - app/views/partials/concept/_new_link_base.html.erb
284
285
  - app/views/partials/concept/relation/_base.html.erb
285
286
  - app/views/partials/concept/relation/_edit_base.html.erb
287
+ - app/views/partials/concept/relation/_edit_ranked.html.erb
288
+ - app/views/partials/concept/relation/_ranked.html.erb
286
289
  - app/views/partials/concept/relation/skos/_narrower.html.erb
287
290
  - app/views/partials/concept/relation/skos/broader/_mono.html.erb
288
291
  - app/views/partials/concept/relation/skos/broader/_poly.html.erb
@@ -305,6 +308,7 @@ files:
305
308
  - app/views/search_results/index.html.erb
306
309
  - app/views/search_results/index.iqrdf
307
310
  - app/views/triple_store_syncs/new.html.erb
311
+ - app/views/user_sessions/_form.html.erb
308
312
  - app/views/user_sessions/new.html.erb
309
313
  - app/views/users/_form.html.erb
310
314
  - app/views/users/edit.html.erb
@@ -325,6 +329,7 @@ files:
325
329
  - config/initializers/action_view.rb
326
330
  - config/initializers/active_record.rb
327
331
  - config/initializers/backtrace_silencers.rb
332
+ - config/initializers/heroku.rb
328
333
  - config/initializers/inflections.rb
329
334
  - config/initializers/iqvoc.rb
330
335
  - config/initializers/jdbc.rb
@@ -364,6 +369,7 @@ files:
364
369
  - db/migrate/20110615134040_change_umt_note_annotations_to_dct.rb
365
370
  - db/migrate/20120119000000_create_configuration_settings.rb
366
371
  - db/migrate/20120201120736_add_top_term_to_concepts.rb
372
+ - db/migrate/20120326102037_add_rank_to_concept_relations.rb
367
373
  - db/schema.rb
368
374
  - db/seeds.rb
369
375
  - public/404.html
@@ -380,20 +386,19 @@ files:
380
386
  - lib/iqvoc/configuration/core.rb
381
387
  - lib/iqvoc/configuration/label.rb
382
388
  - lib/iqvoc/controller_extensions.rb
383
- - lib/iqvoc/data_helper.rb
384
389
  - lib/iqvoc/deep_cloning.rb
385
390
  - lib/iqvoc/environments/development.rb
386
391
  - lib/iqvoc/environments/production.rb
387
392
  - lib/iqvoc/environments/test.rb
393
+ - lib/iqvoc/inline_data_helper.rb
388
394
  - lib/iqvoc/instance_configuration.rb
389
395
  - lib/iqvoc/maker.rb
390
396
  - lib/iqvoc/origin.rb
391
- - lib/iqvoc/rdf_helper.rb
397
+ - lib/iqvoc/rankable.rb
392
398
  - lib/iqvoc/skos_importer.rb
393
399
  - lib/iqvoc/version.rb
394
400
  - lib/iqvoc/versioning.rb
395
401
  - lib/iqvoc.rb
396
- - lib/ojdbc14.jar
397
402
  - lib/string.rb
398
403
  - lib/tasks/heroku.rake
399
404
  - lib/tasks/importer.rake
@@ -457,7 +462,7 @@ files:
457
462
  - vendor/assets/javascripts/excanvas.js
458
463
  - vendor/assets/javascripts/jit_rgraph.js
459
464
  - vendor/assets/javascripts/jquery-1.7.1.js
460
- - vendor/assets/javascripts/jquery-ui-1.8.16.custom.js
465
+ - vendor/assets/javascripts/jquery-ui-1.8.20.custom.js
461
466
  - vendor/assets/javascripts/jquery-ui.datepicker-de.js
462
467
  - vendor/assets/javascripts/jquery.treeview.async.js
463
468
  - vendor/assets/javascripts/jquery.treeview.js
@@ -467,7 +472,7 @@ files:
467
472
  - vendor/assets/stylesheets/blueprint/ie.css
468
473
  - vendor/assets/stylesheets/blueprint/print.css
469
474
  - vendor/assets/stylesheets/blueprint/screen.css
470
- - vendor/assets/stylesheets/jquery-ui-1.8.16.custom.css
475
+ - vendor/assets/stylesheets/jquery-ui-1.8.20.custom.css
471
476
  - vendor/assets/stylesheets/jquery.treeview.css.erb
472
477
  homepage: http://github.com/innoq/iqvoc
473
478
  licenses: []
@@ -489,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
489
494
  version: '0'
490
495
  requirements: []
491
496
  rubyforge_project:
492
- rubygems_version: 1.8.15
497
+ rubygems_version: 1.8.11
493
498
  signing_key:
494
499
  specification_version: 3
495
500
  summary: iQvoc
@@ -1,11 +0,0 @@
1
- <h2>Multiple Choices</h2>
2
-
3
- <p><em><%= @exception.message %></em></p>
4
-
5
- <p>You may find what you seek by trying one of the following links:</p>
6
-
7
- <ul>
8
- <% for choice, url in @exception.choices %>
9
- <li><%= link_to choice, url %></li>
10
- <% end %>
11
- </ul>
@@ -1,67 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- # Copyright 2011 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
- module Iqvoc
18
- # TODO: The whole class should move to umt because it highly proprietary
19
- # (and also has the wrong name because it only deals with "turtle").
20
- # TODO: The term "Helper" is misleading.
21
- class RdfHelper
22
-
23
- LITERAL_REGEXP = /"(.*)"@([a-zA-Z]{2})/
24
-
25
- NSMAP = {
26
- 'rdf' => "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
27
- 'skos' => "http://www.w3.org/2004/02/skos/core#",
28
- 'owl' => "http://www.w3.org/2002/07/owl#",
29
- 'rdfs' => "http://www.w3.org/2000/01/rdf-schema#" }
30
-
31
- def self.extract_id(uri)
32
- uri =~ /([^\/]+)\/{0,1}$/
33
- $1
34
- end
35
-
36
- def self.is_literal_form?(str)
37
- str.match LITERAL_REGEXP
38
- end
39
-
40
- def self.quote_turtle_literal(val)
41
- if val.to_s.match(/^<.*>$/)
42
- val
43
- else
44
- "\"#{val}\""
45
- end
46
- end
47
-
48
- def self.split_literal(str)
49
- elements = str.scan(LITERAL_REGEXP).first
50
- @split_literal = {
51
- :value => elements[0].gsub(/\\"/, '"'),
52
- :language => elements[1]
53
- }
54
- ::Rails.logger.debug "@split_literal => #{@split_literal}"
55
- @split_literal
56
- end
57
-
58
- def self.to_xml_attribute_array
59
- res = {}
60
- NSMAP.each do |k,v|
61
- res["xmlns:#{k}"] = v
62
- end
63
- res
64
- end
65
-
66
- end
67
- end
data/lib/ojdbc14.jar DELETED
Binary file