iqvoc 3.4.0 → 3.5.0

data/app/controllers/search_results_controller.rb

@@ -88,9 +88,10 @@ class SearchResultsController < ApplicationController
   end
 
   def self.prepare_basic_variables(controller)
-    langs = (Iqvoc.available_languages + Iqvoc::Concept.labeling_class_names.values.flatten).uniq.each_with_object({}) do |lang_sym, hsh|
-      lang_sym ||= "none"
-      hsh[lang_sym.to_s] = I18n.t("languages.#{lang_sym.to_s}", :default => lang_sym.to_s)
+    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|
+      lang ||= "none"
+      hsh[lang] = I18n.t("languages.#{lang}", :default => lang)
     end
     controller.instance_variable_set(:@available_languages, langs)
 

data/app/helpers/application_helper.rb

@@ -25,7 +25,7 @@ module ApplicationHelper
   end
 
   def options_for_language_select(selected = nil)
-    locales_collection = Iqvoc.available_languages.map { |l| [l.to_s, l.to_s] }
+    locales_collection = Iqvoc.available_languages.map { |l| [l, l] }
 
     options_for_select(locales_collection, selected)
   end

data/app/helpers/concepts_helper.rb

@@ -46,7 +46,7 @@ module ConceptsHelper
     render_concept_association(res, concept, Collection::Member::Concept)
 
     Iqvoc::Concept.labeling_classes.each do |labeling_class, languages|
-      (languages || Iqvoc::available_languages).each do |lang|
+      (languages || Iqvoc.available_languages).each do |lang|
         render_concept_association(res, concept, labeling_class, :lang => lang)
       end
     end

data/app/models/configuration_setting.rb

@@ -0,0 +1,22 @@
+# 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.
+
+# NB: not to be used directly, but only through Iqvoc::InstanceConfiguration
+class ConfigurationSetting < ActiveRecord::Base # TODO: make private, somehow?
+
+  validates_uniqueness_of :key
+
+end

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

@@ -0,0 +1,15 @@
+<h2><%= t("txt.views.instance_configuration.caption").titleize %></h2>
+
+<%= form_tag(instance_configuration_path, :method => :put, :class => "form large-labels") do %>
+  <fieldset>
+    <ol>
+      <% @settings.each do |key, value| %>
+      <li>
+        <label><%= key %></label>
+        <%= text_field_tag "config[#{key}]", value %>
+      </li>
+      <% end %>
+    </ol>
+  </fieldset>
+  <%= submit_tag t("txt.common.save") %>
+<% end %>

data/app/views/layouts/_controls.html.erb

@@ -17,14 +17,14 @@
         <% Iqvoc::Concept.pref_labeling_languages.each do |lang| %>
           <li>
             <%= link_to t("languages.#{lang}"), params.merge(:lang => lang),
-              :class => lang == I18n.locale ? "current" : nil %>
+              :class => lang == I18n.locale.to_s ? "current" : nil %>
           </li>
         <% end %>
       <% end %>
 
-      <% if Iqvoc::available_languages.length > 1 %>
+      <% if Iqvoc.available_languages.length > 1 %>
         <li><h3><%= t("txt.views.lang_widget.secondary") %></h3></li>
-        <% Iqvoc::available_languages.reject { |lang| lang == I18n.locale }.each do |lang| %>
+        <% Iqvoc.available_languages.reject { |lang| lang == I18n.locale.to_s }.each do |lang| %>
           <li>
             <label>
               <input type="checkbox" value="<%= lang %>"> <%= t("languages.#{lang}") %>

data/app/views/layouts/_header.html.erb

@@ -1 +1 @@
-<h1 class="header"><%= Iqvoc.title || t("txt.common.iqvoc_title") %></h1>
+<h1 class="header"><%= Iqvoc.title || t("txt.common.iqvoc_title") %></h1>

data/app/views/layouts/_navigation.html.erb

@@ -21,7 +21,12 @@
       <%= link_to t("txt.views.navigation.users"), users_path %>
     </li>
   <% end %>
