iqvoc 4.2.0 → 4.3.0

data/db/migrate/20131220134356_create_delayed_jobs.rb

@@ -0,0 +1,22 @@
+class CreateDelayedJobs < ActiveRecord::Migration
+  def self.up
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually.
+      table.text     :handler, :null => false                 # YAML-encoded string of the object that will do work
+      table.text     :last_error                              # reason for last failure (See Note below)
+      table.datetime :run_at                                  # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                               # Set when a client is working on this object
+      table.datetime :failed_at                               # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string   :locked_by                               # Who is working on this object (if locked)
+      table.string   :queue                                   # The name of the queue this job is in
+      table.timestamps
+    end
+
+    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
+  end
+
+  def self.down
+    drop_table :delayed_jobs
+  end
+end

data/db/migrate/20131220144601_create_imports.rb

@@ -0,0 +1,11 @@
+class CreateImports < ActiveRecord::Migration
+  def change
+    create_table :imports do |t|
+      t.references :user
+      t.text :output
+      t.boolean :success, :default => false
+      t.timestamps
+      t.timestamp :finished_at
+    end
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130508103137) do
+ActiveRecord::Schema.define(version: 20131220144601) do
 
   create_table "collection_members", force: true do |t|
     t.integer "collection_id"
@@ -56,6 +56,31 @@ ActiveRecord::Schema.define(version: 20130508103137) do
     t.string "value"
   end
 
+  create_table "delayed_jobs", force: true do |t|
+    t.integer  "priority",   default: 0, null: false
+    t.integer  "attempts",   default: 0, null: false
+    t.text     "handler",                null: false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
+
+  create_table "imports", force: true do |t|
+    t.integer  "user_id"
+    t.text     "output"
+    t.boolean  "success",     default: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "finished_at"
+  end
+
   create_table "labelings", force: true do |t|
     t.string   "type"
     t.integer  "owner_id"

data/iqvoc.gemspec

@@ -18,18 +18,27 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari', '0.13.0'
   s.add_dependency 'authlogic'
   s.add_dependency 'cancan'
-  s.add_dependency 'iq_rdf', '~> 0.1.2'
+  s.add_dependency 'iq_rdf', '>= 0.1.13'
   s.add_dependency 'json'
   s.add_dependency 'rails_autolink'
+  s.add_dependency 'faraday'
   s.add_dependency 'simple_form'
   s.add_dependency 'sass-rails', '~> 4.0.0'
   s.add_dependency 'bootstrap-sass', '~> 2.3.1.3'
   s.add_dependency 'iq_triplestorage'
+  s.add_dependency 'nokogiri'
+  s.add_dependency 'linkeddata'
   s.add_dependency 'protected_attributes', '>= 1.0.5'
+  s.add_dependency 'font-awesome-rails'
+  s.add_dependency 'uglifier', '>= 1.3.0'
+  s.add_dependency 'apipie-rails'
+  s.add_dependency 'maruku'
+  s.add_dependency 'database_cleaner'
+  s.add_dependency 'delayed_job_active_record', '~> 4.0.0'
 
   s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) +
     Dir.glob("{app,config,db,public,lib,test,vendor}/**/*")
-  s.test_files = Dir.glob("{test}/**/*")
-  s.executables = Dir.glob("{bin}/**/*")
+  s.test_files = s.files.grep(%r{^test/})
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

data/lib/iqvoc/ability.rb

@@ -43,6 +43,8 @@ module Iqvoc
           can :update, Iqvoc::Concept.root_class.instance
 
           can :use, :administration
+
+          can :reset, :thesaurus
         end
       else # no user
         can :create, UserSession

data/lib/iqvoc/configuration/core.rb

@@ -28,6 +28,14 @@ module Iqvoc
           iqvoc/ie_fixes.css
           bootstrap/bootstrap.js
           html5.js
+          *.png
+          *.jpg
+          *.jpeg
+          *.gif
+          *.svg
+          *.ttf
+          *.woff
+          *.eof
         )
 
         self.navigation_items = [{
@@ -84,11 +92,12 @@ module Iqvoc
           }]
         }]
 
