iqvoc 4.1.3 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a13cf281376e316b925171dc9c5bc7a22bd9ab
-  data.tar.gz: cfd1c8a7b2d3476a3704c15ed0de3653337fff4d
+  metadata.gz: ebb9e46d3a119f2b2318bbe6818debef048d41cc
+  data.tar.gz: 8cc74d5728f037b852601113107a1df766b1532e
 SHA512:
-  metadata.gz: 93f3bdcc53729392cd0b8bbc45ff03ce1f452f33401bad96e3d1fdc96c1610cebf50a985ca21edd029202e8472626b4952512bdcf6d70831bceb86945535bf27
-  data.tar.gz: 21976d7d516483188dcef8c4a09bfa604479afb97855079d3c333b9b6788d37f263ec4a52f518aba9587d000f5d40a0c155ae302f848fd31cf38b9cd7b56b9c5
+  metadata.gz: 0d2fcb9c40f78e0bd0528cd2532efd3685f1f755fb773fafddf508079ab51e16bb8ad47544e5ca37d1e5e93b42cdc6197a43c6e2c32dfa9e7bcc12e03606245a
+  data.tar.gz: 09edcec2d24b3764661820e8b1ddb7359db43d49a1e909c153a2ccfd8b80846205b83f2da0a08123cc30db155aee5e4c388ee97e9354841a7b04157c22ad7477

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [4.2.0]
+
+As 5.0.0 has been postponed, 4.2.0 comes as another 4.x release.
+
+* Rails 4
+* Unbounded hierarchy API depth (853883668977a85d29b30b4e2654f2f53094cae6)
+* Collection notes are now configurable
+* HTML titles throughout the app
+* Bugfixes
+
 ## [4.1.3]
 
 This version is intended as the last minor/patch release before version 5.0.0 -
@@ -14,7 +24,8 @@ as well as more sophisticated RDF processing.
 
 ## [4.1.2]
 
-  * Dumped Jbuilder (introduced in 4.1.1) to fix endless recursions happening in hierarchical views
+  * Dumped Jbuilder (introduced in 4.1.1) to fix endless recursions happening in
+    hierarchical views
 
 ## [4.1.1]
 

data/Gemfile

@@ -19,36 +19,33 @@ source 'http://rubygems.org'
 # TODO: The following dependencies could be included by the "gemspec" command.
 # There is only one problem: gemspec puts the dependencies automatically to a
 # group (:development by default). This is not what we need.
-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
-
-gem 'kaminari'
+gem 'rails', '4.0.1'
+gem 'protected_attributes', '>= 1.0.5'
+gem 'kaminari', '0.13.0'
 gem 'authlogic'
 gem 'cancan'
 gem 'iq_rdf'
 gem 'iq_triplestorage'
 gem 'json'
-gem 'rails_autolink'
+gem 'rails_autolink', :git => 'git://github.com/tenderlove/rails_autolink.git'
 gem 'jruby-openssl', :platforms => :jruby
-gem 'simple_form'
+gem 'simple_form', :git => 'git://github.com/plataformatec/simple_form.git'
+gem 'uglifier'
+gem 'sass-rails', '~> 4.0.0'
+gem 'bootstrap-sass', '2.3.1.3'
 
 group :development do
   gem 'view_marker'
   gem 'better_errors'
   gem 'binding_of_caller', :platform => :ruby
+  gem 'quiet_assets'
 end
 
 group :development, :test do
   gem 'awesome_print'
 
   platforms :ruby do
-    gem 'mysql2'
+    gem 'mysql2', '0.3.13'
     gem 'sqlite3'
 
     gem 'zeus'
@@ -67,14 +64,13 @@ group :development, :test do
 end
 
 group :test do
-  gem 'nokogiri', '~> 1.5.0'
+  gem 'nokogiri'
   gem 'capybara'
   gem 'capybara-screenshot'
-  gem 'capybara-webkit', '~> 0.14.2'
+  gem 'capybara-webkit'
   gem 'database_cleaner'
   gem 'factory_girl_rails'
   gem 'turn'
-  gem 'minitest'
   gem 'webmock'
 end
 
