iqvoc 4.0.8 → 4.0.9

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [4.0.9]
+
+  * Speed improvements in SKOS importer
+  * Preferred labels are now required to be unique
+  * Improved handling of a potential "none" language
+  * Bugfixes in application template
+  * Improved handling of complex comma separated values
+  * New view for expired concepts
+  * Internal overhaul for collections
+  * Lots of bugfixes and improvements throughout
+
 ## [4.0.8]
 
   * Portugese and spanish UI translations (@nitaibezerra)

data/Gemfile

@@ -41,10 +41,14 @@ gem 'fastercsv', :platforms => :ruby_18
 group :development do
   gem 'heroku'
   gem 'view_marker'
+  gem 'better_errors'
+  gem 'binding_of_caller', :platform => :ruby
 end
 
 group :development, :test do
   gem 'awesome_print'
+  gem 'pry', :platform => :ruby
+  gem 'pry-remote', :platform => :ruby
 
   platforms :ruby do
     gem 'mysql2'
@@ -61,7 +65,7 @@ group :test do
   gem 'nokogiri', '~> 1.5.0'
   gem 'capybara'
   gem 'capybara-screenshot'
-  gem 'capybara-webkit'
+  gem 'capybara-webkit', '~> 0.14.2'
   gem 'database_cleaner'
   gem 'factory_girl_rails'
   gem 'spork'

data/Gemfile.lock

@@ -36,32 +36,39 @@ GEM
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.3.2)
+    addressable (2.3.3)
     ansi (1.4.3)
     arel (3.0.2)
     authlogic (3.1.3)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
     awesome_print (1.1.0)
+    better_errors (0.3.2)
+      coderay (>= 1.0.0)
+      erubis (>= 2.7.0)
+    binding_of_caller (0.7.1)
+      debug_inspector (>= 0.0.1)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
     cancan (1.6.8)
-    capybara (1.1.4)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
+      xpath (~> 1.0.0)
     capybara-screenshot (0.3.1)
       capybara (>= 1.0, < 3)
-    capybara-webkit (0.12.1)
-      capybara (>= 1.0.0, < 1.2)
+    capybara-webkit (0.14.2)
+      capybara (~> 2.0, >= 2.0.2)
       json
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
+    coderay (1.0.8)
     crack (0.3.1)
     database_cleaner (0.8.0)
+    debug_inspector (0.0.2)
     erubis (2.7.0)
     excon (0.16.2)
     execjs (1.4.0)
@@ -105,22 +112,27 @@ GEM
       ffi (~> 1.1.1)
       spoon (~> 0.0.1)
     libv8 (3.3.10.4)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    method_source (0.8.1)
     mime-types (1.21)
     minitest (3.4.0)
-    multi_json (1.5.1)
+    multi_json (1.6.1)
     mysql2 (0.3.11)
     netrc (0.7.7)
-    nokogiri (1.5.5)
-    nokogiri (1.5.5-java)
+    nokogiri (1.5.6)
+    nokogiri (1.5.6-java)
     pg (0.14.1)
     polyglot (0.3.3)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    pry-remote (0.1.6)
