iqvoc_skosxl 2.8.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ff88b0372ad6e88dfdb28f2bbdd831237bbca06
-  data.tar.gz: 4c72323bf71ff134b74bcbf5deabed07b8858673
+  metadata.gz: f38c524d54db4e897d951d428cadfd2fb4ebc87b
+  data.tar.gz: b3e1925374f843c2b089ef228ff41504d2285442
 SHA512:
-  metadata.gz: 0d4891b95b4011d3c17a8b5e734cd46dfa88aabda122a77fa84ebda52dd7992f65860ffec74330710c046ce8882c3b66ade9ee002f34e0b9abf09a8535b0796c
-  data.tar.gz: 9f68dc5caafd49b6fc13de40db9c86dfd487a60195d4a4e3eb0557e6931b179d4b5b03dec0b06e44d2ea8102953c9510a439646876b31df75dcad124159f5906
+  metadata.gz: cc57417b3ee637a83d3723732761a58b23d90e949b5c6834d51aec39e5488a9756c5814a0ecfd60b958e9621667ae7aa092af98c01e1a06ffc72b8d2e5636b63
+  data.tar.gz: 9f7d8c3048efcf4d053d105ea51065e8933b2de52376598c1db7a0b43feabcb0158415bd2fa153c4e3f80734dcd94894fcff3308eeb4d9901e39cc703bbedee1

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'iqvoc', '~> 4.10.0', :github => 'innoq/iqvoc', branch: 'master'
+gem 'iqvoc', '~> 4.11.0', :github => 'innoq/iqvoc', branch: 'master'
 
 platforms :ruby do
   gem 'mysql2'

data/Gemfile.lock

@@ -1,19 +1,19 @@
 GIT
   remote: git://github.com/innoq/iqvoc.git
-  revision: 9d308319f98735b34375501cb226628d0abbca2b
+  revision: 0b0a87123de77cc94dbf0049c0270f5948651a44
   branch: master
   specs:
-    iqvoc (4.10.0)
+    iqvoc (4.11.1)
       apipie-rails (~> 0.3.5)
       authlogic (~> 3.4.2)
-      autoprefixer-rails (~> 5.1.8)
+      autoprefixer-rails (~> 6.5.1.1)
       bootstrap-sass (~> 3.3.1.0)
       bootstrap_form (~> 2.2.0)
       bundler
       cancancan
       carrierwave
       database_cleaner
-      delayed_job_active_record (~> 4.0.1)
+      delayed_job_active_record (~> 4.1.1)
       faraday (= 0.9.0)
       faraday_middleware
       font-awesome-rails (~> 4.2.0)
@@ -22,10 +22,10 @@ GIT
       json
       kaminari
       kaminari-bootstrap (~> 3.0.1)
-      linkeddata
+      linkeddata (~> 1.1.2)
       maruku
-      nokogiri
-      rails (~> 4.2.0)
+      nokogiri (~> 1.6.0)
+      rails (>= 4.2.8, < 5.0)
       rails_autolink
       sass-rails (~> 5.0.0)
       uglifier (>= 1.3.0)
@@ -33,246 +33,235 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
-    activerecord-jdbc-adapter (1.3.14)
-      activerecord (>= 2.2)
-    activerecord-jdbcmysql-adapter (1.3.14)
-      activerecord-jdbc-adapter (~> 1.3.14)
-      jdbc-mysql (>= 5.1.22)
-    activerecord-jdbcpostgresql-adapter (1.3.14)
-      activerecord-jdbc-adapter (~> 1.3.14)
-      jdbc-postgres (>= 9.1)
-    activerecord-jdbcsqlite3-adapter (1.3.14)
-      activerecord-jdbc-adapter (~> 1.3.14)
-      jdbc-sqlite3 (>= 3.7.2, < 3.9)
-    activesupport (4.2.1)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    apipie-rails (0.3.5)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    apipie-rails (0.3.7)
       json
-    arel (6.0.0)
+    arel (6.0.4)
     authlogic (3.4.6)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       request_store (~> 1.0)
       scrypt (>= 1.2, < 3.0)
-    autoprefixer-rails (5.1.11)
+    autoprefixer-rails (6.5.1.1)
       execjs
-      json
-    awesome_print (1.6.1)
+    awesome_print (1.7.0)
     bcp47 (0.3.3)
       i18n
     bootstrap-sass (3.3.1.0)
       sass (~> 3.2)
     bootstrap_form (2.2.0)
