iqvoc_skosxl 2.3.1 → 2.5.0

data/app/controllers/labels/versions_controller.rb

@@ -1,16 +1,15 @@
 class Labels::VersionsController < ApplicationController
-
   def merge
     current_label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).published.last
-    new_version = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
-    raise ActiveRecord::RecordNotFound.new("Couldn't find unpublished label with origin '#{params[:origin]}'") unless new_version
+    new_version = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last!
+
     authorize! :merge, new_version
 
     ActiveRecord::Base.transaction do
       if current_label.blank? || current_label.destroy
         new_version.publish
         new_version.unlock
-        if new_version.valid_with_full_validation?
+        if new_version.publishable?
           new_version.save
           begin
            # TODO if RdfStore.update(new_version.rdf_uri, label_url(:id => new_version, :format => :ttl))
@@ -20,40 +19,41 @@ class Labels::VersionsController < ApplicationController
             handle_virtuoso_exception(e.message)
           end
           if new_version.has_concept_or_label_relations?
-            flash[:success] = t("txt.controllers.versioning.published")
-            redirect_to label_path(:id => new_version)
+            flash[:success] = t('txt.controllers.versioning.published')
+            redirect_to label_path(id: new_version)
           else
-            flash[:error] = t("txt.controllers.versioning.published_with_warning")
-            redirect_to label_path(:id => new_version)
+            flash[:error] = t('txt.controllers.versioning.published_with_warning')
+            redirect_to label_path(id: new_version)
           end
         else
-          flash[:error] = t("txt.controllers.versioning.merged_publishing_error")
-          redirect_to label_path(:published => 0, :id => new_version)
+          flash[:error] = t('txt.controllers.versioning.merged_publishing_error')
+          redirect_to label_path(published: 0, id: new_version)
         end
       else
-        flash[:error] = t("txt.controllers.versioning.merged_delete_error")
-        redirect_to label_path(:published => 0, :id => new_version)
+        flash[:error] = t('txt.controllers.versioning.merged_delete_error')
+        redirect_to label_path(published: 0, id: new_version)
       end
     end
   end
 
   def branch
-    current_label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).published.last
-    raise ActiveRecord::RecordNotFound.new("Couldn't find published Label with origin '#{params[:origin]}'") unless current_label
-    raise "There is already an unpublished version for Label '#{params[:origin]}'" if Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
+    current_label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).published.last!
+    if Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
+      raise "There is already an unpublished version for Label '#{params[:origin]}'"
+    end
+
     authorize! :branch, current_label
     new_version = nil
     ActiveRecord::Base.transaction do
       new_version = current_label.branch(current_user)
       new_version.save!
     end
-    flash[:success] = t("txt.controllers.versioning.branched")
-    redirect_to edit_label_path(:published => 0, :id => new_version, :check_associations_in_editing_mode => true)
+    flash[:success] = t('txt.controllers.versioning.branched')
+    redirect_to edit_label_path(published: 0, id: new_version, check_associations_in_editing_mode: true)
   end
 
   def lock
-    new_version = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
-    raise ActiveRecord::RecordNotFound.new("Couldn't find unpublished Label with origin '#{params[:origin]}'") unless new_version
+    new_version = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last!
     raise "Label with origin '#{params[:origin]}' has already been locked." if new_version.locked?
 
     authorize! :lock, new_version
@@ -61,13 +61,12 @@ class Labels::VersionsController < ApplicationController
     new_version.lock_by_user(current_user.id)
     new_version.save!
 
-    flash[:success] = t("txt.controllers.versioning.locked")
-    redirect_to edit_label_path(:published => 0, :id => new_version)
+    flash[:success] = t('txt.controllers.versioning.locked')
+    redirect_to edit_label_path(published: 0, id: new_version)
   end
 
   def unlock
-    new_version = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
-    raise ActiveRecord::RecordNotFound.new("Couldn't find unpublished Label with origin '#{params[:origin]}'") unless new_version
+    new_version = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last!
     raise "Label with origin '#{params[:origin]}' wasn't locked." unless new_version.locked?
 
     authorize! :unlock, new_version
@@ -75,35 +74,32 @@ class Labels::VersionsController < ApplicationController
     new_version.unlock
     new_version.save!
 
-    flash[:success] = t("txt.controllers.versioning.unlocked")
-    redirect_to label_path(:published => 0, :id => new_version)
+    flash[:success] = t('txt.controllers.versioning.unlocked')
+    redirect_to label_path(published: 0, id: new_version)
   end
 
   def consistency_check
-    label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
-    raise ActiveRecord::RecordNotFound unless label
+    label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last!
 
     authorize! :check_consistency, label
 