+      pry (~> 0.9)
+      slop (~> 3.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -156,14 +168,15 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.26.0)
+    selenium-webdriver (2.30.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
     simple_form (2.0.2)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
+    slop (3.3.3)
     spoon (0.0.1)
     spork (0.9.2)
     spork-testunit (0.0.8)
@@ -192,8 +205,8 @@ GEM
     webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
-    websocket (1.0.4)
-    xpath (0.1.4)
+    websocket (1.0.7)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -206,10 +219,12 @@ DEPENDENCIES
   activerecord-oracle_enhanced-adapter
   authlogic
   awesome_print
+  better_errors
+  binding_of_caller
   cancan
   capybara
   capybara-screenshot
-  capybara-webkit
+  capybara-webkit (~> 0.14.2)
   database_cleaner
   factory_girl_rails
   fastercsv
@@ -223,6 +238,8 @@ DEPENDENCIES
   mysql2
   nokogiri (~> 1.5.0)
   pg
+  pry
+  pry-remote
   rails (= 3.2.12)
   rails_autolink
   sass-rails (~> 3.2.5)

data/README.md

@@ -1,6 +1,7 @@
 # iQvoc
 
 [![Build Status](https://secure.travis-ci.org/innoq/iqvoc.png)](http://travis-ci.org/innoq/iqvoc)
+[![Code Climate](https://codeclimate.com/github/innoq/iqvoc.png)](https://codeclimate.com/github/innoq/iqvoc)
 
 iQvoc is a vocabulary management tool that combines easy-to-use human interfaces with Semantic Web interoperability.
 
@@ -63,7 +64,7 @@ Running the cloned source code is possible but any modifications would require a
 
 ## Compatibility
 
-iQvoc is fully compatible with Ruby 1.9.2, 1.8.7 and JRuby 1.6.
+iQvoc is fully compatible with Ruby 1.9 and JRuby 1.6.
 
 ## Customization
 
@@ -97,6 +98,6 @@ iQvoc was originally created and is being maintained by [innoQ Deutschland GmbH]
 
 ## License
 
-Copyright 2011 innoQ Deutschland GmbH
+Copyright 2013 innoQ Deutschland GmbH
 
 Licensed under the Apache License, Version 2.0

data/app/assets/stylesheets/iqvoc/components.css.scss

@@ -33,12 +33,6 @@ tr.highlightable {
   cursor: pointer;
 }
 
-table.dashboard {
-  th {
-    white-space: nowrap;
-  }
-}
-
 .alert {
   p {
     margin: 0 0 10px 0;

data/app/controllers/collections_controller.rb

@@ -21,19 +21,34 @@ class CollectionsController < ApplicationController
 
     respond_to do |format|
       format.html do
-        @top_collections = Iqvoc::Collection.base_class.
-          with_pref_labels.
-          tops.
-          sort { |a, b| a.pref_label.to_s <=> b.pref_label.to_s }
-
-        # 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(@collections, [:subcollections]).run
+        @top_collections = Iqvoc::Collection.base_class.with_pref_labels
+        @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 }
+
+        ActiveRecord::Associations::Preloader.new(@top_collections, {:members => :target}).run
       end
-      format.json do # For the widget
-        @collections = Iqvoc::Collection.base_class.with_pref_labels.merge(Label::Base.by_query_value("#{params[:query]}%"))
-        response = []
-        @collections.each { |c| response << collection_widget_data(c) }
+      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.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})"
+            }
+          end
+        else
+          collections = Iqvoc::Collection.base_class.with_pref_labels.merge(Label::Base.by_query_value("#{params[:query]}%"))
+          collections.map do |c|
+            collection_widget_data(c)
+          end
+        end
         render :json => response
       end
     end
@@ -49,8 +64,7 @@ class CollectionsController < ApplicationController
     # one query. We don't want that! So let's do it manually :-)
     ActiveRecord::Associations::Preloader.new(@collection,
       [:pref_labels,
-      {:subcollections => [:pref_labels, :subcollections]},
-      {:concepts => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}]).run
+        {:members => {:target => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}}]).run
   end
 
   def new
@@ -83,9 +97,8 @@ 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, [
-      :pref_labels,
-      {:subcollections => :pref_labels},
-      {:concepts => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}]).run
+        :pref_labels,
+        {:members => {:target => [:pref_labels] + Iqvoc::Concept.base_class.default_includes}}]).run
 
     build_note_relations
   end

data/app/controllers/concepts/alphabetical_controller.rb

@@ -23,15 +23,7 @@ class Concepts::AlphabeticalController < ConceptsController
 
     redirect_to(url_for :prefix => "a") unless params[:prefix]
 
-    @pref_labelings = Iqvoc::Concept.pref_labeling_class.
-      concept_published.
-      label_begins_with(params[:prefix]).
-      by_label_language(I18n.locale).
-      includes(:target).
-      order("LOWER(#{Label::Base.table_name}.value)").
-      joins(:owner).
-      where(:concepts => { :type => Iqvoc::Concept.base_class_name }).
-      page(params[:page])
+    @pref_labelings = find_labelings
 
     # 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 :-)
