iqvoc 4.3.3 → 4.4.0

data/app/helpers/rdf_namespaces_helper.rb

@@ -0,0 +1,11 @@
+module RdfNamespacesHelper
+  include *Iqvoc.default_rdf_namespace_helper_modules
+
+  def iqvoc_default_rdf_namespaces
+    Iqvoc.rdf_namespaces.merge({
+      default: root_url(format: nil, lang: nil, trailing_slash: true),
+      coll: rdf_collections_url(trailing_slash: true, lang: nil, format: nil),
+      schema: schema_url(format: nil, anchor: '', lang: nil)
+    })
+  end
+end

data/app/helpers/search_results_helper.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 module SearchResultsHelper
-
   def search_language_selected?(lang)
     (params[:languages] && params[:languages].include?(lang.to_s)) ||
       (!params[:query] && I18n.locale.to_s == lang.to_s)
@@ -41,8 +40,7 @@ module SearchResultsHelper
     end
 
     content_tag :h2 do
-      raw( t('txt.views.search_results.search_results') << " " << content_tag(:small, desc) )
+      raw( t('txt.views.search_results.search_results') << ' ' << content_tag(:small, desc) )
     end
   end
-
 end

data/app/helpers/widget_helper.rb

@@ -1,5 +1,4 @@
 module WidgetHelper
-
   def widget_values(concept, relation_class)
     concept.concept_relations_by_id(relation_class.name.to_relation_name)
   end
@@ -35,5 +34,4 @@ module WidgetHelper
     concepts = concepts_with_ranks.reject { |k, v| !allowed_concepts.include?(k) }
     concepts.map { |c, r| concept_widget_data(c, r) }.to_json
   end
-
 end

data/app/jobs/export_job.rb

@@ -0,0 +1,19 @@
+require 'iqvoc/skos_exporter'
+
+class ExportJob < Struct.new(:export, :filename, :type, :base_uri)
+  def perform
+    strio = StringIO.new
+
+    exporter = Iqvoc::SkosExporter.new(filename, type, base_uri, Logger.new(strio))
+    exporter.run
+    @messages = strio.string
+  end
+
+  def success(job)
+    export.finish!(@messages)
+  end
+
+  def error(job, exception)
+    export.fail!(exception)
+  end
+end

data/app/jobs/import_job.rb

@@ -1,10 +1,10 @@
 require 'iqvoc/skos_importer'
 
-class ImportJob < Struct.new(:import, :content, :user, :namespace, :publish)
+class ImportJob < Struct.new(:import, :filename, :user, :namespace, :publish)
   def perform
     strio = StringIO.new
 
-    importer = Iqvoc::SkosImporter.new(content.to_s.split("\n"), namespace, Logger.new(strio), publish)
+    importer = Iqvoc::SkosImporter.new(filename, namespace, Logger.new(strio), publish)
     importer.run
     @messages = strio.string
   end

data/app/models/collection/base.rb

@@ -15,35 +15,29 @@
 # limitations under the License.
 
 class Collection::Base < Concept::Base
-
-  #*********** Associations
-
   has_many Note::SKOS::Definition.name.to_relation_name,
-      :class_name => 'Note::SKOS::Definition',
-      :as => :owner,
-      :dependent => :destroy
+      class_name: 'Note::SKOS::Definition',
+      as: :owner,
+      dependent: :destroy
 
   has_many :members,
-      :class_name  => 'Collection::Member::Base',
-      :foreign_key => 'collection_id',
-      :dependent   => :destroy
+      class_name: 'Collection::Member::Base',
+      foreign_key: 'collection_id',
+      dependent: :destroy
 
   has_many :parent_collection_members,
-      :class_name  => 'Collection::Member::Base',
-      :foreign_key => 'target_id',
-      :dependent   => :destroy
+      class_name: 'Collection::Member::Base',
+      foreign_key: 'target_id',
+      dependent: :destroy
   has_many :parent_collections,
-      :through => :parent_collection_members
-
-
-  #********** Hooks
+      through: :parent_collection_members
 
   after_save :regenerate_concept_members, :regenerate_collection_members
 
-  #********** Scopes
+  validate :circular_subcollections
 
   def self.by_origin(origin)
-    where(:origin => origin)
+    where(origin: origin)
   end
 
   def self.by_label_value(val)
@@ -60,11 +54,13 @@ class Collection::Base < Concept::Base
         where(Collection::Member::Base.arel_table[:collection_id].eq(parent_id))
   end
 