-    builder (3.2.2)
-    cancancan (1.13.1)
-    capybara (2.4.4)
+    builder (3.2.3)
+    cancancan (2.0.0)
+    capybara (2.10.1)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (0.10.0)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      json (>= 1.7)
+    carrierwave (1.1.0)
+      activemodel (>= 4.0.0)
+      activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     cliver (0.3.2)
-    coderay (1.1.0)
-    concurrent-ruby (1.0.0)
-    database_cleaner (1.5.1)
-    delayed_job (4.0.6)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.0.3)
-      activerecord (>= 3.0, < 5.0)
-      delayed_job (>= 3.0, < 4.1)
-    ebnf (1.0.0)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.5)
+    database_cleaner (1.6.1)
+    delayed_job (4.1.2)
+      activesupport (>= 3.0, < 5.1)
+    delayed_job_active_record (4.1.1)
+      activerecord (>= 3.0, < 5.1)
+      delayed_job (>= 3.0, < 5)
+    ebnf (0.3.9)
       rdf (~> 1.1)
       sxp (~> 0.1, >= 0.1.3)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    execjs (2.6.0)
+    execjs (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.8)
-    ffi (1.9.8-java)
-    ffi-compiler (0.1.3)
+    faraday_middleware (0.11.0.1)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.9.18)
+    ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
+    globalid (0.4.0)
+      activesupport (>= 4.2.0)
     haml (4.0.7)
       tilt
     htmlentities (4.3.4)
-    i18n (0.7.0)
+    i18n (0.8.1)
     iq_rdf (0.1.15)
       activesupport
       builder
       bundler
     iq_triplestorage (0.2.2)
-    jdbc-mysql (5.1.33)
-    jdbc-postgres (9.3.1102)
-    jdbc-sqlite3 (3.8.7)
-    json (1.8.2)
-    json (1.8.2-java)
-    json-ld (1.99.0)
+    json (2.1.0)
+    json-ld (1.1.11.1)
       multi_json (~> 1.11)
-      rdf (~> 1.99)
-    kaminari (0.16.3)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+      rdf (~> 1.1, >= 1.1.17, < 1.99)
+    kaminari (1.0.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.0.1)
+      kaminari-activerecord (= 1.0.1)
+      kaminari-core (= 1.0.1)
+    kaminari-actionview (1.0.1)
+      actionview
+      kaminari-core (= 1.0.1)
+    kaminari-activerecord (1.0.1)
+      activerecord
+      kaminari-core (= 1.0.1)
     kaminari-bootstrap (3.0.1)
       kaminari (>= 0.13.0)
       rails
+    kaminari-core (1.0.1)
     link_header (0.0.8)
-    linkeddata (1.99.0)
-      equivalent-xml (~> 0.6)
-      json-ld (~> 1.99)
+    linkeddata (1.1.11.2)
+      equivalent-xml (~> 0.5)
+      json-ld (~> 1.1, >= 1.1.8, < 1.99)
       nokogiri (~> 1.6)
-      rdf (~> 1.99)
-      rdf-aggregate-repo (~> 1.99)
-      rdf-isomorphic (~> 1.99)
-      rdf-json (~> 1.1, >= 1.1.2)
-      rdf-microdata (~> 2.0, >= 2.0.2)
-      rdf-n3 (~> 1.99)
-      rdf-rdfa (~> 1.99)
-      rdf-rdfxml (~> 1.1, >= 1.1.5)
-      rdf-reasoner (~> 0.3)
-      rdf-tabular (~> 0.3)
-      rdf-trig (~> 1.99, >= 1.99.0.1)
-      rdf-trix (~> 1.99)
-      rdf-turtle (~> 1.99)
-      rdf-vocab (~> 0.8, >= 0.8.6)
-      rdf-xsd (~> 1.1, >= 1.1.5)
-      sparql (~> 1.99)
-      sparql-client (~> 1.99)
+      rdf (~> 1.1, >= 1.1.11, < 1.99)
+      rdf-aggregate-repo (~> 1.1, < 1.99)
+      rdf-isomorphic (~> 1.1, < 1.99)
+      rdf-json (~> 1.1, >= 1.1.2, < 1.99)
+      rdf-microdata (~> 2.0, >= 2.0.1)
+      rdf-n3 (~> 1.1, >= 1.1.3, < 1.99)
+      rdf-rdfa (~> 1.1, >= 1.1.6, < 1.99)
+      rdf-rdfxml (~> 1.1, >= 1.1.4, < 1.99)
+      rdf-reasoner (~> 0.2, >= 0.2.1, < 1.99)
+      rdf-tabular (~> 0.1, >= 0.1.2)
+      rdf-trig (~> 1.1, >= 1.1.4, < 1.99)
+      rdf-trix (~> 1.1, < 1.99)
+      rdf-turtle (~> 1.1, >= 1.1.6, < 1.99)
+      rdf-vocab (~> 0.8)
+      rdf-xsd (~> 1.1, >= 1.1.3, < 1.99)
+      sparql (~> 1.1, >= 1.1.5, < 1.99)
+      sparql-client (~> 1.1, >= 1.1.3, < 1.99)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    maruku (0.7.2)
+    mail (2.6.5)
+      mime-types (>= 1.16, < 4)
+    maruku (0.7.3)
     method_source (0.8.2)
