iqvoc 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe748701f343a235ed146e497547f4669a07d2aa
-  data.tar.gz: a76fbd2601fc477dd0f0f7252f4761fe2c997259
+  metadata.gz: 69a13cf281376e316b925171dc9c5bc7a22bd9ab
+  data.tar.gz: cfd1c8a7b2d3476a3704c15ed0de3653337fff4d
 SHA512:
-  metadata.gz: 55ee8b2a162e067453c1763995cc1cd1e2f6b89b050a5d0eeaafe400c5b082bb96762cb05ff7641dc91a6c99842af0af91a806df9459a7179ae02926b6acd427
-  data.tar.gz: d5febd044f1da68dcf60dac66c617808cd742ac05a43d206a3b88d2b693de25bc955e080a86fe0cb60ab2aa091324f0d9feb9774f76c9b3e8582d7d782390f24
+  metadata.gz: 93f3bdcc53729392cd0b8bbc45ff03ce1f452f33401bad96e3d1fdc96c1610cebf50a985ca21edd029202e8472626b4952512bdcf6d70831bceb86945535bf27
+  data.tar.gz: 21976d7d516483188dcef8c4a09bfa604479afb97855079d3c333b9b6788d37f263ec4a52f518aba9587d000f5d40a0c155ae302f848fd31cf38b9cd7b56b9c5

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [4.1.3]
+
+This version is intended as the last minor/patch release before version 5.0.0 -
+that will incorporate significant overhauls of both internal and external APIs
+as well as more sophisticated RDF processing.
+
+  * Improved instance configuration UI
+  * Adjusted internal name of note languages setting for consistency
+  * Updated Bootstrap
+  * Introduced Navigation API<br />
+    iQvoc extensions can be injected into the main navigation either at root
+    level or in a separate group
+  * Removed duplicate results from search when concepts had unpublished versions
+
 ## [4.1.2]
 
   * Dumped Jbuilder (introduced in 4.1.1) to fix endless recursions happening in hierarchical views

data/Gemfile

@@ -24,6 +24,7 @@ gem 'rails', '3.2.13'
 group :assets do
   gem 'uglifier',   '>= 1.0.3'
   gem 'sass-rails', '~> 3.2.5'
+  gem 'bootstrap-sass', '~> 2.3.1.0'
   gem 'therubyracer', :platforms => :ruby
 end
 

data/Gemfile.lock

@@ -47,6 +47,8 @@ GEM
       erubis (>= 2.7.0)
     binding_of_caller (0.7.1)
       debug_inspector (>= 0.0.1)
+    bootstrap-sass (2.3.1.0)
+      sass (~> 3.2)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
     cancan (1.6.8)
@@ -102,8 +104,8 @@ GEM
     journey (1.0.4)
     jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
-    json (1.7.7)
-    json (1.7.7-java)
+    json (1.8.0)
+    json (1.8.0-java)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -218,6 +220,7 @@ DEPENDENCIES
   awesome_print
   better_errors
   binding_of_caller
+  bootstrap-sass (~> 2.3.1.0)
   cancan
   cane
   capybara

data/README.md

@@ -1,5 +1,6 @@
 # iQvoc
 
