iqvoc_skosxl 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdc6a35e58b0d000312d04c68cdd1c2c6ac12605
-  data.tar.gz: f71ad4c57bac10b3f5d5a0d4a2e2859aa18a0537
+  metadata.gz: 71c4e174716271a11722d0ed4095fe90dd98fabc
+  data.tar.gz: 4db8d50bde562f2f519cc7020f779728b5a02b2c
 SHA512:
-  metadata.gz: 7bd885f0fe99b8b2714a39327e85169f25f24851f3b6e723fe08612eec472e1d052c7bdbb5401bdf0789214227fc4df9b2c8a1098f632d53609f09865279b02c
-  data.tar.gz: 648fe3b0bd5023ed198095bb529c6f7eaa5e3afaab29809c84c5339c9303b8c75ede63105d0b0ae53d5b1568fa8cca81f9ce1d6de93d635c41f873f69fb3cdc0
+  metadata.gz: 1cb8a521a55337791146f08706ced52e783bc5bb2b3e26594f08d3f4db650fea5132cf489193993fe7583945c83cf31e23f3eaf50e4bcd6e98c3309967555817
+  data.tar.gz: 051099db1772d5c835bb77a9d82961e7f754be5daa06e3a961b4e1bcacce8a34a3387fd05e40b9983b7640ced2f85a9527a013c96e7f81456866abb3c41970ee

data/Gemfile

@@ -1,49 +1,13 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.13'
-gem 'iqvoc', :git => 'git://github.com/innoq/iqvoc.git'
-
-group :development do
-  gem 'awesome_print'
-end
-
-group :assets do
-  gem 'uglifier',   '>= 1.0.3'
-  gem 'sass-rails', '~> 3.2.5'
-end
-
-group :development, :test do
-  platforms :ruby do
-    gem 'mysql2'
-    gem 'sqlite3'
-  end
-  platforms :jruby do
-    gem 'activerecord-jdbcsqlite3-adapter'
-    gem 'activerecord-jdbcmysql-adapter'
-  end
-end
+gem 'iqvoc', '~> 4.3.0', :github => 'innoq/iqvoc'
+gem 'mysql2'
+gem 'sqlite3'
+gem 'awesome_print', :group => :test
 
 group :test do
-  gem 'test-unit'
-  gem 'nokogiri', '~> 1.5.0'
   gem 'capybara'
-  gem 'database_cleaner'
-  gem 'factory_girl_rails'
-end
-
-group :production, :production_internal do
-  platforms :ruby do
-    gem 'sqlite3'
-
-    gem 'pry'
-    gem 'pry-rails'
-    gem 'pry-debugger'
-    gem 'pry-remote'
-    gem 'hirb-unicode'
-    gem 'cane'
-  end
-
-  platforms :jruby do
-    gem 'activerecord-oracle_enhanced-adapter'
-  end
+  gem 'factory_girl', '~> 4.3.0'
+  gem 'turn'
+  gem 'webmock'
 end

data/Gemfile.lock

@@ -1,186 +1,257 @@
 GIT
   remote: git://github.com/innoq/iqvoc.git
-  revision: 77c24b3613951ce84e4a65db2f04b53c278aa0b6
+  revision: 8b7c4a60041cdf1fc0e6fd41f7c9c4dc1d2578cb
   specs:
-    iqvoc (4.1.0)
+    iqvoc (4.3.2)
+      apipie-rails
       authlogic
+      bootstrap-sass (~> 2.3.1.3)
       bundler
       cancan
-      iq_rdf (~> 0.1.2)
+      database_cleaner
+      delayed_job_active_record (~> 4.0.0)
+      faraday
+      font-awesome-rails
+      iq_rdf (>= 0.1.13)
       iq_triplestorage
       json
-      kaminari
-      rails (~> 3.2.1)
+      kaminari (= 0.13.0)
+      linkeddata
+      maruku
+      nokogiri
+      protected_attributes (>= 1.0.5)
+      rails (~> 4.0.0)
       rails_autolink
