iqvoc 4.3.3 → 4.4.0

data/app/controllers/collections/versions_controller.rb

@@ -0,0 +1,144 @@
+# encoding: UTF-8
+
+# Copyright 2011-2013 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 'iqvoc/rdf_sync'
+
+class Collections::VersionsController < ApplicationController
+  include Iqvoc::RDFSync::Helper
+
+  def merge
+    scope = Iqvoc::Collection.base_class.by_origin(params[:origin])
+
+    current_collection = scope.published.last
+    new_version = scope.unpublished.last!
+
+    authorize! :merge, new_version
+
+    ActiveRecord::Base.transaction do
+      if current_collection.blank? || current_collection.destroy
+        new_version.rdf_updated_at = nil
+        new_version.publish
+        new_version.unlock
+        if new_version.publishable?
+          new_version.save
+
+          if Iqvoc.config['triplestore.autosync']
+           synced = triplestore_syncer.sync([new_version]) # XXX: blocking
+           flash[:warning] = 'triplestore synchronization failed' unless synced # TODO: i18n
+          end
+
+          flash[:success] = t('txt.controllers.versioning.published')
+          redirect_to collection_path(new_version)
+        else
+          flash[:error] = t('txt.controllers.versioning.merged_publishing_error')
+          redirect_to collection_path(new_version, published: 0)
+        end
+      else
+        flash[:error] = t('txt.controllers.versioning.merged_delete_error')
+        redirect_to collection_path(new_version, published: 0)
+      end
+    end
+  end
+
+  def branch
+    scope = Iqvoc::Collection.base_class.by_origin(params[:origin])
+    current_collection = scope.published.last!
+
+    if draft_collection = scope.unpublished.last
+      raise "There already is an unpublished version for collection '#{draft_collection.origin}'"
+    end
+
+    authorize! :branch, current_collection
+
+    new_version = nil
+    ActiveRecord::Base.transaction do
+      new_version = current_collection.branch(current_user)
+      new_version.save!
+    end
+    flash[:success] = t('txt.controllers.versioning.branched')
+    redirect_to edit_collection_path(new_version, published: 0)
+  end
+
+  def lock
+    new_version = Iqvoc::Collection.base_class.
+        by_origin(params[:origin]).
+        unpublished.
+        last!
+
+    if new_version.locked?
+      raise "Collection '#{new_version.origin}' is already locked."
+    end
+
+    authorize! :lock, new_version
+
+    new_version.lock_by_user(current_user.id)
+    new_version.save validate: false
+
+    flash[:success] = t('txt.controllers.versioning.locked')
+    redirect_to edit_collection_path(new_version, published: 0)
+  end
+
+  def unlock
+    new_version = Iqvoc::Collection.base_class.
+        by_origin(params[:origin]).
+        unpublished.
+        last!
+
+    unless new_version.locked?
+      raise "Collection '#{new_version.origin}' is not locked."
+    end
+
+    authorize! :unlock, new_version
+
+    new_version.unlock
+    new_version.save validate: false
+
+    flash[:success] = t('txt.controllers.versioning.unlocked')
+
+    redirect_to collection_path(new_version, published: 0)
+  end
+
+  def consistency_check
+    collection = Iqvoc::Collection.base_class.
+        by_origin(params[:origin]).
+        unpublished.
+        last!
+
+    authorize! :check_consistency, collection
+
+    if collection.publishable?
+      flash[:success] = t('txt.controllers.versioning.consistency_check_success')
+      redirect_to collection_path(collection, published: 0)
+    else
+      flash[:error] = t('txt.controllers.versioning.consistency_check_error')
+      redirect_to edit_collection_path(collection, published: 0, full_consistency_check: '1')
+    end
+  end
+
+  def to_review
+    collection = Iqvoc::Collection.base_class.
+        by_origin(params[:origin]).
+        unpublished.
+        last!
+
+    authorize! :send_to_review, collection
+
+    collection.to_review
+    collection.save!
+    flash[:success] = t('txt.controllers.versioning.to_review_success')
+    redirect_to collection_path(collection, published: 0)
+  end
+end

data/app/controllers/collections_controller.rb

@@ -15,54 +15,68 @@
 # limitations under the License.
 
 class CollectionsController < ApplicationController
