iqvoc 4.0.0 → 4.0.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 4.0.1 (2012-06-20)
+
+  * Rails application template
+  * Bugfixes
+
 ## 4.0.0 (2012-05-31)
 
   * Completely redesigned UI
@@ -11,7 +16,7 @@
   * Counting concept members in collection hierarchy view
   * Improved heroku support
   * Bugfixes
-  
+
 Please note that this is the last tiny release before we hit 4.0.0.
 
 ## 3.5.6 (2012-03-07)

data/Gemfile

@@ -19,7 +19,7 @@ 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.3'
+gem 'rails', '3.2.6'
 
 group :assets do
   gem 'uglifier',   '>= 1.0.3'

data/Gemfile.lock

@@ -1,40 +1,51 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.3)
-      actionpack (= 3.2.3)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
       mail (~> 2.4.4)
-    actionpack (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.3)
-      activemodel (= 3.2.3)
-      activesupport (= 3.2.3)
-    activesupport (3.2.3)
+    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.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.8)
     ansi (1.4.2)
     arel (3.0.2)
-    authlogic (3.1.0)
-      activerecord (>= 3.0.7)
+    authlogic (3.1.2)
+      activerecord (>= 3.0.0)
       activerecord (>= 3.0.7)
+      activesupport (>= 3.0.0)
+      activesupport (>= 3.0.7)
     awesome_print (1.0.2)
+    bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
     cancan (1.6.7)
     capybara (1.1.2)
@@ -46,13 +57,14 @@ GEM
       xpath (~> 0.1.4)
     capybara-screenshot (0.1.10)
       capybara (>= 1.0)
-    capybara-webkit (0.12.0)
+    capybara-webkit (0.12.1)
       capybara (>= 1.0.0, < 1.2)
       json
     childprocess (0.3.2)
       ffi (~> 1.0.6)
-    database_cleaner (0.7.2)
+    database_cleaner (0.8.0)
     erubis (2.7.0)
+    excon (0.14.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (3.3.0)
@@ -62,24 +74,37 @@ GEM
       railties (>= 3.0.0)
     fastercsv (1.5.5)
     ffi (1.0.11)
-    heroku (2.25.0)
+    ffi (1.0.11-java)
+    heroku (2.26.6)
+      heroku-api (~> 0.2.4)
       launchy (>= 0.3.2)
-      netrc (~> 0.7.1)
+      netrc (~> 0.7.2)
       rest-client (~> 1.6.1)
       rubyzip
+    heroku-api (0.2.4)
+      excon (~> 0.14.0)
     hike (1.2.1)
     i18n (0.6.0)
     iq_rdf (0.1.5)
       builder
       bundler
-    journey (1.0.3)
+    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.7.3)
+    json (1.7.3-java)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     launchy (2.1.0)
       addressable (~> 2.2.6)
+    launchy (2.1.0-java)
+      addressable (~> 2.2.6)
+      ffi (~> 1.0.9)
+      spoon (~> 0.0.1)
     libv8 (3.3.10.4)
     libwebsocket (0.1.3)
       addressable
@@ -88,11 +113,12 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.18)
-    minitest (3.0.0)
-    multi_json (1.3.5)
+    minitest (3.0.1)
+    multi_json (1.3.6)
     mysql2 (0.3.11)
-    netrc (0.7.1)
-    nokogiri (1.5.2)
+    netrc (0.7.4)
+    nokogiri (1.5.3)
+    nokogiri (1.5.3-java)
     pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
@@ -102,35 +128,35 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.3)
-      actionmailer (= 3.2.3)
-      actionpack (= 3.2.3)
-      activerecord (= 3.2.3)
-      activeresource (= 3.2.3)
-      activesupport (= 3.2.3)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.3)
-    rails_autolink (1.0.7)
+      railties (= 3.2.6)
+    rails_autolink (1.0.9)
       rails (~> 3.1)