-    if label.valid_with_full_validation?
-      flash[:success] = t("txt.controllers.versioning.consistency_check_success")
-      redirect_to label_path(:published => 0, :id => label)
+    if label.publishable?
+      flash[:success] = t('txt.controllers.versioning.consistency_check_success')
+      redirect_to label_path(published: 0, id: label)
     else
-      flash[:error] = t("txt.controllers.versioning.consistency_check_error")
-      redirect_to edit_label_path(:published => 0, :id => label, :full_consistency_check => 1)
+      flash[:error] = t('txt.controllers.versioning.consistency_check_error')
+      redirect_to edit_label_path(published: 0, id: label, full_consistency_check: 1)
     end
   end
 
   def to_review
-    label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last
-    raise ActiveRecord::RecordNotFound unless label
+    label = Iqvoc::XLLabel.base_class.by_origin(params[:origin]).unpublished.last!
 
     authorize! :send_to_review, label
 
     label.to_review
     label.save!
-    flash[:success] = t("txt.controllers.versioning.to_review_success")
-    redirect_to label_path(:published => 0, :id => label)
+    flash[:success] = t('txt.controllers.versioning.to_review_success')
+    redirect_to label_path(published: 0, id: label)
   end
-
 end

data/app/controllers/labels_controller.rb

@@ -8,21 +8,21 @@ class LabelsController < ApplicationController
     if params[:language] # NB: this is not the same as :lang, which is supplied via route
       scope = scope.by_language(params[:language])
     end
-    @labels = scope.published.order("LOWER(value)").all
+    @labels = scope.published.order('LOWER(value)').all
 
     respond_to do |format|
       format.html do
-        redirect_to :action => "index", :format => "txt"
+        redirect_to action: 'index', format: 'txt'
       end
       format.text do
-        render :content_type => "text/plain",
-            :text => @labels.map { |label| "#{label.origin}: #{label.value}" }.join("\n")
+        render content_type: 'text/plain',
+            text: @labels.map { |label| "#{label.origin}: #{label.value}" }.join("\n")
       end
       format.json do
         response = []
         @labels.each { |label| response << label_widget_data(label) }
 
-        render :json => response
+        render json: response
       end
     end
   end
@@ -34,10 +34,9 @@ class LabelsController < ApplicationController
       @new_label_version = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last
     elsif params[:published] == '0'
       published = false
-      @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last
+      @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last!
     end
 
-    raise ActiveRecord::RecordNotFound unless @label
     authorize! :read, @label
 
     respond_to do |format|
@@ -50,32 +49,31 @@ class LabelsController < ApplicationController
 
   def new
     authorize! :create, Iqvoc::XLLabel.base_class
-    raise "You have to specify a language parameter!" if params[:language].blank?
-    data = {:language => params[:language]}
-    data.merge(:value => params[:value]) if params[:value]
+    raise 'You have to specify a language parameter!' if params[:language].blank?
+    data = {language: params[:language]}
+    data.merge(value: params[:value]) if params[:value]
     @label = Iqvoc::XLLabel.base_class.new(data)
   end
 
   def create
     authorize! :create, Iqvoc::XLLabel.base_class
-    @label = Iqvoc::XLLabel.base_class.new(params[:label])
+    @label = Iqvoc::XLLabel.base_class.new(label_params)
     if @label.valid?
       if @label.save
-        flash[:success] = I18n.t("txt.controllers.versioned_label.success")
-        redirect_to label_path(:published => 0, :id => @label.origin)
+        flash[:success] = I18n.t('txt.controllers.versioned_label.success')
+        redirect_to label_path(published: 0, id: @label.origin)
       else
-        flash.now[:error] = I18n.t("txt.controllers.versioned_label.error")
+        flash.now[:error] = I18n.t('txt.controllers.versioned_label.error')
         render :new
       end
     else
-      flash.now[:error] = I18n.t("txt.controllers.versioned_label.error")
+      flash.now[:error] = I18n.t('txt.controllers.versioned_label.error')
       render :new
     end
   end
 
   def edit
-    @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last
-    raise ActiveRecord::RecordNotFound unless @label
+    @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last!
     authorize! :update, @label
 
     if params[:check_associations_in_editing_mode]
@@ -86,7 +84,7 @@ class LabelsController < ApplicationController
     # @alt_labelings = AltLabeling.by_label(@label).all(:include => {:owner => :pref_labels}).sort
 
     if params[:full_consistency_check]
-      @label.valid_with_full_validation?
+      @label.publishable?
     end
 
     Iqvoc::XLLabel.note_class_names.each do |note_class_name|
@@ -95,35 +93,38 @@ class LabelsController < ApplicationController
   end
 
   def update
-    @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last
-    raise ActiveRecord::RecordNotFound unless @label
+    @label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last!
     authorize! :update, @label
 
     respond_to do |format|
       format.html do
