iqvoc 4.3.3 → 4.4.0

data/app/controllers/users_controller.rb

@@ -15,46 +15,59 @@
 # limitations under the License.
 
 class UsersController < ApplicationController
-  load_and_authorize_resource
-
   def index
-    @users = User.find(:all)
+    @users = User.all
+    authorize! :read, User
   end
 
   def new
+    authorize! :create, User
     @user = User.new
   end
 
   def create
-    @user = User.new(params[:user])
+    authorize! :create, User
+    @user = User.new(user_params)
 
     if @user.save
       flash[:success] = I18n.t('txt.controllers.users.successfully_created')
       redirect_to users_path
     else
-      render :action => :new
+      render action: :new
     end
   end
 
   def edit
     @user = User.find(params[:id])
+    authorize! :update, @user
   end
 
   def update
     @user = User.find(params[:id])
+    authorize! :update, @user
 
-    if @user.update_attributes(params[:user])
+    if @user.update_attributes(user_params)
       flash[:success] = I18n.t('txt.controllers.users.successfully_updated')
       redirect_to users_path
     else
-      render :action => :edit
+      render action: :edit
     end
   end
 
   def destroy
     @user = User.find(params[:id])
+    authorize! :destroy, @user
+
     @user.destroy
 
     redirect_to users_path
   end
+
+  private
+
+  def user_params
+    params.require(:user).permit(:forename, :surname, :email, :password,
+                                 :password_confirmation, :active, :role,
+                                 :telephone_number)
+  end
 end

data/app/exceptions/invalid_string_literal_error.rb

@@ -0,0 +1,7 @@
+class InvalidStringLiteralError < ArgumentError
+  attr_reader :original
+  def initialize(msg, original = $!)
+    super(msg)
+    @original = original;
+  end
+end

data/app/helpers/application_helper.rb

@@ -15,24 +15,15 @@
 # limitations under the License.
 
 module ApplicationHelper
-
   GLYPHS = {
-    :yes => "✓",
-    :no  => "✗"
+    yes: '✓',
+    no: '✗'
   }
 
-  def iqvoc_default_rdf_namespaces
-    Iqvoc.rdf_namespaces.merge({
-      :default => root_url(:format => nil, :lang => nil, :trailing_slash => true).gsub(/\/\/$/, "/"), # gsub because of a Rails bug :-(
-      :coll => rdf_collections_url(:trailing_slash => true, :lang => nil, :format => nil),
-      :schema => controller.schema_url(:format => nil, :anchor => "", :lang => nil)
-    })
-  end
-
   def user_details(user)
     details = mail_to(user.email, user.name)
     if user.telephone_number?
-      details << " " << user.telephone_number
+      details << ' ' << user.telephone_number
     end
     details
   end
@@ -41,9 +32,9 @@ module ApplicationHelper
   def item_listing(items, &block)
     return nil if items.empty?
 
-    content_tag :ul, :class => "entity_list" do
+    content_tag :ul, class: 'entity_list' do
       items.map do |item|
-        content_tag :li, :class => (items.last == item ? "last-child" : "") do
+        content_tag :li, class: (items.last == item ? 'last-child' : '') do
           block.call(item)
         end
       end.join("\n").html_safe
@@ -52,7 +43,7 @@ module ApplicationHelper
 
   def error_messages_for(object)
     if object.errors.any?
-      content_tag :div, :class => 'alert alert-error' do
+      content_tag :div, class: 'alert alert-danger' do
         content_tag(:p, content_tag(:strong, t('txt.common.form_errors'))) <<
         content_tag(:ul) do
           object.errors.full_messages.each do |msg|
@@ -69,7 +60,7 @@ module ApplicationHelper
     end
 
     content_for :page_header do
-      content_tag :div, :class => "page-header" do
+      content_tag :div, class: 'page-header' do
         content_tag :h1 do
           ("#{title} #{content_tag(:small, args[:desc])}").html_safe
         end
@@ -79,9 +70,9 @@ module ApplicationHelper
 
   def login_logout
     if current_user
-      link_to t("txt.views.navigation.logout"), user_session_path, :method => :delete
+      link_to t('txt.views.navigation.logout'), user_session_path, method: :delete
     else
