iqvoc 4.0.5 → 4.0.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 4.0.6
+
+  * Bugfixes for Triplestore Sync and configuration
+
 ## 4.0.5
 
   * Fixed a bug where triple store sync wouldn't load in engine mode

data/Gemfile.lock

@@ -87,8 +87,7 @@ GEM
     iq_rdf (0.1.8)
       builder
       bundler
-    iq_triplestorage (0.1.2)
-      typhoeus
+    iq_triplestorage (0.1.4)
     jdbc-mysql (5.1.13)
     jdbc-sqlite3 (3.7.2)
     journey (1.0.4)
@@ -182,9 +181,6 @@ GEM
       polyglot (>= 0.3.1)
     turn (0.9.6)
       ansi
-    typhoeus (0.4.2)
-      ffi (~> 1.0)
-      mime-types (~> 1.18)
     tzinfo (0.3.33)
     uglifier (1.3.0)
       execjs (>= 0.3.0)

data/app/controllers/triplestore_sync_controller.rb

@@ -22,6 +22,9 @@ class TriplestoreSyncController < ApplicationController
   def index
     authorize! :use, :dashboard
 
+    flash.now[:info] = [I18n.t("txt.controllers.triplestore_sync.batch_hint",
+        :host => root_url(:lang => nil))]
+
     if Iqvoc.config["triplestore.url"] == Iqvoc.config.defaults["triplestore.url"]
       flash.now[:warning] = I18n.t("txt.controllers.triplestore_sync.config_warning")
     else
@@ -34,7 +37,7 @@ class TriplestoreSyncController < ApplicationController
       elsif username
         target_info = "#{target_info} (as #{username})" # XXX: i18n
       end
