iqvoc_skosxl 2.6.0 → 2.7.0

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

@@ -8,8 +8,9 @@ module Label
         validates :origin, uniqueness: { scope: :rev }
         validate :origin_has_to_be_escaped
 
+        validate :referenced_published_concepts_has_to_be_valid, if: :validatable_for_publishing?
         validates :value, uniqueness: { scope: [:language, :rev] },
-                          if: :validatable_for_publishing?
+          if: :validatable_for_publishing?
         validates :value, presence: true, if: :validatable_for_publishing?
       end
 
@@ -19,6 +20,20 @@ module Label
         end
       end
 
+      def referenced_published_concepts_has_to_be_valid
+        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
+          labels = concept.pref_labels.reject{ |l| l == published_label }
+
+          unless 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

@@ -36,25 +36,32 @@ class Labeling::SKOSXL::Base < Labeling::Base
     query_str = build_query_string(params)
 
     scope = includes(:target).order("LOWER(#{Label::Base.table_name}.value)").references(:labels, :concepts)
-
     if params[:query].present?
-      scope = scope.merge(Label::Base.by_query_value(query_str).by_language(params[:languages].to_a).published)
+      labels = Label::Base.by_query_value(query_str).by_language(params[:languages].to_a).published
+      scope = scope.merge(labels)
     else
       scope = scope.merge(Label::Base.by_language(params[:languages].to_a).published)
     end
 
     if params[:collection_origin].present?
-      scope = scope.includes(owner: { collection_members: :collection })
-      scope = scope.merge(Collection::Base.where(origin: params[:collection_origin]))
+      collection = Collection::Base.where(origin: params[:collection_origin]).last
+      if collection
+        scope = scope.includes(owner: { collection_members: :collection })
+        scope = scope.where("#{Collection::Member::Base.table_name}.collection_id" => collection.id)
+      else
+        raise "Collection with Origin #{params[:collection_origin]} not found!"
+      end
     end
 
-    # Check that the included concept is in published state:
-    scope = scope.includes(:owner).merge(Iqvoc::Concept.base_class.published)
-
-    unless params[:collection_origin].blank?
-      #
+    # apply search entity type
+    case params[:for]
+    when 'concept'
+      scope = scope.includes(:owner).merge(Iqvoc::Concept.base_class.published)
+    when 'collection'
+      scope = scope.includes(:owner).merge(Iqvoc::Collection.base_class.published)
     end
 
+    scope = yield(scope) if block_given?
     scope.map { |result| SearchResult.new(result) }
   end
 

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

@@ -6,10 +6,8 @@
   <fieldset id="label_base_data">
     <legend><%= t("txt.common.attributes") %></legend>
     <%= f.text_field :value %>
-    <%= f.form_group :language, :label => { :text => label.class.human_attribute_name(:language) } do %>
-      <span><%= label.language %></span>
-      <%= f.hidden_field :language %>
-    <% end %>
+
+    <%= f.select :language, Iqvoc.all_languages %>
 
     <% if Iqvoc::XLLabel.has_additional_base_data %>
       <%= render 'partials/label/additional_base_data', :f => f %>

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

@@ -6,7 +6,8 @@
   <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => rdf_url(label.origin, :format => :rdf, :published => published_param, :lang => nil), :id => 'rdf_link_xml' %>
   <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => rdf_url(label.origin, :format => :ttl, :published => published_param, :lang => nil), :id => 'rdf_link_ttl' %>
   <%= sidebar_item :icon => 'share', :text => 'RDF/NTriples', :path => rdf_url(label.origin, :format => :nt, :published => published_param, :lang => nil), :id => 'rdf_link_nt' %>
+
   <%= sidebar_header 'Links' %>
-  <%#= sidebar_item :icon => 'zoom-in', :text => 'Visualization', :path => '#visualization', :'data-toggle' => 'modal' %>
+  <%= sidebar_item :icon => 'link', :text => t('txt.models.label.uri'), :path => rdf_url(label.origin, :format => nil, :published => published_param, :lang => nil) %>
   <%= render Iqvoc::XLLabel.base_class.new_link_partial_name %>
 <% end %>

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