-      link_to t("txt.views.navigation.login"), new_user_session_path
+      link_to t('txt.views.navigation.login'), new_user_session_path
     end
   end
 
@@ -92,18 +83,20 @@ module ApplicationHelper
     html << content_tag(:strong, header) if header
     html << capture(&block)
 
-    content_tag(:div, :class => "alert alert-#{type}") do
+    type = :danger if type == 'error'
+
+    content_tag(:div, class: "alert alert-#{type}") do
       html
     end
   end
 
-  def icon(name, additional_css = "")
+  def icon(name, additional_css = '')
     css_classes = %W(fa fa-#{name})
     if additional_css.respond_to?(:split)
-      css_classes << additional_css.split(" ")
+      css_classes << additional_css.split(' ')
     end
 
-    content_tag :i, "", :class => css_classes.join(" ")
+    content_tag :i, '', class: css_classes.join(' ')
   end
 
   def glyph(name)
@@ -111,7 +104,7 @@ module ApplicationHelper
   end
 
   def html_classes(*args)
-    args.compact.join(" ")
+    args.compact.join(' ')
   end
 
   def page_title
@@ -121,5 +114,4 @@ module ApplicationHelper
       Iqvoc.title
     end
   end
-
 end

data/app/helpers/concepts_helper.rb

@@ -15,10 +15,9 @@
 # limitations under the License.
 
 module ConceptsHelper
-
   # if `broader` is supplied, the tree's direction is reversed (descendants represent broader relations)
   def treeview(concepts, broader = false)
-    render "concepts/hierarchical/treeview", :concepts => concepts, :broader => broader
+    render 'concepts/hierarchical/treeview', concepts: concepts, broader: broader
   end
 
   # turns a hash of concept/relations pairs of arbitrary nesting depth into the
@@ -27,25 +26,21 @@ module ConceptsHelper
     ordered = options[:ordered] || false
     options.delete(:ordered)
 
-    content_tag(ordered ? "ol" : "ul", options) do
+    content_tag(ordered ? 'ol' : 'ul', options) do
       hash.map do |concept, rels|
-        rels.empty? ? content_tag("li", concept) : content_tag("li") do
-          h(concept) + nested_list(rels, :ordered => ordered) # NB: recursive
+        rels.empty? ? content_tag('li', concept) : content_tag('li') do
+          h(concept) + nested_list(rels, ordered: ordered) # NB: recursive
         end
       end.join("\n").html_safe
     end
   end
 
-  def letter_selector(&block)
-    letters = ('A'..'Z').to_a +
-      (0..9).to_a +
-      ['[']
-
-    content_tag :ul, :class => 'letter-selector unstyled' do
+  def letter_selector(letters = ('A'..'Z').to_a, &block)
+    content_tag :ul, class: 'letter-selector list-unstyled' do
       letters.map do |letter|
         content_tag :li, link_to(letter, yield(letter)),
-          :class => ('active' if params[:prefix] == letter.to_s.downcase)
-      end.join("").html_safe
+          class: ('active' if params[:prefix] == letter.to_s.downcase)
+      end.join('').html_safe
     end
   end
 
@@ -58,7 +53,7 @@ module ConceptsHelper
 
     Iqvoc::Concept.labeling_classes.each do |labeling_class, languages|
       (languages || Iqvoc.available_languages).each do |lang|
-        render_concept_association(res, concept, labeling_class, :lang => lang)
+        render_concept_association(res, concept, labeling_class, lang: lang)
       end
     end
 
@@ -89,12 +84,12 @@ module ConceptsHelper
     desc = concept.class.model_name.human
 
     if concept.expired_at
-      desc += " #{t('txt.views.concepts.expired_at', :date => l(concept.expired_at, :format => :long))} "
+      desc += " #{t('txt.views.concepts.expired_at', date: l(concept.expired_at, format: :long))} "
     end
 
     title = concept.pref_label || concept.origin
 
-    page_header :title => title.to_s, :desc => desc.html_safe
+    page_header title: title.to_s, desc: desc.html_safe
   end
 
   private
@@ -103,15 +98,14 @@ module ConceptsHelper
   # associated to the concept.
   def render_concept_association(hash, concept, association_class, further_options = {})
     html = if association_class.respond_to?(:hidden?) && association_class.hidden?(concept)
-      ""
+      ''
     else
-      render(association_class.partial_name(concept), further_options.merge(:concept => concept, :klass => association_class))
+      render(association_class.partial_name(concept), further_options.merge(concept: concept, klass: association_class))
     end
     # Convert the already safely buffered string back to a regular one
     # in order to be able to modify it with squish
     if String.new(html).squish.present?
-      ((hash[association_class.view_section(concept)] ||= {})[association_class.view_section_sort_key(concept)] ||= "") << html.html_safe
+      ((hash[association_class.view_section(concept)] ||= {})[association_class.view_section_sort_key(concept)] ||= '') << html.html_safe
     end
   end
-
 end

data/app/helpers/dashboard_helper.rb

@@ -15,32 +15,30 @@
 # limitations under the License.
 
 module DashboardHelper
-
   def sorting_controls_for(name)
-    content_tag :div, :class => "sorting-controls" do
-      link_to(icon("arrow-circle-o-up", "sorting-arrow"),
-        dashboard_path(:order => "asc", :by => name.to_s)) +
-        link_to(icon("arrow-circle-o-down", "sorting-arrow"),
-        dashboard_path(:order => "desc", :by => name.to_s))
+    content_tag :div, class: 'sorting-controls' do
+      link_to(icon('arrow-circle-o-up', 'sorting-arrow'),
+        dashboard_path(order: 'asc', by: name.to_s)) +
+        link_to(icon('arrow-circle-o-down', 'sorting-arrow'),
+        dashboard_path(order: 'desc', by: name.to_s))
     end
   end
 
   def consistency_status(item)
-    css, msg = if item.valid_with_full_validation?
-      ["valid", "✓"]
+    css, msg = if item.publishable?
+      ['valid', '✓']
     else
-      ["invalid", "✗"]
+      ['invalid', '✗']
     end
 
-    content_tag :span, raw(msg), :class => css
+    content_tag :span, raw(msg), class: css
   end
 
   def link_to_dashboard_item(item)
     if item.is_a?(Label::Base)
-      item.published? ? label_path(:id => item.origin) : label_path(:published => 0, :id => item.origin)
+      item.published? ? label_path(id: item.origin) : label_path(published: 0, id: item.origin)
     else
-      item.published? ? concept_path(:id => item.origin) : concept_path(:published => 0, :id => item.origin)
+      item.published? ? concept_path(id: item.origin) : concept_path(published: 0, id: item.origin)
     end
   end
-
 end

data/app/helpers/form_helper.rb

@@ -15,9 +15,7 @@
 # limitations under the License.
 
 module FormHelper
-
   ## Generates verbose bootstrap wrapper HTML for generic forms
-  ## Use simple_form_for and it's helpers for forms focused on records
   #
   ## Accepts a hash of arguments with the following keys:
   ## id: id attribute of the input element (necessary for accessible labels)
@@ -27,17 +25,16 @@ module FormHelper
     id = options.delete(:id)
 
     label = if label_text
-      label_tag(id, label_text, :class => 'control-label')
+      label_tag(id, label_text, class: 'control-label')
     else
       ActiveSupport::SafeBuffer.new # empty safe string
     end
 
-    content_tag(:div, :class => 'control-group') do
+    content_tag(:div, class: 'control-group') do
       label <<
-      content_tag(:div, :class => 'controls') do
+      content_tag(:div, class: 'controls') do
         capture(&block)
       end
     end
   end
-
 end

data/app/helpers/link_helper.rb

@@ -2,11 +2,11 @@ module LinkHelper
   def link_to_object(object, name, html_options = nil, &block)
     path = case object
     when Iqvoc::Concept.base_class
-      concept_path(:id => object)
+      concept_path(id: object)
     when Iqvoc::Collection.base_class
-      collection_path(:id => object)
+      collection_path(id: object)
     when Label::Base
-      label_path(:id => object)
+      label_path(id: object)
     end
 
     link_to name, path, html_options, &block

data/app/helpers/navigation_helper.rb

@@ -28,14 +28,14 @@ module NavigationHelper
     items.map do |item|
       if !item.has_key?(:authorized?) || instance_eval(&item[:authorized?])
         if item[:items]
-          content_tag :li, :class => "dropdown" do
+          content_tag :li, class: 'dropdown' do
             raw(link_to(element_value(item[:text]).html_safe +
-                    content_tag(:b, nil, :class => "caret"), "#",
-                    :class => "dropdown-toggle",
-                    :data => { :toggle => "dropdown" }) +
+                    content_tag(:b, nil, class: 'caret'), '#',
+                    class: 'dropdown-toggle',
+                    data: { toggle: 'dropdown' }) +
                 content_tag(:ul,
                     item[:items].map { |i| nav_item(i) }.join.html_safe,
-                    :class => "dropdown-menu"))
+                    class: 'dropdown-menu'))
           end
         else
           nav_item(item)