-      sass-rails (~> 3.2.5)
+      sass-rails (~> 4.0.0)
       simple_form
+      uglifier (>= 1.3.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
+      mail (~> 2.5.4)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.2.9)
-    activerecord-jdbcmysql-adapter (1.2.9)
-      activerecord-jdbc-adapter (~> 1.2.9)
-      jdbc-mysql (~> 5.1.0)
-    activerecord-jdbcsqlite3-adapter (1.2.9)
-      activerecord-jdbc-adapter (~> 1.2.9)
-      jdbc-sqlite3 (~> 3.7.2)
-    activerecord-oracle_enhanced-adapter (1.4.2)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    arel (3.0.2)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
+      builder (~> 3.1.0)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.2)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
+    ansi (1.4.3)
+    apipie-rails (0.0.24)
+      rails (>= 3.0.10)
+    arel (4.0.2)
+    atomic (1.1.14)
+    atomic (1.1.14-java)
     authlogic (3.3.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
-    awesome_print (1.1.0)
-    builder (3.0.4)
-    cancan (1.6.9)
-    cane (2.5.2)
-      parallel
+    awesome_print (1.2.0)
+    bootstrap-sass (2.3.1.3)
+      sass (~> 3.2)
+    builder (3.1.4)
+    cancan (1.6.10)
     capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    coderay (1.0.9)
-    columnize (0.3.6)
-    database_cleaner (0.9.1)
-    debugger (1.5.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    database_cleaner (1.2.0)
+    delayed_job (4.0.0)
+      activesupport (>= 3.0, < 4.1)
+    delayed_job_active_record (4.0.0)
+      activerecord (>= 3.0, < 4.1)
+      delayed_job (>= 3.0, < 4.1)
+    ebnf (0.3.5)
+      rdf
+      sxp
+    equivalent-xml (0.4.0)
+      nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.2.0)
+    execjs (2.0.2)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
-      railties (>= 3.0.0)
-    hike (1.2.2)
-    hirb (0.7.1)
-    hirb-unicode (0.0.5)
-      hirb (~> 0.5)
-      unicode-display_width (~> 0.1.1)
-    i18n (0.6.1)
-    iq_rdf (0.1.10)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    font-awesome-rails (4.0.3.1)
+      railties (>= 3.2, < 5.0)
+    haml (4.0.5)
+      tilt
+    hike (1.2.3)
+    htmlentities (4.3.1)
+    i18n (0.6.9)
+    iq_rdf (0.1.14)
       activesupport
       builder
       bundler
     iq_triplestorage (0.2.2)
-    jdbc-mysql (5.1.24)
-    jdbc-sqlite3 (3.7.2.1)
-    journey (1.0.4)
-    json (1.7.7)
-    json (1.7.7-java)
-    kaminari (0.14.1)
+    json (1.8.1)
+    json (1.8.1-java)
+    json-ld (1.1.1)
+      rdf (>= 1.0.8)
+    kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+      railties (>= 3.0.0)
+    linkeddata (1.1.1)
+      equivalent-xml (>= 0.4.0)
+      json-ld (>= 1.1.1)
+      nokogiri (>= 1.6.1)
+      rdf (>= 1.1.1)
+      rdf-aggregate-repo (>= 1.1.0)
+      rdf-isomorphic (>= 1.1.0)
+      rdf-json (>= 1.1.0)
+      rdf-microdata (>= 1.1.1)
+      rdf-n3 (>= 1.1.0)
+      rdf-rdfa (>= 1.1.1)
+      rdf-rdfxml (>= 1.1.0)
+      rdf-trig (>= 1.1.2)
+      rdf-trix (>= 1.1.0)
+      rdf-turtle (>= 1.1.2)
+      sparql (>= 1.1.2)
+      sparql-client (>= 1.1.1)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.22)
-    multi_json (1.7.2)
-    mysql2 (0.3.11)
-    nokogiri (1.5.9)
-    nokogiri (1.5.9-java)
-    parallel (0.6.4)
+    maruku (0.7.1)
+    mime-types (1.25.1)
+    mini_portile (0.5.2)
+    minitest (4.7.5)
+    multi_json (1.8.4)
+    multipart-post (2.0.0)
+    mysql2 (0.3.13)
+    net-http-persistent (2.9.4)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.1-java)
+      mini_portile (~> 0.5.0)
     polyglot (0.3.3)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