@@ -42,4 +34,18 @@ class Concepts::AlphabeticalController < ConceptsController
     ActiveRecord::Associations::Preloader.new(@pref_labelings, :owner => includes).run
   end
 
+  protected
+
+  def find_labelings
+    Iqvoc::Concept.pref_labeling_class.
+      concept_published.
+      concept_not_expired.
+      label_begins_with(params[:prefix]).
+      by_label_language(I18n.locale).
+      includes(:target).
+      order("LOWER(#{Label::Base.table_name}.value)").
+      joins(:owner).
+      where(:concepts => { :type => Iqvoc::Concept.base_class_name }).
+      page(params[:page])
+  end
 end

data/app/{models/collection/member/concept.rb → controllers/concepts/expired_controller.rb}

@@ -14,20 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Collection::Member::Concept < Collection::Member::Base
+class Concepts::ExpiredController < Concepts::AlphabeticalController
+  protected
 
-  belongs_to :concept, :class_name => Iqvoc::Concept.base_class_name, :foreign_key => 'target_id'
-
-  def self.view_section(obj)
-    "main"
-  end
-
-  def self.view_section_sort_key(obj)
-    250
+  def find_labelings
+    Iqvoc::Concept.pref_labeling_class.
+      concept_expired.
+      label_begins_with(params[:prefix]).
+      by_label_language(I18n.locale).
+      includes(:target).
+      order("LOWER(#{Label::Base.table_name}.value)").
+      joins(:owner).
+      where(:concepts => { :type => Iqvoc::Concept.base_class_name }).
+      page(params[:page])
   end
-
-  def self.partial_name(obj)
-    "partials/collection/member"
-  end
-
-end
+end

data/app/controllers/concepts/hierarchical_controller.rb

@@ -25,6 +25,9 @@ class Concepts::HierarchicalController < ConceptsController
       Iqvoc::Concept.base_class.published
     end
 
+    #collect only the not expired concepts
+    scope = scope.not_expired
+
     # if params[:broader] is given, the action is handling the reversed tree
     root_id = params[:root]
     if root_id && root_id =~ /\d+/

data/app/controllers/concepts_controller.rb

@@ -27,9 +27,8 @@ class ConceptsController < ApplicationController
         @concepts = scope.all.map { |concept| concept_widget_data(concept) }
         render :json => @concepts
       end
-      format.all do # RDF full export
-        authorize! :full_export, Concept::Base
-      end
+      # RDF full export
+      format.any(:rdf, :ttl) { authorize! :full_export, Concept::Base }
     end
   end
 

data/app/controllers/instance_configuration_controller.rb

@@ -14,12 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if RUBY_VERSION < '1.9'
-  require 'fastercsv'
-  CSV = FCSV
-else
-  require 'csv'
-end
+require 'csv'
 
 class InstanceConfigurationController < ApplicationController
 
@@ -44,6 +39,8 @@ class InstanceConfigurationController < ApplicationController
         begin
           Iqvoc.config[key] = deserialize(value, default_value)
         rescue TypeError => exc
+          Rails.logger.error(exc)
+          Rails.logger.error(exc.backtrace.join("\n"))
           errors << t("txt.controllers.instance_configuration.invalid_value",
               :key => key, :error_message => exc.message)
         end
@@ -99,6 +96,8 @@ class InstanceConfigurationController < ApplicationController
       end
     elsif type == String
       return str
+    elsif type == Symbol
+      return str
     elsif type == Fixnum
       raise TypeError, "expected integer" unless str =~ /^[-+]?[0-9]+$/
       return str.to_i

data/app/controllers/search_results_controller.rb

@@ -87,8 +87,7 @@ class SearchResultsController < ApplicationController
   end
 
   def self.prepare_basic_variables(controller)