+  <% if can?(:manage, Iqvoc.config) %>
+    <li class="<%= params[:controller] == 'instance_configuration' ? 'active' : '' %>">
+      <%= link_to t("txt.views.navigation.instance_configuration"), instance_configuration_path %>
+    </li>
+  <% end %>
   <li class="<%= params[:controller] == 'pages' && params[:action] == 'about' ? 'active' : '' %>">
     <%= link_to t("txt.views.navigation.about"), about_path %>
   </li>
-</ul>
+</ul>

data/app/views/layouts/application.html.erb

@@ -8,13 +8,13 @@
     <title><%= Iqvoc.title || t("txt.common.iqvoc_title") %></title>
     <%= stylesheet_link_tag "blueprint/screen", :media => "screen, projection" %>
     <%= stylesheet_link_tag "blueprint/print", :media => "print" %>
-	  <!--[if lt IE 8]>
+    <!--[if lt IE 8]>
     <%= stylesheet_link_tag "blueprint/ie", :media => "screen, projection" %>
     <![endif]-->
     <%= stylesheet_link_tag "manifest" %>
-		<!--[if (gte IE 6)&(lte IE 8)]>
-		<%= stylesheet_link_tag "iqvoc/ie_fixes" %>
-		<![endif]-->
+    <!--[if (gte IE 6)&(lte IE 8)]>
+    <%= stylesheet_link_tag "iqvoc/ie_fixes" %>
+    <![endif]-->
 
     <%= yield :head %>
   </head>
@@ -53,6 +53,13 @@
         </div>
       </div>
     </div>
+
+    <script>
+      // load JSON polyfill only if necessary
+      if(typeof JSON === "undefined") {
+        document.write('<%= javascript_include_tag("json2").sub("</", "<\\/").html_safe %>');
+      }
+    </script>
     <%= javascript_include_tag "manifest" %>
     <%= yield :scripts %>
   </body>

data/config/blazing.rb

@@ -0,0 +1,36 @@
+#
+# Blazing Configuration File
+#
+
+#
+# Specify the location of your repository:
+#
+repository 'git@github.com:innoq/iqvoc.git'
+
+#
+# Define possible deploy targets:
+#
+target :"iqvoc.innoq.com", 'iqvoc@iqvoc.innoq.com:/var/www/iqvoc'
+# target :staging, 'blazing@production.server.com:/where/your/code/is/shipped/to', :default => true, :some_option => 'foo' # note: options defined here will override options defined globally for a recipe
+
+#
+# Optional: RVM handling
+#
+# Use Ruby Enterprise Edition and gemset 123
+rvm '1.9.3'
+
+# Or use the rvmrc
+# rvm :rvmrc
+#
+
+#
+# Define Recipes to be used (See the README for available recipes).
+# Recipes are run in the order they are specified
+#
+recipe :precompile_assets
+recipe :passenger_restart
+
+#
+# Define a rake task that should be run after deployment. The rake task will run after the recipes have run.
+#
+rake "db:migrate db:seed RAILS_ENV=production"

data/config/database.yml

@@ -1,13 +1,3 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-# 
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql2
   encoding: utf8
@@ -16,11 +6,8 @@ development:
   pool: 5
   username: root
   password:
-  socket: /tmp/mysql.sock
+  hostname: 127.0.0.1
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   adapter: mysql2
   encoding: utf8
@@ -29,7 +16,7 @@ test:
   pool: 5
   username: root
   password:
-  socket: /tmp/mysql.sock
+  hostname: 127.0.0.1
 
 production:
   adapter: mysql2
@@ -39,4 +26,4 @@ production:
   pool: 5
   username: root
   password:
-  socket: /tmp/mysql.sock
+  hostname: 127.0.0.1

data/config/deploy.rb

@@ -69,4 +69,4 @@ namespace :deploy do
   end
 end
 
-after 'deploy:update_code', 'deploy:symlink_shared', 'assets:precompile'
+after 'deploy:update_code', 'deploy:symlink_shared'