@@ -30,7 +30,7 @@
       label_path(:published => 0, :id => @label.origin),
       :method => :delete,
       :confirm => I18n.t("txt.views.versioning.delete_confirm"),
-      :class => 'btn btn-default' %>
+      :class => 'btn btn-danger' %>
   <% else %>
     <%= button_to t("txt.views.versioning.unlock"),
       label_versions_unlock_path(:origin => @label.origin),

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

@@ -1,7 +1,11 @@
 <div class="relation panel">
   <h2><%= klass.model_name.human(:count => 2) %></h2>
   <div class="relation-body">
-    <%= item_listing(label.related_labels_for_relation_class(klass)) do |label|
+    <%-
+      items = label.related_labels_for_relation_class(klass)
+      items = items.select { |item| can?(:read, item) }
+    -%>
+    <%= item_listing(items) do |label|
       link_to label.value, label_path(:id => label)
     end
   %>

data/app/views/partials/label/skosxl/_new_link_base.html.erb

@@ -1,5 +1 @@
-<span class="list-group-item">
-<%= icon(:edit) %> <%= t("txt.views.labels.new") %> (<% Iqvoc::Concept::labeling_class_names.values.flatten.map(&:to_s).uniq.each do |language| %>
-  <%= link_to language.to_s, new_label_path(:published => 0, :language => language), :class => 'inline-language-selector' %>
-<% end %>)
-</span>
+<%= sidebar_item :icon => 'edit', :text => t('txt.views.labels.new'), :path => new_label_path(published: 0) %>

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

@@ -0,0 +1,13 @@
+<% if label = result.result_object %>
+<li class="search-result" data-rdf-namespace="<%= result.rdf_namespace %>" data-rdf-value="<%= result.value %>" data-rdf-language="<%= result.language %>">
+  <%= link_to_object(label, result.value, :class => 'search-result-link') %>
+  <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.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.language %></dd>
+    <% end %>
+  </dl>
+</li>
+<% end %>

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

@@ -2,16 +2,24 @@
   <% if defined?(concept) %>
     <h2><%= klass.model_name.human(:count => 2) %> <small><%= "#{t("languages.#{lang}", :default => lang.to_s)}" %></small></h2>
     <div class="relation-body">
-      <%= item_listing(concept.labels_for_labeling_class_and_language(klass, lang.to_s)) do |label|
-        link_to label.value, label_path(:id => label)
+      <%-
+        items = concept.labels_for_labeling_class_and_language(klass, lang.to_s)
+        items = items.select { |item| can?(:read, item) }
+      -%>
+      <%= item_listing(items) do |label|
+        link_to label.value, label_path(:id => label), class: label.published? ? '' : 'unpublished'
       end
     %>
     </div>
   <% elsif defined?(label) %>
     <h2><%= klass.model_name.human %> <%= t("txt.common.of") %></h2>
     <div class="relation-body">
-      <%= item_listing(label.concepts_for_labeling_class(klass)) do |c|
-        link_to c.to_s, concept_path(:id => c)
+      <%-
+        items = label.concepts_for_labeling_class(klass)
+        items = items.select { |item| can?(:read, item) }
+      -%>
+      <%= item_listing(items) do |c|
+        link_to c.to_s, concept_path(:id => c), class: c.published? ? '' : 'unpublished'
       end
     %>
     </div>

data/config/database.yml

@@ -1,36 +1,20 @@
-<% socket = [
-  "/tmp/mysql.sock",
-  "/opt/local/var/run/mysql5/mysqld.sock",
-  "/tmp/mysqld.sock",
-  "/var/run/mysqld.sock"
-].detect { |socket| File.exist?(socket) } %>
-
-defaults: &defaults
-  encoding: utf8
-  username: root
-  password:
-<% if defined?(JRuby) %>
-  adapter: jdbcmysql
-  hostname: localhost
-<% else %>
-  adapter: mysql2
-  socket: <%= socket %>
-<% end %>
-
 development:
-  <<: *defaults
+  adapter: mysql2
   database: iqvoc_skosxl_development
