iqvoc 3.4.0 → 3.5.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.5.0 (2012-02-01)
+
+ * Instance configuration<br>
+   You are now able to provide configuration for certain settings in the browser.
+
 ## 3.4.0 (2012-01-27)
 
  * Rails 3.2

data/Gemfile

@@ -32,12 +32,13 @@ gem 'cancan'
 gem 'iq_rdf', '~> 0.1.2'
 gem 'json'
 gem 'rails_autolink'
+gem 'jruby-openssl', :platforms => :jruby
+gem 'blazing'
+gem 'blazing-passenger'
+gem 'blazing-rails'
 
 group :development do
   gem 'awesome_print'
-  gem 'capistrano'
-  gem 'capistrano-ext'
-  gem 'rvm' # RVM API (for Capistrano deployments)
   gem 'heroku'
   gem 'view_marker'
 end
@@ -70,7 +71,7 @@ end
 
 group :production do
   gem 'sqlite3', :platforms => :ruby
-  gem 'activerecord-oracle_enhanced-adapter', :platforms => :ruby
+  gem 'activerecord-oracle_enhanced-adapter', :platforms => :jruby
 end
 
 group :heroku do

data/Gemfile.lock

@@ -29,7 +29,14 @@ GEM
       activesupport (= 3.2.1)
       arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activerecord-oracle_enhanced-adapter (1.4.0)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcmysql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-mysql (~> 5.1.0)
+    activerecord-jdbcsqlite3-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-sqlite3 (~> 3.7.2)
+    activerecord-oracle_enhanced-adapter (1.4.1)
     activeresource (3.2.1)
       activemodel (= 3.2.1)
       activesupport (= 3.2.1)
@@ -37,22 +44,26 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    ansi (1.4.1)
+    ansi (1.4.2)
     arel (3.0.0)
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
     awesome_print (1.0.2)
+    blazing (0.2.7)
+      activesupport
+      grit
+      i18n
+      logging
+    blazing-passenger (0.2.3)
+      blazing (>= 0.2.5)
+      httparty
+    blazing-rails (0.1.3)
+      blazing (>= 0.2.5)
+      httparty
+    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     cancan (1.6.7)
-    capistrano (2.9.0)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    capistrano-ext (1.2.1)
-      capistrano (>= 1.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -66,6 +77,7 @@ GEM
     childprocess (0.3.0)
       ffi (~> 1.0.6)
     database_cleaner (0.7.1)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
@@ -75,26 +87,44 @@ GEM
       factory_girl (~> 2.5.0)
       railties (>= 3.0.0)
     ffi (1.0.11)
-    heroku (2.19.0)
+    ffi (1.0.11-java)
+    grit (2.4.1)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+    heroku (2.19.1)
       launchy (>= 0.3.2)
       rest-client (~> 1.6.1)
       rubyzip
       term-ansicolor (~> 1.0.5)
-    highline (1.6.11)
     hike (1.2.1)
+    httparty (0.8.1)
+      multi_json
+      multi_xml
     i18n (0.6.0)
     iq_rdf (0.1.2)
       builder
       bundler
+    jdbc-mysql (5.1.13)
+    jdbc-sqlite3 (3.7.2)
     journey (1.0.1)
+    jruby-openssl (0.7.5)
+      bouncy-castle-java (>= 1.5.0146.1)
     json (1.6.5)
+    json (1.6.5-java)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
+    launchy (2.0.5-java)
+      addressable (~> 2.2.6)
+      ffi (~> 1.0.9)
+      spoon (~> 0.0.1)
     libv8 (3.3.10.4)
+    little-plugger (1.1.3)
+    logging (1.6.2)
+      little-plugger (>= 1.1.3)
     mail (2.4.1)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -102,15 +132,10 @@ GEM
     memory_test_fix (0.2.0)
     mime-types (1.17.2)
     multi_json (1.0.4)
+    multi_xml (0.4.1)
     mysql2 (0.3.11)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
     nokogiri (1.5.0)
+    nokogiri (1.5.0-java)
     pg (0.12.2)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -128,8 +153,8 @@ GEM
       activesupport (= 3.2.1)
       bundler (~> 1.0)
       railties (= 3.2.1)
-    rails_autolink (1.0.4)
-      rails (>= 3.1.0)
+    rails_autolink (1.0.5)
+      rails (~> 3.1)
     railties (3.2.1)
       actionpack (= 3.2.1)
       activesupport (= 3.2.1)
@@ -143,12 +168,12 @@ GEM
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rubyzip (0.9.5)
-    rvm (1.9.2)
-    selenium-webdriver (2.17.0)
+    selenium-webdriver (2.18.0)
       childprocess (>= 0.2.5)
       ffi (~> 1.0.9)
       multi_json (~> 1.0.4)
       rubyzip
+    spoon (0.0.1)
     spork (0.9.0)
     sprockets (2.1.2)
       hike (~> 1.2)
@@ -166,7 +191,7 @@ GEM
     turn (0.8.3)
       ansi
     tzinfo (0.3.31)
-    uglifier (1.2.2)
+    uglifier (1.2.3)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     view_marker (1.0.0)
@@ -175,6 +200,7 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -183,15 +209,17 @@ DEPENDENCIES
   activerecord-oracle_enhanced-adapter
   authlogic
   awesome_print
+  blazing
+  blazing-passenger
+  blazing-rails
   cancan
-  capistrano
-  capistrano-ext
   capybara
   capybara-webkit
   database_cleaner
   factory_girl_rails
   heroku
   iq_rdf (~> 0.1.2)
+  jruby-openssl
   json
   kaminari
   memory_test_fix
@@ -200,7 +228,6 @@ DEPENDENCIES
   pg
   rails (= 3.2.1)
   rails_autolink
-  rvm
   spork (~> 0.9.0.rc)
   spork-testunit!
   sqlite3

data/app/assets/javascripts/framework.js

@@ -5,4 +5,3 @@
 //= require jquery.treeview
 //= require jquery.treeview.async
 //= require storage
-//= require json2

data/app/assets/stylesheets/iqvoc/forms.css.erb

@@ -68,4 +68,8 @@ form.form span.fieldWithErrors {
   height: 20px;
   display: inline-block;
   margin-left: 1em;
-}
+}
+
+form.large-labels label {
+  width: 350px;
+}