-    pry-rails (0.2.2)
-      pry (>= 0.9.10)
-    pry-remote (0.1.7)
-      pry (~> 0.9)
-      slop (~> 3.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    protected_attributes (1.0.5)
+      activemodel (>= 4.0.1, < 5.0)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    rails_autolink (1.0.9)
-      rails (~> 3.1)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.2)
+      sprockets-rails (~> 2.0.0)
+    rails_autolink (1.1.5)
+      rails (> 3.1)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    sass (3.2.7)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.1)
+    rdf (1.1.2.1)
+    rdf-aggregate-repo (1.1.0)
+      rdf (>= 1.1)
+    rdf-isomorphic (1.1.0)
+      rdf (>= 1.1)
+    rdf-json (1.1.0)
+      rdf (>= 1.1.0)
+    rdf-microdata (1.1.1)
+      htmlentities (>= 4.3.0)
+      nokogiri (>= 1.6.1)
+      rdf (>= 1.1.0)
+      rdf-xsd (>= 1.1.0)
+    rdf-n3 (1.1.0)
+      rdf (>= 1.1)
+    rdf-rdfa (1.1.2)
+      haml (>= 4.0)
+      htmlentities (>= 4.3.1)
+      rdf (>= 1.1.0)
+      rdf-xsd (>= 1.1)
+    rdf-rdfxml (1.1.0)
+      rdf (>= 1.1)
+      rdf-rdfa (>= 1.1)
+      rdf-xsd (>= 1.1)
+    rdf-trig (1.1.2)
+      ebnf (>= 0.3.5)
+      rdf (>= 1.1.1.1)
+      rdf-turtle (>= 1.1.2)
+    rdf-trix (1.1.0)
+      rdf (>= 1.1)
+    rdf-turtle (1.1.2)
+      ebnf (>= 0.3.5)
+      rdf (>= 1.1.1.1)
+    rdf-xsd (1.1.0)
+      rdf (>= 1.1)
+    safe_yaml (0.9.7)
+    sass (3.2.14)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
-    simple_form (2.1.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-    slop (3.4.4)
-    sprockets (2.2.2)
+      sprockets-rails (~> 2.0.0)
+    simple_form (3.0.1)
+      actionpack (>= 4.0.0, < 4.1)
+      activemodel (>= 4.0.0, < 4.1)
+    sparql (1.1.2.1)
+      builder (>= 3.0)
+      ebnf (>= 0.3.2)
+      json (>= 1.7)
+      rdf (>= 1.1.0)
+      rdf-aggregate-repo (>= 1.1.0)
+      rdf-xsd (>= 1.0.2)
+      sparql-client (>= 1.1)
+      sxp (>= 0.1.3)
+    sparql-client (1.1.1)
+      json (>= 1.8)
+      net-http-persistent (>= 1.4)
+      rdf (>= 1.1)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    test-unit (2.5.4)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.8)
+    sxp (0.1.5)
     thor (0.18.1)
-    tilt (1.3.7)
-    treetop (1.4.12)
+    thread_safe (0.1.3)
+      atomic
+    thread_safe (0.1.3-java)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    uglifier (2.0.1)
+    turn (0.9.6)
+      ansi
+    tzinfo (0.3.38)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    unicode-display_width (0.1.1)
+      json (>= 1.8.0)
+    webmock (1.15.2)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -189,24 +260,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord-jdbcmysql-adapter
-  activerecord-jdbcsqlite3-adapter
-  activerecord-oracle_enhanced-adapter
   awesome_print