-  #********** Validations
-
-  validate :circular_subcollections
+  def self.edit_link_partial_name
+    'partials/collection/edit_link_base'
+  end
 
-  #********** Methods
+  def self.new_link_partial_name
+    'partials/collection/new_link_base'
+  end
 
   def subcollections
     members.map(&:target).select { |m| m.is_a?(::Collection::Base) }
@@ -87,7 +83,7 @@ class Collection::Base < Concept::Base
   end
 
   def build_rdf_subject(&block)
-    IqRdf::Coll::build_uri(self.origin, IqRdf::Skos::build_uri("Collection"), &block)
+    IqRdf::Coll::build_uri(self.origin, IqRdf::Skos::build_uri('Collection'), &block)
   end
 
   def inline_member_concept_origins=(origins)
@@ -101,9 +97,9 @@ class Collection::Base < Concept::Base
 
   def inline_member_concepts
     if @member_concept_origins
-      Concept::Base.editor_selectable.where(:origin => @member_concept_origins)
+      Concept::Base.editor_selectable.where(origin: @member_concept_origins)
     else
-      concepts.select{|c| c.editor_selectable?}
+      concepts.select{ |c| c.editor_selectable? }
     end
   end
 
@@ -119,14 +115,12 @@ class Collection::Base < Concept::Base
 
   def inline_member_collections
     if @member_collection_origins
-      Collection::Base.where(:origin => @member_collection_origins)
+      Collection::Base.where(origin: @member_collection_origins)
     else
       subcollections
     end
   end
 
-  #********** Hook methods
-
   def regenerate_members(target_class, target_origins)
     return if target_origins.nil? # There is nothing to do
     existing = self.members.includes(:target)
@@ -140,7 +134,7 @@ class Collection::Base < Concept::Base
       member = existing.find{ |m| m.target.origin == new_origin }
       unless member
         c = target_class.by_origin(new_origin).first
-        member = Iqvoc::Collection.member_class.create(:collection => self, :target => c) if c
+        member = Iqvoc::Collection.member_class.create(collection: self, target: c) if c
       end
       new << member if member
     end
@@ -163,21 +157,11 @@ class Collection::Base < Concept::Base
   # TODO: This should be a real circle detector (but still performant) or be
   # removed (seems to me like the better idea).
   def circular_subcollections
-    Iqvoc::Collection.base_class.by_origin(@member_collection_origins).includes(:members => :target).each do |subcollection|
+    Iqvoc::Collection.base_class.by_origin(@member_collection_origins).includes(members: :target).each do |subcollection|
       if subcollection.subcollections.include?(self)
         errors.add(:base,
-          I18n.t("txt.controllers.collections.circular_error", :label => subcollection.pref_label))
+          I18n.t('txt.controllers.collections.circular_error', label: subcollection.pref_label))
       end
     end
   end
-
-  def pref_label_in_primary_thesaurus_language
-    labels = self.send(Iqvoc::Concept.pref_labeling_class_name.to_relation_name).map(&:target).select{|l| l.published?}
-    if labels.count == 0
-      errors.add :base, I18n.t("txt.models.concept.no_pref_label_error")
-    elsif not labels.map(&:language).map(&:to_s).include?(Iqvoc::Concept.pref_labeling_languages.first.to_s)
-      errors.add :base, I18n.t("txt.models.concept.main_pref_label_language_missing_error")
-    end
-  end
-
 end

data/app/models/collection/member/base.rb

@@ -15,18 +15,17 @@
 # limitations under the License.
 
 class Collection::Member::Base < ActiveRecord::Base
-
   self.table_name = 'collection_members'
 
   class_attribute :rdf_namespace, :rdf_predicate
   self.rdf_namespace = nil
   self.rdf_predicate = nil
 
-  belongs_to :collection, :class_name => 'Collection::Base'
-  belongs_to :target, :class_name => 'Concept::Base'
+  belongs_to :collection, class_name: 'Collection::Base'
+  belongs_to :target, class_name: 'Concept::Base'
 
   def self.view_section(obj)
-    "main"
+    'main'
   end
 
   def self.view_section_sort_key(obj)
@@ -34,7 +33,6 @@ class Collection::Member::Base < ActiveRecord::Base
   end
 
   def self.partial_name(obj)
-    "partials/collection/member"
+    'partials/collection/member'
   end
-
 end