-
   def index
     authorize! :read, Iqvoc::Collection.base_class
 
     respond_to do |format|
       format.html do
-        @top_collections = Iqvoc::Collection.base_class.with_pref_labels
+        @top_collections = Iqvoc::Collection.base_class.with_pref_labels.published
         @top_collections = if params[:root].present?
           @top_collections.by_parent_id(params[:root])
         else
           @top_collections.tops
         end
 
-        @top_collections.sort! { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }
+        @top_collections.to_a.sort! { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }
 
-        ActiveRecord::Associations::Preloader.new(@top_collections, {:members => :target}).run
+        ActiveRecord::Associations::Preloader.new.preload(@top_collections, { members: :target })
       end
       format.json do # For the widget and treeview
         response = if params[:root].present?
-          collections = Iqvoc::Collection.base_class.with_pref_labels.by_parent_id(params[:root])
+          collections = Iqvoc::Collection.base_class.with_pref_labels.published.by_parent_id(params[:root])
           collections.map do |collection|
-            { :id => collection.id,
-              :url => collection_path(:id => collection, :format => :html),
-              :text => CGI.escapeHTML(collection.pref_label.to_s),
-              :hasChildren => collection.subcollections.any?,
-              :additionalText => " (#{collection.additional_info})"
+            { id: collection.id,
+              url: collection_path(id: collection, format: :html),
+              text: CGI.escapeHTML(collection.pref_label.to_s),
+              hasChildren: collection.subcollections.any?,
+              additionalText: " (#{collection.additional_info})"
             }
           end
         else
-          collections = Iqvoc::Collection.base_class.with_pref_labels.merge(Label::Base.by_query_value("#{params[:query]}%"))
+          collections = Iqvoc::Collection.base_class.with_pref_labels.published.merge(Label::Base.by_query_value("#{params[:query]}%"))
           collections.map do |c|
             collection_widget_data(c)
           end
         end
-        render :json => response
+        render json: response
       end
     end
   end
 
   def show
-    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
+    published = params[:published] == '1' || !params[:published]
+    scope = Iqvoc::Collection.base_class.by_origin(params[:id])
+
+    if published
+      scope = scope.published
+      @new_collection_version = Iqvoc::Collection.base_class.by_origin(params[:id]).unpublished.last
+    else
+      scope = scope.unpublished
+    end
+
+    @collection = scope.last!
     authorize! :read, @collection
 
     # When in single query mode, AR handles ALL includes to be loaded by that
     # one query. We don't want that! So let's do it manually :-)
-    ActiveRecord::Associations::Preloader.new(@collection,
+    ActiveRecord::Associations::Preloader.new.preload(@collection,
       [:pref_labels,
-        {:members => {:target => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}}]).run
+        { members: { target: [:pref_labels] + Iqvoc::Collection.base_class.default_includes } }])
+
+    respond_to do |format|
+      format.html { published ? render('show_published') : render('show_unpublished') }
+      format.any(:rdf, :ttl, :nt)
+    end
   end
 
   def new
@@ -75,13 +89,13 @@ class CollectionsController < ApplicationController
   def create
     authorize! :create, Iqvoc::Collection.base_class
 
-    @collection = Iqvoc::Collection.base_class.new(params[:concept])
+    @collection = Iqvoc::Collection.base_class.new(concept_params)
 
     if @collection.save
-      flash[:success] = I18n.t("txt.controllers.collections.save.success")
-      redirect_to collection_path(:id => @collection)
+      flash[:success] = I18n.t('txt.controllers.collections.save.success')
+      redirect_to collection_path(published: 0, id: @collection.origin)
     else
-      flash.now[:error] = I18n.t("txt.controllers.collections.save.error")
+      flash.now[:error] = I18n.t('txt.controllers.collections.save.error')
       render :new
     end
   end
@@ -92,9 +106,9 @@ class CollectionsController < ApplicationController
 
     # When in single query mode, AR handles ALL includes to be loaded by that
     # one query. We don't want that! So let's do it manually :-)
