iqvoc 4.9.0 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d178562c345ec6693d7f4b67f552266799856cf4
-  data.tar.gz: 21d82c798ac02be2e8f1d7709453e0c70908f6d5
+  metadata.gz: e1475e23fc06bf41a94bb3ceda90957f083638e0
+  data.tar.gz: f1974964f991cb31e0e4b78bd89a842fd9e2ec70
 SHA512:
-  metadata.gz: 0c8a0580d169b4593ab82de3004224c6667bea534e4abab21a5f9f9510e251b9a81597b84f4197602d7039e9c862e5d1ed400d1f98ea9700e021d8143e19e766
-  data.tar.gz: 05c237e9b6000fd2f078174f3770d7ad3b2300b221acba4dfc561f350292065f33319062b127ec485057dda39320f9feef44fe9c3bada298ea50f7495cb693f9
+  metadata.gz: 161ed636284243cd11817ef5dd04e11745572b726b394f55956a7eed52307358cbe401fd7ce6bfdc7b6a87b39a436867cf59f19a7ea16badd2088686cc9f573f
+  data.tar.gz: cfa95b56a8f5c3509b2c2bf1cfa4ffdca881f9582dfb0d3b796ba6f3aee3dd4929c70680efe7426cd5a6aad3333e5f5502f4c49e45bf062f015e10cb31e6037b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [4.10.0]
+
+  * Fixed: several bugs (i18n, sorting)
+  * Fixed: several UI glitches
+
 ## [4.9.0]
 
   * Added: updated to latest Rails release (v4.2.4)

data/Gemfile

@@ -36,7 +36,7 @@ gem 'uglifier'
 gem 'sass-rails', '~> 5.0.0'
 gem 'bootstrap_form', '~> 2.2.0'
 gem 'font-awesome-rails', '~> 4.3.0'
-gem 'apipie-rails', '~> 0.3.4'
+gem 'apipie-rails', '~> 0.3.5'
 gem 'maruku', require: false
 gem 'database_cleaner'
 gem 'delayed_job_active_record', '~> 4.0.1'

data/Gemfile.lock

@@ -48,7 +48,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.7)
-    apipie-rails (0.3.4)
+    apipie-rails (0.3.5)
       json
     arel (6.0.3)
     authlogic (3.4.5)
@@ -354,7 +354,7 @@ DEPENDENCIES
   activerecord-jdbcmysql-adapter
   activerecord-jdbcpostgresql-adapter (~> 1.3.13)
   activerecord-jdbcsqlite3-adapter
-  apipie-rails (~> 0.3.4)
+  apipie-rails (~> 0.3.5)
   authlogic (~> 3.4.2)
   autoprefixer-rails (~> 5.1.8)
   awesome_print
@@ -397,4 +397,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.10.2
+   1.10.6

data/README.md

@@ -23,8 +23,13 @@ vocabularies:
 * editorial features for registered users
 * publishing the vocabulary in the Semantic Web
 