data/app/models/collection/member/skos/base.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Collection::Member::SKOS::Base < Collection::Member::Base
-
   self.rdf_namespace = 'skos'
   self.rdf_predicate = 'member'
 
@@ -23,14 +22,14 @@ class Collection::Member::SKOS::Base < Collection::Member::Base
     raise "#{self.name}#build_from_rdf: Subject (#{rdf_subject}) must be a Collection."          unless rdf_subject.is_a?(Collection::Base)
     raise "#{self.name}#build_from_rdf: Object (#{rdf_object}) must be a Collection or Concept." unless rdf_object.is_a?(Collection::Base) or rdf_object.is_a?(Concept::Base)
 
-    member_instance = rdf_subject.members.select{|rel| rel.target == rdf_object}.first
+    member_instance = rdf_subject.members.detect{ |rel| rel.target == rdf_object }
     if member_instance.nil?
       predicate_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
-      member_instance = predicate_class.new(:target => rdf_object)
+      member_instance = predicate_class.new(target: rdf_object)
       rdf_subject.members << member_instance
     end
 
-    if rdf_object.collections.select{|coll| coll.id == rdf_subject.id}.empty?
+    if rdf_object.collections.select{ |coll| coll.id == rdf_subject.id }.empty?
       rdf_object.collections << rdf_subject
     end
     member_instance

data/app/models/collection/skos/base.rb

@@ -15,9 +15,8 @@
 # limitations under the License.
 
 class Collection::SKOS::Base < Collection::Base
-
-  self.rdf_namespace = "skos"
-  self.rdf_class = "Collection"
+  self.rdf_namespace = 'skos'
+  self.rdf_class = 'Collection'
 
   def build_rdf_subject(&block)
     ns = IqRdf::Namespace.find_namespace_class(self.rdf_namespace)
@@ -25,11 +24,10 @@ class Collection::SKOS::Base < Collection::Base
     subject = IqRdf.build_uri(self.origin, ns.build_uri(self.rdf_class), &block)
 
     # ensure skos:Collection type is present
-    unless self.rdf_namespace == "skos" && self.rdf_class == "Collection"
-      subject.Rdf.build_predicate("type", IqRdf::Skos.build_uri("Collection"))
+    unless self.rdf_namespace == 'skos' && self.rdf_class == 'Collection'
+      subject.Rdf.build_predicate('type', IqRdf::Skos.build_uri('Collection'))
     end
 
     return subject
   end
-
 end

data/app/models/collection/unordered.rb

@@ -14,12 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 class Collection::Unordered < Collection::SKOS::Base
-
   def initialize(*args)
-    ActiveSupport::Deprecation.warn("Collection::Unordered is deprecated. Use Collection::SKOS::Unordered instead.")
+    ActiveSupport::Deprecation.warn('Collection::Unordered is deprecated. Use Collection::SKOS::Unordered instead.')
     super
   end
-
 end

data/app/models/concept/base.rb

@@ -15,11 +15,8 @@
 # limitations under the License.
 
 class Concept::Base < ActiveRecord::Base
-
   self.table_name = 'concepts'
 
-  include Iqvoc::Versioning
-
   class_attribute :default_includes
   self.default_includes = []
 
@@ -27,17 +24,15 @@ class Concept::Base < ActiveRecord::Base
   self.rdf_namespace = nil
   self.rdf_class = nil
 
-  include Concept::Validations
-
   Iqvoc::Concept.include_modules.each do |mod|
     include mod
   end
 
-  # ********** Hooks
+  include Versioning
+  include Concept::Validations
+  include FirstLevelObjectValidations
 
-  after_initialize do
-    @full_validation = false
-  end
+  # ********** Hooks
 
   before_validation do |concept|
     # Handle save or destruction of inline relations (relations or labelings)
@@ -57,7 +52,7 @@ class Concept::Base < ActiveRecord::Base
           Iqvoc::InlineDataHelper.parse_inline_values(inline_values).each do |value|
             value.squish!
             unless value.blank?
-              self.send(relation_name).build(:target => labeling_class.label_class.new(:value => value, :language => lang))
+              self.send(relation_name).build(target: labeling_class.label_class.new(value: value, language: lang))
             end
           end
         end
@@ -81,7 +76,7 @@ class Concept::Base < ActiveRecord::Base
       # Extract embedded ranks (if any) from origin strings (e.g. "origin1:100")
       # => { 'origin1' => nil, 'origin2' => 90 }
       new_origins = new_origins.each_with_object({}) do |e, hsh|
