iqvoc 3.5.5 → 3.5.6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.5.6 (2012-03-07)
+
+  * Refactored origin (URI slug) generation<br>
+    Now supports custom filters to extend generation logic. See more: https://github.com/innoq/iqvoc/blob/master/lib/iqvoc/origin.rb
+  * Bugfixes
+
 ## 3.5.4 (2012-02-08)
 
   * Top concepts<br>

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.1'
+gem 'rails', '3.2.2'
 
 group :assets do
   gem 'uglifier', '>= 1.0.3'
@@ -42,14 +42,10 @@ end
 
 group :development, :test do
   gem 'awesome_print'
-  
+
   platforms :ruby do
     gem 'mysql2'
     gem 'sqlite3'
-    # v0.9 required for spork-testunit
-    gem 'spork', '~> 0.9.0.rc'
-    # head required for Ruby 1.9.3 compatibility; cf. https://github.com/sporkrb/spork-testunit/pull/17
-    gem 'spork-testunit', :git => 'git://github.com/sporkrb/spork-testunit.git'
   end
 
   platforms :jruby do
@@ -59,12 +55,14 @@ group :development, :test do
 end
 
 group :test do
+  gem 'test-unit'
   gem 'nokogiri', '~> 1.5.0'
   gem 'capybara'
   gem 'capybara-webkit'
   gem 'database_cleaner'
   gem 'factory_girl_rails'
-  gem 'minitest'
+  gem 'spork'
+  gem 'spork-testunit'
 end
 
 group :production do

data/Gemfile.lock

@@ -1,19 +1,12 @@
-GIT
-  remote: git://github.com/sporkrb/spork-testunit.git
-  revision: fcf530694dd8c7fed752cf45e0d10db1ea55e3f6
-  specs:
-    spork-testunit (0.0.7)
-      spork (>= 0.6.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
       mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
@@ -21,13 +14,13 @@ GEM
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-jdbc-adapter (1.2.2)
     activerecord-jdbcmysql-adapter (1.2.2)
@@ -37,14 +30,14 @@ GEM
       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)
-    activesupport (3.2.1)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (3.0.0)
+    addressable (2.2.7)
+    arel (3.0.2)
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
@@ -59,40 +52,41 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-webkit (0.8.0)
+    capybara-webkit (0.10.0)
       capybara (>= 1.0.0, < 1.2)
       json
-    childprocess (0.3.0)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
     database_cleaner (0.7.1)
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.5.0)
-      activesupport
-    factory_girl_rails (1.6.0)
-      factory_girl (~> 2.5.0)
+    factory_girl (2.6.0)
+      activesupport (>= 2.3.9)
+    factory_girl_rails (1.7.0)
+      factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
     fastercsv (1.5.4)
     ffi (1.0.11)
     ffi (1.0.11-java)
-    heroku (2.19.1)
+    heroku (2.20.1)
       launchy (>= 0.3.2)
       rest-client (~> 1.6.1)
       rubyzip
       term-ansicolor (~> 1.0.5)
     hike (1.2.1)
     i18n (0.6.0)
-    iq_rdf (0.1.2)
+    iq_rdf (0.1.5)
       builder
       bundler
     jdbc-mysql (5.1.13)
     jdbc-sqlite3 (3.7.2)
-    journey (1.0.1)
-    jruby-openssl (0.7.5)
+    journey (1.0.3)
+    jruby-openssl (0.7.6.1)
       bouncy-castle-java (>= 1.5.0146.1)
     json (1.6.5)
     json (1.6.5-java)
+    json_pure (1.6.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -109,12 +103,11 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    minitest (2.11.1)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     mysql2 (0.3.11)
     nokogiri (1.5.0)
     nokogiri (1.5.0-java)
-    pg (0.12.2)
+    pg (0.13.2)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.1)
@@ -123,19 +116,19 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.2.1)
+      railties (= 3.2.2)
     rails_autolink (1.0.5)
       rails (~> 3.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -145,21 +138,24 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.18.0)