-  cane
   capybara
-  database_cleaner
-  factory_girl_rails
-  hirb-unicode
-  iqvoc!
+  factory_girl (~> 4.3.0)
+  iqvoc (~> 4.3.0)!
   mysql2
-  nokogiri (~> 1.5.0)
-  pry
-  pry-debugger
-  pry-rails
-  pry-remote
-  rails (~> 3.2.13)
-  sass-rails (~> 3.2.5)
   sqlite3
-  test-unit
-  uglifier (>= 1.0.3)
+  turn
+  webmock

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

@@ -1,8 +1,6 @@
 class Labeling::SKOSXL::AltLabel < Labeling::SKOSXL::Base
 
-  def build_rdf(document, subject)
-    subject.Skosxl::altLabel(IqRdf.build_uri(target.origin))
-    subject.Skos.altLabel(target.to_s, :lang => target.language)
-  end
+  self.rdf_namespace = 'skosxl'
+  self.rdf_predicate = 'altLabel'
 
 end

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

@@ -1,5 +1,9 @@
 class Labeling::SKOSXL::Base < Labeling::Base
 
+  class_attribute :rdf_namespace, :rdf_predicate
+  self.rdf_namespace = nil
+  self.rdf_predicate = nil
+
   def self.target_in_edit_mode
     includes(:target).merge(Iqvoc::XLLabel.base_class.in_edit_mode)
   end
@@ -32,7 +36,7 @@ class Labeling::SKOSXL::Base < Labeling::Base
   def self.single_query(params = {})
     query_str = build_query_string(params)
 
-    scope = includes(:target).order("LOWER(#{Label::Base.table_name}.value)")
+    scope = includes(:target).order("LOWER(#{Label::Base.table_name}.value)").references(:labels)
 
     if params[:query].present?
       scope = scope.merge(Label::Base.by_query_value(query_str).by_language(params[:languages].to_a).published)
@@ -52,7 +56,7 @@ class Labeling::SKOSXL::Base < Labeling::Base
       #
     end
 
-    scope
+    scope.map { |result| SearchResult.new(result) }
   end
 
   def self.search_result_partial_name
@@ -71,6 +75,11 @@ class Labeling::SKOSXL::Base < Labeling::Base
   #   includes(:target).merge(self.label_class.by_language(language))
   # end
 
+  def build_rdf(document, subject)
+    subject.send(self.rdf_namespace.camelcase).send(self.rdf_predicate, IqRdf.build_uri(target.origin))
+    subject.Skos.send(self.rdf_predicate, target.value.to_s, :lang => target.language)
+  end
+
   def build_search_result_rdf(document, result)
     result.Sdc::link(IqRdf.build_uri(owner.origin))
     build_rdf(document, result)

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

@@ -1,9 +1,7 @@
 class Labeling::SKOSXL::HiddenLabel < Labeling::SKOSXL::Base
 
-  def build_rdf(document, subject)
-    subject.Skosxl::hiddenLabel(IqRdf.build_uri(target.origin))
-    subject.Skos.hiddenLabel(target.to_s, :lang => target.language)
-  end
+  self.rdf_namespace = 'skosxl'
+  self.rdf_predicate = 'hiddenLabel'
 
   def self.view_section(obj)
     "hidden"

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

@@ -1,12 +1,10 @@
 class Labeling::SKOSXL::PrefLabel < Labeling::SKOSXL::Base
 
-  def build_rdf(document, subject)
-    subject.Skosxl::prefLabel(IqRdf.build_uri(target.origin))
-    subject.Skos.prefLabel(target.to_s, :lang => target.language)
-  end
+  self.rdf_namespace = 'skosxl'
+  self.rdf_predicate = 'prefLabel'
 
   def self.only_one_allowed?
     true
   end
 
-end
+end

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