data/config/engine.rb

@@ -9,11 +9,19 @@ require 'iq_rdf'
 require 'json'
 require 'rails_autolink'
 
+require 'iqvoc/controller_extensions'
+
 module Iqvoc
   
   class Engine < Rails::Engine
     paths["lib/tasks"] << "lib/engine_tasks"
     
+    initializer "iqvoc.mixin_controller_extensions" do |app|
+      if const_defined?(:ApplicationController)
+        ApplicationController.send(:include, Iqvoc::ControllerExtensions)
+      end
+    end
+    
     initializer "iqvoc.add_assets_to_precompilation" do |app|
       app.config.assets.precompile += Iqvoc.core_assets
     end

data/config/environments/development.rb

@@ -15,69 +15,11 @@
 # limitations under the License.
 
 require 'debug'
+require 'iqvoc/environments/development'
 
 if Iqvoc.const_defined?(:Application)
   Iqvoc::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-
-    # In the development environment your application's code is reloaded on
-    # every request.  This slows down response time but is perfect for development
-    # since you don't have to restart the webserver when you make code changes.
-    config.cache_classes = false
-
-    # Log error messages when you accidentally call methods on nil.
-    config.whiny_nils = true
-
-    # Show full error reports and disable caching
-    config.consider_all_requests_local       = true
-    config.action_controller.perform_caching = false
-
-    # Don't care if the mailer can't send
-    config.action_mailer.raise_delivery_errors = false
-
-    # Print deprecation notices to the Rails logger
-    config.active_support.deprecation = :log
-
-    # Only use best-standards-support built into browsers
-    config.action_dispatch.best_standards_support = :builtin
-  
-    # Do not compress assets
-    config.assets.compress = false
-
-    # Expands the lines which load the assets
-    config.assets.debug = true
-    
-    # Raise exception on mass assignment protection for Active Record models
-    config.active_record.mass_assignment_sanitizer = :logger
-
-    # Log the query plan for queries taking more than this (works
-    # with SQLite, MySQL, and PostgreSQL)
-    config.active_record.auto_explain_threshold_in_seconds = 0.5
-
-    # Prepend all log lines with the following tags
-    # config.log_tags = [ :subdomain, :uuid ]
-
-    # The default URI prefix for RDF data. This will be followed by a document
-    # specific shnippet like (specimenType) and the id.
-
-    # The JDBC driver url for the coinnection to the virtuoso triple store.
-    # Login crdentials have to be stored here too. See
-    # http://docs.openlinksw.com/virtuoso/VirtuosoDriverJDBC.html#jdbcurl4mat for
-    # more details.
-    # Example: "jdbc:virtuoso://localhost:1111/UID=dba/PWD=dba"
-    # Use nil to disable virtuoso triple synchronization
-    # Rails.application.config.virtuoso_jdbc_driver_url = "jdbc:virtuoso://virtuoso.dyndns.org:1111/UID=iqvoc/PWD=vocpass!/charset=UTF-8"
-    config.virtuoso_jdbc_driver_url = nil
-
-    # Set up the virtuoso synchronization (which is a triggered pull from the
-    # virtuoso server) to be run in a new thread.
-    # This is needed in environments where the webserver only runs in a single
-    # process/thread (mostly in development environments).
-    # When a synchronizaion would be triggered e.g. from a running
-    # update action in the UPB, the update would trigger virtuoso to do a HTTP GET
-    # back to the UPB to fetch the RDF data. But the only process in the UPB would be
-    # blocked by the update... => Deadlock. You can avoid this by using the threaded
-    # mode.
-    config.virtuoso_sync_threaded = false
+    Iqvoc::Environments.setup_development(config)
   end
 end

data/config/environments/heroku.rb

@@ -32,7 +32,7 @@ if Iqvoc.const_defined?(:Application)
     # Disable Rails's static asset server
     # In production, Apache or nginx will already do this
     config.serve_static_assets = true