-        key, value = e.split(":") # NB: defaults to nil if no rank is provided
+        key, value = e.split(':') # NB: defaults to nil if no rank is provided
         hsh[key] = value
       end
 
@@ -96,7 +91,7 @@ class Concept::Base < ActiveRecord::Base
       # This is necessary because changing the rank of an already assigned relation
       # would otherwise be ignored.
       Concept::Base.by_origin(new_origins.keys).each do |c|
-        concept.send(relation_name).create_with_reverse_relation(c, :rank => new_origins[c.origin])
+        concept.send(relation_name).create_with_reverse_relation(c, rank: new_origins[c.origin])
       end
     end
   end
@@ -104,9 +99,9 @@ class Concept::Base < ActiveRecord::Base
   after_save do |concept|
     # Generate a origin if none was given yet
     if concept.origin.blank?
-      raise "Concept::Base#after_save (generate origin): Unable to set the origin by id!" unless concept.id
+      raise 'Concept::Base#after_save (generate origin): Unable to set the origin by id!' unless concept.id
       concept.reload
-      concept.origin = sprintf("_%08d", concept.id)
+      concept.origin = sprintf('_%08d', concept.id)
       concept.save! # On exception the complete save transaction will be rolled back
     end
   end
@@ -115,26 +110,26 @@ class Concept::Base < ActiveRecord::Base
 
   @nested_relations = [] # Will be marked as nested attributes later
 
-  has_many :relations, :foreign_key => 'owner_id', :class_name => "Concept::Relation::Base", :dependent => :destroy
-  has_many :related_concepts, :through => :relations, :source => :target
-  has_many :referenced_relations, :foreign_key => 'target_id', :class_name => "Concept::Relation::Base", :dependent => :destroy
+  has_many :relations, foreign_key: 'owner_id', class_name: 'Concept::Relation::Base', dependent: :destroy
+  has_many :related_concepts, through: :relations, source: :target
+  has_many :referenced_relations, foreign_key: 'target_id', class_name: 'Concept::Relation::Base', dependent: :destroy
   include_to_deep_cloning(:relations, :referenced_relations)
 
-  has_many :labelings, :foreign_key => 'owner_id', :class_name => "Labeling::Base", :dependent => :destroy
-  has_many :labels, :through => :labelings, :source => :target
+  has_many :labelings, foreign_key: 'owner_id', class_name: 'Labeling::Base', dependent: :destroy
+  has_many :labels, through: :labelings, source: :target
   # Deep cloning has to be done in specific relations. S. pref_labels etc
 
-  has_many :notes, :class_name => "Note::Base", :as => :owner, :dependent => :destroy
-  include_to_deep_cloning({:notes => :annotations})
+  has_many :notes, class_name: 'Note::Base', as: :owner, dependent: :destroy
+  include_to_deep_cloning({ notes: :annotations })
 
-  has_many :matches, :foreign_key => 'concept_id', :class_name => "Match::Base", :dependent => :destroy
+  has_many :matches, foreign_key: 'concept_id', class_name: 'Match::Base', dependent: :destroy
   include_to_deep_cloning(:matches)
 
-  has_many :collection_members, :foreign_key => 'target_id', :class_name => "Collection::Member::Base", :dependent => :destroy
-  has_many :collections, :through => :collection_members, :class_name => Iqvoc::Collection.base_class_name
+  has_many :collection_members, foreign_key: 'target_id', class_name: 'Collection::Member::Base', dependent: :destroy
+  has_many :collections, through: :collection_members, class_name: Iqvoc::Collection.base_class_name
   include_to_deep_cloning(:collection_members)
 
-  has_many :notations, :class_name => 'Notation::Base', :foreign_key => 'concept_id', :dependent => :destroy
+  has_many :notations, class_name: 'Notation::Base', foreign_key: 'concept_id', dependent: :destroy
   include_to_deep_cloning :notations
   @nested_relations << :notations
 
@@ -147,18 +142,18 @@ class Concept::Base < ActiveRecord::Base
   # BUT: the include in scope :tops doesn't work with
   # 'Iqvoc::Concept.broader_relation_class_name'!?!?! (Rails Bug????)
   has_many :broader_relations,