-        self.searchable_class_names = [
-          "Labeling::SKOS::Base",
-          "Labeling::SKOS::PrefLabel",
-          "Note::Base"
-        ]
+        self.searchable_class_names = {
+          "Labeling::SKOS::Base" => "labels",
+          "Labeling::SKOS::PrefLabel" => "pref_labels",
+          "Note::Base" => "notes"
+        }
+
         self.unlimited_search_results = false
 
         self.default_rdf_namespace_helper_methods = [:iqvoc_default_rdf_namespaces]
@@ -99,7 +108,9 @@ module Iqvoc
           :owl  => "http://www.w3.org/2002/07/owl#",
           :skos => "http://www.w3.org/2004/02/skos/core#",
           :dct  => "http://purl.org/dc/terms/",
-          :foaf => "http://xmlns.com/foaf/spec/"
+          :foaf => "http://xmlns.com/foaf/spec/",
+          :void => "http://rdfs.org/ns/void#",
+          :iqvoc => "http://try.iqvoc.net/schema#"
         }
 
         # The class to use for automatic generation of change notes on every save
@@ -109,7 +120,15 @@ module Iqvoc
 
         self.ability_class_name = "Iqvoc::Ability"
 
-        self.search_sections = ["klass", "mode", "terms", "type", "collection", "languages"]
+        self.search_sections = [
+          "klass",
+          "mode",
+          "terms",
+          "type",
+          "collection",
+          "languages",
+          "datasets"
+        ]
 
         # initialize
         self.config.register_settings({
@@ -117,7 +136,8 @@ module Iqvoc
           "languages.pref_labeling" => ["en", "de"],
           "languages.further_labelings.Labeling::SKOS::AltLabel" => ["en", "de"],
           "languages.notes" => ["en", "de"],
-          "performance.unbounded_hierarchy" => false
+          "performance.unbounded_hierarchy" => false,
+          "sources.iqvoc" => [""]
         })
       end
 
@@ -157,7 +177,7 @@ module Iqvoc
         end
 
         def searchable_classes
-          searchable_class_names.map(&:constantize)
+          searchable_class_names.keys.map(&:constantize)
         end
 
         def first_level_classes
@@ -189,6 +209,13 @@ module Iqvoc
           self.config.register_setting("title", value)
         end
 
+        def root
+          if Iqvoc.const_defined?(:Engine)
+            Iqvoc::Engine.root
+          else
+            Rails.root
+          end
+        end
       end
 
     end

data/lib/iqvoc/controller_extensions.rb

@@ -95,5 +95,9 @@ module Iqvoc
       @current_user ||= current_user_session && current_user_session.user
     end
 
+    def with_layout?
+      !params[:layout]
+    end
+
   end
 end

data/lib/iqvoc/environments/production.rb

@@ -63,7 +63,7 @@ module Iqvoc::Environments
 
     # Precompile additional assets.
     # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-    # config.assets.precompile += %w( search.js )
+    config.assets.precompile += Iqvoc.core_assets
 
     # Ignore bad email addresses and do not raise email delivery errors.
     # Set this to true and configure the email server for immediate delivery to raise delivery errors.

data/lib/iqvoc/skos_importer.rb

@@ -13,10 +13,13 @@ module Iqvoc
         [Iqvoc::Concept.root_class] +
         [Iqvoc::Collection.member_class]
 
-    def initialize(file, default_namespace_url, logger = Rails.logger)
+    def initialize(file, default_namespace_url, logger = Rails.logger, publish = true)
+      @file = file
+      @publish = publish
+
       @logger = logger
 
-      unless file.is_a?(File) || file.is_a?(Array)
+      unless @file.is_a?(File) || @file.is_a?(Array)
         raise "Iqvoc::SkosImporter#import: Parameter 'file' should be a File or an Array."
       end
 
@@ -56,8 +59,10 @@ module Iqvoc
           @existing_origins[thing.origin] = klass
         end
       end
+    end
 
-      import file
+    def run
+      import @file
     end
 
     private
@@ -82,34 +87,41 @@ module Iqvoc
             import_second_level_objects(second_level_types, false, *extract_triple(line))
       end
 
-      @logger.debug("Computing 'forward' defined triples...")
+      @logger.debug "Computing 'forward' defined triples..."
       @unknown_second_level_triples.each do |s, p, o|
         import_second_level_objects(second_level_types, true, s, p, o)
       end
 
       first_import_step_done = Time.now