-        raise ActiveRecord::RecordNotFound unless @label
-        if @label.update_attributes(params[:label])
-          flash[:success] = I18n.t("txt.controllers.versioned_label.update_success")
-          redirect_to label_path(:published => 0, :id => @label)
+        if @label.update_attributes(label_params)
+          flash[:success] = I18n.t('txt.controllers.versioned_label.update_success')
+          redirect_to label_path(published: 0, id: @label)
         else
-          flash.now[:error] = I18n.t("txt.controllers.versioned_label.update_error")
-          render :action => :edit
+          flash.now[:error] = I18n.t('txt.controllers.versioned_label.update_error')
+          render action: :edit
         end
       end
     end
   end
 
   def destroy
-    @new_label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last
-    raise ActiveRecord::RecordNotFound unless @new_label
+    @new_label = Iqvoc::XLLabel.base_class.by_origin(params[:id]).unpublished.last!
     authorize! :destroy, @new_label
 
     if @new_label.destroy
-      flash[:success] = I18n.t("txt.controllers.label_versions.delete")
+      flash[:success] = I18n.t('txt.controllers.label_versions.delete')
       redirect_to dashboard_path
     else
-      flash[:error] = I18n.t("txt.controllers.label_versions.delete_error")
-      redirect_to label_path(:published => 0, :id => @new_label)
+      flash[:error] = I18n.t('txt.controllers.label_versions.delete_error')
+      redirect_to label_path(published: 0, id: @new_label)
     end
   end
+
+  private
+
+  def label_params
+    params.require(:label).permit!
+  end
 end

data/app/controllers/rdf_controller.rb

@@ -1,16 +1,16 @@
-require_dependency Iqvoc::Engine.find_root_with_flag("app").join("app/controllers/rdf_controller").to_s
-class RdfController
+require_dependency Iqvoc.root.join('app/controllers/rdf_controller').to_s
 
+class RdfController
   def show_with_labels
-    scope = params[:published] == "0" ? Iqvoc::XLLabel.base_class.scoped.unpublished : Iqvoc::XLLabel.base_class.scoped.published
+    scope = params[:published] == '0' ? Iqvoc::XLLabel.base_class.unpublished : Iqvoc::XLLabel.base_class.published
     if @label = scope.by_origin(params[:id]).with_associations.last
       respond_to do |format|
         format.html {
-          redirect_to label_url(:id => @label.origin, :published => params[:published])
+          redirect_to label_url(id: @label.origin, published: params[:published])
         }
         format.any {
           authorize! :read, @label
-          render "show_label"
+          render 'show_label'
         }
       end
     else
@@ -19,5 +19,4 @@ class RdfController
   end
 
   alias_method_chain(:show, :labels)
-
-end
+end

data/app/helpers/iqvoc_skosxl_helper.rb

@@ -1,15 +1,9 @@
 module IqvocSkosxlHelper
-
-  def iqvoc_skosxl_default_rdf_namespaces
-    {
-    }
-  end
-
   def render_label(label)
     if label.new_record?
-      "-"
+      '-'
     elsif label.is_a?(Label::SKOSXL::Base)
-      link_to(label.to_s, label_path(:id => label))
+      link_to(label.to_s, label_path(id: label))
     else
       label.to_s
     end
@@ -21,5 +15,4 @@ module IqvocSkosxlHelper
     str << " (#{concept.additional_info})" if concept.additional_info
     str
   end
-
 end

data/app/helpers/labels_helper.rb

@@ -1,5 +1,4 @@
 module LabelsHelper
-
   def render_label_rdf(document, label)
     document << label.build_rdf_subject do |c|
 
@@ -7,7 +6,7 @@ module LabelsHelper
 
       c.Owl::deprecated(true) if label.expired_at and label.expired_at <= Date.new
 
-      c.Skosxl::literalForm(label.value, :lang => label.language)
+      c.Skosxl::literalForm(label.value, lang: label.language)
 
       label.relations.each do |relation|
         relation.build_rdf(document, c)
@@ -27,16 +26,16 @@ module LabelsHelper
 
   def render_label_association(hash, label, association_class, further_options = {})
     return unless association_class.partial_name(label)
-    ((hash[association_class.view_section(label)] ||= {})[association_class.view_section_sort_key(label)] ||= "") <<
-      render(association_class.partial_name(label), further_options.merge(:label => label, :klass => association_class))
+    ((hash[association_class.view_section(label)] ||= {})[association_class.view_section_sort_key(label)] ||= '') <<
+      render(association_class.partial_name(label), further_options.merge(label: label, klass: association_class))
   end
 
   def label_view_data(label)
     res = {'main' => {}}
 
