iqvoc 4.0.9 → 4.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 16d4accd1ec6444487808f8bd96d5c199ab71eff
+  data.tar.gz: 6207cec740aa1379da5c2416a825a08e63ef472b
+SHA512:
+  metadata.gz: 562c550eb713e0372b0bc67a7c7d34518460f03ccf35345a486237f1691a3337c9c44593ad25487c72e07e0703d200261c9258d13f41d9003dffa411ff3980bc
+  data.tar.gz: ffda6405a0ba2955b29e4b110ddb35d8fa016bbbd5bbc26215cafb9fff52b4a7eb1bb4664506a4255b58b245c4ed80cdd5d03de54e24a18917848f4676300898

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [4.1.0]
+
+  * Concepts hierarchy API (/hierarchy)
+  * Support for SKOS notations
+  * Adjusted RDF serializations to always include related concepts' pref. labels
+  * Fixed MIME type for RDF/XML
+  * Editable concept scheme
+  * Ruby 2.0 compatibility
+  * Dropped support for Ruby 1.8
+  * Heroku Cedar support
+  * Bugfixes
+
 ## [4.0.9]
 
   * Speed improvements in SKOS importer

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.12'
+gem 'rails', '3.2.13'
 
 group :assets do
   gem 'uglifier',   '>= 1.0.3'
@@ -36,7 +36,6 @@ gem 'json'
 gem 'rails_autolink'
 gem 'jruby-openssl', :platforms => :jruby
 gem 'simple_form'
-gem 'fastercsv', :platforms => :ruby_18
 
 group :development do
   gem 'heroku'
@@ -47,12 +46,17 @@ end
 
 group :development, :test do
   gem 'awesome_print'
-  gem 'pry', :platform => :ruby
-  gem 'pry-remote', :platform => :ruby
 
   platforms :ruby do
     gem 'mysql2'
     gem 'sqlite3'
+
+    gem 'pry'
+    gem 'pry-rails'
+    gem 'pry-debugger'
+    gem 'pry-remote'
+    gem 'hirb-unicode'
+    gem 'cane'
   end
 
   platforms :jruby do
@@ -76,8 +80,6 @@ group :test do
 end
 
 group :production do
-  gem 'sqlite3', :platforms => :ruby
-  gem 'activerecord-oracle_enhanced-adapter', :platforms => :jruby
 end
 
 group :heroku do

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.12)
-      actionpack (= 3.2.12)
-      mail (~> 2.4.4)
-    actionpack (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    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)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -14,12 +14,12 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    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)
@@ -29,12 +29,11 @@ GEM
     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.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    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)
     ansi (1.4.3)
@@ -51,6 +50,8 @@ GEM
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
     cancan (1.6.8)
+    cane (2.5.2)
+      parallel
     capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -66,9 +67,16 @@ GEM
     childprocess (0.3.8)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.0.8)
+    columnize (0.3.6)
     crack (0.3.1)
     database_cleaner (0.8.0)
     debug_inspector (0.0.2)
+    debugger (1.5.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.0)
     erubis (2.7.0)
     excon (0.16.2)
     execjs (1.4.0)
@@ -78,7 +86,6 @@ GEM
     factory_girl_rails (4.1.0)
       factory_girl (~> 4.1.0)
       railties (>= 3.0.0)
-    fastercsv (1.5.5)
     ffi (1.1.5)
     ffi (1.1.5-java)
     heroku (2.31.2)
@@ -90,6 +97,10 @@ GEM
     heroku-api (0.3.5)
       excon (~> 0.16.1)
     hike (1.2.1)
+    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)
       builder
@@ -112,24 +123,30 @@ GEM
       ffi (~> 1.1.1)
       spoon (~> 0.0.1)
     libv8 (3.3.10.4)
-    mail (2.4.4)
+    mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.21)
     minitest (3.4.0)
-    multi_json (1.6.1)
+    multi_json (1.7.2)
     mysql2 (0.3.11)
     netrc (0.7.7)
     nokogiri (1.5.6)
     nokogiri (1.5.6-java)
+    parallel (0.6.4)
     pg (0.14.1)
     polyglot (0.3.3)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
+      pry (~> 0.9.10)
+    pry-rails (0.2.2)
+      pry (>= 0.9.10)
     pry-remote (0.1.6)
       pry (~> 0.9)
       slop (~> 3.0)
@@ -140,25 +157,25 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.12)
-      actionmailer (= 3.2.12)
-      actionpack (= 3.2.12)
-      activerecord (= 3.2.12)
-      activeresource (= 3.2.12)
-      activesupport (= 3.2.12)
+    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.12)
+      railties (= 3.2.13)
     rails_autolink (1.0.9)
       rails (~> 3.1)