data/app/controllers/application_controller.rb

@@ -14,113 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class ApplicationController < ActionController::Base
-
-  prepend_before_filter :set_locale
-  before_filter :ensure_extension
-  before_filter :require_user
-
-  helper :all
-  helper_method :current_user_session, :current_user, :concept_widget_data, :collection_widget_data, :label_widget_data
-
-  rescue_from ActiveRecord::RecordNotFound, :with => :handle_not_found
-  rescue_from CanCan::AccessDenied, :with => :handle_access_denied
+require "iqvoc/controller_extensions"
 
+class ApplicationController < ActionController::Base
+  include Iqvoc::ControllerExtensions
+  
   protect_from_forgery
-
-  protected
-
-  def default_url_options(options = nil)
-    { :format => params[:format], :lang => I18n.locale }.
-      reject { |key, value| key == :lang and value.to_s.strip.blank? }. # Strip out the lang parameter if it's empty.
-      merge(options || {})
-  end
-
-  # Force an extension to every url. (LOD)
-  def ensure_extension
-    unless params[:format] || request.method != "GET"
-      flash.keep
-      redirect_to url_for(params.merge(:format => (request.format && request.format.symbol) || :html))
-    end
-  end
-
-  def handle_access_denied(exception)
-    @exception = exception
-    render :template => 'errors/access_denied', :status => :access_denied
-  end
-
-  def handle_multiple_choices(exception)
-    @exception = exception
-    render :template => 'errors/multiple_choices', :status => :multiple_choices
-  end
-
-  def handle_not_found(exception)
-    @exception = exception
-    SearchResultsController.prepare_basic_variables(self)
-
-    respond_to do |format|
-      format.html { render :template => 'errors/not_found', :status => :not_found }
-    end
-  end
-
-  def set_locale
-    if Iqvoc::Concept.pref_labeling_languages.include?(nil)
-      I18n.locale = " "
-    elsif params[:lang] && Iqvoc::Concept.pref_labeling_languages.include?(params[:lang].to_sym)
-      I18n.locale = params[:lang]
-    else
-      I18n.locale = Iqvoc::Concept.pref_labeling_languages.first
-    end
-  end
-
-  def concept_widget_data(concept)
-    {
-      :id => concept.origin,
-      :name => concept.pref_label.value.to_s + (concept.additional_info ? " (#{concept.additional_info })" : "")
-    }
-  end
-
-  def collection_widget_data(collection)
-    {
-      :id => collection.origin,
-      :name => collection.pref_label.to_s
-    }
-  end
-
-  def label_widget_data(label)
-    {
-      :id => label.origin,
-      :name => label.value
-    }
-  end
-
-  # Configurable Ability class
-  def current_ability
-    @current_ability ||= Iqvoc.ability_class.new(current_user)
-  end
-
-  def current_user_session
-    return @current_user_session if defined?(@current_user_session)
-    @current_user_session = UserSession.find
-  end
-
-  def current_user
-    return @current_user if defined?(@current_user)
-    @current_user = current_user_session && current_user_session.user
-  end
-
-  # TODO: Don't require an user (this is skipped in nearly every controller).
-  # Use Abilitys instead and handle the AccessDeniedException: (#handle_access_denied)
-  # * User logged in: Exception!
-  # * User not logged in: Redirect to login path!
-  # Don't forget to delete this method and all the /.*before_filter :require_user/
-  # statements in the controllers.
-  def require_user
-    unless current_user
-      flash[:error] = I18n.t("txt.controllers.application.login_required")
-      redirect_to new_user_session_url(:back_to => request.fullpath)
-      return false
-    end
-  end
-
 end