+  username: root
+  password:
+  encoding: utf8
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
 test:
-  <<: *defaults
+  adapter: mysql2
   database: iqvoc_skosxl_test
+  username: root
+  password:
+  encoding: utf8
 
 production:
+  adapter: mysql2
+  database: iqvoc_skosxl_production
+  username: root
+  password:
   encoding: utf8
-  username: iqvoc_skosxl
-  password: 
-  database: iqvoc_skosxl
-  adapter: oracle_enhanced

data/config/database.yml.postgresql

@@ -0,0 +1,23 @@
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: iqvoc_skosxl_development
+  pool: 5
+  username: postgres
+  password:
+
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: iqvoc_skosxl_test
+  pool: 5
+  username: postgres
+  password:
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: iqvoc_skosxl_production
+  pool: 5
+  username: postgres
+  password:

data/config/initializers/iqvoc.rb

@@ -3,6 +3,7 @@ silence_warnings do
 end
 
 Iqvoc.searchable_class_names = {
+    'Label::SKOSXL::Base' => 'xllabels',
     'Labeling::SKOSXL::Base' => 'labels',
     'Labeling::SKOSXL::PrefLabel' => 'pref_labels',
     'Labeling::SKOSXL::AltLabel' => 'alt_labels'

data/config/locales/de.yml

@@ -6,4 +6,6 @@ de:
           concepts: Konzepte
     models:
       label:
+        uri: Label-URI
         origin_invalid: enthält ungültige Zeichen.
+        referenced_concepts_invalid: Referenzierte Konzepte werden durch diese Änderung invalide. Bitte Labelzuordnung am Konzept aufheben.

data/config/locales/en.yml

@@ -6,4 +6,6 @@ en:
           concepts: Concepts
     models:
       label:
+        uri: Label URI
         origin_invalid: Origin contains invalid characters.
+        referenced_concepts_invalid: Some referenced concepts become invalid. Please remove label from referenced concepts first.

data/db/migrate/20150414083600_remove_fk_constraints_iqvoc_skosxl.rb

@@ -0,0 +1,5 @@
+class RemoveFkConstraintsIqvocSkosxl < ActiveRecord::Migration
+  def change
+    remove_foreign_key :labels, column: 'published_version_id'
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150108154312) do
+ActiveRecord::Schema.define(version: 20150414083600) do
 
   create_table "collection_members", force: :cascade do |t|
     t.integer "collection_id", limit: 4
@@ -20,7 +20,7 @@ ActiveRecord::Schema.define(version: 20150108154312) 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_5a05e228ee", using: :btree
+  add_index "collection_members", ["target_id"], name: "fk_rails_ca5b83d3a1", using: :btree
 
   create_table "concept_relations", force: :cascade do |t|
     t.string   "type",       limit: 255
@@ -32,7 +32,7 @@ ActiveRecord::Schema.define(version: 20150108154312) 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_1b7d5559ab", using: :btree
+  add_index "concept_relations", ["target_id"], name: "fk_rails_b9505863fe", using: :btree
 
   create_table "concepts", force: :cascade do |t|
     t.string   "type",                 limit: 255
@@ -50,7 +50,7 @@ ActiveRecord::Schema.define(version: 20150108154312) do
     t.boolean  "top_term",             limit: 1,    default: false
   end
 
-  add_index "concepts", ["locked_by"], name: "fk_rails_ca7e673cc3", using: :btree
+  add_index "concepts", ["locked_by"], name: "fk_rails_c1c63f3716", 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
 
@@ -60,20 +60,28 @@ ActiveRecord::Schema.define(version: 20150108154312) do
   end
 
   create_table "delayed_jobs", force: :cascade do |t|