-iQvoc is built with state-of-the-art technology and can be easily customized
-according to user's needs.
+iQvoc is built with state-of-the-art technology and can be easily customized according to user's needs.
+
+## Demo
+
+You can try out iQvoc right now! In our [sandbox](http://try.iqvoc.net/) you can play around with the public views.
+If you like to test the collaborative functions simply [request](mailto:iqvoc@innoq.com) your personal demo account.
+
 ## Setup
 
 ### Heroku
@@ -96,6 +101,17 @@ provides a basic overview of the possibilities.
 
 Documentation resources can be found in the [wiki](https://github.com/innoq/iqvoc/wiki).
 
+iQvoc provides an (inline) API documentation which can be found on `APP_URI/apidoc`. Check out our sandbox to see it in action: http://try.iqvoc.net/apidoc/
+
+## Related projects
+
+We provide several extensions to add additional features to iQvoc:
+
+* [iqvoc_skosxl](https://github.com/innoq/iqvoc_skosxl): SKOS-XL extension for iQvoc
+* [iqvoc_compound_forms](https://github.com/innoq/iqvoc_compound_forms): Compound labels for iQvoc
+* [iqvoc_inflectionals](https://github.com/innoq/iqvoc_inflectionals): Inflectionals for iQvoc
+* [iqvoc_similar_terms](https://github.com/innoq/iqvoc_similar_terms):  iQvoc engine for similar terms
+
 ## Versioning
 
 Releases will follow a semantic versioning format:

data/app/assets/javascripts/iqvoc/autocomplete.js

@@ -15,7 +15,7 @@ function augment(field, source, options) {
   options.displayKey = options.displayKey || "value";
 
   field.typeahead({
-    minLength: 3,
+    minLength: 2,
     highlight: true
   }, {
     source: source,

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

@@ -29,6 +29,7 @@
   overflow: hidden;
   list-style-type: none;
   margin-top: 5px;
+  padding-left: 0;
   li {
     float: left;
     a { font-size: 14px; }

data/app/controllers/collections/versions_controller.rb

@@ -26,26 +26,26 @@ class Collections::VersionsController < ApplicationController
     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')
+      new_version.rdf_updated_at = nil
+      new_version.publish
+      new_version.unlock
+      if new_version.publishable?
+        new_version.save
+
+        if current_collection && !current_collection.destroy
+          flash[:error] = t('txt.controllers.versioning.merged_delete_error')
           redirect_to collection_path(new_version, published: 0)
         end
+
+        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_delete_error')
+        flash[:error] = t('txt.controllers.versioning.merged_publishing_error')
         redirect_to collection_path(new_version, published: 0)
       end
     end

data/app/controllers/collections_controller.rb

@@ -119,6 +119,9 @@ class CollectionsController < ApplicationController
     @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :update, @collection
 
+    # set to_review to false if someone edits a concepts
+    concept_params["to_review"] = "false"
+
     if @collection.update_attributes(concept_params)
       flash[:success] = I18n.t('txt.controllers.collections.save.success')
       redirect_to collection_path(@collection, published: 0)

data/app/controllers/concepts/alphabetical_controller.rb

@@ -30,7 +30,8 @@ class Concepts::AlphabeticalController < ConceptsController
                           .order("letter").map(&:letter)
 
     if dataset = datasets.detect { |dataset| dataset.name == params[:dataset] }
-      @search_results = dataset.alphabetical_search(params[:prefix], I18n.locale) || []
+      query = params[:prefix].mb_chars.downcase.to_s
+      @search_results = dataset.alphabetical_search(query, I18n.locale) || []
       @search_results = Kaminari.paginate_array(@search_results).page(params[:page])
     else
       @search_results = find_labelings
@@ -54,10 +55,12 @@ class Concepts::AlphabeticalController < ConceptsController
   protected
 
   def find_labelings
+    query = params[:prefix].mb_chars.downcase.to_s
+
     Iqvoc::Concept.pref_labeling_class.
       concept_published.
       concept_not_expired.
-      label_begins_with(params[:prefix]).
+      label_begins_with(query).
       by_label_language(I18n.locale).
       includes(:target).
       order("LOWER(#{Label::Base.table_name}.value)").

data/app/controllers/concepts/versions_controller.rb

@@ -31,26 +31,26 @@ class Concepts::VersionsController < ApplicationController
     authorize! :merge, new_version
 
     ActiveRecord::Base.transaction do
-      if current_concept.blank? || current_concept.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 concept_path(id: new_version)
-        else
-          flash[:error] = t('txt.controllers.versioning.merged_publishing_error')
+      new_version.rdf_updated_at = nil
+      new_version.publish
+      new_version.unlock
+      if new_version.publishable?
+        new_version.save
+
+        if current_concept && !current_concept.destroy
+          flash[:error] = t('txt.controllers.versioning.merged_delete_error')
           redirect_to concept_path(published: 0, id: new_version)
         end
+
+        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 concept_path(id: new_version)
       else
-        flash[:error] = t('txt.controllers.versioning.merged_delete_error')
+        flash[:error] = t('txt.controllers.versioning.merged_publishing_error')
         redirect_to concept_path(published: 0, id: new_version)
       end
     end

data/app/controllers/concepts_controller.rb

@@ -174,6 +174,9 @@ class ConceptsController < ApplicationController
 
     @datasets = datasets_as_json
 
+    # set to_review to false if someone edits a concepts
+    concept_params["to_review"] = "false"
+
     if @concept.update_attributes(concept_params)
       flash[:success] = I18n.t('txt.controllers.versioned_concept.update_success')
       redirect_to concept_path(published: 0, id: @concept)

data/app/controllers/concerns/controller_extensions.rb

@@ -86,7 +86,7 @@ module ControllerExtensions
   def label_widget_data(label)
     {
       id: label.origin,
-      name: label.value
+      name: label.value + ' (' + label.language + ')'
     }
   end
 

data/app/models/concept/base.rb

@@ -180,7 +180,7 @@ class Concept::Base < ActiveRecord::Base
   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 :labels, -> { order(:value) }, 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
@@ -237,6 +237,7 @@ class Concept::Base < ActiveRecord::Base
     class_name: Iqvoc::Concept.pref_labeling_class_name
 
   has_many :pref_labels,
+    -> { order(:value) },
     through: :pref_labelings,
     source: :target
 
@@ -245,6 +246,7 @@ class Concept::Base < ActiveRecord::Base
     class_name: Iqvoc::Concept.alt_labeling_class_name
 
   has_many :alt_labels,
+    -> { order(:value) },
     through: :alt_labelings,
     source: :target
 
@@ -435,13 +437,13 @@ 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 }.sort_by(&:value)
   end
 
   def related_concepts_for_relation_class(relation_class, only_published = true)
     relation_class = relation_class.name if relation_class < ActiveRecord::Base # Use the class name string
     relations.select { |rel| rel.class.name == relation_class }.map(&:target).
-        select { |c| c.published? || !only_published }
+        select { |c| c.published? || !only_published }.sort_by(&:pref_label)
   end
 
   def matches_for_class(match_class)

data/app/models/label/base.rb

@@ -63,7 +63,7 @@ class Label::Base < ActiveRecord::Base
   end
 
   def self.by_query_value(query)
-    where(["LOWER(#{table_name}.value) LIKE ?", query.to_s.downcase])
+    where(["LOWER(#{table_name}.value) LIKE ?", query.mb_chars.downcase.to_s])
   end
 
   # Attention: This means that even label classes without version controll will also

data/app/presenters/search_result.rb

@@ -1,5 +1,6 @@
 class SearchResult
   extend Forwardable
+  attr_reader :result_object
   def_delegators :@result_object, :build_search_result_rdf, :owner, :target,
       :value, :label, :rdf_namespace, :rdf_predicate
 

data/app/views/collections/_form.html.erb

@@ -50,6 +50,7 @@
 <hr />
 <div class="well">
   <%= f.submit t("txt.common.save"), :class => "btn btn-primary" %>
+  <%= link_to t("txt.common.cancel"), collection_path(collection, :published => 0), :class => "btn btn-default" %>
 </div>
 
 <% end %>

data/app/views/collections/show_unpublished.html.erb

@@ -33,6 +33,9 @@
     <% else %>
       <%= button_to t("txt.views.versioning.to_edit_mode"),
         collection_versions_lock_path(:origin => @collection.origin), :class => 'btn btn-default' if can?(:lock, @collection) %>
+  <% end %>
+
+  <% if can?(:destroy, @collection) %>
     <%= button_to t("txt.views.versioning.delete"),
       collection_path(:published => 0, :id => @collection.origin),
         :method => :delete,

data/app/views/concepts/_form.html.erb

@@ -93,6 +93,8 @@
 
   <div class="well">
     <%= f.submit t("txt.common.save"), :class => "btn btn-primary" %>
+
+    <%= link_to t("txt.common.cancel"), concept_path(:published => 0, :id => concept), :class => "btn btn-default" %>
   </div>
 
 <% end %>

data/app/views/concepts/show_unpublished.html.erb

@@ -37,11 +37,14 @@
   <% else %>
     <%= button_to t("txt.views.versioning.to_edit_mode"),
       concept_versions_lock_path(:origin => @concept.origin), :class => 'btn btn-default' if can?(:lock, @concept) %>
+  <% end %>
+
+  <% if can?(:destroy, @concept) %>
     <%= button_to t("txt.views.versioning.delete"),
       concept_path(:published => 0, :id => @concept.origin),
         :method => :delete,
         :class => 'btn btn-danger',
-        :data => { :confirm => I18n.t("txt.views.versioning.delete_confirm") } if can?(:destroy, @concept) %>
+        :data => { :confirm => I18n.t("txt.views.versioning.delete_confirm") } %>
   <% end %>
 </div>
 

data/app/views/partials/concept/relation/skos/_narrower.html.erb

@@ -4,9 +4,9 @@
     <% if concept.narrower_relations.any? %>
       <div class="selector">
         <% if(params[:published] == '0') %>
-          <%= treeview(concept.narrower_relations.published_with_newer_versions.map(&:target)) %>
+          <%= treeview(concept.narrower_relations.published_with_newer_versions.map(&:target).sort_by(&:pref_label)) %>
         <% else %>
-          <%= treeview(concept.narrower_relations.published.map(&:target)) %>
+          <%= treeview(concept.narrower_relations.published.map(&:target).sort_by(&:pref_label)) %>
         <% end %>
       </div>
     <% end %>

data/app/views/partials/note/_note.html.erb

@@ -2,7 +2,10 @@
   <div class="translation" lang="<%= note.language %>">
     <span class="language_flap"><%= note.language %></span>
     <div class="note_content">
-      <p><%= auto_link(note.value, :html => { :target => '_blank' }) %></p>
+      <% if note.value %>
+        <p><%= auto_link(note.value, :html => { :target => '_blank' }) %></p>
+      <% end %>
+
       <% if note.annotations.any? %>
         <dl class="note_annotations">
           <% note.annotations.each do |annotation| %>

data/config/locales/de.yml

@@ -53,6 +53,7 @@ de:
      welcome: "Hallo %{user_name}"
      move: "Verschieben"
      save: "Speichern"
+     cancel: "Abbrechen"
      copy: "Kopieren"
      reset: "Zurücksetzen"
      language: "Sprache"
@@ -109,8 +110,10 @@ de:
          sources: Föderation
        settings:
          title: Titel
-         languages_notes: Sprachen für Notes
+         available_languages: verfügbare Sprachen
          languages_pref_labeling: Sprachen für bevorzugte Labels
+         languages_notes: Sprachen für Notes
+         languages_further_labelings_Labeling: Sprachen für alternative Labels
          languages_further_labelings_Labeling::SKOS::AltLabel: Sprachen für alternative Labels
          performance_unbounded_hierarchy: unbegrenzte Hierarchie-Tiefe
          triplestore_url: Triplestore-URL

data/config/locales/en.yml

@@ -53,6 +53,7 @@ en:
      welcome: "Hello %{user_name}"
      move: "Move"
      save: "Save"
+     cancel: "Cancel"
      copy: 'Copy'
      reset: "Reset"
      language: "Language"
@@ -109,8 +110,10 @@ en:
          sources: Federation
        settings:
          title: Site title
-         languages_notes: Languages for notes
+         available_languages: available languages
          languages_pref_labeling: Languages for preferred labels
+         languages_notes: Languages for notes
+         languages_further_labelings_Labeling: Languages for alternative labels
          languages_further_labelings_Labeling::SKOS::AltLabel: Languages for alternative labels
          performance_unbounded_hierarchy: Unlimited hierarchy depth
          triplestore_url: Triplestore URL

data/iqvoc.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'linkeddata'
   s.add_dependency 'font-awesome-rails', '~> 4.2.0'
   s.add_dependency 'uglifier', '>= 1.3.0'
-  s.add_dependency 'apipie-rails'
+  s.add_dependency 'apipie-rails', '~> 0.3.5'
   s.add_dependency 'maruku'
   s.add_dependency 'database_cleaner'
   s.add_dependency 'delayed_job_active_record', '~> 4.0.1'

data/lib/iqvoc/environments/development.rb

@@ -70,10 +70,9 @@ module Iqvoc::Environments
     config.assets.raise_runtime_errors = true
 
     # Raises error for missing translations
-    # config.action_view.raise_on_missing_translations = true
+    config.action_view.raise_on_missing_translations = true
 
+    # Raises error for missing translations
     config.i18n.enforce_available_locales = true
-
-    config.action_view.raise_on_missing_translations = true
   end
 end