@@ -6,4 +6,4 @@
 <div class="panel">
   <h2><%= t("txt.views.labels.language") %></h2>
   <%= label.language %>
-</div
+</div>

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

@@ -1,9 +1,13 @@
 <% if concept = result.owner %>
-  <dt>
-    <%= link_to search_result_label(highlight_query(result.target.value, params[:query]), concept), concept_path(:id => concept) %>
-  </dt>
-  <dd><%= t('txt.views.search_results.type') %>: <%= result.class.model_name.human %></dd>
-  <% if result.target.language %>
-    <dd><%= t('txt.views.search_results.language') %>: <%= result.target.language %></dd>
-  <% end %>
+<li class="search-result" data-rdf-namespace="<%= iqvoc_default_rdf_namespaces[result.rdf_namespace.try(:to_sym)] %>" data-rdf-predicate="<%= result.rdf_predicate %>" data-rdf-value="<%= result.to_s %>" data-rdf-language="<%= result.language %>">
+  <%= link_to_object(concept, result.target.value, :class => 'search-result-link', :data => { 'resource-path' => rdf_path(concept.origin, :lang => nil, :format => nil) }) %> <% if concept.additional_info.present? %>(<%= concept.additional_info %>)<% end %>
+  <dl class="search-result-meta">
+    <dt class="search-result-key"><%= t('txt.views.search_results.type') %></dt>
+    <dd class="search-result-value" data-key="<%= t('txt.views.search_results.type') %>"><%= result.model_name.human %></dd>
+    <% if result.target.language %>
+    <dt class="search-result-key"><%= t('txt.views.search_results.language') %></dt>
+    <dd class="search-result-value" data-key="<%= t('txt.views.search_results.language') %>"><%= result.target.language %></dd>
+    <% end %>
+  </dl>
+</li>
 <% end %>

data/config/engine.rb

@@ -7,7 +7,7 @@ module Iqvoc
       paths["lib/tasks"] << "lib/engine_tasks"
 
       initializer "iqvoc_skosxl.load_migrations" do |app|
-        app.config.paths['db/migrate'] += Iqvoc::SKOSXL::Engine.paths['db/migrate'].existent
+        app.config.paths['db/migrate'].concat(Iqvoc::SKOSXL::Engine.paths['db/migrate'].existent)
       end
     end
 

data/config/environments/development.rb

@@ -1,4 +1,3 @@
-require 'debug'
 require 'iqvoc/environments/development'
 
 if Iqvoc::SKOSXL.const_defined?(:Application)

data/config/environments/test.rb

@@ -1,4 +1,3 @@
-require 'debug'
 require 'iqvoc/environments/test'
 
 if Iqvoc::SKOSXL.const_defined?(:Application)

data/config/initializers/iqvoc.rb

@@ -2,5 +2,6 @@ silence_warnings do
   Iqvoc::Label = nil
 end
 
-Iqvoc.searchable_class_names = ['Labeling::SKOSXL::Base'] +
-    Iqvoc::Concept.labeling_class_names.keys + Iqvoc::Concept.note_class_names
+Iqvoc.searchable_class_names = { 'Labeling::SKOSXL::Base' => 'labels',
+  'Labeling::SKOSXL::PrefLabel' => 'pref_labels',
+  'Labeling::SKOSXL::AltLabel' => 'alt_labels' }

data/config/initializers/secret_token.rb

@@ -6,4 +6,5 @@
 # no regular words or you'll be exposed to dictionary attacks.
 if Iqvoc::SKOSXL.const_defined?(:Application)
   Iqvoc::SKOSXL::Application.config.secret_token = '1cf4863673a83d39f30e77670978adaa9009fc27e6869066c67157ef6790c4b79a4eb4c32029987a3444483b73cb01606291c272a32d6201c06f4ca75dcd5b14'
-end
+  Iqvoc::SKOSXL::Application.config.secret_key_base = '1cf4863673a83d39f30e77670978adaa9009fc27e6869066c67157ef6790c4b79a4eb4c32029987a3444483b73cb01606291c272a32d6201c06f4ca75dcd5b14'
+end