-    label_langs = Iqvoc::Concept.labeling_class_names.values.flatten.map(&:to_s)
-    langs = (Iqvoc.available_languages + label_langs).uniq.each_with_object({}) do |lang, hsh|
+    langs = Iqvoc.all_languages.each_with_object({}) do |lang, hsh|
       lang ||= "none"
       hsh[lang] = I18n.t("languages.#{lang}", :default => lang)
     end

data/app/helpers/application_helper.rb

@@ -24,15 +24,11 @@ module ApplicationHelper
   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 => collections_url(:trailing_slash => true, :lang => nil, :format => nil),
+      :coll => rdf_collections_url(:trailing_slash => true, :lang => nil, :format => nil),
       :schema => controller.schema_url(:format => nil, :anchor => "", :lang => nil)
     })
   end
 
-  def options_for_language_select(selected = nil)
-    locales_collection = Iqvoc.available_languages.map { |l| [l, l] }
-  end
-
   def user_details(user)
     details = mail_to(user.email, user.name)
     if user.telephone_number?

data/app/helpers/concepts_helper.rb

@@ -40,7 +40,7 @@ module ConceptsHelper
   def concept_view_data(concept)
     res = {}
 
-    render_concept_association(res, concept, Collection::Member::Concept)
+    render_concept_association(res, concept, Collection::Member::Base)
 
     Iqvoc::Concept.labeling_classes.each do |labeling_class, languages|
       (languages || Iqvoc.available_languages).each do |lang|

data/app/helpers/rdf_helper.rb

@@ -25,7 +25,7 @@ module RdfHelper
       hash[c.id] = c.origin
     end
 
-    document << concept.build_rdf_subject(document, nil) do |c|
+    document << concept.build_rdf_subject do |c|
 
       concept.collection_members.each do |collection_member|
         if @rdf_helper_cached_collections[collection_member.collection_id]

data/app/helpers/widget_helper.rb

@@ -6,13 +6,13 @@ module WidgetHelper
 
   def widget_values_ranked(concept, relation_class)
     concepts_with_ranks = concept.concept_relations_by_id_and_rank(relation_class.name.to_relation_name)
-    concepts_with_ranks.map { |concept, rank| "#{concept.origin}:#{rank}" }.join(Iqvoc::InlineDataHelper::Joiner)
+    concepts_with_ranks.map { |concept, rank| "#{concept.origin}:#{rank}" }.join(Iqvoc::InlineDataHelper::JOINER)
   end
 
   def widget_entities(concept, relation_class)
     origins = concept.
       concept_relations_by_id(relation_class.name.to_relation_name).
-      split(Iqvoc::InlineDataHelper::Splitter)
+      split(Iqvoc::InlineDataHelper::SPLITTER)
 
     Iqvoc::Concept.base_class.
       editor_selectable.
@@ -24,7 +24,7 @@ module WidgetHelper
   def widget_entities_ranked(concept, relation_class)
     origins = concept.
       concept_relations_by_id(relation_class.name.to_relation_name).
-      split(Iqvoc::InlineDataHelper::Splitter)
+      split(Iqvoc::InlineDataHelper::SPLITTER)
 
     allowed_concepts = Iqvoc::Concept.base_class.
       editor_selectable.

data/app/models/collection/base.rb

@@ -19,35 +19,21 @@ 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
-
-  has_many :concept_members,
-    :class_name  => 'Collection::Member::Concept',
-    :foreign_key => 'collection_id',
-    :dependent   => :destroy
-  has_many :concepts,
-    :through => :concept_members
-
-  has_many :collection_members,
-    :class_name  => 'Collection::Member::Collection',
-    :foreign_key => 'collection_id',
-    :dependent   => :destroy
-  has_many :subcollections,
-    :through => :collection_members
+      :class_name  => 'Collection::Member::Base',
+      :foreign_key => 'collection_id',
+      :dependent   => :destroy
 
   has_many :parent_collection_members,
-    :class_name  => 'Collection::Member::Collection',
-    :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
+      :through => :parent_collection_members
 
 
   #********** Hooks