-    mime-types (2.5)
-    mini_portile (0.6.2)
-    minitest (5.6.1)
-    multi_json (1.11.0)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    minitest (5.10.2)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
-    mysql2 (0.3.17)
+    mysql2 (0.4.5)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-java)
-    pg (0.18.1)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    pg (0.20.0)
     poltergeist (1.5.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry (0.10.1-java)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-      spoon (~> 0.0)
-    pry-rails (0.3.3)
+    pry-rails (0.3.4)
       pry (>= 0.9.10)
-    rack (1.6.1)
+    public_suffix (2.0.4)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.8)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (11.1.2)
-    rdf (1.99.1)
+    rake (12.0.0)
+    rdf (1.1.17.1)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (1.99.0)
-      rdf (~> 1.99)
-    rdf-isomorphic (1.99.0)
-      rdf (~> 1.99)
-    rdf-json (1.99.0)
-      rdf (~> 1.99)
+    rdf-aggregate-repo (1.1.0.1)
+      rdf (~> 1.1, < 1.99)
+    rdf-isomorphic (1.1.0.2)
+      rdf (~> 1.1, >= 1.1.17, < 1.99)
+    rdf-json (1.1.2.1)
+      rdf (~> 1.1, < 1.99)
     rdf-microdata (2.0.2)
       htmlentities (~> 4.3)
       nokogiri (~> 1.6)
       rdf (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-n3 (1.99.0)
-      rdf (~> 1.99)
-    rdf-rdfa (1.99.0)
+    rdf-n3 (1.1.3.1)
+      rdf (~> 1.1, >= 1.1.17, < 1.99)
+    rdf-rdfa (1.1.6.1)
       haml (~> 4.0)
       htmlentities (~> 4.3)
-      rdf (~> 1.99)
-      rdf-aggregate-repo (~> 1.1)
-      rdf-xsd (~> 1.1)
-    rdf-rdfxml (1.99.0)
+      rdf (~> 1.1, >= 1.1.6, < 1.99)
+      rdf-aggregate-repo (~> 1.1, < 1.99)
+      rdf-xsd (~> 1.1, < 1.99)
+    rdf-rdfxml (1.1.5.1)
       htmlentities (~> 4.3)
-      rdf (~> 1.99)
-      rdf-rdfa (~> 1.99)
-      rdf-xsd (~> 1.99)
+      rdf (~> 1.1, >= 1.1.6, < 1.99)
+      rdf-rdfa (~> 1.1, >= 1.1.4.1, < 1.99)
+      rdf-xsd (~> 1.1, < 1.99)
     rdf-reasoner (0.3.0)
       rdf (~> 1.1, >= 1.1.4.2)
       rdf-turtle (~> 1.1)
@@ -285,72 +274,65 @@ GEM
       rdf (~> 1.1, >= 1.1.7)
       rdf-vocab (~> 0.8)
       rdf-xsd (~> 1.1)
-    rdf-trig (1.99.0.1)
-      ebnf (~> 1.0)
-      rdf (~> 1.99)
-      rdf-turtle (~> 1.99)
-    rdf-trix (1.99.0)
-      rdf (~> 1.1)
-    rdf-turtle (1.99.0)
-      ebnf (~> 1.0)
-      rdf (~> 1.99)
-    rdf-vocab (0.8.7.1)
+    rdf-trig (1.1.5.1)
+      ebnf (~> 0.3, >= 0.3.7)
+      rdf (~> 1.1, >= 1.1.11, < 1.99)
+      rdf-turtle (~> 1.1, >= 1.1.7, < 1.99)
+    rdf-trix (1.1.0.1)
+      rdf (~> 1.1, < 1.99)
+    rdf-turtle (1.1.8)
+      ebnf (~> 0.3, >= 0.3.6)
       rdf (~> 1.1, >= 1.1.10)
-    rdf-xsd (1.99.0)
-      rdf (~> 1.99)
-    request_store (1.3.1)
-    sass (3.4.21)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
+    rdf-vocab (0.8.8)
+      rdf (~> 1.1, >= 1.1.10)
+    rdf-xsd (1.1.5.1)
+      rdf (~> 1.1, >= 1.1.9, < 1.99)
+    request_store (1.3.2)
+    sass (3.4.24)
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    scrypt (2.0.2)
+    scrypt (2.1.1)
       ffi-compiler (>= 0.0.2)
       rake
     slop (3.6.0)
-    sparql (1.99.0)
+    sparql (1.1.9)
       builder (~> 3.2)
-      ebnf (~> 1.0)
-      rdf (~> 1.99)
-      rdf-aggregate-repo (~> 1.99)
+      ebnf (~> 0.3, >= 0.3.9)
+      rdf (~> 1.1, >= 1.1.13)
+      rdf-aggregate-repo (~> 1.1, >= 1.1.0)
       rdf-xsd (~> 1.1)
       sparql-client (~> 1.1)
       sxp (~> 0.1)
-    sparql-client (1.99.0)
+    sparql-client (1.1.6.1)
       net-http-persistent (~> 2.9)
-      rdf (~> 1.1)
-    spoon (0.0.4)
-      ffi
-    sprockets (3.5.2)
+      rdf (~> 1.1, < 1.99)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.1)
+    sprockets-rails (3.2.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.10)
+    sqlite3 (1.3.13)
     sxp (0.1.5)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    thread_safe (0.3.5-java)