data/config/initializers/secret_token.rb.template

@@ -5,5 +5,5 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 if Iqvoc::SKOSXL.const_defined?(:Application)
-  Iqvoc::SKOSXL::Application.config.secret_token = '1cf4863673a83d39f30e77670978adaa9009fc27e6869066c67157ef6790c4b79a4eb4c32029987a3444483b73cb01606291c272a32d6201c06f4ca75dcd5b14'
-end
+  Iqvoc::SKOSXL::Application.config.secret_key_base = '1cf4863673a83d39f30e77670978adaa9009fc27e6869066c67157ef6790c4b79a4eb4c32029987a3444483b73cb01606291c272a32d6201c06f4ca75dcd5b14'
+end

data/config/routes.rb

@@ -1,13 +1,10 @@
 Iqvoc.localized_routes << lambda do |routing|
   routing.resources :labels
 
-  routing.match "labels/versions/:origin/branch(.:format)"      => "labels/versions#branch",    :as => "label_versions_branch"
-  routing.match "labels/versions/:origin/merge(.:format)"       => "labels/versions#merge",     :as => "label_versions_merge"
-  routing.match "labels/versions/:origin/lock(.:format)"        => "labels/versions#lock",      :as => "label_versions_lock"
-  routing.match "labels/versions/:origin/unlock(.:format)"      => "labels/versions#unlock",    :as => "label_versions_unlock"
-  routing.match "labels/versions/:origin/to_review(.:format)"   => "labels/versions#to_review", :as => "label_versions_to_review"
-  routing.match "labels/versions/:origin/consistency_check(.:format)" => "labels/versions#consistency_check", :as => "label_versions_consistency_check"
-end
-
-Rails.application.routes.draw do
+  routing.post "labels/versions/:origin/branch(.:format)"      => "labels/versions#branch",    :as => "label_versions_branch"
+  routing.post "labels/versions/:origin/merge(.:format)"       => "labels/versions#merge",     :as => "label_versions_merge"
+  routing.post "labels/versions/:origin/lock(.:format)"        => "labels/versions#lock",      :as => "label_versions_lock"
+  routing.post "labels/versions/:origin/unlock(.:format)"      => "labels/versions#unlock",    :as => "label_versions_unlock"
+  routing.post "labels/versions/:origin/to_review(.:format)"   => "labels/versions#to_review", :as => "label_versions_to_review"
+  routing.get "labels/versions/:origin/consistency_check(.:format)" => "labels/versions#consistency_check", :as => "label_versions_consistency_check"
 end

data/db/schema.rb