@@ -83,4 +79,5 @@ end
 
 group :heroku do
   gem 'pg', :platforms => :ruby
+  gem 'passenger'
 end

data/Gemfile.lock

@@ -1,210 +1,221 @@
+GIT
+  remote: git://github.com/plataformatec/simple_form.git
+  revision: 7f743fd161a73839202a12d2ec765a41896e2f5b
+  specs:
+    simple_form (3.0.0)
+      actionpack (>= 4.0.0, < 4.1)
+      activemodel (>= 4.0.0, < 4.1)
+
+GIT
+  remote: git://github.com/tenderlove/rails_autolink.git
+  revision: 0afc461e9b6ec1f4d0386011201ac63ceef3c06c
+  specs:
+    rails_autolink (1.1.5)
+      rails (> 3.1)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
+    actionmailer (4.0.1)
+      actionpack (= 4.0.1)
+      mail (~> 2.5.4)
+    actionpack (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    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)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activerecord-jdbc-adapter (1.3.2)
+      activerecord (>= 2.2)
+    activerecord-jdbcmysql-adapter (1.3.2)
+      activerecord-jdbc-adapter (~> 1.3.2)
+      jdbc-mysql (>= 5.1.22)
+    activerecord-jdbcsqlite3-adapter (1.3.2)
+      activerecord-jdbc-adapter (~> 1.3.2)
       jdbc-sqlite3 (~> 3.7.2)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.3.3)
+    activesupport (4.0.1)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    addressable (2.3.5)
     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)
+    arel (4.0.1)
+    atomic (1.1.14)
+    atomic (1.1.14-java)
+    authlogic (3.3.0)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+    awesome_print (1.2.0)
+    better_errors (1.0.1)
       coderay (>= 1.0.0)
-      erubis (>= 2.7.0)
-    binding_of_caller (0.7.1)
+      erubis (>= 2.6.6)
+    binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (2.3.1.0)
+    bootstrap-sass (2.3.1.3)
       sass (~> 3.2)
-    bouncy-castle-java (1.5.0146.1)
-    builder (3.0.4)
-    cancan (1.6.8)
-    cane (2.5.2)
+    bouncy-castle-java (1.5.0147)
+    builder (3.1.4)
+    cancan (1.6.10)
+    cane (2.6.1)
       parallel
-    capybara (2.0.2)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    capybara-screenshot (0.3.1)
+      xpath (~> 2.0)
+    capybara-screenshot (0.3.14)
       capybara (>= 1.0, < 3)
-    capybara-webkit (0.14.2)
+      launchy
+    capybara-webkit (1.0.0)
       capybara (~> 2.0, >= 2.0.2)
       json
-    childprocess (0.3.8)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.0.8)
+    coderay (1.0.9)
     columnize (0.3.6)
-    crack (0.3.1)
-    database_cleaner (0.8.0)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
+    daemon_controller (1.1.7)
+    database_cleaner (1.2.0)
     debug_inspector (0.0.2)
-    debugger (1.5.0)
+    debugger (1.6.2)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.0)
+    debugger-ruby_core_source (1.2.3)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.1.0)
+    execjs (2.0.2)
+    factory_girl (4.3.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.3.0)
+      factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    ffi (1.1.5)
-    ffi (1.1.5-java)
-    hike (1.2.1)
+    hike (1.2.3)
     hirb (0.7.1)
     hirb-unicode (0.0.5)
       hirb (~> 0.5)
       unicode-display_width (~> 0.1.1)
-    i18n (0.6.1)
-    iq_rdf (0.1.8)
+    i18n (0.6.5)
+    iq_rdf (0.1.10)
+      activesupport
       builder
       bundler
     iq_triplestorage (0.2.2)