+[![Gem Version](https://badge.fury.io/rb/iqvoc.png)](http://badge.fury.io/rb/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)
 

data/app/assets/javascripts/framework.js

@@ -5,4 +5,6 @@
 //= require jquery.treeview
 //= require jquery.treeview.async
 //= require storage
-//= require bootstrap/bootstrap
+//= require bootstrap-transition
+//= require bootstrap-collapse
+//= require bootstrap-tab

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

@@ -72,7 +72,7 @@ jQuery(document).ready(function($) {
   var locale = document.documentElement.getAttribute("lang");
 
   // language selection
-  $("#language_selection .dropdown-toggle").click(function(ev) { // use Bootstrap's Dropwdown, but without the side-effects
+  $(".dropdown-toggle").click(function(ev) { // use Bootstrap's Dropwdown, but without the side-effects
     $(this).closest(".dropdown").toggleClass("open");
   });
   var langWidget = $("ul.lang-widget")[0];

data/app/assets/stylesheets/framework.css.scss

@@ -0,0 +1,8 @@
+@import 'jquery.treeview';
+@import 'jquery-ui-1.8.23.custom';
+
+@import 'bootstrap';
+body {
+  padding-top: 60px;
+}
+@import 'bootstrap-responsive';

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

@@ -1,64 +1,3 @@
-[class^="icon-"], [class*=" icon-"] {
-  background-image: asset-data-url('bootstrap/glyphicons-halflings.png');
-}
-
-.icon-white {
-  background-image: asset-data-url('bootstrap/glyphicons-halflings-white.png');
-}
-
-.dropdown-menu {
-  h3 {
-    margin: 0 10px;
-  }
-  label {
-    margin: 0;
-    padding: 2px 10px;
-
-    &:hover, &:hover a {
-      text-decoration: none;
-      color: #FFF;
-      background-color: #08C;
-    }
-
-    input {
-      margin-right: 0.5em;
-      display: inline;
-    }
-
-    a {
-      padding-left: 0;
-      display: inline;
-    }
-  }
-}
-
-.navbar {
-  .brand {
-    color: #fff;
-  }
-
-  .navbar-inner {
-    padding: 0 5px;
-
-    background: -moz-linear-gradient(top,#373737 0,#343434 50%,#242424 100%);
-    background: -o-linear-gradient(top,#373737 0,#343434 50%,#242424 100%);
-    background: -ms-linear-gradient(top,#373737 0,#343434 50%,#242424 100%);
-    background: -webkit-gradient(linear,left top,left bottom,from(#373737),color-stop(0.5,#343434),to(#242424));
-    background: -webkit-gradient(linear,left bottom,left top,color-stop(1,rgba(55, 55, 55, 1)),color-stop(0.5,rgba(52, 52, 52, 1)),color-stop(0.5,rgba(52, 52, 52, 1)),color-stop(0,rgba(36, 36, 36, 1)));
-    border-top: 1px solid #2A2A2A;
-    border-bottom: 1px solid black;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
-  }
-}
-
-// Unify topbar margin on all viewports
-@media (min-width: 980px) {
-  .navbar-fixed-top {
-    position: static;
-    margin-bottom: 18px;
-  }
-}
-
 form#search {
   .btn-group {
     margin-top: 10px;

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

@@ -123,3 +123,28 @@ ol.concepts {
     }
   }
 }
+
+.lang-widget {
+  padding: 0 15px 20px 15px;
+
+  h3 {
+    margin-top: 10px;
+    margin-bottom: 0;
+    font-size: 18px;
+  }
+  label {
+    margin: 0;
+    padding: 2px 10px;
+
+    input {
+      margin-top: -2px;
+      margin-right: 0.5em;
+      display: inline;
+    }
+
+    a {
+      padding-left: 0;
+      display: inline;
+    }
+  }
+}

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

@@ -0,0 +1,10 @@
+@import 'iqvoc/bootstrap_extensions';
+@import 'iqvoc/jquery-ui_extensions';
+@import 'iqvoc/layout';
+@import 'iqvoc/components';
+@import 'iqvoc/panel';
+@import 'iqvoc/sidebar';
+@import 'iqvoc/forms';
+@import 'iqvoc/note';
+@import 'iqvoc/entity_select';
+@import 'iqvoc/hacks';

data/app/assets/stylesheets/manifest.css.scss

@@ -0,0 +1,2 @@
+@import 'framework';
+@import 'iqvoc/manifest';

data/app/controllers/instance_configuration_controller.rb

@@ -21,9 +21,18 @@ class InstanceConfigurationController < ApplicationController
   def index
     authorize! :show, Iqvoc.config
 
-    @settings = Iqvoc.config.defaults.each_with_object({}) { |(key, default_value), hsh|
+    settings = Iqvoc.config.defaults.
+        each_with_object({}) do |(key, default_value), hsh|
       hsh[key] = serialize(Iqvoc.config[key], default_value)
-    }
+    end
+
+    @settings_by_namespace = settings.inject({}) do |memo, (key, value)|
+      namespace, setting = key.split(".", 2)
+      namespace = setting ? namespace : "common"
+      memo[namespace] ||= {}
+      memo[namespace][key] = value
+      memo
+    end
   end
 
   def update

data/app/controllers/search_results_controller.rb

@@ -17,8 +17,9 @@
 class SearchResultsController < ApplicationController
 
   def index
-    authorize! :read, Concept::Base # TODO: I think a :search right would be
-    # better here because you're able to serach more than only concepts.
+    authorize! :read, Concept::Base
+    # TODO: requires a dedicated :search permission because this covers more
+    # than just concepts
 
     self.class.prepare_basic_variables(self)
 

data/app/helpers/form_helper.rb

@@ -1,3 +1,19 @@
+# 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.
+
 module FormHelper
 
   ## Generates verbose bootstrap wrapper HTML for generic forms
@@ -24,4 +40,4 @@ module FormHelper
     end
   end
 
-end
+end

data/app/helpers/navigation_helper.rb

@@ -1,5 +1,20 @@
-module NavigationHelper
+# 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.
 
+module NavigationHelper
   # expects an array of hashes with the following members:
   # :content - usually a navigation link
   # :active? - an optional function determining whether the respective item is
@@ -8,13 +23,23 @@ module NavigationHelper
   #     specific controller
   # :authorized? - an optional function determining whether the respective item
   #     is available to the current user (defaults to true)
+  # :items - a list of hashes to be used as second-level navigation items
   def nav_items(items)
     items.map do |item|
-      if (not item[:authorized?]) || instance_eval(&item[:authorized?])
-        active = item[:active?] ? instance_eval(&item[:active?]) : (item[:controller] ? params[:controller] == item[:controller] : false)
-
-        content_tag "li", instance_eval(&item[:content]),
-            :class => ("active" if active)
+      if !item.has_key?(:authorized?) || instance_eval(&item[:authorized?])
+        if item[:items]
+          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(:ul,
+                    item[:items].map { |i| nav_item(i) }.join.html_safe,
+                    :class => "dropdown-menu"))
+          end
+        else
+          nav_item(item)
+        end
       end
     end.join.html_safe
   end
@@ -55,4 +80,20 @@ module NavigationHelper
     content_tag :li, content, :class => css_class
   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
+  end
+
+  def nav_item_authorized?(item)
+    !item.has_key?(:authorized?) || instance_eval(&item[:authorized?])
+  end
+
+  def element_value(e)
+    e.is_a?(Proc) ? instance_eval(&e) : e
+  end
+
 end

data/app/models/labeling/skos/base.rb

@@ -46,11 +46,12 @@ class Labeling::SKOS::Base < Labeling::Base
     query_str = build_query_string(params)
 
     scope = includes(:target).order("LOWER(#{Label::Base.table_name}.value)")
+    languages = Array(params[:languages])
 
     if params[:query].present?
-      scope = scope.merge(Label::Base.by_query_value(query_str).by_language(params[:languages].to_a).published)
+      scope = scope.merge(Label::Base.by_query_value(query_str).by_language(languages).published)
     else
-      scope = scope.merge(Label::Base.by_language(params[:languages].to_a).published)
+      scope = scope.merge(Label::Base.by_language(languages).published)
     end
 
     if params[:collection_origin].present?
@@ -66,7 +67,7 @@ class Labeling::SKOS::Base < Labeling::Base
 
     scope = case params[:for]
     when 'concept'
-      scope.where('concepts.type' => Iqvoc::Concept.base_class_name).merge(Concept::Base.published)
+      scope.where('concepts.type' => Iqvoc::Concept.base_class_name)
     when 'collection'
       scope.where('concepts.type' => Iqvoc::Collection.base_class_name)
     else
@@ -74,7 +75,7 @@ class Labeling::SKOS::Base < Labeling::Base
       scope
     end
 
-    scope
+    scope.merge(Concept::Base.published)
   end
 
   def self.search_result_partial_name
@@ -86,7 +87,11 @@ class Labeling::SKOS::Base < Labeling::Base
     raise "#{self.name}#build_from_rdf: Object (#{rdf_object}) must be a string literal" unless rdf_object =~ /^"(.+)"(@(.+))?$/
 
     lang = $3
-    value = JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
+    value = begin
+      JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
+    rescue JSON::ParserError
+      $1
+    end
 
     predicate_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
     predicate_class.new(:target => self.label_class.new(:value => value, :language => lang)).tap do |labeling|

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

@@ -49,7 +49,7 @@
 </fieldset>
 
 <div class="form-actions">
-  <%= f.submit t("txt.common.save"), :class => "btn-primary" %>
+  <%= f.submit t("txt.common.save"), :class => "btn btn-primary" %>
 </div>
 
 <% end %>

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

@@ -73,7 +73,7 @@
   <!-- / Notations -->
 
   <div class="form-actions">
-    <%= f.submit t("txt.common.save"), :class => "btn-primary" %>
+    <%= f.submit t("txt.common.save"), :class => "btn btn-primary" %>
   </div>
 
 <% end %>

data/app/views/concepts/scheme/edit.html.erb

@@ -25,6 +25,6 @@
     <% end %>
   </fieldset>
   <div class="form-actions">
-    <%= f.submit t("txt.common.save"), :class => "btn-primary" %>
+    <%= f.submit t("txt.common.save"), :class => "btn btn-primary" %>
   </div>
 <% end %>

data/app/views/instance_configuration/index.html.erb

@@ -1,12 +1,20 @@
 <%= page_header :title => t("txt.views.instance_configuration.caption").titleize %>
 
-<%= form_tag(instance_configuration_path, :method => :put, :class => "") do %>
-  <% @settings.each do |key, value| %>
-    <label>
-      <%= t("txt.views.instance_configuration.settings.#{key.gsub(".", "_")}") %>
-      (<code><%= key %></code>)
-    </label>
-    <%= text_field_tag "config[#{key}]", value %>
+<%= form_tag(instance_configuration_path, :method => :put, :class => "form-horizontal") do %>
+  <% @settings_by_namespace.each do |namespace, settings| %>
+    <fieldset>
+      <legend><%= t("txt.views.instance_configuration.groups.#{namespace}").titleize %></legend>
+      <% settings.each do |key, value| %>
+        <div class="control-group">
+          <label class="control-label">
+            <%= t("txt.views.instance_configuration.settings.#{key.gsub(".", "_")}") %>
+          </label>
+          <div class="controls">
+            <%= text_field_tag "config[#{key}]", value %>
+          </div>
+        </div>
+      <% end %>
+    </fieldset>
   <% end %>
   <div class="form-actions">
     <%= submit_tag t("txt.common.save"), :class => "btn btn-primary" %>