-    t.integer  "priority",   limit: 4,     default: 0, null: false
-    t.integer  "attempts",   limit: 4,     default: 0, null: false
-    t.text     "handler",    limit: 65535,             null: false
-    t.text     "last_error", limit: 65535
+    t.integer  "priority",                    limit: 4,     default: 0, null: false
+    t.integer  "attempts",                    limit: 4,     default: 0, null: false
+    t.text     "handler",                     limit: 65535,             null: false
+    t.text     "last_error",                  limit: 65535
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
-    t.string   "locked_by",  limit: 255
-    t.string   "queue",      limit: 255
+    t.string   "locked_by",                   limit: 255
+    t.string   "queue",                       limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "error_message",               limit: 255
+    t.string   "delayed_reference_type",      limit: 255
+    t.integer  "delayed_reference_id",        limit: 4
+    t.string   "delayed_global_reference_id", limit: 255
   end
 
+  add_index "delayed_jobs", ["delayed_global_reference_id"], name: "delayed_jobs_delayed_global_reference_id", using: :btree
+  add_index "delayed_jobs", ["delayed_reference_id"], name: "delayed_jobs_delayed_reference_id", using: :btree
+  add_index "delayed_jobs", ["delayed_reference_type"], name: "delayed_jobs_delayed_reference_type", using: :btree
   add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
+  add_index "delayed_jobs", ["queue"], name: "delayed_jobs_queue", using: :btree
 
   create_table "exports", force: :cascade do |t|
     t.integer  "user_id",           limit: 4
@@ -103,15 +111,6 @@ ActiveRecord::Schema.define(version: 20150108154312) do
 
   add_index "imports", ["user_id"], name: "index_imports_on_user_id", using: :btree
 
-  create_table "job_relations", force: :cascade do |t|
-    t.string   "type",            limit: 255
-    t.string   "owner_reference", limit: 255
-    t.string   "job_id",          limit: 255
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "response_error",  limit: 255
-  end
-
   create_table "label_relations", force: :cascade do |t|
     t.string   "type",       limit: 255
     t.integer  "domain_id",  limit: 4
@@ -121,7 +120,7 @@ ActiveRecord::Schema.define(version: 20150108154312) 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_bb0176a385", using: :btree
+  add_index "label_relations", ["range_id"], name: "fk_rails_bb6dbc5289", using: :btree
   add_index "label_relations", ["type"], name: "ix_label_relations_on_type", using: :btree
 
   create_table "labelings", force: :cascade do |t|
@@ -133,7 +132,7 @@ ActiveRecord::Schema.define(version: 20150108154312) 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_3a628f1b05", using: :btree
+  add_index "labelings", ["target_id"], name: "fk_rails_51629a50d5", using: :btree
   add_index "labelings", ["type"], name: "ix_labelings_on_type", using: :btree
 
   create_table "labels", force: :cascade do |t|
@@ -143,9 +142,9 @@ ActiveRecord::Schema.define(version: 20150108154312) do
     t.string   "value",                limit: 1024
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.date     "published_at"
     t.integer  "rev",                  limit: 4,    default: 1
     t.integer  "published_version_id", limit: 4
+    t.date     "published_at"
     t.integer  "locked_by",            limit: 4
     t.date     "expired_at"
     t.date     "follow_up"
@@ -156,7 +155,6 @@ ActiveRecord::Schema.define(version: 20150108154312) do
   add_index "labels", ["language"], name: "ix_labels_on_language", using: :btree
   add_index "labels", ["origin"], name: "ix_labels_on_origin", length: {"origin"=>255}, using: :btree
   add_index "labels", ["published_version_id"], name: "ix_labels_on_published_v", using: :btree
-  add_index "labels", ["value"], name: "ix_labels_on_value", length: {"value"=>255}, using: :btree
 
   create_table "matches", force: :cascade do |t|
     t.integer  "concept_id", limit: 4
@@ -216,7 +214,7 @@ ActiveRecord::Schema.define(version: 20150108154312) do
     t.string   "perishable_token",  limit: 255
     t.string   "role",              limit: 255
     t.string   "telephone_number",  limit: 255
-    t.string   "type",              limit: 255
+    t.string   "type",              limit: 255, default: "User"
   end
 
   add_foreign_key "collection_members", "concepts", column: "collection_id", on_update: :cascade