-    jdbc-mysql (5.1.13)
-    jdbc-sqlite3 (3.7.2)
-    journey (1.0.4)
-    jruby-openssl (0.7.7)
-      bouncy-castle-java (>= 1.5.0146.1)
-    json (1.8.0)
-    json (1.8.0-java)
+    jdbc-mysql (5.1.27)
+    jdbc-sqlite3 (3.7.2.1)
+    jruby-openssl (0.9.4)
+      bouncy-castle-java (>= 1.5.0147)
+    json (1.8.1)
+    json (1.8.1-java)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    libv8 (3.3.10.4)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+      railties (>= 3.0.0)
+    launchy (2.3.0)
+      addressable (~> 2.3)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.21)
-    minitest (3.4.0)
-    multi_json (1.7.2)
-    mysql2 (0.3.11)
-    nokogiri (1.5.6)
-    nokogiri (1.5.6-java)
-    parallel (0.6.4)
-    pg (0.14.1)
+    method_source (0.8.2)
+    mime-types (1.25)
+    mini_portile (0.5.2)
+    minitest (4.7.5)
+    multi_json (1.8.2)
+    mysql2 (0.3.13)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    nokogiri (1.6.0-java)
+      mini_portile (~> 0.5.0)
+    parallel (0.9.0)
+    passenger (4.0.23)
+      daemon_controller (>= 1.1.0)
+      rack
+      rake (>= 0.8.1)
+    pg (0.17.0)
     polyglot (0.3.3)
-    pry (0.9.10)
+    protected_attributes (1.0.5)
+      activemodel (>= 4.0.1, < 5.0)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
+      slop (~> 3.4)
     pry-debugger (0.2.2)
       debugger (~> 1.3)
       pry (~> 0.9.10)
-    pry-rails (0.2.2)
+    pry-rails (0.3.2)
       pry (>= 0.9.10)
-    pry-remote (0.1.6)
+    pry-remote (0.1.7)
       pry (~> 0.9)
       slop (~> 3.0)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
+    quiet_assets (1.0.2)
+      railties (>= 3.1, < 5.0)
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    rails_autolink (1.0.9)
-      rails (~> 3.1)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.1)
+      actionmailer (= 4.0.1)
+      actionpack (= 4.0.1)
+      activerecord (= 4.0.1)
+      activesupport (= 4.0.1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.1)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.1)
+      actionpack (= 4.0.1)
+      activesupport (= 4.0.1)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rubyzip (0.9.9)
-    sass (3.2.1)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
+    safe_yaml (0.9.7)
+    sass (3.2.12)
+    sass-rails (4.0.1)
+      railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
-    selenium-webdriver (2.30.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
-    simple_form (2.0.2)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-    slop (3.3.3)
-    sprockets (2.2.2)
+      sprockets-rails (~> 2.0.0)
+    slop (3.4.6)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
-    thor (0.17.0)
-    tilt (1.3.6)
-    treetop (1.4.12)
+    sprockets-rails (2.0.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    thread_safe (0.1.3-java)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     turn (0.9.6)
       ansi
-    tzinfo (0.3.37)
-    uglifier (1.3.0)
+    tzinfo (0.3.38)
+    uglifier (2.3.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
     unicode-display_width (0.1.1)
     view_marker (1.0.0)
       rails
-    webmock (1.8.11)
+    webmock (1.15.2)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    websocket (1.0.7)
-    xpath (1.0.0)
+      crack (>= 0.3.2)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
     zeus (0.13.3)
       method_source (>= 0.6.7)
@@ -220,12 +231,12 @@ DEPENDENCIES
   awesome_print
   better_errors
   binding_of_caller
-  bootstrap-sass (~> 2.3.1.0)
+  bootstrap-sass (= 2.3.1.3)
   cancan
   cane
   capybara
   capybara-screenshot
-  capybara-webkit (~> 0.14.2)
+  capybara-webkit
   database_cleaner
   factory_girl_rails
   hirb-unicode
@@ -233,23 +244,24 @@ DEPENDENCIES
   iq_triplestorage
   jruby-openssl
   json
-  kaminari
-  minitest
-  mysql2
-  nokogiri (~> 1.5.0)
+  kaminari (= 0.13.0)
+  mysql2 (= 0.3.13)
+  nokogiri
+  passenger
   pg
+  protected_attributes (>= 1.0.5)
   pry
   pry-debugger
   pry-rails
   pry-remote
-  rails (= 3.2.13)
-  rails_autolink
-  sass-rails (~> 3.2.5)
-  simple_form
+  quiet_assets
+  rails (= 4.0.1)
+  rails_autolink!
+  sass-rails (~> 4.0.0)
+  simple_form!
   sqlite3
-  therubyracer
   turn
-  uglifier (>= 1.0.3)
+  uglifier
   view_marker
   webmock
   zeus

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

@@ -47,6 +47,10 @@ var EntitySelector = function(node) {
     select: this.onSelect
   });
 
+  // jQuery UI does not add a type attribute
+  // Bootstrap expects it to be there
+  this.input.attr('type', 'text');
+
   this.container.append(this.input).append(img).append(selection).
     insertAfter(node).prepend(node);
 

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

@@ -197,5 +197,8 @@ jQuery(document).ready(function($) {
     });
   });
 