-      @logger.debug("Basic import done (took #{(first_import_step_done - start).to_i} seconds).")
+      @logger.debug "Basic import done (took #{(first_import_step_done - start).to_i} seconds)."
 
-      @logger.debug("Publishing #{@new_subjects.count} new subjects...")
-      published = 0
-      @new_subjects.each do |subject|
-        if subject.valid_with_full_validation?
-          subject.publish
-          subject.save!
-          published += 1
-        else
-          @logger.warn "WARNING: Publishing failed! Subject ('#{subject.origin}') invalid: #{subject.errors.to_hash.inspect}"
-        end
-      end
+      published = publish
 
       done = Time.now
-      @logger.debug("Publishing of #{published} subjects done (took #{(done - first_import_step_done).to_i} seconds). #{@new_subjects.count - published} where invalid.")
-      puts "Imported #{published} valid and #{@new_subjects.count - published} invalid subjects in #{(done - start).to_i} seconds."
-      puts "  First step took  #{(first_import_step_done - start).to_i} seconds, publishing took #{(done - first_import_step_done).to_i} seconds."
+      @logger.debug "Publishing of #{published} subjects done (took #{(done - first_import_step_done).to_i} seconds). #{@new_subjects.count - published} are in draft state."
+      puts "Imported #{published} published and #{@new_subjects.count - published} draft subjects in #{(done - start).to_i} seconds."
+      puts "  First step took #{(first_import_step_done - start).to_i} seconds, publishing took #{(done - first_import_step_done).to_i} seconds."
 
       ActiveSupport.run_load_hooks(:skos_importer_after_import, self)
     end
 
+    def publish
+      published = 0
+      if @publish
+        @logger.debug "Publishing #{@new_subjects.count} new subjects..."
+        @new_subjects.each do |subject|
+          if subject.valid_with_full_validation?
+            subject.publish
+            subject.save!
+            published += 1
+          else
+            @logger.warn "WARNING: Publishing failed! Subject ('#{subject.origin}') invalid: #{subject.errors.to_hash.inspect}"
+          end
+        end
+      end
+      published
+    end
+
     def identify_blank_nodes(subject, predicate, object)
       if blank_node?(subject)
         @blank_nodes[subject] ||= []

data/lib/iqvoc/version.rb

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

data/lib/tasks/importer.rake

@@ -13,9 +13,17 @@ namespace :iqvoc do
 
       stdout_logger = Logger.new(STDOUT)
       stdout_logger.level = Logger::INFO
-      Iqvoc::SkosImporter.new(open(URI.parse(ENV['URL']).to_s), URI.parse(ENV['NAMESPACE']).to_s, MultiLogger.new(stdout_logger, Rails.logger))
+
+      publish = if ENV['PUBLISH'].nil? || ENV['PUBLISH'] == "true"
+        true
+      else
+        false
+      end
+
+      importer = Iqvoc::SkosImporter.new(open(URI.parse(ENV['URL']).to_s), URI.parse(ENV['NAMESPACE']).to_s, MultiLogger.new(stdout_logger, Rails.logger), publish)
+      importer.run
     end
 
   end
 
-end
+end

data/lib/tasks/release.rake

@@ -9,7 +9,7 @@ namespace :release do
   task :push => :environment do
     Rake::Task['release:build'].invoke
     system %(git tag `grep VERSION lib/iqvoc/version.rb | sed -e 's/.*= /v/' -e 's/"//g'`)
-    system 'git push --tags'
+    system 'git push origin master --tags'
     system 'gem push iqvoc-*.gem'
   end
 end

data/public/404.html

@@ -2,17 +2,48 @@
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 
@@ -22,5 +53,6 @@
     <h1>The page you were looking for doesn't exist.</h1>
     <p>You may have mistyped the address or the page may have moved.</p>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>

data/public/422.html

@@ -2,17 +2,48 @@
 <html>
 <head>
   <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+  }
+
+  div.dialog {
+    width: 25em;
+    margin: 4em auto 0 auto;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 4em 0 4em;
+  }
+
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+
+  body > p {
+    width: 33em;
+    margin: 0 auto 1em;
+    padding: 1em 0;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow:0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 
@@ -22,5 +53,6 @@
     <h1>The change you wanted was rejected.</h1>
     <p>Maybe you tried to change something you didn't have access to.</p>
   </div>
+  <p>If you are the application owner check the logs for more information.</p>
 </body>
 </html>