@@ -230,8 +228,6 @@ ActiveRecord::Schema.define(version: 20150108154312) do
   add_foreign_key "label_relations", "labels", column: "range_id", on_update: :cascade, on_delete: :cascade
   add_foreign_key "labelings", "concepts", column: "owner_id", on_update: :cascade
   add_foreign_key "labelings", "labels", column: "target_id", on_update: :cascade, on_delete: :cascade
-  add_foreign_key "labels", "labels", column: "published_version_id", on_update: :cascade, on_delete: :cascade
-  add_foreign_key "labels", "labels", column: "published_version_id", on_update: :cascade, on_delete: :cascade
   add_foreign_key "matches", "concepts", on_update: :cascade, on_delete: :cascade
   add_foreign_key "notations", "concepts", on_update: :cascade
   add_foreign_key "note_annotations", "notes", on_update: :cascade, on_delete: :cascade

data/iqvoc_skosxl.gemspec

@@ -13,7 +13,7 @@ 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.8.0', '~> 4.8'
+  s.add_dependency 'iqvoc', '>= 4.8.0', '~> 4.9'
   s.add_development_dependency 'bundler', '~> 1.6'
 
   s.files = %w(README.md Gemfile Gemfile.lock Rakefile iqvoc_skosxl.gemspec) +

data/lib/iqvoc/skosxl/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SKOSXL
-    VERSION = '2.6.0'
+    VERSION = '2.7.0'
   end
 end

data/lib/iqvoc_skosxl.rb

@@ -21,6 +21,7 @@ module IqvocSKOSXL
 
     Iqvoc::Concept.include_module_names << 'Concept::SKOSXL::Extension'
     Iqvoc::Concept.pref_labeling_class_name = 'Labeling::SKOSXL::PrefLabel'
+    Iqvoc::Concept.alt_labeling_class_name = 'Labeling::SKOSXL::AltLabel'
 
     # TODO
     # Iqvoc.searchable_class_names = Iqvoc::Concept.labeling_class_names.keys +

data/test/integration/dashboard_test.rb

@@ -36,7 +36,7 @@ class DashboardTest < ActionDispatch::IntegrationTest
     login('administrator')
 
     visit dashboard_path(lang: 'de', format: 'html')
-    click_link_or_button('de')
+    click_link_or_button('Neues Label')
     assert_equal new_label_path(lang: 'de', format: 'html'), current_path
   end
 end

data/test/integration/label_creation_test.rb

@@ -29,6 +29,18 @@ class LabelCreationTest < ActionDispatch::IntegrationTest
     assert page.has_content? 'Das Label wurde erstellt.'
     click_link_or_button 'Konsistenz prüfen'
     assert page.has_content? 'Instanz ist konsistent.'
+    click_link_or_button 'Veröffentlichen'
+    assert page.has_content? 'Instanz wurde erfolgreich veröffentlicht.'
+    assert page.has_content? 'Testlabel'
+
+    # modify created version
+    click_link_or_button 'Neue Version erstellen'
+    fill_in 'Vorlageform', with: 'Testlabel_modified'
+    click_link_or_button 'Speichern'
+    assert page.has_content? 'Das Label wurde aktualisiert.'
+    assert page.has_content? 'Testlabel_modified'
+    click_link_or_button 'Veröffentlichen'
+    assert page.has_content? 'Instanz wurde erfolgreich veröffentlicht.'
   end
 
   test 'inconsistent label creation' do

data/test/models/concept_test.rb