-      flash.now[:info] = I18n.t("txt.controllers.triplestore_sync.config_info",
+      flash.now[:info] << I18n.t("txt.controllers.triplestore_sync.config_info",
           :target_info => target_info)
     end
 

data/app/models/collection/base.rb

@@ -151,7 +151,7 @@ class Collection::Base < Concept::Base
   #******** Validation methods
 
   # This only prevent circles of length 2.
-  #   # TODO: This shuold be a real circle detector (but still performant) or be
+  # TODO: This should be a real circle detector (but still performant) or be
   # removed (seems to me like the better idea).
   def circular_subcollections
     Iqvoc::Collection.base_class.by_origin(@member_collection_origins).each do |subcollection|

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

@@ -21,8 +21,10 @@
   <div class="row">
     <div class="<%= content_for?(:sidebar) ? "span9" : "span12" %>" id="content">
       <%= yield :page_header %>
-      <% flash.each do |type, msg| %>
-        <%= alert(type) { msg } %>
+      <% flash.each do |type, messages| %>
+        <% (messages.is_a?(Array) ? messages : [messages]).each do |msg| %>
+          <%= alert(type) { msg } %>
+        <% end %>
       <% end %>
       <%= yield %>
     </div>

data/app/views/pages/help.html.erb

@@ -1,4 +1,4 @@
-<h1>The Structure of Domain Terminologies in iQvoc</h1>
+<%= page_header :title => "The Structure of Domain Terminologies in iQvoc" %>
 
 <p>Domain terminologies are implemented based on the
 <a href="http://www.w3.org/TR/skos-reference/">Simple Knowledge Organisation System</a>

data/config/locales/de.yml

@@ -337,6 +337,7 @@ de:
        error: "Bei der Synchronisierung traten Fehler auf - einige Einträge wurden nicht synchronisiert."
        config_info: "Synchronisierung mit Triplestore: %{target_info}"
        config_warning: "Bisher wurde kein Triplestore konfiguriert."
+       batch_hint: "Für große Datenmengen sollte vom Systemadministrator `rake sync:all[%{host}]` ausgeführt werden."
 
    models:
      label:

data/config/locales/en.yml

@@ -344,6 +344,7 @@ en:
        error: "An error occurred during the synchronization process - some entities have not been synchronized."
        config_info: "Synchronizing with triplestore: %{target_info}"
        config_warning: "Triplestore has not been configured yet."
+       batch_hint: "For a large data sets please advise your sysadmin to execute `rake sync:all[%{host}]`."
 
    models:
      label:

data/config/routes.rb

@@ -28,6 +28,9 @@ Rails.application.routes.draw do
     resources :concepts
     resources :collections
 
+    get "triplestore_sync" => "triplestore_sync#index"
+    post "triplestore_sync" => "triplestore_sync#sync"
+
     match "/" => "frontpage#index"
 
     match "concepts/:origin/branch(.:format)"      => "concepts/versions#branch",    :as => "concept_versions_branch"
@@ -56,9 +59,6 @@ Rails.application.routes.draw do
     get "help" => "pages#help", :as => "help"
 
     root :to => 'frontpage#index', :format => nil
-
-    get "triplestore_sync" => "triplestore_sync#index"
-    post "triplestore_sync" => "triplestore_sync#sync"
   end
 
   match '/scheme(.:format)' => 'rdf#scheme', :as => 'scheme'

data/lib/iqvoc/instance_configuration.rb

@@ -78,7 +78,7 @@ module Iqvoc
       raise UnregisteredSetting unless @defaults.include?(key)
       self.class.validate_value(value)
 
-      json = JSON.dump(value)
+      json = JSON.dump([value])[1..-2] # temporary array wrapper ensures valid JSON text
       if setting = ConfigurationSetting.find_by_key(key)
         setting.update_attributes(:value => json)
       else
@@ -94,11 +94,11 @@ module Iqvoc
 
     # populate settings caches
     # (subsequent updates will happen automatically via the respective setters)
-    def initialize_cache(force=false)
+    def initialize_cache
       # cache customized settings
       db_settings = ConfigurationSetting.all rescue [] # database table might not exist yet (pre-migration)
       db_settings.each do |setting|
-        @records[setting.key] = JSON.load(setting.value)
+        @records[setting.key] = JSON.load("[#{setting.value}]")[0] # temporary array wrapper ensures valid JSON text
       end
 
       # cache current settings

data/lib/iqvoc/rdf_sync.rb

@@ -12,7 +12,7 @@ class Iqvoc::RDFSync
     @target_port = options[:port]
     @username = options[:username]
     @password = options[:password]
-    @batch_size = options[:batch_size]
+    @batch_size = options[:batch_size] || 100
     @view_context = options[:view_context] # XXX: not actually optional
     raise(ArgumentError, "missing view context") unless @view_context # XXX: smell (see above)
   end

data/lib/iqvoc/version.rb

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

data/lib/tasks/sync.rake

@@ -0,0 +1,57 @@
+namespace :sync do
+  task :all, [:host] => :environment do |t, args|
+    require 'iqvoc'
+    require 'iqvoc/rdf_sync'
+
+    if Iqvoc.config["triplestore.url"] == Iqvoc.config.defaults["triplestore.url"] # XXX: duplicates controller
+      puts I18n.t("txt.controllers.triplestore_sync.config_warning")
+      fail
+    end
+
+    ROOT = args[:host]
+    raise(ArgumentError, "host not specified") unless ROOT
+
+    include Rails.application.routes.url_helpers
+    default_url_options[:host] = ROOT
+
+    class FakeController
+      include Iqvoc::RDFSync::Helper
+      delegate :url_helpers, :to => "Rails.application.routes"
+
+      def root_url(*args)
+        ROOT
+      end
+
+      def view_context(*args)
+        default_url_options[:host] = root_url
+        view = FakeView.new(Rails.root.join("app", "views"))
+        view.controller = self
+        return view
+      end
+
+      # delegate URL helpers
+      def method_missing(name, *args, &block)
+        url_helpers.send(name, *args, &block)
+      end
+    end
+
+    class FakeView < ActionView::Base
+      include ApplicationHelper
+
+      attr_accessor :controller
+
+      # delegate URL helpers
+      def method_missing(name, *args, &block)
+        @controller.send(name, *args, &block)
+      end
+    end
+
+    puts I18n.t("txt.controllers.triplestore_sync.config_info",
+        :target_info => Iqvoc.config["triplestore.url"]) + " (host: #{ROOT})"
+    success = FakeController.new.triplestore_syncer.all
+    unless success
+      puts I18n.t("txt.controllers.triplestore_sync.error")
+      fail
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70184502750260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70184502750260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70184502749760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502749760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70184502748860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502748860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70184502748140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502748140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70184502747340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502747340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70184502746420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +103,15 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70184502746420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70184502745460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +119,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502745460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70184502744860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +135,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502744860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70184502743660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +151,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502743660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70184502759300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +167,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502759300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70184502756620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -133,10 +183,15 @@ dependencies:
         version: 3.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70184502756620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: iq_triplestorage
-  requirement: &70184502755280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,7 +199,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70184502755280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -440,6 +500,7 @@ files:
 - lib/tasks/heroku.rake
 - lib/tasks/importer.rake
 - lib/tasks/setup.rake
+- lib/tasks/sync.rake
 - lib/templates/erb/scaffold/_form.html.erb
 - test/factories.rb
 - test/integration/alphabetical_test.rb
@@ -533,7 +594,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: iQvoc