@@ -46,8 +46,8 @@ module NavigationHelper
 
   def sidebar(&block)
     content_for :sidebar do
-      content_tag :div, :class => 'well sidebar' do
-        content_tag :ul, :class => 'nav nav-list' do
+      content_tag :div, class: 'sidebar' do
+        content_tag :div, class: 'list-group' do
           capture(&block)
         end
       end
@@ -55,7 +55,7 @@ module NavigationHelper
   end
 
   def sidebar_header(text)
-    content_tag :li, text, :class => 'nav-header'
+    content_tag :h4, text, class: 'sidebar-header'
   end
 
   def sidebar_item(opts = {}, &block)
@@ -63,29 +63,30 @@ module NavigationHelper
       return nil if cannot?(*perms)
     end
 
-    css_class = ''
-    css_class << 'active' if opts.delete(:active)
+    opts[:class] = '' if opts[:class].blank?
+    opts[:class] += ' list-group-item'
+    opts[:class] += ' active' if opts.delete(:active)
 
     content = if block_given?
       capture(&block)
     else
       desc = ActiveSupport::SafeBuffer.new
       if icon = opts.delete(:icon)
-        desc << icon(icon) << " "
+        desc << icon(icon) << ' '
       end
       desc << opts.delete(:text).to_s
       link_to(desc.html_safe, opts.delete(:path), opts)
     end
 