data/app/controllers/concepts/hierarchical_controller.rb

@@ -27,28 +27,27 @@ class Concepts::HierarchicalController < ConceptsController
     end
 
     # if params[:broader] is given, the action is handling the reversed tree
-    @concepts = case params[:root]
-    when /\d+/
-      root_concept = Iqvoc::Concept.base_class.find(params[:root])
+    root_id = params[:root]
+    if root_id && root_id =~ /\d+/
+      # NB: order matters; see the following `where`
       if params[:broader]
-        scope.
-          includes(:narrower_relations, :broader_relations). # D A N G E R: the order matters!!! See the following where
-        where(Concept::Relation::Base.arel_table[:target_id].eq(root_concept.id))
+        scope = scope.includes(:narrower_relations, :broader_relations)
       else
-        scope.
-          includes(:broader_relations, :narrower_relations). # D A N G E R: the order matters!!! See the following where
-        where(Concept::Relation::Base.arel_table[:target_id].eq(root_concept.id))
+        scope = scope.includes(:broader_relations, :narrower_relations)
       end
+      @concepts = scope.where(Concept::Relation::Base.arel_table[:target_id].eq(root_id))
     else
       if params[:broader]
-        scope.broader_tops.includes(:broader_relations)
+        @concepts = scope.broader_tops.includes(:broader_relations)
       else
-        scope.tops.includes(:narrower_relations)
+        @concepts = scope.tops.includes(:narrower_relations)
       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(@concepts,
+        Iqvoc::Concept.base_class.default_includes + [:pref_labels]).run
 
     @concepts.sort! do |a, b|
       a.pref_label.to_s <=> b.pref_label.to_s

data/app/controllers/concepts/untranslated_controller.rb

@@ -28,7 +28,7 @@ class Concepts::UntranslatedController < ConceptsController
       begins_with(params[:letter]).
       missing_translation(I18n.locale, Iqvoc::Concept.pref_labeling_languages.first)
 
-    if I18n.locale == Iqvoc::Concept.pref_labeling_languages.first # TODO: Should be 404!
+    if I18n.locale.to_s == Iqvoc::Concept.pref_labeling_languages.first # TODO: Should be 404!
       @labels = []
       flash[:error] = I18n.t("txt.views.untranslated_concepts.unavailable")
     else

data/app/controllers/instance_configuration_controller.rb

@@ -0,0 +1,103 @@
+# encoding: UTF-8
+
+# Copyright 2011 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 'csv'
+
+class InstanceConfigurationController < ApplicationController
+
+  def index
+    authorize! :show, Iqvoc.config
+
+    @settings = Iqvoc.config.defaults.each_with_object({}) { |(key, default_value), hsh|
+      hsh[key] = serialize(Iqvoc.config[key], default_value)
+    }
+  end
+
+  def update
+    authorize! :update, Iqvoc.config
+
+    # deserialize and save configuration settings
+    errors = []
+    params[:config].each { |key, value|
+      unless Iqvoc.config.defaults.include?(key)
+        errors << t("txt.controllers.instance_configuration.invalid_key", :key => key)
+      else
+        default_value = Iqvoc.config.defaults[key]
+        begin
+          Iqvoc.config[key] = deserialize(value, default_value)
+        rescue TypeError => exc
+          errors << t("txt.controllers.instance_configuration.invalid_value",
+              :key => key, :error_message => exc.message)
+        end
+      end
+    }
+
+    if errors.blank?
+      flash[:notice] = t("txt.controllers.instance_configuration.update_success")
+    else
+      flash[:error] = t("txt.controllers.instance_configuration.update_error",
+          :error_messages => errors.join("; "))
+    end
+
+    redirect_to instance_configuration_url
+  end
+  
+  private
+
+  # default value determines value type
+  def serialize(value, default_value)
+    Iqvoc::InstanceConfiguration.validate_value(value)
+    if default_value.is_a?(Array)
+      return value.to_csv.strip
+    else # String, Fixnum / Float
+      return value.to_s
+    end
+  end
+
+  # default value determines expected type
+  # raises TypeError if deserialization fails
+  def deserialize(str, default_value)
+    str = str.strip
+    unless default_value.is_a? Array
+      return convert_value(str, default_value.class)
+    else
+      return str.blank? ? [] : str.parse_csv.map { |item|
+        item.strip!
+        convert_value(item, default_value[0].class)
+      }
+    end
+  end
+
+  # converts string to given (non-complex) type
+  # raises TypeError on failure
+  def convert_value(str, type)
+    if type == String
+      return str
+    elsif type == Fixnum
+      raise TypeError, "expected integer" unless str =~ /^[-+]?[0-9]+$/
+      return str.to_i
+    elsif type == Float
+      begin
+        return Float(str)
+      rescue ArgumentError
+        raise TypeError, "expected float"
+      end
+    else
+      raise TypeError, "unsupported type: #{type}"
+    end
+  end
+
+end