iqvoc 3.3.3 → 3.3.4

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.3.4 (2012-01-16)
+
+ * Import SKOS files via the web frontend
+ * Bugfixes
+
 ## 3.3.3 (2012-01-13)
 
  * Several asset pipeline related fixes

data/Gemfile

@@ -23,6 +23,7 @@ gem 'rails', '3.1.3'
 
 group :assets do
   gem 'uglifier'
+  gem 'therubyracer'
 end
 
 gem 'kaminari'

data/Gemfile.lock

@@ -85,6 +85,7 @@ GEM
       railties (>= 3.0.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
+    libv8 (3.3.10.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -147,6 +148,8 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
     term-ansicolor (1.0.7)
+    therubyracer (0.9.9)
+      libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -189,5 +192,6 @@ DEPENDENCIES
   rails_autolink
   rvm
   sqlite3
+  therubyracer
   turn
   uglifier

data/README.md

@@ -35,6 +35,7 @@ bundle exec rake heroku:config
 git push heroku master
 heroku rake db:migrate
 heroku rake db:seed
+heroku restart
 ```
 
 `heroku open` opens your app in the browser.

data/app/controllers/import_controller.rb

@@ -0,0 +1,39 @@
+# 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.
+
+require 'iqvoc/skos_importer'
+
+class ImportController < ApplicationController
+
+  before_filter do
+    authorize! :import, Concept::Base
+  end
+
+  def index
+  end
+
+  def import
+    content = params[:ntriples_file] && params[:ntriples_file].read
+    strio = StringIO.new
+    begin
+      Iqvoc::SkosImporter.new(content.to_s.split("\n"), params[:default_namespace], Logger.new(strio))
+      @messages = strio.string
+    rescue Exception => e
+      @messages = e.to_s + "\n\n" + e.backtrace.join("\n")
+    end
+  end
+
+end

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

@@ -88,7 +88,6 @@ class Labeling::SKOS::Base < Labeling::Base
     lang = $3
     value = JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
 
-
     subject.send(self.name.to_relation_name) << self.new(:target => self.label_class.new(:value => value, :language => lang))
   end
 

data/app/views/dashboard/index.html.erb

@@ -11,6 +11,9 @@
       <%= link_to("RDF/XML", concepts_url(:format => :rdf)) %>
     </li>
   <%- end -%>
+  <%- if can?(:import, Concept::Base) -%>
+    <li><%= link_to(t('txt.views.dashboard.import') , import_url) %></li>
+  <%- end -%>
 <%#= link_to "Triple Store Sync", new_triple_store_sync_path %>
 </ul>
 <table>

data/app/views/import/import.html.erb

@@ -0,0 +1,4 @@
+<h2>Import</h2>
+
+<h4>Output</h4>
+<pre><%= @messages %></pre>

data/app/views/import/index.html.erb

@@ -0,0 +1,23 @@
+<h2>Import</h2>
+
+<%= form_tag import_url, :method => :post, :multipart => true , :class => "form" do %>
+  <fieldset>
+    <ol>
+
+      <li>
+        <%= label_tag "ntriples_file", "NTriples File: " %>
+        <%= file_field_tag 'ntriples_file'  %>
+      </li>
+
+      <li>
+        <%= label_tag "default_namespace", "Default namespace: " %>
+        <%= text_field_tag 'default_namespace', root_url(:format => nil, :lang => nil, :trailing_slash => true).gsub(/\/\/$/, "/")  %>
+      </li>
+
+      <li>
+        <%= submit_tag "Start" %>
+      </li>
+
+    </ol>
+  </fieldset>
+<% end %>

data/config/deploy.rb

@@ -69,4 +69,4 @@ namespace :deploy do
   end
 end
 
-after 'deploy:update_code', 'deploy:symlink_shared'
+after 'deploy:update_code', 'deploy:symlink_shared', 'assets:precompile'

data/config/locales/de.yml

@@ -221,6 +221,7 @@ de:
        inconsistent: "inkonsistent"
        state: "Status"
        full_rdf_export: Vollständiger RDF Export
+       import: Import
      collections:
        new: "Neue Kollektion"
 

data/config/locales/en.yml

@@ -229,6 +229,7 @@ en:
        inconsistent: "inconsistent"
        state: "State"
        full_rdf_export: Complete RDF export
+       import: Import
      collections:
        new: "New collection"
 

data/config/routes.rb

@@ -44,6 +44,9 @@ Rails.application.routes.draw do
     match 'about(.:format)'     => 'pages#about',          :as => 'about'
     match 'dashboard(.:format)' => 'dashboard#index',      :as => 'dashboard'
 
+    get "import" => "import#index", :as => 'import'
+    post "import" => "import#import"
+
     match 'search(.:format)' => 'search_results#index', :as => 'search'
 
     root :to => 'concepts/hierarchical#index', :format => nil

data/iqvoc.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'iq_rdf', '~> 0.1.0'
   s.add_dependency 'json'
   s.add_dependency 'rails_autolink'
-  
 
   s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) + 
     Dir.glob("{app,config,db,public,lib,test,vendor}/**/*")

data/lib/engine_tasks/db.rake

@@ -35,7 +35,7 @@ namespace :iqvoc do
       }
 
       engines.select{|e| e.engine_name !~ /^iqvoc_/}.each do |engine|
-        puts "There is a non-iQvoc engine (#{engine.engine_name}) having seeds. These seeds are not necessarily idemprotent."
+        puts "There is a non-iQvoc engine (#{engine.engine_name}) having seeds. These seeds are not necessarily idempotent."
         puts "Do you with to (c)ontinue, (i)gnore it or (a)bort?"
         input = nil
         while input !~ /^[cia]$/

data/lib/engine_tasks/setup.rake

@@ -0,0 +1,9 @@
+namespace :iqvoc do
+  namespace :setup do
+    task :generate_secret_token do
+      require 'iqvoc'
+
+      Iqvoc.generate_secret_token
+    end
+  end
+end

data/lib/iqvoc.rb

@@ -34,12 +34,15 @@ module Iqvoc
     :core_assets
 
   self.title = "iQvoc"
-  
+
   self.core_assets = %w(
     manifest.css
     manifest.js
     blueprint/ie.css
     iqvoc/ie_fixes.css
+    excanvas.js
+    jit_rgraph.js
+    iqvoc/visualization.js
   )
 
   self.searchable_class_names = [
@@ -84,6 +87,25 @@ module Iqvoc
     ability_class_name.constantize
   end
 
+  def self.generate_secret_token
+    require 'securerandom'
+
+    template = Rails.root.join("config", "initializers", "secret_token.rb.template")
+    raise "File not found: #{template}" unless File.exist?(template)
+
+    file_name = "config/initializers/secret_token.rb"
+
+    token = SecureRandom.hex(64)
+    txt = File.read(template)
+    txt.gsub!("S-E-C-R-E-T", token)
+
+    File.open(file_name, "w") do |f|
+      f.write txt
+    end
+
+    puts "Secret token configuration has been created in #{file_name}."
+  end
+
   # ************** Concept specific settings **************
 
   module Concept

data/lib/iqvoc/ability.rb

@@ -34,6 +34,7 @@ module Iqvoc
           can :manage, User
 
           can :full_export, ::Concept::Base
+          can :import, ::Concept::Base
         end
       
       end

data/lib/iqvoc/skos_importer.rb

@@ -7,7 +7,10 @@ module Iqvoc
       Iqvoc::Concept.relation_classes +
       Iqvoc::Concept.match_classes
 
-    def initialize(file, default_namespace_url)
+    def initialize(file, default_namespace_url, logger = Rails.logger)
+
+      @logger = logger
+
       unless file.is_a?(File) || file.is_a?(Array)
         raise "Iqvoc::SkosImporter#import: Parameter 'file' should be a File or an Array."
       end
@@ -62,7 +65,7 @@ module Iqvoc
           subject.publish
           subject.save!
         else
-          Rails.logger.warn "WARNING: Subject not valid: '#{subject.origin}'. Won't be published automatically.."
+          @logger.warn "WARNING: Subject not valid: '#{subject.origin}'. Won't be published automatically.."
         end
       end
 
@@ -75,9 +78,9 @@ module Iqvoc
 
         if (@existing_origins[origin])
           if (types[object] == @existing_origins[origin])
-            Rails.logger.info "Iqvoc::SkosImporter: Subject with origin '#{origin}' already exists. Skipping duplicate creation (should be no problem)."
+            @logger.info "Iqvoc::SkosImporter: Subject with origin '#{origin}' already exists. Skipping duplicate creation (should be no problem)."
           else
-            Rails.logger.warn "Iqvoc::SkosImporter: Subject with origin '#{origin} already exists but has another class (#{@existing_origins[origin]}) then the one I wanted to create (#{types[object]}). You seem to have a problem with your configuration!"
+            @logger.warn "Iqvoc::SkosImporter: Subject with origin '#{origin} already exists but has another class (#{@existing_origins[origin]}) then the one I wanted to create (#{types[object]}). You seem to have a problem with your configuration!"
           end
         else
           @seen_first_level_objects[origin] = types[object].create!(:origin => origin)
@@ -92,7 +95,7 @@ module Iqvoc
       subject_origin = $1
       subject = load_first_level_object(subject_origin)
       unless subject
-        Rails.logger.warn "Iqvoc::SkosImporter: Couldn't find Subject with origin '#{subject_origin}. Skipping entry '#{subject} #{predicate} #{object}.'"
+        @logger.warn "Iqvoc::SkosImporter: Couldn't find Subject with origin '#{subject_origin}. Skipping entry '#{subject} #{predicate} #{object}.'"
         return
       end
 
@@ -101,7 +104,7 @@ module Iqvoc
         object_origin = $1
         object = load_first_level_object(object_origin)
         unless object
-          Rails.logger.warn "Iqvoc::SkosImporter: Couldn't find Object with origin '#{object_origin}. Skipping entry ':#{subject_origin} #{predicate} #{object}.'"
+          @logger.warn "Iqvoc::SkosImporter: Couldn't find Object with origin '#{object_origin}. Skipping entry ':#{subject_origin} #{predicate} #{object}.'"
           return
         end
       end

data/lib/iqvoc/version.rb

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

data/lib/iqvoc/versioning.rb

@@ -60,7 +60,9 @@ module Iqvoc
         )
       }
 
-      scope :unsynced, where(:rdf_updated_at => nil)
+      scope :unsynced, lambda {
+        where(:rdf_updated_at => nil)
+      }
 
     end
 

data/lib/tasks/setup.rake

@@ -1,20 +1,7 @@
 namespace :setup do
   task :generate_secret_token do
-    require 'securerandom'
-    
-    template = Rails.root.join("config", "initializers", "secret_token.rb.template")
-    raise "File not found: #{template}" unless File.exist?(template)
+    require 'iqvoc'
 
-    file_name = "config/initializers/secret_token.rb"
-
-    token = SecureRandom.hex(64)
-    txt = File.read(template)
-    txt.gsub!("S-E-C-R-E-T", token)
-
-    File.open(file_name, "w") do |f|
-      f.write txt
-    end
-    
-    puts "Secret token configuration has been created in #{file_name}."
+    Iqvoc.generate_secret_token
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70173094141340 !ruby/object:Gem::Requirement
+  requirement: &70224561742940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70173094141340
+  version_requirements: *70224561742940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70173094140940 !ruby/object:Gem::Requirement
+  requirement: &70224561742540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173094140940
+  version_requirements: *70224561742540
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70173094140480 !ruby/object:Gem::Requirement
+  requirement: &70224561742080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173094140480
+  version_requirements: *70224561742080
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70173094140060 !ruby/object:Gem::Requirement
+  requirement: &70224561741660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173094140060
+  version_requirements: *70224561741660
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70173094139640 !ruby/object:Gem::Requirement
+  requirement: &70224561741240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173094139640
+  version_requirements: *70224561741240
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70173094139140 !ruby/object:Gem::Requirement
+  requirement: &70224561740740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70173094139140
+  version_requirements: *70224561740740
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70173094138720 !ruby/object:Gem::Requirement
+  requirement: &70224561740320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173094138720
+  version_requirements: *70224561740320
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70173094138260 !ruby/object:Gem::Requirement
+  requirement: &70224561739860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173094138260
+  version_requirements: *70224561739860
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -172,6 +172,7 @@ files:
 - app/controllers/concepts/versions_controller.rb
 - app/controllers/concepts_controller.rb
 - app/controllers/dashboard_controller.rb
+- app/controllers/import_controller.rb
 - app/controllers/pages_controller.rb
 - app/controllers/rdf_controller.rb
 - app/controllers/search_results_controller.rb
@@ -252,6 +253,8 @@ files:
 - app/views/errors/access_denied.html.erb
 - app/views/errors/multiple_choices.html.erb
 - app/views/errors/not_found.html.erb
+- app/views/import/import.html.erb
+- app/views/import/index.html.erb
 - app/views/kaminari/_page.html.erb
 - app/views/kaminari/_paginator.html.erb
 - app/views/layouts/_controls.html.erb
@@ -533,6 +536,7 @@ files:
 - public/robots.txt
 - public/stylesheets/iqvoc/ie_fixes.css
 - lib/engine_tasks/db.rake
+- lib/engine_tasks/setup.rake
 - lib/iqvoc/ability.rb
 - lib/iqvoc/data_helper.rb
 - lib/iqvoc/deep_cloning.rb