-    content_tag :li, content, :class => css_class
+    content
   end
 
   private
 
   def nav_item(item)
     active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
-    css = active ? "active" : nil
-    content_tag :li, link_to(element_value(item[:text]), element_value(item[:href])), :class => css
+    css = active ? 'active' : nil
+    content_tag :li, link_to(element_value(item[:text]), element_value(item[:href])), class: css
   end
 
   def nav_item_authorized?(item)
@@ -95,5 +96,4 @@ module NavigationHelper
   def element_value(e)
     e.is_a?(Proc) ? instance_eval(&e) : e
   end
-
 end

data/app/helpers/rdf_helper.rb

@@ -15,13 +15,11 @@
 # limitations under the License.
 
 module RdfHelper
-
   def render_concept(document, concept, suppress_extra_labels = false)
-
     # You can not eager load polymorphic associations. That's why we're loading
     # the collections _one_ time and remember them for further _render_concept_
     # calls in the future.
-    @rdf_helper_cached_collections ||= Iqvoc::Collection.base_class.select("id, origin").load.each_with_object({}) do |c, hash|
+    @rdf_helper_cached_collections ||= Iqvoc::Collection.base_class.select('id, origin').load.each_with_object({}) do |c, hash|
       hash[c.id] = c.origin
     end
 
@@ -67,4 +65,32 @@ module RdfHelper
     end
   end
 
+  def render_collection(document, collection)
+    # You can not eager load polymorphic associations. That's why we're loading
+    # the collections _one_ time and remember them for further _render_concept_
+    # calls in the future.
+    @rdf_helper_cached_collections ||= Iqvoc::Collection.base_class.select('id, origin').load.each_with_object({}) do |c, hash|
+      hash[c.id] = c.origin
+    end
+
+    document << collection.build_rdf_subject do |c|
+
+      collection.labelings.each do |labeling|
+        labeling.build_rdf(document, c)
+      end
+
+      collection.note_skos_definitions.each do |note|
+        note.build_rdf(document, c)
+      end
+
+      collection.concepts.each do |concept|
+        c.Skos::member(IqRdf.build_uri(concept.origin))
+      end
+
+      collection.subcollections.each do |subcollection|
+        c.Skos::member(IqRdf::Coll.build_uri(subcollection.origin))
+      end
+
+    end
+  end
 end