-    tilt (2.0.2)
-    tzinfo (1.2.2)
+    thor (0.19.4)
+    thread_safe (0.3.6)
+    tilt (2.0.7)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    uglifier (2.7.2)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    websocket-driver (0.5.1)
-      websocket-extensions (>= 0.1.0)
-    websocket-driver (0.5.1-java)
+    uglifier (3.2.0)
+      execjs (>= 0.3.0, < 3)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.1)
+    websocket-extensions (0.1.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
@@ -359,7 +341,7 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   awesome_print
   capybara
-  iqvoc (~> 4.10.0)!
+  iqvoc (~> 4.11.0)!
   mysql2
   pg
   poltergeist (~> 1.5.0)
@@ -367,4 +349,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.12.4
+   1.15.0

data/app/controllers/labels_controller.rb

@@ -4,7 +4,7 @@ class LabelsController < ApplicationController
   def index
     authorize! :read, Iqvoc::XLLabel.base_class
 
-    scope = Iqvoc::XLLabel.base_class.by_query_value("#{params[:query]}%")
+    scope = Iqvoc::XLLabel.base_class.by_query_value("%#{params[:query]}%")
     if params[:language] # NB: this is not the same as :lang, which is supplied via route
       scope = scope.by_language(params[:language])
     end
@@ -53,6 +53,20 @@ class LabelsController < ApplicationController
   def new
     authorize! :create, Iqvoc::XLLabel.base_class
     @label = Iqvoc::XLLabel.base_class.new
+
+    # initial created-ChangeNote creation
+    @label.send(Iqvoc::change_note_class_name.to_relation_name).new do |change_note|
+      change_note.value = I18n.t('txt.views.versioning.initial_version')
+      change_note.language = I18n.locale.to_s
+      change_note.annotations_attributes = [
+        { namespace: 'dct', predicate: 'creator', value: current_user.name },
+        { namespace: 'dct', predicate: 'created', value: DateTime.now.to_s }
+      ]
+    end
+
+    Iqvoc::XLLabel.note_class_names.each do |note_class_name|
+      @label.send(note_class_name.to_relation_name).build if @label.send(note_class_name.to_relation_name).empty?
+    end
   end
 
   def create

data/app/helpers/labels_helper.rb

@@ -2,7 +2,7 @@ module LabelsHelper
   def render_label_rdf(document, label)
     document << label.build_rdf_subject do |c|
 
-      c.Schema::expires(label.expired_at) if label.expired_at
+      c.Schema::expires(label.expired_at.to_s) if label.expired_at
 
       c.Owl::deprecated(true) if label.expired_at and label.expired_at <= Date.new
 

data/app/models/label/relation/base.rb

@@ -47,7 +47,7 @@ class Label::Relation::Base < ActiveRecord::Base
     'partials/label/relation/edit_base'
   end
 
-  def self.only_one_allowed?
+  def self.bidirectional?
     false
   end
 end

data/app/models/label/relation/bidirectional_relation_extension.rb

@@ -0,0 +1,47 @@
+# encoding: UTF-8
+
+# Copyright 2011-2016 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Label
+  module Relation
+    module BidirectionalRelationExtension
+      def create_with_bidirectional_relation(target_label, attributes = {})
+        relation_class = proxy_association.reflection.class_name.constantize
+        ActiveRecord::Base.transaction do
+          # The one direction
+          scope = relation_class.where(domain_id: proxy_association.owner.id, range_id: target_label.id)
+          scope.any? || scope.create!(attributes)
+
+          # The bidirectional direction
+          scope = relation_class.where(domain_id: target_label.id, range_id: proxy_association.owner.id)
+          scope.any? || scope.create!(attributes)
+        end
+      end
+
+      def destroy_with_bidirectional_relation(target_label)
+        relation_class = proxy_association.reflection.class_name.constantize
+        ActiveRecord::Base.transaction do
+          relation_class.where(domain_id: proxy_association.owner.id, range_id: target_label.id).load.each do |relation|
+            relation.destroy
+          end
+
+          relation_class.where(domain_id: target_label.id, range_id: proxy_association.owner.id).load.each do |relation|
+            relation.destroy
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/label/skosxl/base.rb

@@ -19,13 +19,25 @@ class Label::SKOSXL::Base < Label::Base
 
   after_save do |label|
     # Handle save or destruction of inline relations for use with widgets
-    (@inline_assigned_relations ||= {}).each do |relation_class_name, origins|
-      # Remove all associated labelings of the given type
-      label.send(relation_class_name.to_relation_name).destroy_all
+    (@inline_assigned_relations ||= {}).each do |relation_class_name, new_origins|
+      # Remove all existing associated labelings of the given type
+      existing_origins = label.send(relation_class_name.to_relation_name).map { |r| r.range.origin }.uniq
+      Iqvoc::XLLabel.base_class.by_origin(existing_origins).each do |l|
+        if relation_class_name.constantize.bidirectional?
+          label.send(relation_class_name.to_relation_name).destroy_with_bidirectional_relation(l)
+        else
+          relation = label.send(relation_class_name.to_relation_name).find_by(range: l)
+          relation.destroy if relation
+        end
+      end
 
       # Recreate relations reflecting the widget's parameters
-      Iqvoc::XLLabel.base_class.by_origin(origins).each do |l|
-        label.send(relation_class_name.to_relation_name).create(range: l)
+      Iqvoc::XLLabel.base_class.by_origin(new_origins).each do |l|
+        if relation_class_name.constantize.bidirectional?
+          label.send(relation_class_name.to_relation_name).create_with_bidirectional_relation(l)
+        else
+          label.send(relation_class_name.to_relation_name).create(range: l)
+        end
       end
     end
   end
@@ -58,6 +70,12 @@ class Label::SKOSXL::Base < Label::Base
     has_many relation_class_name.to_relation_name,
       foreign_key: 'domain_id',
       class_name: relation_class_name,
+      extend: Label::Relation::BidirectionalRelationExtension,
+      dependent: :destroy
+
+    has_many "#{relation_class_name.to_relation_name}_of".to_sym,
+      foreign_key: 'range_id',
+      class_name: relation_class_name,
       dependent: :destroy
 
     # Serialized setters and getters (\r\n or , separated)
@@ -164,9 +182,11 @@ class Label::SKOSXL::Base < Label::Base
     labelings.select{ |l| l.class.name == labeling_class.to_s }.map(&:owner)
   end
 
-  def related_labels_for_relation_class(relation_class)
+  def related_labels_for_relation_class(relation_class, only_published = true)
     relation_class = relation_class.name if relation_class < ActiveRecord::Base # Use the class name string
-    relations.select{ |rel| rel.class.name == relation_class }.map(&:range)
+    relations.select { |rel| rel.class.name == relation_class }
+             .map(&:range)
+             .select { |l| l.published? || !only_published }
   end
 
   def notes_for_class(note_class)

data/app/models/label/skosxl/validations.rb

@@ -8,8 +8,10 @@ module Label
         validates :origin, uniqueness: { scope: :rev }
         validate :origin_has_to_be_escaped
 
-        validate :pref_label_language, if: :validatable_for_publishing?
+        # publishing validations
         validates :value, presence: true, if: :validatable_for_publishing?
+        validate :pref_label_language, if: :validatable_for_publishing?
+        validate :referenced_published_concepts_have_main_language_pref_label, if: :validatable_for_publishing?
       end
 
       def origin_has_to_be_escaped
@@ -19,11 +21,28 @@ module Label
       end
 
       def pref_label_language
-        if language != ::Iqvoc::Concept.pref_labeling_languages.first.to_s && concepts_for_labeling_class(::Iqvoc::Concept::pref_labeling_class).any?
+        invalid_pref_label_language = ::Iqvoc::Concept.pref_labeling_languages.exclude?(language)
+        has_pref_labeled_concepts = concepts_for_labeling_class(::Iqvoc::Concept.pref_labeling_class).any?
+
+        if invalid_pref_label_language && has_pref_labeled_concepts
           errors.add :base, I18n.t('txt.models.label.pref_label_language')
         end
       end
 
+      def referenced_published_concepts_have_main_language_pref_label
+        published_label = self.published_version
+
+        # check published concepts which use the current label as a pref label
+        concepts.published.each do |concept|
+          # pref labels without the current published one
+          pref_labels = concept.pref_labels.reject { |l| l == published_label }
+
+          unless pref_labels.map(&:language).map(&:to_s).include?(::Iqvoc::Concept.pref_labeling_languages.first.to_s)
+            errors.add :base, I18n.t('txt.models.label.referenced_concepts_invalid')
+          end
+        end
+      end
+
     end
   end
 end

data/app/models/labeling/skosxl/base.rb

@@ -77,6 +77,10 @@ class Labeling::SKOSXL::Base < Labeling::Base
     'partials/labeling/skosxl/edit_base'
   end
 
+  def self.only_one_allowed?
+    false
+  end
+
   def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
     unless rdf_subject.is_a?(Concept::Base)
       raise "#{self.name}#build_from_rdf: Subject (#{rdf_subject}) must be a Concept."

data/app/views/labels/_form.html.erb

@@ -17,12 +17,14 @@
     <%= f.text_field :expired_at, :class => 'datepicker' %>
   </fieldset>
 
+  <% if Iqvoc::XLLabel.relation_classes.any? %>
   <fieldset>
     <legend><%= Label::Relation::SKOSXL::Base.model_name.human(:count => 2) %></legend>
       <% Iqvoc::XLLabel.relation_classes.each do |relation_class| %>
         <%= render relation_class.edit_partial_name(label), :f => f, :label => label, :klass => relation_class %>
       <% end %>
   </fieldset>
+  <% end %>
 
   <% Iqvoc::XLLabel.additional_association_classes.keys.each do |association_class| %>
     <fieldset>
@@ -32,8 +34,8 @@
   <% end %>
 
 
-  <% unless label.new_record? %>
-    <% Iqvoc::XLLabel.note_classes.each do |note_class| %>
+  <% Iqvoc::XLLabel.note_classes.each do |note_class| %>
+    <% unless note_class.edit_partial_name(label).nil? %>
       <%= render note_class.edit_partial_name(label), :owner_klass => label, :assoc_klass => note_class, :f => f %>
     <% end %>
   <% end %>

data/app/views/partials/label/relation/_edit_base.html.erb

@@ -4,13 +4,11 @@
 %>
 
 <%= f.text_field "inline_#{klass.name.to_relation_name}",
-  label: klass.model_name.human(:count => 2),
-  value: label.send("inline_#{klass.name.to_relation_name}").join(','),
-  id: klass.name.to_relation_name,
-  class: "entity_select",
-  data: {
-    'query-url': labels_path(:format => :json),
-    'entity-uri': label_path("{id}"),
-    'entities': data_entities
-  }
+  :label => klass.model_name.human(:count => 2),
+  :value => label.send("inline_#{klass.name.to_relation_name}").join(','),
+  :id => klass.name.to_relation_name,
+  :class => 'entity_select',
+  :'data-query-url' => labels_path(:format => :json),
+  :'data-entity-uri' => label_path("{id}"),
+  :'data-entities' => data_entities
 %>

data/app/views/partials/labeling/skosxl/_edit_base.html.erb

@@ -10,6 +10,7 @@
         :"data-language" => language,
         :"data-query-url" => labels_path(:format => :json, :language => language),
         :"data-entity-uri" => label_path("{id}"),
+        :"data-singular" => klass.only_one_allowed? ? true : false,
         :"data-entities" => Iqvoc::XLLabel.base_class.editor_selectable.
             by_language(language).by_origin(concept.labelings_by_id(
                 klass.name.to_relation_name, language).

data/config/locales/de.yml

@@ -12,3 +12,4 @@ de:
         uri: Label-URI
         origin_invalid: enthält ungültige Zeichen.
         pref_label_language: "Es muss ein bevorzugtes Label in der Hauptsprache des Thesaurus vorliegen."
+        referenced_concepts_invalid: Referenzierte Konzepte werden durch diese Änderung invalide. Bitte Labelzuordnung am Konzept aufheben.

data/config/locales/en.yml

@@ -12,3 +12,4 @@ en:
         uri: Label URI
         origin_invalid: Origin contains invalid characters.
         pref_label_language: There must be a prefered label in thesaurus main language.
+        referenced_concepts_invalid: Some referenced concepts become invalid. Please remove label from referenced concepts first.

data/db/schema.rb

@@ -20,7 +20,7 @@ ActiveRecord::Schema.define(version: 20150414083600) do
   end
 
   add_index "collection_members", ["collection_id", "target_id", "type"], name: "ix_collections_fk_type", using: :btree
-  add_index "collection_members", ["target_id"], name: "fk_rails_ca5b83d3a1", using: :btree
+  add_index "collection_members", ["target_id"], name: "fk_rails_2a51b48094", using: :btree
 
   create_table "concept_relations", force: :cascade do |t|
     t.string   "type",       limit: 255
@@ -32,7 +32,7 @@ ActiveRecord::Schema.define(version: 20150414083600) do
   end
 
   add_index "concept_relations", ["owner_id", "target_id"], name: "ix_concept_relations_fk", using: :btree
-  add_index "concept_relations", ["target_id"], name: "fk_rails_b9505863fe", using: :btree
+  add_index "concept_relations", ["target_id"], name: "fk_rails_fd6c6e6fd7", using: :btree
 
   create_table "concepts", force: :cascade do |t|
     t.string   "type",                 limit: 255
@@ -50,7 +50,7 @@ ActiveRecord::Schema.define(version: 20150414083600) do
     t.boolean  "top_term",             limit: 1,    default: false
   end
 
-  add_index "concepts", ["locked_by"], name: "fk_rails_c1c63f3716", using: :btree
+  add_index "concepts", ["locked_by"], name: "fk_rails_69655c7fd3", using: :btree
   add_index "concepts", ["origin"], name: "ix_concepts_on_origin", length: {"origin"=>255}, using: :btree
   add_index "concepts", ["published_version_id"], name: "ix_concepts_publ_version_id", using: :btree
 
@@ -120,7 +120,7 @@ ActiveRecord::Schema.define(version: 20150414083600) do
   end
 
   add_index "label_relations", ["domain_id", "range_id", "type"], name: "ix_label_rel_dom_rng_type", using: :btree
-  add_index "label_relations", ["range_id"], name: "fk_rails_bb6dbc5289", using: :btree
+  add_index "label_relations", ["range_id"], name: "fk_rails_a56a2bdf28", using: :btree
   add_index "label_relations", ["type"], name: "ix_label_relations_on_type", using: :btree
 
   create_table "labelings", force: :cascade do |t|
@@ -132,7 +132,7 @@ ActiveRecord::Schema.define(version: 20150414083600) do
   end
 
   add_index "labelings", ["owner_id", "target_id", "type"], name: "ix_labelings_fk_type", using: :btree
-  add_index "labelings", ["target_id"], name: "fk_rails_51629a50d5", using: :btree
+  add_index "labelings", ["target_id"], name: "fk_rails_5897707e64", using: :btree
   add_index "labelings", ["type"], name: "ix_labelings_on_type", using: :btree
 
   create_table "labels", force: :cascade do |t|

data/iqvoc_skosxl.gemspec

@@ -13,11 +13,11 @@ Gem::Specification.new do |s|
   s.license     = 'Apache License 2.0'
   s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'
 
-  s.add_dependency 'iqvoc', '~> 4.10.0'
+  s.add_dependency 'iqvoc', '~> 4.11.0'
   s.add_development_dependency 'bundler', '~> 1.6'
 
   s.files = %w(README.md Gemfile Gemfile.lock Rakefile iqvoc_skosxl.gemspec) +
-      Dir.glob('{app,config,db,public,lib,test}/**/*')
+            Dir.glob('{app,config,db,public,lib,test}/**/*')
   s.test_files = s.files.grep(%r{^test/})
   s.require_paths = ['lib']
 end

data/lib/iqvoc/skosxl/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SKOSXL
-    VERSION = "2.8.1"
+    VERSION = "2.9.0"
   end
 end

data/test/integration/label_creation_test.rb

@@ -33,6 +33,14 @@ class LabelCreationTest < ActionDispatch::IntegrationTest
     assert page.has_content? 'Instanz wurde erfolgreich veröffentlicht.'
     assert page.has_content? 'Testlabel'
 
+    # check initial created-ChangeNote
+    change_note_relation_name = Iqvoc::change_note_class_name.to_relation_name
+    within("\##{change_note_relation_name}") do
+      assert page.has_css?('.translation', count: 1)
+      assert page.has_content? 'Initiale Version'
+      assert page.has_content? 'dct:created'
+    end
+
     # modify created version
     click_link_or_button 'Neue Version erstellen'
     fill_in 'Vorlageform', with: 'Testlabel_modified'
@@ -41,6 +49,14 @@ class LabelCreationTest < ActionDispatch::IntegrationTest
     assert page.has_content? 'Testlabel_modified'
     click_link_or_button 'Veröffentlichen'
     assert page.has_content? 'Instanz wurde erfolgreich veröffentlicht.'
+
+    # check ChangeNote (initial+modified)
+    within("\##{change_note_relation_name}") do
+      assert page.has_css?('.translation', count: 2)
+      assert page.has_content? 'Initiale Version'
+      assert page.has_content? 'dct:created'
+      assert page.has_content? 'dct:modified'
+    end
   end
 
   test 'inconsistent label creation' do

data/test/integration/label_relation_test.rb

@@ -0,0 +1,135 @@
+# encoding: UTF-8
+
+# Copyright 2011-2016 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
+
+class LabelsRelationTest < ActionDispatch::IntegrationTest
+
+  # sample bidirectional relation
+  module Label::Relation::SKOSXL
+    class Translation < Label::Relation::SKOSXL::Base
+      def self.bidirectional?
+        true
+      end
+    end
+
+    class UnidirectionalRelation < Label::Relation::SKOSXL::Base
+    end
+  end
+
+  # add label relation to iqvoc initializer
+  Iqvoc::XLLabel.relation_class_names = [
+    'Label::Relation::SKOSXL::Translation',
+    'Label::Relation::SKOSXL::UnidirectionalRelation'
+  ]
+
+  setup do
+    @dog_en = Iqvoc::XLLabel.base_class.create!(
+      language: 'en',
+      value: 'Dog',
+      origin: 'dog_en',
+      published_at: Time.now
+    )
+
+    @dog_de = Iqvoc::XLLabel.base_class.create!(
+      language: 'de',
+      value: 'Hund',
+      origin: 'dog_de',
+      published_at: Time.now
+    )
+
+    login('administrator')
+  end
+
+  test 'bidirectional label relation assignment' do
+    assert @dog_en.label_relation_skosxl_translations.empty?
+    assert @dog_de.label_relation_skosxl_translations.empty?
+
+    visit label_path(@dog_en, lang: 'en', format: 'html')
+    click_link_or_button('Create new version')
+    assert_equal edit_label_path(@dog_en, lang: 'en', format: 'html'), current_path
+    assert page.has_content? 'Instance copy has been created and locked.'
+
+    # add translation dog_en => dog_de
+    fill_in 'label_relation_skosxl_translations', with: 'dog_de'
+    click_link_or_button('Save')
+
+    assert page.has_content? 'Label has been successfully modified.'
+    click_link_or_button('Publish')
+
+    # check db relations
+    dog_en_with_translation = Iqvoc::XLLabel.base_class.find_by(origin: 'dog_en')
+    assert_equal 1, dog_en_with_translation.label_relation_skosxl_translations.size
+    assert_equal 'dog_de', dog_en_with_translation.label_relation_skosxl_translations.first.range.origin
+
+    dog_de_with_translation = Iqvoc::XLLabel.base_class.find_by(origin: 'dog_de')
+    assert_equal 1, dog_de_with_translation.label_relation_skosxl_translations.size
+    assert_equal 'dog_en', dog_de_with_translation.label_relation_skosxl_translations.first.range.origin
+
+    # remove previously added translation
+    click_link_or_button('Create new version')
+    fill_in 'label_relation_skosxl_translations', with: ''
+    click_link_or_button('Save')
+    assert page.has_content? 'Label has been successfully modified.'
+    click_link_or_button('Publish')
+
+    # check if relations are destroyed
+    dog_en_without_translation = Iqvoc::XLLabel.base_class.find_by(origin: 'dog_en')
+    assert dog_en_without_translation.label_relation_skosxl_translations.empty?
+
+    dog_de_without_translation = Iqvoc::XLLabel.base_class.find_by(origin: 'dog_de')
+    assert dog_de_without_translation.label_relation_skosxl_translations.empty?
+  end
+
+  test 'unidirectional label relation assignment' do
+    assert @dog_en.label_relation_skosxl_unidirectional_relations.empty?
+    assert @dog_de.label_relation_skosxl_unidirectional_relations.empty?
+
+    visit label_path(@dog_en, lang: 'en', format: 'html')
+    click_link_or_button('Create new version')
+    assert_equal edit_label_path(@dog_en, lang: 'en', format: 'html'), current_path
+    assert page.has_content? 'Instance copy has been created and locked.'
+
+    # add translation dog_en => dog_de
+    fill_in 'label_relation_skosxl_unidirectional_relations', with: 'dog_de'
+    click_link_or_button('Save')
+
+    assert page.has_content? 'Label has been successfully modified.'
+    click_link_or_button('Publish')
+
+    # check db relations
+    dog_en_with_unidirectional_relalation = Iqvoc::XLLabel.base_class.find_by(origin: 'dog_en')
+    assert_equal 1, dog_en_with_unidirectional_relalation.label_relation_skosxl_unidirectional_relations.size
+    assert_equal 'dog_de', dog_en_with_unidirectional_relalation.label_relation_skosxl_unidirectional_relations.first.range.origin
+
+    old_dog_de = Iqvoc::XLLabel.base_class.find_by(origin: 'dog_de')
+    assert old_dog_de.label_relation_skosxl_unidirectional_relations.empty?
+
+    # remove previously added unidirectional relation
+    click_link_or_button('Create new version')
+    fill_in 'label_relation_skosxl_unidirectional_relations', with: ''
+    click_link_or_button('Save')
+    assert page.has_content? 'Label has been successfully modified.'
+    click_link_or_button('Publish')
+
+    # check if relations are destroyed
+    dog_en_without_relations = Iqvoc::XLLabel.base_class.find_by(origin: 'dog_en')
+    assert dog_en_without_relations.label_relation_skosxl_unidirectional_relations.empty?
+
+    dog_de_without_translation = Iqvoc::XLLabel.base_class.find_by(origin: 'dog_de')
+    assert dog_de_without_translation.label_relation_skosxl_unidirectional_relations.empty?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_skosxl
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.0
 platform: ruby
 authors:
 - Robert Glaser
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.0
+        version: 4.11.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - app/helpers/labels_helper.rb
 - app/models/concept/skosxl/extension.rb
 - app/models/label/relation/base.rb
+- app/models/label/relation/bidirectional_relation_extension.rb
 - app/models/label/relation/skosxl/base.rb
 - app/models/label/skosxl/base.rb
 - app/models/label/skosxl/properties/literal_form.rb
@@ -134,6 +135,7 @@ files:
 - test/integration/dashboard_test.rb
 - test/integration/edit_labels_test.rb
 - test/integration/label_creation_test.rb
+- test/integration/label_relation_test.rb
 - test/integration/labels_order_test.rb
 - test/integration_test_helper.rb
 - test/models/concept_test.rb
@@ -160,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: iQvoc SKOS-XL extension
@@ -171,6 +173,7 @@ test_files:
 - test/integration/dashboard_test.rb
 - test/integration/edit_labels_test.rb
 - test/integration/label_creation_test.rb
+- test/integration/label_relation_test.rb
 - test/integration/labels_order_test.rb
 - test/integration_test_helper.rb
 - test/models/concept_test.rb