+  // unobtrusive tabs
+  $(".tab-panels").addClass("tab-content"); // the latter is for Bootstrap Tabs
+
   IQVOC.onebox(".onebox");
 });

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

@@ -127,24 +127,29 @@ ol.concepts {
 .lang-widget {
   padding: 0 15px 20px 15px;
 
-  h3 {
+  .lang-widget-item {
+    white-space: nowrap;
+
+    label {
+      margin: 0;
+      padding: 2px 10px;
+
+      input {
+        margin-top: -2px;
+        margin-right: 0.5em;
+        display: inline;
+      }
+
+      a {
+        padding-left: 0;
+        display: inline;
+      }
+    }
+  }
+
+  .lang-widget-header {
     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/entity_select.css.scss

@@ -33,6 +33,7 @@
   margin-top: 5px;
   li {
     float: left;
+    a { font-size: 14px; }
   }
 }
 

data/app/controllers/collections_controller.rb

@@ -55,9 +55,7 @@ class CollectionsController < ApplicationController
   end
 
   def show
-    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last
-    raise ActiveRecord::RecordNotFound.new("Could not find Collection for id '#{params[:id]}'") unless @collection
-
+    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :read, @collection
 
     # When in single query mode, AR handles ALL includes to be loaded by that
@@ -89,9 +87,7 @@ class CollectionsController < ApplicationController
   end
 
   def edit
-    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last
-    raise ActiveRecord::RecordNotFound.new("Could not find Collection for id '#{params[:id]}'") unless @collection
-
+    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :update, @collection
 
     # When in single query mode, AR handles ALL includes to be loaded by that
@@ -104,9 +100,7 @@ class CollectionsController < ApplicationController
   end
 
   def update
-    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last
-    raise ActiveRecord::RecordNotFound.new("Could not find Collection for id '#{params[:id]}'") unless @collection
-
+    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :update, @collection
 
     if @collection.update_attributes(params[:concept])
@@ -119,9 +113,7 @@ class CollectionsController < ApplicationController
   end
 
   def destroy
-    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last
-    raise ActiveRecord::RecordNotFound.new("Could not find Collection for id '#{params[:id]}'") unless @collection
-
+    @collection = Iqvoc::Collection.base_class.by_origin(params[:id]).last!
     authorize! :destroy, @collection
 
     if @collection.destroy

data/app/controllers/concepts/alphabetical_controller.rb

@@ -46,6 +46,7 @@ class Concepts::AlphabeticalController < ConceptsController
       order("LOWER(#{Label::Base.table_name}.value)").
       joins(:owner).
       where(:concepts => { :type => Iqvoc::Concept.base_class_name }).
+      references(:concepts, :labels, :labelings).
       page(params[:page])
   end
 end

data/app/controllers/concepts/expired_controller.rb

@@ -26,6 +26,7 @@ class Concepts::ExpiredController < Concepts::AlphabeticalController
       order("LOWER(#{Label::Base.table_name}.value)").
       joins(:owner).
       where(:concepts => { :type => Iqvoc::Concept.base_class_name }).
+      references(:concepts, :labels, :labelings).
       page(params[:page])
   end
-end
+end

data/app/controllers/concepts/scheme_controller.rb

@@ -23,10 +23,8 @@ class Concepts::SchemeController < ApplicationController
     @top_concepts = Iqvoc::Concept.base_class.tops.published
 
     respond_to do |format|
-      format.html do
-      end
-      format.any :rdf, :ttl do
-      end
+      format.html
+      format.any(:rdf, :ttl)
     end
   end