@@ -0,0 +1,162 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20130315141952) do
+
+  create_table "collection_members", :force => true do |t|
+    t.integer "collection_id"
+    t.integer "target_id"
+    t.string  "type"
+  end
+
+  add_index "collection_members", ["collection_id", "target_id", "type"], :name => "ix_collections_fk_type"
+
+  create_table "concept_relations", :force => true do |t|
+    t.string   "type"
+    t.integer  "owner_id"
+    t.integer  "target_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "rank",       :default => 100
+  end
+
+  add_index "concept_relations", ["owner_id", "target_id"], :name => "ix_concept_relations_fk"
+
+  create_table "concepts", :force => true do |t|
+    t.string   "type"
+    t.string   "origin",               :limit => 4000
+    t.integer  "rev",                                  :default => 1
+    t.date     "published_at"
+    t.integer  "published_version_id"
+    t.integer  "locked_by"
+    t.date     "expired_at"
+    t.date     "follow_up"
+    t.boolean  "to_review"
+    t.date     "rdf_updated_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean  "top_term",                             :default => false
+  end
+
+  add_index "concepts", ["origin"], :name => "ix_concepts_on_origin", :length => {"origin"=>255}
+  add_index "concepts", ["published_version_id"], :name => "ix_concepts_publ_version_id"
+
+  create_table "configuration_settings", :force => true do |t|
+    t.string "key"
+    t.string "value"
+  end
+
+  create_table "label_relations", :force => true do |t|
+    t.string   "type"
+    t.integer  "domain_id"
+    t.integer  "range_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "label_relations", ["domain_id", "range_id", "type"], :name => "ix_label_rel_dom_rng_type"
+  add_index "label_relations", ["type"], :name => "ix_label_relations_on_type"
+
+  create_table "labelings", :force => true do |t|
+    t.string   "type"
+    t.integer  "owner_id"
+    t.integer  "target_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "labelings", ["owner_id", "target_id", "type"], :name => "ix_labelings_fk_type"
+  add_index "labelings", ["type"], :name => "ix_labelings_on_type"
+
+  create_table "labels", :force => true do |t|
+    t.string   "type"
+    t.string   "origin",               :limit => 4000
+    t.string   "language"
+    t.string   "value",                :limit => 1024
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.date     "published_at"
+    t.integer  "rev",                                  :default => 1
+    t.integer  "published_version_id"
+    t.integer  "locked_by"
+    t.date     "expired_at"
+    t.date     "follow_up"
+    t.boolean  "to_review"
+    t.date     "rdf_updated_at"
+  end
+
+  add_index "labels", ["language"], :name => "ix_labels_on_language"
+  add_index "labels", ["origin"], :name => "ix_labels_on_origin", :length => {"origin"=>255}
+  add_index "labels", ["published_version_id"], :name => "ix_labels_on_published_v"
+  add_index "labels", ["value"], :name => "ix_labels_on_value", :length => {"value"=>255}
+
+  create_table "matches", :force => true do |t|
+    t.integer  "concept_id"
+    t.string   "type"
+    t.string   "value"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "matches", ["concept_id", "type"], :name => "ix_matches_fk_type"
+  add_index "matches", ["type"], :name => "ix_matches_on_type"
+
+  create_table "notations", :force => true do |t|
+    t.integer "concept_id"
+    t.string  "value",      :limit => 4000
+    t.string  "data_type",  :limit => 4000
+  end
+
+  add_index "notations", ["concept_id"], :name => "index_notations_on_concept_id"
+
+  create_table "note_annotations", :force => true do |t|
+    t.integer  "note_id"
+    t.string   "predicate",  :limit => 50
+    t.string   "value",      :limit => 1024
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "namespace",  :limit => 50
+  end
+
+  add_index "note_annotations", ["note_id"], :name => "ix_note_annotations_fk"
+
+  create_table "notes", :force => true do |t|
+    t.string   "language",   :limit => 2
+    t.string   "value",      :limit => 4000
+    t.string   "type",       :limit => 50
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.integer  "owner_id"
+    t.string   "owner_type",                 :null => false
+  end
+
+  add_index "notes", ["language"], :name => "ix_notes_on_language"
+  add_index "notes", ["owner_id", "owner_type", "type"], :name => "ix_notes_fk_type"
+  add_index "notes", ["type"], :name => "ix_notes_on_type"
+
+  create_table "users", :force => true do |t|
+    t.string   "forename"
+    t.string   "surname"
+    t.string   "email"
+    t.string   "crypted_password"
+    t.boolean  "active"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "password_salt"
+    t.string   "persistence_token"
+    t.string   "perishable_token"
+    t.string   "role"
+    t.string   "telephone_number"
+  end
+
+end

data/iqvoc_skosxl.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary     = "iQvoc SKOS-XL extension"
   s.description = ""
 
-  s.add_dependency "iqvoc", "~> 4.1.0"
+  s.add_dependency "iqvoc", "~> 4.3.0"
   s.add_dependency "bundler"
 
   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

@@ -1,5 +1,5 @@
 module Iqvoc
   module SKOSXL
-    VERSION = "2.1.0"
+    VERSION = "2.3.0"
   end
 end