-      childprocess (>= 0.2.5)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.13.0)
+      childprocess (>= 0.2.1)
       ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      json_pure
       rubyzip
     spoon (0.0.1)
     spork (0.9.0)
+    spork-testunit (0.0.8)
+      spork (>= 0.6.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
     term-ansicolor (1.0.7)
-    therubyracer (0.9.9)
+    test-unit (2.4.7)
+    therubyracer (0.9.10)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
@@ -196,15 +192,15 @@ DEPENDENCIES
   jruby-openssl
   json
   kaminari
-  minitest
   mysql2
   nokogiri (~> 1.5.0)
   pg
-  rails (= 3.2.1)
+  rails (= 3.2.2)
   rails_autolink
-  spork (~> 0.9.0.rc)
-  spork-testunit!
+  spork
+  spork-testunit
   sqlite3
+  test-unit
   therubyracer
   uglifier (>= 1.0.3)
   view_marker

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

@@ -59,6 +59,7 @@ var createNote = function(ev) {
 	// FIXME: Hardcoded UMT stuff
 	var isUsageNote = source.find("label:first")[0].getAttribute("for");
 	isUsageNote = isUsageNote ? isUsageNote.match(/^concept_note_umt_usage_notes/) : false;
+	var noteSelector = isUsageNote ? "select" : "textarea, input";
 
 	if(source.is(":hidden")) {
 		source.show();
@@ -67,7 +68,7 @@ var createNote = function(ev) {
 
 	var clone = source.clone();
 
-	var count = source.find(isUsageNote ? "select" : "textarea")[0].id
+	var count = source.find(noteSelector)[0].id
 			.match(/_(\d+)_/)[1];
 	count = String(parseInt(count, 10) + 1);
 	var newIdCount = "_" + count + "_",
@@ -83,15 +84,17 @@ var createNote = function(ev) {
 
 	var src, el;
 	if(!isUsageNote) {
-		src = source.find("textarea")[0];
-		el = clone.find("textarea").val("")[0];
+		src = source.find(noteSelector)[0];
+		el = clone.find(noteSelector).val("")[0];
 		el.id = src.id.replace(/_\d+_/, newIdCount);
 		el.name = src.name.replace(/\[\d+\]/, newNameCount);
 	}
 	src = source.find("select")[0];
-	el = clone.find("select")[0];
-	el.id = src.id.replace(/_\d+_/, newIdCount);
-	el.name = src.name.replace(/\[\d+\]/, newNameCount);
+	if(src) {
+		el = clone.find("select")[0];
+		el.id = src.id.replace(/_\d+_/, newIdCount);
+		el.name = src.name.replace(/\[\d+\]/, newNameCount);
+	}
 
 	clone.addClass("new");
 	$("ol", container).append(clone);

data/app/controllers/rdf_controller.rb

@@ -18,7 +18,7 @@ class RdfController < ApplicationController
 
   skip_before_filter :require_user
   skip_before_filter :set_locale
-  
+
   def scheme
     respond_to do |format|
       format.html { redirect_to about_path }

data/app/helpers/rdf_helper.rb

@@ -35,7 +35,7 @@ module RdfHelper
 
       c.Schema::expires(concept.expired_at) 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?
 
       concept.labelings.each do |labeling|

data/app/models/collection/base.rb

@@ -56,18 +56,18 @@ class Collection::Base < Concept::Base
 
   #********** Scopes
 
-  scope :by_origin, lambda { |origin|
+  def self.by_origin(origin)
     where(:origin => origin)
-  }
+  end
 
-  scope :by_label_value, lambda { |val|
+  def self.by_label_value(val)
     includes(:labels).merge(Label::Base.by_query_value(val))
-  }
+  end
 
-  scope :tops, lambda {
+  def self.tops
     includes(:parent_collection_members).
       where("#{Collection::Member::Collection.table_name}.target_id IS NULL")
-  }
+  end
 
   #********** Validations
 

data/app/models/concept/base.rb

@@ -233,26 +233,32 @@ class Concept::Base < ActiveRecord::Base
 
   # ********** Scopes
 
-  scope :tops, where(:top_term => true)
+  def self.tops
+    where(:top_term => true)
+  end
 
-  scope :broader_tops, includes(:narrower_relations, :pref_labels).
+  def self.broader_tops
+    includes(:narrower_relations, :pref_labels).
     where(:concept_relations => { :id => nil },
-        :labelings => { :type => Iqvoc::Concept.pref_labeling_class_name }).
+      :labelings => { :type => Iqvoc::Concept.pref_labeling_class_name }).
     order("LOWER(#{Label::Base.table_name}.value)")
+  end
 
-  scope :with_associations, includes([
+  def self.with_associations
+    includes([
       { :labelings => :target }, :relations, :matches, :notes
     ])
+  end
 
-  scope :with_pref_labels,
+  def self.with_pref_labels
     includes(:pref_labels).
     order("LOWER(#{Label::Base.table_name}.value)").
     where(:labelings => { :type => Iqvoc::Concept.pref_labeling_class_name }) # This line is just a workaround for a Rails Bug. TODO: Delete it when the Bug is fixed
+  end
 
-  scope :for_dashboard, lambda {
-    unpublished_or_follow_up.
-      includes(:pref_labels, :locking_user)
-  }
+  def self.for_dashboard
+    unpublished_or_follow_up.includes(:pref_labels, :locking_user)
+  end
 
   # ********** Class methods
 

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

@@ -41,29 +41,29 @@ class Concept::Relation::Base < ActiveRecord::Base
 
   # ********* Scopes
 
-  scope :by_owner, lambda { |owner_id|
+  def self.by_owner(owner_id)
     where(:owner_id => owner_id)
-  }
+  end
 
-  scope :by_owner_origin, lambda { |owner_id|
-    includes(:owner).merge(Concept::Base.by_origin(owner_id))
-  }
+  def self.by_owner_origin(owner_origin)
+    includes(:owner).merge(Concept::Base.by_origin(owner_origin))
+  end
 
-  scope :by_target_origin, lambda { |owner_id|
-    includes(:target).merge(Concept::Base.by_origin(owner_id))
-  }
+  def self.by_target_origin(target_origin)
+    includes(:target).merge(Concept::Base.by_origin(target_origin))
+  end
 
-  scope :target_editor_selectable, lambda { # Lambda because Concept::Base.editor_selectable is currently not known + we don't want to call it at load time!
+  def self.target_editor_selectable
     includes(:target).merge(Concept::Base.editor_selectable)
-  }
+  end
 
-  scope :published, lambda { # Lambda because Concept::Base.published is currently not known + we don't want to call it at load time!
+  def self.published
     includes(:target).merge(Concept::Base.published)
-  }
+  end
 
-  scope :target_in_edit_mode, lambda { # Lambda because Concept::Base.in_edit_mode is currently not known + we don't want to call it at load time!
+  def self.target_in_edit_mode
     joins(:target).merge(Concept::Base.in_edit_mode)
-  }
+  end
 
   # ********* Methods
 

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

@@ -20,9 +20,16 @@ class Concept::SKOS::Base < Concept::Base
   self.rdf_class = "Concept"
 
   def build_rdf_subject(document, controller, &block)
-    ns = IqRdf::Namespace.find_namespace_class(self.rdf_namespace.to_sym)
-    raise "Namespace '#{rdf_namespace}' is not defined in IqRdf document." unless ns
-    IqRdf.build_uri(self.origin, ns.build_uri(self.rdf_class), &block)
+    ns = IqRdf::Namespace.find_namespace_class(self.rdf_namespace)
+    raise "Namespace '#{base_namespace}' is not defined in IqRdf document." unless ns
+    subject = IqRdf.build_uri(self.origin, ns.build_uri(self.rdf_class), &block)
+
+    # ensure skos:Concept type is present
+    unless self.rdf_namespace == "skos" && self.rdf_class == "Concept"
+      subject.Rdf::type(IqRdf::Skos.build_uri("Concept"))
+    end
+
+    return subject
   end
 
 end