-    :foreign_key => :owner_id,
-    :class_name => Iqvoc::Concept.broader_relation_class_name,
-    :extend => Concept::Relation::ReverseRelationExtension
+    foreign_key: :owner_id,
+    class_name: Iqvoc::Concept.broader_relation_class_name,
+    extend: Concept::Relation::ReverseRelationExtension
 
   # Narrower
   # FIXME: Actually this is not needed anymore.
   # BUT: the include in scope :tops doesn't work with
   # 'Iqvoc::Concept.broader_relation_class_name'!?!?! (Rails Bug????)
   has_many :narrower_relations,
-    :foreign_key => :owner_id,
-    :class_name => Iqvoc::Concept.broader_relation_class.narrower_class.name,
-    :extend => Concept::Relation::ReverseRelationExtension
+    foreign_key: :owner_id,
+    class_name: Iqvoc::Concept.broader_relation_class.narrower_class.name,
+    extend: Concept::Relation::ReverseRelationExtension
 
   # Relations
   # e.g. 'concept_relation_skos_relateds'
@@ -166,25 +161,25 @@ class Concept::Base < ActiveRecord::Base
   # classes!
   Iqvoc::Concept.relation_class_names.each do |relation_class_name|
     has_many relation_class_name.to_relation_name,
-      :foreign_key => :owner_id,
-      :class_name  => relation_class_name,
-      :extend => Concept::Relation::ReverseRelationExtension
+      foreign_key: :owner_id,
+      class_name: relation_class_name,
+      extend: Concept::Relation::ReverseRelationExtension
   end
 
   # *** Labels/Labelings
 
   has_many :pref_labelings,
-    :foreign_key => 'owner_id',
-    :class_name => Iqvoc::Concept.pref_labeling_class_name
+    foreign_key: 'owner_id',
+    class_name: Iqvoc::Concept.pref_labeling_class_name
 
   has_many :pref_labels,
-    :through => :pref_labelings,
-    :source => :target
+    through: :pref_labelings,
+    source: :target
 
   Iqvoc::Concept.labeling_class_names.each do |labeling_class_name, languages|
     has_many labeling_class_name.to_relation_name,
-      :foreign_key => 'owner_id',
-      :class_name => labeling_class_name
+      foreign_key: 'owner_id',
+      class_name: labeling_class_name
     # Only clone superclass relations
     unless Iqvoc::Concept.labeling_classes.keys.detect { |klass| labeling_class_name.constantize < klass }
       # When a Label has only one labeling (the "no skosxl" case) we'll have to
@@ -201,8 +196,8 @@ class Concept::Base < ActiveRecord::Base
 
   Iqvoc::Concept.match_class_names.each do |match_class_name|
     has_many match_class_name.to_relation_name,
-      :class_name  => match_class_name,
-      :foreign_key => 'concept_id'
+      class_name: match_class_name,
+      foreign_key: 'concept_id'
 
     # Serialized setters and getters (\r\n or , separated) -- TODO: use Iqvoc::InlineDataHelper?
     define_method("inline_#{match_class_name.to_relation_name}".to_sym) do
@@ -219,7 +214,7 @@ class Concept::Base < ActiveRecord::Base
         end
       end
       urls.each do |url|
-        self.send(match_class_name.to_relation_name) << match_class_name.constantize.new(:value => url)
+        self.send(match_class_name.to_relation_name) << match_class_name.constantize.new(value: url)
       end
     end
 
@@ -229,14 +224,14 @@ class Concept::Base < ActiveRecord::Base
 
   Iqvoc::Concept.note_class_names.each do |class_name|
     relation_name = class_name.to_relation_name
-    has_many relation_name, :class_name => class_name, :as => :owner
+    has_many relation_name, class_name: class_name, as: :owner
     @nested_relations << relation_name
   end
 
   # *** Further association classes (could be ranks or stuff like that)
 
   Iqvoc::Concept.additional_association_classes.each do |association_class, foreign_key|
-    has_many association_class.name.to_relation_name, :class_name => association_class.name, :foreign_key => foreign_key, :dependent => :destroy
+    has_many association_class.name.to_relation_name, class_name: association_class.name, foreign_key: foreign_key, dependent: :destroy
     include_to_deep_cloning(association_class.deep_cloning_relations)
     association_class.referenced_by(self)
   end
@@ -244,32 +239,32 @@ class Concept::Base < ActiveRecord::Base
   # ********** Relation Stuff
 
   @nested_relations.each do |relation|