-    ActiveRecord::Associations::Preloader.new(@collection, [
+    ActiveRecord::Associations::Preloader.new.preload(@collection, [
         :pref_labels,
-        {:members => {:target => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}}]).run
+        { members: { target: [:pref_labels] + Iqvoc::Concept.base_class.default_includes } }])
 
     build_note_relations
   end
@@ -103,11 +117,11 @@ class CollectionsController < ApplicationController
     @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :update, @collection
 
-    if @collection.update_attributes(params[:concept])
-      flash[:success] = I18n.t("txt.controllers.collections.save.success")
-      redirect_to collection_path(:id => @collection)
+    if @collection.update_attributes(concept_params)
+      flash[:success] = I18n.t('txt.controllers.collections.save.success')
+      redirect_to collection_path(@collection, published: 0)
     else
-      flash.now[:error] = I18n.t("txt.controllers.collections.save.error")
+      flash.now[:error] = I18n.t('txt.controllers.collections.save.error')
       render :edit
     end
   end
@@ -117,18 +131,21 @@ class CollectionsController < ApplicationController
     authorize! :destroy, @collection
 
     if @collection.destroy
-      flash[:success] = I18n.t("txt.controllers.collections.destroy.success")
+      flash[:success] = I18n.t('txt.controllers.collections.destroy.success')
       redirect_to collections_path
     else
-      flash.now[:error] = I18n.t("txt.controllers.collections.destroy.error")
-      render :action => :show
+      flash.now[:error] = I18n.t('txt.controllers.collections.destroy.error')
+      render action: :show
     end
   end
 
   private
 
+  def concept_params
+    params.require(:concept).permit!
+  end
+
   def build_note_relations
     @collection.note_skos_definitions.build if @collection.note_skos_definitions.empty?
   end
-
 end

data/app/controllers/concepts/alphabetical_controller.rb

@@ -22,11 +22,14 @@ class Concepts::AlphabeticalController < ConceptsController
   def index
     authorize! :read, Concept::Base
 
-    redirect_to(url_for :prefix => "a") unless params[:prefix]
+    redirect_to(url_for prefix: 'a') unless params[:prefix]
 
     datasets = init_datasets
 
-    if dataset = datasets.detect {|dataset| dataset.name == params[:dataset] }
+    @letters = Label::Base.select("DISTINCT UPPER(SUBSTR(value, 1, 1)) AS letter")
+                          .order("letter").map(&:letter)
+
+    if dataset = datasets.detect { |dataset| dataset.name == params[:dataset] }
       @search_results = dataset.alphabetical_search(params[:prefix], I18n.locale) || []
       @search_results = Kaminari.paginate_array(@search_results).page(params[:page])
     else
@@ -38,13 +41,13 @@ class Concepts::AlphabeticalController < ConceptsController
       if Iqvoc::Concept.note_classes.include?(Note::SKOS::Definition)
         includes << Note::SKOS::Definition.name.to_relation_name
       end
-      ActiveRecord::Associations::Preloader.new(@search_results, :owner => includes).run
+      ActiveRecord::Associations::Preloader.new.preload(@search_results, owner: includes)
 
-      @search_results.map! { |pl| AlphabeticalSearchResult.new(pl) }
+      @search_results.to_a.map! { |pl| AlphabeticalSearchResult.new(pl) }
     end
 
     respond_to do |format|
-      format.html { render :index, :layout => with_layout? }
+      format.html { render :index, layout: with_layout? }
     end
   end
 
@@ -59,7 +62,7 @@ class Concepts::AlphabeticalController < ConceptsController
       includes(:target).
       order("LOWER(#{Label::Base.table_name}.value)").
       joins(:owner).
-      where(:concepts => { :type => Iqvoc::Concept.base_class_name }).
+      where(concepts: { type: Iqvoc::Concept.base_class_name }).
       references(:concepts, :labels, :labelings).
       page(params[:page])
   end

data/app/controllers/concepts/expired_controller.rb

@@ -25,7 +25,7 @@ class Concepts::ExpiredController < Concepts::AlphabeticalController
       includes(:target).
       order("LOWER(#{Label::Base.table_name}.value)").
       joins(:owner).
-      where(:concepts => { :type => Iqvoc::Concept.base_class_name }).
+      where(concepts: { type: Iqvoc::Concept.base_class_name }).
       references(:concepts, :labels, :labelings).
       page(params[:page])
   end