-    res['main'][10] = render 'labels/value_and_language', :label => label
+    res['main'][10] = render 'labels/value_and_language', label: label
 
-    res['main'][1000] = render 'labels/details', :label => label
+    res['main'][1000] = render 'labels/details', label: label
 
     Iqvoc::Concept.labeling_classes.keys.each do |labeling_class|
       render_label_association(res, label, labeling_class)
@@ -61,12 +60,11 @@ module LabelsHelper
     desc = label.class.model_name.human
 
     if label.expired_at
-      desc += " #{t('txt.views.concepts.expired_at', :date => l(label.expired_at, :format => :long))} "
+      desc += " #{t('txt.views.concepts.expired_at', date: l(label.expired_at, format: :long))} "
     end
 
     title = label.origin
 
-    page_header :title => title.to_s, :desc => desc.html_safe
+    page_header title: title.to_s, desc: desc.html_safe
   end
-
 end

data/app/models/concept/skosxl/extension.rb

@@ -1,7 +1,6 @@
 module Concept
   module SKOSXL
     module Extension
-
       extend ActiveSupport::Concern
 
       included do
@@ -24,7 +23,7 @@ module Concept
 
               # Iterate over all labels to be added and create them
               Iqvoc::XLLabel.base_class.by_origin(new_origins).each do |l|
-                concept.send(labeling_relation_name).create!(:target => l)
+                concept.send(labeling_relation_name).create!(target: l)
               end
             end
           end
@@ -48,13 +47,12 @@ module Concept
             Iqvoc::XLLabel.base_class.by_origin(new_origins).each do |label|
               if label.language != language.to_s
                 errors.add(:base,
-                    I18n.t("txt.controllers.versioned_concept.label_error") % label)
+                    I18n.t('txt.controllers.versioned_concept.label_error') % label)
               end
             end
           }
         }
       end
-
     end
   end
 end

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

@@ -1,39 +1,38 @@
 class Label::Relation::Base < ActiveRecord::Base
-
   class_attribute :rdf_namespace, :rdf_predicate
   self.rdf_namespace = nil
   self.rdf_predicate = nil
 
   self.table_name ='label_relations'
 
-  belongs_to :domain, :class_name => "Label::Base"
-  belongs_to :range,  :class_name => "Label::Base"
+  belongs_to :domain, class_name: 'Label::Base'
+  belongs_to :range,  class_name: 'Label::Base'
 
   def self.by_domain(domain)
-    where(:domain_id => domain)
+    where(domain_id: domain)
   end
 
   def self.by_range(range)
-    where(:range_id => range)
+    where(range_id: range)
   end
 
   def self.by_range_origin(origin)
-    includes(:range).merge(Label::Base.by_origin(origin))
+    includes(:range).references(:labels).merge(Label::Base.by_origin(origin))
   end
 
   def self.range_editor_selectable
     # includes(:range) & Iqvoc::XLLabel.base_class.editor_selectable
     # Doesn't work correctly (kills label_relations.type condition :-( )
     includes(:range).
-    where("labels.published_at IS NOT NULL OR (labels.published_at IS NULL AND labels.published_version_id IS NULL) ")
+    where('labels.published_at IS NOT NULL OR (labels.published_at IS NULL AND labels.published_version_id IS NULL) ')
   end
 
   def self.range_in_edit_mode
-    joins(:range).merge(Iqvoc::XLLabel.base_class.in_edit_mode)
+    joins(:range).references(:labels).merge(Iqvoc::XLLabel.base_class.in_edit_mode)
   end
 
   def self.view_section(obj)
-    "relations"
+    'relations'
   end
 
   def self.view_section_sort_key(obj)
@@ -41,15 +40,14 @@ class Label::Relation::Base < ActiveRecord::Base
   end
 
   def self.partial_name(obj)
-    "partials/label/relation/base"
+    'partials/label/relation/base'
   end
 
   def self.edit_partial_name(obj)
-    "partials/label/relation/edit_base"
+    'partials/label/relation/edit_base'
   end
 
   def self.only_one_allowed?
     false
   end
-
 end

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

@@ -1,12 +1,14 @@
 class Label::Relation::SKOSXL::Base < Label::Relation::Base
-
   self.rdf_namespace = 'skosxl'
 
+  def self.build_from_rdf(subject, predicate, object)
+    create(domain: subject, range: object)
+  end
+
   def build_rdf(document, subject)
     pred = self.class == Label::Relation::SKOSXL::Base ? :labelRelation : self.rdf_predicate
     raise "Match::SKOS::Base#build_rdf: Class #{self.class.name} needs to define self.rdf_namespace and self.rdf_predicate." unless pred
 
     subject.send(self.rdf_namespace.camelcase).send(pred, IqRdf.build_uri(range.origin))
   end
-
-end
+end