@@ -66,7 +52,12 @@ class Collection::Base < Concept::Base
 
   def self.tops
     includes(:parent_collection_members).
-      where("#{Collection::Member::Collection.table_name}.target_id IS NULL")
+        where("#{Collection::Member::Base.table_name}.target_id IS NULL")
+  end
+
+  def self.by_parent_id(parent_id)
+    includes(:parent_collection_members).
+        where(Collection::Member::Base.arel_table[:collection_id].eq(parent_id))
   end
 
   #********** Validations
@@ -75,6 +66,14 @@ class Collection::Base < Concept::Base
 
   #********** Methods
 
+  def subcollections
+    members.map(&:target).select { |m| m.is_a?(::Collection::Base) }
+  end
+
+  def concepts
+    members.map(&:target).select { |m| !m.is_a?(::Collection::Base) }
+  end
+
   def additional_info
     concepts.count
   end
@@ -87,17 +86,17 @@ class Collection::Base < Concept::Base
     pref_label
   end
 
-  def build_rdf_subject(document, controller, &block)
+  def build_rdf_subject(&block)
     IqRdf::Coll::build_uri(self.origin, IqRdf::Skos::build_uri("Collection"), &block)
   end
 
   def inline_member_concept_origins=(origins)
     @member_concept_origins = origins.to_s.
-      split(Iqvoc::InlineDataHelper::Splitter).map(&:strip)
+        split(Iqvoc::InlineDataHelper::SPLITTER).map(&:strip)
   end
 
   def inline_member_concept_origins
-    @member_concept_origins || concept_members.map { |m| m.concept.origin }.uniq
+    @member_concept_origins || concepts.map { |m| m.origin }.uniq
   end
 
   def inline_member_concepts
@@ -110,12 +109,12 @@ class Collection::Base < Concept::Base
 
   def inline_member_collection_origins=(origins)
     @member_collection_origins = origins.to_s.
-      split(Iqvoc::InlineDataHelper::Splitter).map(&:strip)
+        split(Iqvoc::InlineDataHelper::SPLITTER).map(&:strip)
   end
 
   def inline_member_collection_origins
-    @member_collection_origins || collection_members.
-      map { |m| m.subcollection.origin }.uniq
+    @member_collection_origins || collections.
+        map { |m| m.origin }.uniq
   end
 
   def inline_member_collections
@@ -128,24 +127,34 @@ class Collection::Base < Concept::Base
 
   #********** Hook methods
 
-  def regenerate_concept_members
-    return if @member_concept_origins.nil? # There is nothing to do
-    concept_members.destroy_all
-    @member_concept_origins.each do |new_origin|
-      Concept::Base.by_origin(new_origin).each do |c|
-        concept_members.create!(:target_id => c.id)
+  def regenerate_members(target_class, target_origins)
+    return if target_origins.nil? # There is nothing to do
+    existing = self.members.includes(:target)
+    existing = if target_class <= Collection::Base
+      existing.select { |m| m.target.is_a?(Collection::Base) }
+    else
+      existing.reject { |m| m.target.is_a?(Collection::Base) }
+    end
+    new = []
+    target_origins.each do |new_origin|
+      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
       end
+      new << member if member
+    end
+    (existing - new).each do |m|
+      m.destroy
     end
   end
 
+  def regenerate_concept_members
+    regenerate_members(Concept::Base, @member_concept_origins)
+  end
+
   def regenerate_collection_members
-    return if @member_collection_origins.nil? # There is nothing to do
-    collection_members.destroy_all
-    @member_collection_origins.each do |new_origin|
-      Iqvoc::Collection.base_class.where(:origin => new_origin).each do |c|
-        collection_members.create!(:target_id => c.id)
-      end
-    end
+    regenerate_members(Collection::Base, @member_collection_origins)
   end
 
   #******** Validation methods
@@ -154,12 +163,21 @@ 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).each do |subcollection|
-      if subcollection.subcollections.all.include?(self)
+    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))
       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