-    accepts_nested_attributes_for relation, :allow_destroy => true, :reject_if => Proc.new { |attrs| attrs[:value].blank? }
+    accepts_nested_attributes_for relation, allow_destroy: true, reject_if: Proc.new { |attrs| attrs[:value].blank? }
   end
 
   # ********** Scopes
 
   def self.tops
-    where(:top_term => true)
+    where(top_term: true)
   end
 
   def self.broader_tops
     includes(:narrower_relations, :pref_labels).
-    where(:concept_relations => { :id => nil },
-      :labelings => { :type => Iqvoc::Concept.pref_labeling_class_name }).
+    where(concept_relations: { id: nil },
+      labelings: { type: Iqvoc::Concept.pref_labeling_class_name }).
     order("LOWER(#{Label::Base.table_name}.value)")
   end
 
   def self.with_associations
     includes([
-      { :labelings => :target }, :relations, :matches, :notes, :notations
+      { labelings: :target }, :relations, :matches, :notes, :notations
     ])
   end
 
   def self.with_pref_labels
     includes(:pref_labels).
     order("LOWER(#{Label::Base.table_name}.value)").
-    where(:labelings => { :type => Iqvoc::Concept.pref_labeling_class_name }) # This line is just a workaround for a Rails Bug. TODO: Delete it when the Bug is fixed
+    where(labelings: { type: Iqvoc::Concept.pref_labeling_class_name }) # This line is just a workaround for a Rails Bug. TODO: Delete it when the Bug is fixed
   end
 
   def self.for_dashboard
@@ -279,15 +274,15 @@ class Concept::Base < ActiveRecord::Base
   # ********** Class methods
 
   def self.inline_partial_name
-    "partials/concept/inline_base"
+    'partials/concept/inline_base'
   end
 
   def self.new_link_partial_name
-    "partials/concept/new_link_base"
+    'partials/concept/new_link_base'
   end
 
   def self.edit_link_partial_name
-    "partials/concept/edit_link_base"
+    'partials/concept/edit_link_base'
   end
 
   # ********** Methods
@@ -334,7 +329,7 @@ class Concept::Base < ActiveRecord::Base
   # If no prefLabel for the requested language exists, a new label will be returned
   # (if you modify it, don't forget to save it afterwards!)
   def pref_label
-    lang = I18n.locale.to_s == "none" ? nil : I18n.locale.to_s
+    lang = I18n.locale.to_s == 'none' ? nil : I18n.locale.to_s
     @cached_pref_labels ||= pref_labels.each_with_object({}) do |label, hash|
       if hash[label.language]
         Rails.logger.warn("Two pref_labels (#{hash[label.language]}, #{label}) for one language (#{label.language}). Taking the second one.")
@@ -353,7 +348,7 @@ class Concept::Base < ActiveRecord::Base
   def labels_for_labeling_class_and_language(labeling_class, lang = :en, only_published = true)
     # Convert lang to string in case it's not nil.
     # nil values play their own role for labels without a language.
-    if lang == "none"
+    if lang == 'none'
       lang = nil
     elsif lang
       lang = lang.to_s
@@ -362,7 +357,7 @@ class Concept::Base < ActiveRecord::Base
     @labels ||= labelings.each_with_object({}) do |labeling, hash|
       ((hash[labeling.class.name.to_s] ||= {})[labeling.target.language] ||= []) << labeling.target if labeling.target
     end
-    ((@labels && @labels[labeling_class] && @labels[labeling_class][lang]) || []).select{|l| l.published? || !only_published}
+    ((@labels && @labels[labeling_class] && @labels[labeling_class][lang]) || []).select{ |l| l.published? || !only_published }
   end
 
   def related_concepts_for_relation_class(relation_class, only_published = true)
@@ -400,28 +395,9 @@ class Concept::Base < ActiveRecord::Base
     pref_label.to_s
   end
 
-  # TODO: rename to "publish!"
-  def save_with_full_validation!
-    @full_validation = true
-    save!
-  end
-
-  # TODO: rename to "publishable?"
-  def valid_with_full_validation?
-    @full_validation = true
-    valid?
-  end
-
-  # TODO: remove
-  def invalid_with_full_validation?
-    @full_validation = true
-    invalid?
-  end
-
   def associated_objects_in_editing_mode
     {
-      :concept_relations => Concept::Relation::Base.by_owner(id).target_in_edit_mode,
+      concept_relations: Concept::Relation::Base.by_owner(id).target_in_edit_mode,
     }
   end
-
 end