-    railties (3.2.12)
-      actionpack (= 3.2.12)
-      activesupport (= 3.2.12)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12.1)
+    rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -190,16 +207,17 @@ GEM
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
     thor (0.17.0)
-    tilt (1.3.3)
+    tilt (1.3.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     turn (0.9.6)
       ansi
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
+    unicode-display_width (0.1.1)
     view_marker (1.0.0)
       rails
     webmock (1.8.11)
@@ -216,19 +234,19 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
   activerecord-jdbcsqlite3-adapter
-  activerecord-oracle_enhanced-adapter
   authlogic
   awesome_print
   better_errors
   binding_of_caller
   cancan
+  cane
   capybara
   capybara-screenshot
   capybara-webkit (~> 0.14.2)
   database_cleaner
   factory_girl_rails
-  fastercsv
   heroku
+  hirb-unicode
   iq_rdf
   iq_triplestorage
   jruby-openssl
@@ -239,8 +257,10 @@ DEPENDENCIES
   nokogiri (~> 1.5.0)
   pg
   pry
+  pry-debugger
+  pry-rails
   pry-remote
-  rails (= 3.2.12)
+  rails (= 3.2.13)
   rails_autolink
   sass-rails (~> 3.2.5)
   simple_form

data/README.md

@@ -31,11 +31,11 @@ To run iQvoc on heroku do the following:
 
 ```
 bundle install
-bundle exec heroku create --stack bamboo
+bundle exec heroku create
 bundle exec rake heroku:config
 git push heroku master
-bundle exec heroku rake db:migrate
-bundle exec heroku rake db:seed
+bundle exec heroku run rake db:migrate
+bundle exec heroku run rake db:seed
 bundle exec heroku restart
 ```
 
@@ -43,10 +43,6 @@ bundle exec heroku restart
 
 Remember to visit the Users section and change the default passwords!
 
-**Remarks:**
-For now iQvoc only supports the standard Bamboo stack. Cedar is not supported as we have `sqlite3` as a dependency
-in the Gemfile and Cedar does not support a custom `BUNDLE_WITHOUT` config like Bamboo at the moment.
-
 ### Custom
 
 We recommend running [iQvoc as a Rails engine](https://github.com/innoq/iqvoc/wiki/iQvoc-as-a-Rails-Engine).

data/app/controllers/concepts/hierarchical_controller.rb

@@ -19,11 +19,8 @@ class Concepts::HierarchicalController < ConceptsController
   def index
     authorize! :read, Iqvoc::Concept.base_class
 
-    scope = if params[:published] == '0'
-      Iqvoc::Concept.base_class.editor_selectable
-    else
-      Iqvoc::Concept.base_class.published
-    end
+    scope = Iqvoc::Concept.base_class
+    scope = params[:published] == "0" ? scope.editor_selectable : scope.published
 
     #collect only the not expired concepts
     scope = scope.not_expired

data/app/controllers/concepts/scheme_controller.rb

@@ -0,0 +1,51 @@
+# 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.
+
+class Concepts::SchemeController < ApplicationController
+
+  def show
+    @scheme = Iqvoc::Concept.root_class.instance
+    authorize! :read, @scheme
+
+    @top_concepts = Iqvoc::Concept.base_class.tops.published
+
+    respond_to do |format|
+      format.html do
+      end
+      format.any :rdf, :ttl do
+      end
+    end
+  end
+
+  def edit
+    @scheme = Iqvoc::Concept.root_class.instance
+    authorize! :update, @scheme
+  end
+
+  def update
+    @scheme = Iqvoc::Concept.root_class.instance
+    authorize! :update, @scheme
+
+    if @scheme.update_attributes(params[:concept])
+      flash[:success] = t("txt.controllers.concept_scheme.save.success")
+      redirect_to scheme_path
+    else
+      flash[:error] = t("txt.controllers.concept_scheme.save.error")
+      render :edit
+    end
+  end
+
+end

data/app/controllers/concepts_controller.rb

@@ -97,6 +97,8 @@ class ConceptsController < ApplicationController
     Iqvoc::Concept.note_class_names.each do |note_class_name|
       @concept.send(note_class_name.to_relation_name).build if @concept.send(note_class_name.to_relation_name).empty?
     end
+
+    @concept.notations.build if @concept.notations.none?
   end
 
   def create

data/app/controllers/hierarchy_controller.rb

@@ -0,0 +1,105 @@
+# 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.
+
+class HierarchyController < ApplicationController
+
+  def show
+    authorize! :read, Iqvoc::Concept.base_class
+
+    root_origin = params[:root]
+    direction = params[:dir] == "up" ? "up" : "down"
+    depth = params[:depth].blank? ? 3 : (Float(params[:depth]).to_i rescue nil)
+    include_siblings = params[:siblings] || false
+    include_unpublished = params[:published] == "0" # FIXME: requires additional AuthZ check
+
+    scope = Iqvoc::Concept.base_class
+    scope = include_unpublished ? scope.editor_selectable : scope.published
+
+    # validate depth parameter
+    error = "invalid depth parameter" unless depth # TODO: i18n
+    # validate root parameter
+    error = "missing root parameter" unless root_origin # TODO: i18n
+    unless error
+      root_concept = scope.where(:origin => root_origin).first
+      error = [404, "no concept matching root parameter"] unless root_concept # TODO: i18n
+    end
+    # error handling
+    if error
+      status, error = error if error.is_a? Array
+      flash.now[:error] = error
+      render :status => (status || 400)
+      return
+    end
+
+    # caching -- NB: invalidated on any in-scope concept modifications
+    latest = scope.maximum(:updated_at)
+    response.cache_control[:public] = !include_unpublished # XXX: this should not be necessary!?
+    return unless stale?(:etag => [latest, params], :last_modified => latest,
+        :public => !include_unpublished)
+
+    # NB: order matters due to the `where` clause below
+    if direction == "up"
+      scope = scope.includes(:narrower_relations, :broader_relations)
+    else
+      scope = scope.includes(:broader_relations, :narrower_relations)
+    end
+
+    @concepts = {}
+    if include_siblings
+      determine_siblings(root_concept).each { |sib| @concepts[sib] = {} }
+    end
+    @concepts[root_concept] = populate_hierarchy(root_concept, scope, depth, 0,
+        include_siblings)
+
+    @relation_class = Iqvoc::Concept.broader_relation_class
+    @relation_class = @relation_class.narrower_class unless direction == "up"
+
+    respond_to do |format|
+      format.html
+      format.ttl
+      format.rdf
+    end
+  end
+
+  private
+
+  # returns a hash of concept/relations pairs of arbitrary nesting depth
+  # NB: recursive, triggering one database query per iteration
+  def populate_hierarchy(root_concept, scope, max_depth, current_depth=0,
+      include_siblings=false)
+    current_depth += 1
+    return {} if current_depth > max_depth
+
+    rels = scope.where(Concept::Relation::Base.arel_table[:target_id].
+        eq(root_concept.id))
+    return rels.inject({}) do |memo, concept|
+      if include_siblings
+        determine_siblings(concept).each { |sib| memo[sib] = {} }
+      end
+      memo[concept] = populate_hierarchy(concept, scope, max_depth,
+          current_depth, include_siblings)
+      memo
+    end
+  end
+
+  # NB: includes support for poly-hierarchies -- XXX: untested
+  def determine_siblings(concept)
+    return concept.broader_relations.map do |rel|
+      rel.target.narrower_relations.map { |rel| rel.target } # XXX: expensive
+    end.flatten.uniq
+  end
+
+end

data/app/controllers/rdf_controller.rb

@@ -17,16 +17,6 @@
 class RdfController < ApplicationController
   skip_before_filter :set_locale
 
-  def scheme
-    respond_to do |format|
-      format.html { redirect_to about_path }
-      format.any do
-        authorize! :read, Iqvoc::Concept.root_class.instance
-        @top_concepts = Iqvoc::Concept.base_class.tops.published.all
-      end
-    end
-  end
-
   def show
     scope = if params[:published] == "0"
       Iqvoc::Concept.base_class.unpublished

data/app/controllers/user_sessions_controller.rb

@@ -31,7 +31,11 @@ class UserSessionsController < ApplicationController
     if @user_session.save
       @current_ability = nil
       flash[:success] = I18n.t("txt.controllers.user_sessions.login_success")
-      redirect_to params[:back_to].presence || (can?(:use, :dashboard) ? dashboard_path : root_path)
+      if params[:back_to]
+        redirect_to URI.parse(params[:back_to]).path
+      else
+        redirect_to can?(:use, :dashboard) ? dashboard_path : root_path
+      end
     else
       flash[:error] = I18n.t("txt.views.user_sessions.error")
       render :action => :new

data/app/helpers/application_helper.rb

@@ -37,7 +37,7 @@ module ApplicationHelper
     details
   end
 
-  # Formats a list ob items or returns a remark if no items where given
+  # Formats a list of items or returns a remark if no items where given
   def item_listing(items, &block)
     return nil if items.empty?
 

data/app/helpers/concepts_helper.rb

@@ -22,6 +22,21 @@ module ConceptsHelper
       :locals => { :concepts => concepts, :broader => broader }
   end
 
+  # turns a hash of concept/relations pairs of arbitrary nesting depth into the
+  # corresponding HTML list
+  def nested_list(hash, options={})
+    ordered = options[:ordered] || false
+    options.delete(:ordered)
+
+    content_tag(ordered ? "ol" : "ul", options) do
+      hash.map do |concept, rels|
+        rels.empty? ? content_tag("li", concept) : content_tag("li") do
+          h(concept) + nested_list(rels, :ordered => ordered) # NB: recursive
+        end
+      end.join("\n").html_safe
+    end
+  end
+
   def letter_selector(&block)
     letters = ('A'..'Z').to_a +
       (0..9).to_a +
@@ -60,6 +75,10 @@ module ConceptsHelper
       render_concept_association(res, concept, note_class)
     end
 
+    Iqvoc::Concept.notation_classes.each do |notation_class|
+      render_concept_association(res, concept, notation_class)
+    end
+
     Iqvoc::Concept.additional_association_classes.keys.each do |assoc_class|
       render_concept_association(res, concept, assoc_class)
     end

data/app/helpers/rdf_helper.rb

@@ -37,6 +37,7 @@ module RdfHelper
       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?
+      c.Skos::inScheme IqRdf.build_uri(Iqvoc::Concept.root_class.instance.origin)
 
       concept.labelings.each do |labeling|
         labeling.build_rdf(document, c)
@@ -54,6 +55,10 @@ module RdfHelper
         match.build_rdf(document, c)
       end
 
+      concept.notations.each do |notation|
+        notation.build_rdf(document, c)
+      end
+
       Iqvoc::Concept.additional_association_class_names.keys.each do |class_name|
         concept.send(class_name.to_relation_name).each do |additional_object|
           additional_object.build_rdf(document, c)

data/app/models/concept/base.rb

@@ -132,6 +132,10 @@ class Concept::Base < ActiveRecord::Base
   has_many :collections, :through => :collection_members, :class_name => Iqvoc::Collection.base_class_name
   include_to_deep_cloning(:collection_members)
 
+  has_many :notations, :class_name => 'Notation::Base', :foreign_key => 'concept_id', :dependent => :destroy
+  include_to_deep_cloning :notations
+  @nested_relations << :notations
+
   # ************** "Dynamic"/configureable relations
 
   # *** Concept2Concept relations
@@ -256,7 +260,7 @@ class Concept::Base < ActiveRecord::Base
 
   def self.with_associations
     includes([
-      { :labelings => :target }, :relations, :matches, :notes
+      { :labelings => :target }, :relations, :matches, :notes, :notations
     ])
   end
 
@@ -375,6 +379,11 @@ class Concept::Base < ActiveRecord::Base
     notes.select{ |note| note.class.name == note_class }
   end
 
+  def notations_for_class(notation_class)
+    notation_class = notation_class.name if notation_class < ActiveRecord::Base # Use the class name string
+    notations.select{ |notation| notation.class.name == notation_class }
+  end
+
   # This shows up (in brackets) to the right of a concept link if it doesn't
   # return nil
   def additional_info

data/app/models/concept/relation/skos/base.rb

@@ -25,7 +25,7 @@ class Concept::Relation::SKOS::Base < Concept::Relation::Base
     relation_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
 
     relation_instance = rdf_subject.send(self.name.to_relation_name).select{|rel| rel.target == rdf_object}
-    unless relation_instance
+    if relation_instance.empty?
       relation_instance = relation_class.new(:target => rdf_object)
       rdf_subject.send(self.name.to_relation_name) << relation_instance
     end
@@ -42,6 +42,13 @@ class Concept::Relation::SKOS::Base < Concept::Relation::Base
 
   def build_rdf(document, subject)
     subject.send(self.rdf_namespace.camelcase).send(self.rdf_predicate, IqRdf.build_uri(target.origin))
+
+    # Auto-include preferred labels for referenced concepts
+    document << IqRdf::build_uri(target.origin) do |subject|
+      target.pref_labelings.each do |labeling|
+        subject.skos.send(labeling.rdf_predicate, labeling.target.value.to_s, :lang => labeling.target.language)
+      end
+    end
   end
 
 end