data/lib/iqvoc/xllabel.rb

@@ -14,7 +14,7 @@ module Iqvoc
 
     self.base_class_name = 'Label::SKOSXL::Base'
 
-    self.relation_class_names = ['Label::Relation::SKOSXL::Base']
+    self.relation_class_names = []
 
     self.note_class_names = Iqvoc::Concept.note_class_names
 

data/test/integration/concept_label_language_test.rb

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'integration_test_helper'
+require Iqvoc::Engine.root.join('test', 'integration_test_helper')
 
 class ConceptLabelLanguageTest < ActionDispatch::IntegrationTest
 

data/test/integration/dashboard_test.rb

@@ -1,5 +1,21 @@
+# encoding: UTF-8
+
+# Copyright 2011 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 'test_helper'
-require 'integration_test_helper'
+require Iqvoc::Engine.root.join('test', 'integration_test_helper')
 
 class DashboardTest < ActionDispatch::IntegrationTest
 

data/test/integration/edit_labels_test.rb

@@ -1,5 +1,21 @@
+# encoding: UTF-8
+
+# Copyright 2011 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 'test_helper'
-require 'integration_test_helper'
+require Iqvoc::Engine.root.join('test', 'integration_test_helper')
 
 class EditConceptsTest < ActionDispatch::IntegrationTest
 

data/test/integration/labels_order_test.rb

@@ -1,3 +1,19 @@
+# encoding: UTF-8
+
+# Copyright 2011 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 'test_helper'
 
 class LabelsOrderTest < ActionDispatch::IntegrationTest

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
+require 'factories'
 
 class ActiveSupport::TestCase
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_skosxl
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Robert Glaser
@@ -10,34 +10,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -47,11 +47,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - Gemfile
 - Gemfile.lock
+- README.md
 - Rakefile
-- iqvoc_skosxl.gemspec
 - app/assets/javascripts/iqvoc_skosxl/manifest.js
 - app/assets/javascripts/manifest.js
 - app/assets/stylesheets/iqvoc_skosxl/entity_select.css
@@ -111,7 +110,9 @@ files:
 - config/routes.rb
 - db/migrate/20110408121540_extend_label.rb
 - db/migrate/20110408123644_add_label_relations.rb
+- db/schema.rb
 - db/seeds.rb
+- iqvoc_skosxl.gemspec
 - lib/engine_tasks/db.rake
 - lib/iqvoc/skosxl/version.rb
 - lib/iqvoc/xllabel.rb
@@ -122,7 +123,6 @@ files:
 - test/integration/dashboard_test.rb
 - test/integration/edit_labels_test.rb
 - test/integration/labels_order_test.rb
-- test/integration_test_helper.rb
 - test/test_helper.rb
 - test/unit/label_test.rb
 homepage: http://innoq.com
@@ -134,17 +134,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: iQvoc SKOS-XL extension
@@ -155,6 +155,5 @@ test_files:
 - test/integration/dashboard_test.rb
 - test/integration/edit_labels_test.rb
 - test/integration/labels_order_test.rb
-- test/integration_test_helper.rb
 - test/test_helper.rb
 - test/unit/label_test.rb

data/test/integration_test_helper.rb

@@ -1,27 +0,0 @@
-require 'test_helper'
-require 'capybara/rails'
-
-module ActionController
-  class IntegrationTest
-    include Capybara::DSL
-
-    def login(role = nil)
-      logout
-      user(role)
-      visit new_user_session_path(:lang => :de)
-      fill_in "E-Mail", :with => user.email
-      fill_in "Passwort", :with => user.password
-      click_button "Anmelden"
-    end
-
-    def logout
-      visit dashboard_path(:lang => :de)
-      click_link_or_button "Abmelden" if page.has_link?("Abmelden")
-    end
-
-    def user(role = nil)
-      @user ||= FactoryGirl.create(:user, :role => (role || User.default_role))
-    end
-
-  end
-end