data/app/controllers/concepts/hierarchical_controller.rb

@@ -15,12 +15,11 @@
 # limitations under the License.
 
 class Concepts::HierarchicalController < ConceptsController
-
   def index
     authorize! :read, Iqvoc::Concept.base_class
 
     scope = Iqvoc::Concept.base_class
-    scope = params[:published] == "0" ? scope.editor_selectable : scope.published
+    scope = params[:published] == '0' ? scope.editor_selectable : scope.published
 
     # only select unexpired concepts
     scope = scope.not_expired
@@ -30,43 +29,42 @@ class Concepts::HierarchicalController < ConceptsController
     if root_id && root_id =~ /\d+/
       # NB: order matters; see the following `where`
       if params[:broader]
-        scope = scope.includes(:narrower_relations, :broader_relations)
+        scope = scope.includes(:narrower_relations, :broader_relations).references(:relations)
       else
-        scope = scope.includes(:broader_relations, :narrower_relations)
+        scope = scope.includes(:broader_relations, :narrower_relations).references(:relations)
       end
       @concepts = scope.where(Concept::Relation::Base.arel_table[:target_id].eq(root_id))
     else
       if params[:broader]
-        @concepts = scope.broader_tops.includes(:broader_relations)
+        @concepts = scope.broader_tops.includes(:broader_relations).references(:concepts)
       else
-        @concepts = scope.tops.includes(:narrower_relations)
+        @concepts = scope.tops.includes(:narrower_relations).references(:concepts)
       end
     end
 
     # When in single query mode, AR handles ALL includes to be loaded by that
     # one query. We don't want that! So let's do it manually :-)
-    ActiveRecord::Associations::Preloader.new(@concepts,
-        Iqvoc::Concept.base_class.default_includes + [:pref_labels]).run
+    ActiveRecord::Associations::Preloader.new.preload(@concepts,
+        Iqvoc::Concept.base_class.default_includes + [:pref_labels])
 
-    @concepts.sort! do |a, b|
+    @concepts.to_a.sort! do |a, b|
       a.pref_label.to_s <=> b.pref_label.to_s
     end
 
     respond_to do |format|
       format.html
       format.json do # Treeview data
-        concepts = @concepts.select {|c| can? :read, c }.map do |c|
+        concepts = @concepts.select { |c| can? :read, c }.map do |c|
           {
-            :id   => c.id,
-            :url  => concept_path(:id => c, :format => :html),
-            :text => CGI.escapeHTML(c.pref_label.to_s),
-            :hasChildren => (params[:broader] ? c.broader_relations.any? : c.narrower_relations.any?),
-            :additionalText => (" (#{c.additional_info})" if c.additional_info.present?)
+            id: c.id,
+            url: concept_path(id: c, format: :html),
+            text: CGI.escapeHTML(c.pref_label.to_s),
+            hasChildren: (params[:broader] ? c.broader_relations.any? : c.narrower_relations.any?),
+            additionalText: (" (#{c.additional_info})" if c.additional_info.present?)
           }
         end
-        render :json => concepts
+        render json: concepts
       end
     end
   end
-
 end

data/app/controllers/concepts/scheme_controller.rb

@@ -43,7 +43,7 @@ class Concepts::SchemeController < ApplicationController
 
     respond_to do |format|
       format.html
-      format.any(:rdf, :ttl)
+      format.any(:rdf, :ttl, :nt)
     end
   end
 
@@ -56,13 +56,17 @@ class Concepts::SchemeController < ApplicationController
     @scheme = Iqvoc::Concept.root_class.instance
     authorize! :update, @scheme
 
-    if @scheme.update_attributes(params[:concept])
-      flash[:success] = t("txt.controllers.concept_scheme.save.success")
+    if @scheme.update_attributes(concept_params)
+      flash[:success] = t('txt.controllers.concept_scheme.save.success')
       redirect_to scheme_path
     else
-      flash[:error] = t("txt.controllers.concept_scheme.save.error")
+      flash[:error] = t('txt.controllers.concept_scheme.save.error')
       render :edit
     end
   end
 
+  private
+  def concept_params
+    params.require(:concept).permit!
+  end
 end