-  
+
     # Compress JavaScripts and CSS
     config.assets.compress = false
 

data/config/environments/production.rb

@@ -14,69 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Makes Iqvoc available within the .configure block
-require "iqvoc"
+require 'iqvoc/environments/production'
 
 if Iqvoc.const_defined?(:Application)
   Iqvoc::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-
-    # The production environment is meant for finished, "live" apps.
-    # Code is not reloaded between requests
-    config.cache_classes = true
-
-    # Full error reports are disabled and caching is turned on
-    config.consider_all_requests_local       = false
-    config.action_controller.perform_caching = true
-
-    # Specifies the header that your server uses for sending files
-    config.action_dispatch.x_sendfile_header = "X-Sendfile"
-
-    # For nginx:
-    # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
-
-    # If you have no front-end server that supports something like X-Sendfile,
-    # just comment this out and Rails will serve the files
-
-    # See everything in the log (default is :info)
-    # config.log_level = :debug
-
-    # Use a different logger for distributed setups
-    # config.logger = SyslogLogger.new
-
-    # Use a different cache store in production
-    # config.cache_store = :mem_cache_store
-
-    # Disable Rails's static asset server
-    # In production, Apache or nginx will already do this
-    config.serve_static_assets = false
-  
-    # Compress JavaScripts and CSS
-    config.assets.compress = true
-
-    # Don't fallback to assets pipeline if a precompiled asset is missed
-    config.assets.compile = false
-
-    # Generate digests for assets URLs
-    config.assets.digest = true
-    
-
-    config.assets.precompile += Iqvoc.core_assets
-
-    # Enable serving of images, stylesheets, and javascripts from an asset server
-    # config.action_controller.asset_host = "http://assets.example.com"
-
-    # Disable delivery errors, bad email addresses will be ignored
-    # config.action_mailer.raise_delivery_errors = false
-
-    # Enable threaded mode
-    # config.threadsafe!
-
-    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-    # the I18n.default_locale when a translation can not be found)
-    config.i18n.fallbacks = true
-
-    # Send deprecation notices to registered listeners
-    config.active_support.deprecation = :notify
+    Iqvoc::Environments.setup_production(config)
   end
 end

data/config/environments/test.rb

@@ -15,54 +15,11 @@
 # limitations under the License.
 
 require 'debug'
+require 'iqvoc/environments/test'
 
 if Iqvoc.const_defined?(:Application)
   Iqvoc::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-
-    # The test environment is used exclusively to run your application's
-    # test suite.  You never need to work with it otherwise.  Remember that
-    # your test database is "scratch space" for the test suite and is wiped
-    # and recreated between test runs.  Don't rely on the data there!
-    config.cache_classes = true
-
-    # Log error messages when you accidentally call methods on nil.
-    config.whiny_nils = true
-
-    # Show full error reports and disable caching
-    config.consider_all_requests_local       = true
-    config.action_controller.perform_caching = false
-
-    # Raise exceptions instead of rendering exception templates
-    config.action_dispatch.show_exceptions = false
-
-    # Disable request forgery protection in test environment
-    config.action_controller.allow_forgery_protection = false
-
-    # Tell Action Mailer not to deliver emails to the real world.
-    # The :test delivery method accumulates sent emails in the
-    # ActionMailer::Base.deliveries array.
-    config.action_mailer.delivery_method = :test
-
-    # Use SQL instead of Active Record's schema dumper when creating the test database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Print deprecation notices to the stderr
-    config.active_support.deprecation = :stderr
-  
-    # Configure static asset server for tests with Cache-Control for performance
-    config.serve_static_assets = true
-    config.static_cache_control = "public, max-age=3600"
-  
-    # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-    config.assets.allow_debugging = true
-    
-    # Raise exception on mass assignment protection for Active Record models
-    config.active_record.mass_assignment_sanitizer = :logger
-
-    # Print deprecation notices to the stderr
-    config.active_support.deprecation = :stderr
+    Iqvoc::Environments.setup_test(config)
   end
 end