@@ -0,0 +1,86 @@
+# encoding: UTF-8
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class ConceptTest < ActiveSupport::TestCase
+  setup do
+  end
+
+  test 'exclusive pref label' do
+    monkey = RDFAPI.devour 'Monkey', 'a', 'skos:Concept'
+    monkey_label = Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Monkey', published_at: 3.days.ago)
+
+    monkey.pref_labels << monkey_label
+    assert monkey.save
+    assert monkey.publishable?
+
+    monkey.alt_labels << monkey_label
+    assert monkey.save
+    refute monkey.publishable?, 'There should be no duplicates between prefLabel/altLabel'
+  end
+
+  test 'unique alt labels' do
+    tiger = RDFAPI.devour 'Tiger', 'a', 'skos:Concept'
+    tiger_label = Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Tiger', published_at: 3.days.ago)
+    tiger_alt_label = Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Big Cat', published_at: 3.days.ago)
+
+    tiger.pref_labels << tiger_label
+    tiger.alt_labels << tiger_alt_label
+    assert tiger.save
+    assert tiger.publishable?
+
+    tiger.alt_labels << tiger_alt_label
+    assert tiger.save
+    refute tiger.publishable?, 'There should be no identical alt labels'
+  end
+
+  test 'concepts alt label language change' do
+    dog = RDFAPI.devour 'Dog', 'a', 'skos:Concept'
+    dog.pref_labels << Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Dog', published_at: 3.days.ago)
+    dog.alt_labels << Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Hound', published_at: 3.days.ago)
+
+    assert dog.save
+    assert dog.publish
+
+    alt_label = dog.alt_labels.first
+    assert_equal 'Hound', alt_label.value
+    assert_equal 'en', alt_label.language
+
+    # should be publishable with a german alt label
+    alt_label.value = 'Jagdhund'
+    alt_label.language = 'de'
+    assert alt_label.save
+    assert alt_label.publishable?
+  end
+
+  test 'concepts pref label language change' do
+    dog = RDFAPI.devour 'Dog', 'a', 'skos:Concept'
+    refute dog.publishable?
+    dog.pref_labels << Iqvoc::XLLabel.base_class.create(
+      language: 'en', value: 'Dog', published_at: 3.days.ago)
+
+    assert dog.save!
+    assert dog.publishable?
+    assert dog.publish!
+    pref_label = dog.pref_label
+    assert_equal 'Dog', pref_label.value
+    assert_equal 'en', pref_label.language
+
+    # should not be publishable with an german prefLabel
+    pref_label.value = 'Hund'
+    pref_label.language = 'de'
+    assert pref_label.save!
+    refute pref_label.publishable?, 'Label should not be publishable (no english pref Label)'
+
+    # no problem with a english prefLabel
+    pref_label.value = 'Dog'
+    pref_label.language = 'en'
+    assert pref_label.save!
+    assert pref_label.publishable?, 'Label should not be publishable (no english pref Label)'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_skosxl
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Robert Glaser
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
@@ -21,7 +21,7 @@ dependencies:
         version: 4.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: 4.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '4.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - app/views/partials/label/relation/_edit_base.html.erb
 - app/views/partials/label/skosxl/_edit_link_base.html.erb
 - app/views/partials/label/skosxl/_new_link_base.html.erb
+- app/views/partials/label/skosxl/_search_result.html.erb
 - app/views/partials/labeling/skosxl/_base.html.erb
 - app/views/partials/labeling/skosxl/_edit_base.html.erb
 - app/views/partials/labeling/skosxl/_search_result.html.erb
@@ -101,6 +102,7 @@ files:
 - config/database.template.yml
 - config/database.yml
 - config/database.yml.mysql
+- config/database.yml.postgresql
 - config/database.yml.sqlite
 - config/engine.rb
 - config/environment.rb
@@ -125,6 +127,7 @@ files:
 - db/migrate/20110408121540_extend_label.rb
 - db/migrate/20110408123644_add_label_relations.rb
 - db/migrate/20150108154312_add_fk_contraints_iqvoc_skosxl.rb
+- db/migrate/20150414083600_remove_fk_constraints_iqvoc_skosxl.rb
 - db/schema.rb
 - db/seeds.rb
 - iqvoc_skosxl.gemspec
@@ -140,6 +143,7 @@ files:
 - test/integration/label_creation_test.rb
 - test/integration/labels_order_test.rb
 - test/integration_test_helper.rb
+- test/models/concept_test.rb
 - test/models/label_test.rb
 - test/models/skos_importer_test.rb
 - test/test_helper.rb
@@ -163,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: iQvoc SKOS-XL extension
@@ -176,6 +180,7 @@ test_files:
 - test/integration/label_creation_test.rb
 - test/integration/labels_order_test.rb
 - test/integration_test_helper.rb
+- test/models/concept_test.rb
 - test/models/label_test.rb
 - test/models/skos_importer_test.rb
 - test/test_helper.rb