-    railties (3.2.3)
-      actionpack (= 3.2.3)
-      activesupport (= 3.2.3)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rubyzip (0.9.8)
-    sass (3.1.18)
+    sass (3.1.19)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.21.2)
+    selenium-webdriver (2.22.1)
       childprocess (>= 0.2.5)
       ffi (~> 1.0)
       libwebsocket (~> 0.1.3)
@@ -139,6 +165,7 @@ GEM
     simple_form (2.0.2)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
+    spoon (0.0.1)
     spork (0.9.2)
     spork-testunit (0.0.8)
       spork (>= 0.6.0)
@@ -149,7 +176,7 @@ GEM
     sqlite3 (1.3.6)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
-    thor (0.14.6)
+    thor (0.15.3)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
@@ -166,6 +193,7 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -190,7 +218,7 @@ DEPENDENCIES
   mysql2
   nokogiri (~> 1.5.0)
   pg
-  rails (= 3.2.3)
+  rails (= 3.2.6)
   rails_autolink
   sass-rails (~> 3.2.5)
   simple_form

data/README.md

@@ -48,6 +48,9 @@ in the Gemfile and Cedar does not support a custom `BUNDLE_WITHOUT` config like
 
 ### Custom
 
+We recommend running [iQvoc as a Rails engine](https://github.com/innoq/iqvoc/wiki/iQvoc-as-a-Rails-Engine). 
+Running the cloned source code is possible but any modifications would require a fork.
+
 1. Configure your database via `config/database.template.yml`. Don't forget to rename it to `database.yml`
 2. Run `bundle install`
 3. Run `bundle exec rake db:create` to create the database

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

@@ -102,7 +102,7 @@ jQuery(document).ready(function($) {
     $(".translation[lang]").each(function(i, node) {
       var el = $(node),
         lang = el.attr("lang");
-      if(lang !== locale && $.inArray(lang, langSelected) === -1) {
+      if(lang && lang !== locale && $.inArray(lang, langSelected) === -1) {
         el.addClass("hidden");
       } else {
         el.removeClass("hidden");

data/app/helpers/rdf_helper.rb

@@ -33,7 +33,7 @@ module RdfHelper
         end
       end
 
-      c.Schema::expires(concept.expired_at) if concept.expired_at
+      c.Schema::expires(concept.expired_at.to_s) if concept.expired_at
       c.Owl::deprecated(true) if concept.expired_at and concept.expired_at <= Date.new
 
       c.Skos::topConceptOf IqRdf.build_uri(Iqvoc::Concept.root_class.instance.origin) if concept.top_term?

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

@@ -17,9 +17,10 @@
         <% end %>
       <% end %>
 
-      <% if Iqvoc.available_languages.any? %>
+      <% secondary_languages = Iqvoc.available_languages.reject { |lang| lang == I18n.locale.to_s } %>
+      <% if secondary_languages.any? %>
         <li><h3><%= t("txt.views.lang_widget.secondary") %></h3></li>
-        <% Iqvoc.available_languages.reject { |lang| lang == I18n.locale.to_s }.each do |lang| %>
+        <% secondary_languages.each do |lang| %>
           <li>
             <label>
               <input type="checkbox" value="<%= lang %>"> <%= t("languages.#{lang}") %>

data/config/database.yml

@@ -28,7 +28,7 @@ production:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: iqvoc_production
+  database: iqvoc_development
   username: root
   password:
   hostname: 127.0.0.1

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120412090126) do
+ActiveRecord::Schema.define(:version => 20120601094501) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"
@@ -92,16 +92,6 @@ ActiveRecord::Schema.define(:version => 20120412090126) do
   add_index "matches", ["concept_id", "type"], :name => "ix_matches_fk_type"
   add_index "matches", ["type"], :name => "ix_matches_on_type"
 
-  create_table "metrics", :force => true do |t|
-    t.string   "name"
-    t.integer  "duration"
-    t.integer  "request_id"
-    t.integer  "parent_id"
-    t.text     "payload"
-    t.datetime "started_at"
-    t.datetime "created_at"
-  end
-
   create_table "note_annotations", :force => true do |t|
     t.integer  "note_id"
     t.string   "predicate",  :limit => 50
@@ -127,6 +117,15 @@ ActiveRecord::Schema.define(:version => 20120412090126) do
   add_index "notes", ["owner_id", "owner_type", "type"], :name => "ix_notes_fk_type"
   add_index "notes", ["type"], :name => "ix_notes_on_type"
 
+  create_table "page_requests", :force => true do |t|
+    t.string   "path"
+    t.float    "page_duration"
+    t.float    "view_duration"
+    t.float    "db_duration"
+    t.datetime "created_at",    :null => false
+    t.datetime "updated_at",    :null => false
+  end
+
   create_table "users", :force => true do |t|
     t.string   "forename"
     t.string   "surname"

data/db/seeds.rb

@@ -15,23 +15,25 @@
 # limitations under the License.
 
 if User.where(:email => 'admin@iqvoc').none?
-  User.create!(
-    :forename => 'Admin',
-    :surname => 'Istrator',
-    :email => 'admin@iqvoc',
-    :password => 'admin',
-    :password_confirmation => 'admin',
-    :active => true,
-    :role => "administrator")
+  User.create! do |user|
+    user.forename = 'Admin'
+    user.surname  = 'Istrator'
+    user.email    = 'admin@iqvoc'
+    user.password = 'admin'
+    user.password_confirmation = 'admin'
+    user.active = true
+    user.role = "administrator"
+  end
 end
 
 if User.where(:email => 'demo@iqvoc').none?
-  User.create!(
-    :forename => 'Demo',
-    :surname => 'User',
-    :email => 'demo@iqvoc',
-    :password => 'cooluri',
-    :password_confirmation => 'cooluri',
-    :active => true,
-    :role => "reader")
+  User.create! do |user|
+    user.forename = 'Demo'
+    user.surname  = 'User'
+    user.email    = 'demo@iqvoc'
+    user.password = 'cooluri'
+    user.password_confirmation = 'cooluri'
+    user.active = true
+    user.role = "reader"
+  end
 end

data/lib/generators/app/template.rb

@@ -0,0 +1,49 @@
+namespaced_app_name = app_path.gsub("_", "/").camelize
+
+gem 'iqvoc'
+
+["config/application.rb",
+ "config/environment.rb",
+ "config/initializers/secret_token.rb",
+ "config/initializers/session_store.rb",
+ "config.ru",
+ "Rakefile"].each do |file|
+  gsub_file file, app_const_base, namespaced_app_name
+end
+
+gsub_file "config/routes.rb", "#{app_const_base}::Application", "Rails.application"
+
+%w(development test production).each do |env|
+  remove_file "config/environments/#{env}.rb"
+  create_file "config/environments/#{env}.rb", <<-EOF
+require 'iqvoc/environments/#{env}'
+
+if #{namespaced_app_name}.const_defined?(:Application)
+  #{namespaced_app_name}::Application.configure do
+    # Settings specified here will take precedence over those in config/environment.rb
+    Iqvoc::Environments.setup_#{env}(config)
+  end
+end
+EOF
+end
+
+initializer 'iqvoc.rb', <<-EOF
+Iqvoc.config do |config|
+  config.register_settings({
+    "title" => "#{app_const_base.titleize}"
+  })
+end
+
+# Iqvoc::Concept.base_class_name = "#{app_path}"
+# Iqvoc::Concept.pref_labeling_class_name = "MyLabelingClass"
+# Iqvoc::Concept.further_relation_class_names << "MyConceptRelationClass"
+# Iqvoc::Concept.note_class_names = []
+# Iqvoc.default_rdf_namespace_helper_methods << :my_namespace
+
+# Iqvoc.core_assets += []
+EOF
+
+remove_file "public/index.html"
+remove_file "app/controllers/application_controller.rb"
+remove_file "app/helpers/application_helper.rb"
+remove_file "app/views/layouts/application.html.erb"

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end