iqvoc 4.1.3 → 4.2.0

data/test/integration_test_helper.rb

@@ -14,34 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require File.join(File.expand_path(File.dirname(__FILE__)), 'test_helper')
 require 'capybara/rails'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'capybara_helper')
+require 'webmock'
 
-module ActionController
-  class IntegrationTest
-    include Capybara::DSL
+WebMock.allow_net_connect! # required for integration tests
 
-    Capybara.javascript_driver = :webkit
-
-    def login(role = nil)
-      logout
-      user(role)
-      visit new_user_session_path(:lang => :de)
-      fill_in "E-Mail", :with => user.email
-      fill_in "Passwort", :with => user.password
-      click_button "Anmelden"
-    end
-
-    def logout
-      visit dashboard_path(:lang => :de)
-      click_link_or_button "Abmelden" if page.has_link?("Abmelden")
-      @user.try(:destroy)
-      @user = nil
-    end
-
-    def user(role = nil)
-      @user ||= FactoryGirl.create(:user, :role => (role || User.default_role))
-    end
-
-  end
-end

data/test/test_helper.rb

@@ -19,5 +19,3 @@ require 'rubygems'
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
-require 'webmock'
-WebMock.allow_net_connect! # required for integration tests

data/test/unit/instance_configuration_test.rb

@@ -16,7 +16,7 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 
-class InstanceConfigurationTest < ActiveSupport::TestCase
+class InstanceConfigurationBrowsingTest < ActiveSupport::TestCase
 
   setup do
     @config = Iqvoc::InstanceConfiguration.instance

data/test/unit/skos_import_test.rb

@@ -210,5 +210,19 @@ class SkosCollectionImportTest < ActiveSupport::TestCase
     assert_not_nil collection_with_subcollections
     assert_not_nil collection_with_subcollections.subcollections.first
   end
+
+  test "empty string import"  do
+    test_data = (<<-DATA
+      <http://www.example.com/water-animal> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Collection> .
+      <http://www.example.com/water-animal> <http://www.w3.org/2008/05/skos#prefLabel> ""@de .
+    DATA
+    ).split("\n")
+
+    assert_nothing_raised do
+    assert_difference('Collection::Base.count', 1) do
+      Iqvoc::SkosImporter.new(test_data, "http://www.example.com/")
+      end
+    end
+  end
 end
 

data/vendor/assets/stylesheets/jquery-ui-1.8.23.custom.css.scss

@@ -56,26 +56,26 @@
 .ui-widget { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande, Lucida Sans, Arial, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd asset-url('ui-bg_inset-hard_100_fcfdfd_1x100.png', image) 50% bottom repeat-x; color: #222222; }
+.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd asset-url('ui-bg_inset-hard_100_fcfdfd_1x100.png') 50% bottom repeat-x; color: #222222; }
 .ui-widget-content a { color: #222222; }
-.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc asset-url('ui-bg_gloss-wave_55_5c9ccc_500x100.png', image) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc asset-url('ui-bg_gloss-wave_55_5c9ccc_500x100.png') 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
 .ui-widget-header a { color: #ffffff; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc asset-url('ui-bg_glass_85_dfeffc_1x400.png', image) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc asset-url('ui-bg_glass_85_dfeffc_1x400.png') 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 asset-url('ui-bg_glass_75_d0e5f5_1x400.png', image) 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 asset-url('ui-bg_glass_75_d0e5f5_1x400.png') 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #1d5987; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 asset-url('ui-bg_inset-hard_100_f5f8f9_1x100.png', image) 50% 50% repeat-x; font-weight: bold; color: #e17009; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 asset-url('ui-bg_inset-hard_100_f5f8f9_1x100.png') 50% 50% repeat-x; font-weight: bold; color: #e17009; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fad42e; background: #fbec88 asset-url('ui-bg_flat_55_fbec88_40x100.png', image) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fad42e; background: #fbec88 asset-url('ui-bg_flat_55_fbec88_40x100.png') 50% 50% repeat-x; color: #363636; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec asset-url('ui-bg_glass_95_fef1ec_1x400.png', image) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec asset-url('ui-bg_glass_95_fef1ec_1x400.png') 50% 50% repeat-x; color: #cd0a0a; }
 .ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
 .ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
@@ -86,14 +86,14 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: asset-url('ui-icons_469bdd_256x240.png', image); }
-.ui-widget-content .ui-icon {background-image: asset-url('ui-icons_469bdd_256x240.png', image); }
-.ui-widget-header .ui-icon {background-image: asset-url('ui-icons_d8e7f3_256x240.png', image); }
-.ui-state-default .ui-icon { background-image: asset-url('ui-icons_6da8d5_256x240.png', image); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: asset-url('ui-icons_217bc0_256x240.png', image); }
-.ui-state-active .ui-icon {background-image: asset-url('ui-icons_f9bd01_256x240.png', image); }
-.ui-state-highlight .ui-icon {background-image: asset-url('ui-icons_2e83ff_256x240.png', image); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: asset-url('ui-icons_cd0a0a_256x240.png', image); }
+.ui-icon { width: 16px; height: 16px; background-image: asset-url('ui-icons_469bdd_256x240.png'); }
+.ui-widget-content .ui-icon {background-image: asset-url('ui-icons_469bdd_256x240.png'); }
+.ui-widget-header .ui-icon {background-image: asset-url('ui-icons_d8e7f3_256x240.png'); }
+.ui-state-default .ui-icon { background-image: asset-url('ui-icons_6da8d5_256x240.png'); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: asset-url('ui-icons_217bc0_256x240.png'); }
+.ui-state-active .ui-icon {background-image: asset-url('ui-icons_f9bd01_256x240.png'); }
+.ui-state-highlight .ui-icon {background-image: asset-url('ui-icons_2e83ff_256x240.png'); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: asset-url('ui-icons_cd0a0a_256x240.png'); }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -283,8 +283,8 @@
 .ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; -khtml-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
 
 /* Overlays */
-.ui-widget-overlay { background: #aaaaaa asset-url('ui-bg_flat_0_aaaaaa_40x100.png', image) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa asset-url('ui-bg_flat_0_aaaaaa_40x100.png', image) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
+.ui-widget-overlay { background: #aaaaaa asset-url('ui-bg_flat_0_aaaaaa_40x100.png') 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa asset-url('ui-bg_flat_0_aaaaaa_40x100.png') 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*!
  * jQuery UI Autocomplete 1.8.23
  *
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
@@ -293,7 +293,7 @@
  *
  * http://docs.jquery.com/UI/Autocomplete#theming
  */
-.ui-autocomplete { position: absolute; cursor: default; }	
+.ui-autocomplete { position: absolute; cursor: default; }
 
 /* workarounds */
 * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
@@ -358,7 +358,7 @@
 .ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
 .ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
 .ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
+.ui-datepicker select.ui-datepicker-month,
 .ui-datepicker select.ui-datepicker-year { width: 49%;}
 .ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
 .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
@@ -402,4 +402,4 @@
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.2.0
 platform: ruby
 authors:
 - Robert Glaser
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -44,16 +44,16 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
@@ -144,16 +144,30 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.5
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.1.3
+- !ruby/object:Gem::Dependency
+  name: iq_triplestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -167,19 +181,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: iq_triplestorage
+  name: protected_attributes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -474,7 +488,6 @@ files:
 - public/500.html
 - public/favicon.ico
 - public/robots.txt
-- lib/debug.rb
 - lib/engine_tasks/db.rake
 - lib/engine_tasks/setup.rake
 - lib/generators/app/template.rb
@@ -505,9 +518,11 @@ files:
 - lib/string.rb
 - lib/tasks/heroku.rake
 - lib/tasks/importer.rake
+- lib/tasks/release.rake
 - lib/tasks/setup.rake
 - lib/tasks/sync.rake
 - lib/templates/erb/scaffold/_form.html.erb
+- test/capybara_helper.rb
 - test/factories.rb
 - test/functional/hierarchy_test.rb
 - test/functional/rdf_test.rb
@@ -517,10 +532,10 @@ files:
 - test/integration/client_augmentation_test.rb
 - test/integration/client_edit_concept_test.rb
 - test/integration/collection_circularity_test.rb
-- test/integration/concept_scheme_test.rb
-- test/integration/concept_test.rb
+- test/integration/concept_browsing_test.rb
+- test/integration/concept_scheme_browsing_test.rb
 - test/integration/edit_concepts_test.rb
-- test/integration/instance_configuration_test.rb
+- test/integration/instance_configuration_browsing_test.rb
 - test/integration/navigation_test.rb
 - test/integration/note_annotations_test.rb
 - test/integration/search_test.rb
@@ -581,7 +596,8 @@ files:
 - vendor/assets/stylesheets/jquery-ui-1.8.23.custom.css.scss
 - vendor/assets/stylesheets/jquery.treeview.css.erb
 homepage: http://github.com/innoq/iqvoc
-licenses: []
+licenses:
+- Apache License 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -599,11 +615,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: iQvoc
 test_files:
+- test/capybara_helper.rb
 - test/factories.rb
 - test/functional/hierarchy_test.rb
 - test/functional/rdf_test.rb
@@ -613,10 +630,10 @@ test_files:
 - test/integration/client_augmentation_test.rb
 - test/integration/client_edit_concept_test.rb
 - test/integration/collection_circularity_test.rb
-- test/integration/concept_scheme_test.rb
-- test/integration/concept_test.rb
+- test/integration/concept_browsing_test.rb
+- test/integration/concept_scheme_browsing_test.rb
 - test/integration/edit_concepts_test.rb
-- test/integration/instance_configuration_test.rb
+- test/integration/instance_configuration_browsing_test.rb
 - test/integration/navigation_test.rb
 - test/integration/note_annotations_test.rb
 - test/integration/search_test.rb

data/lib/debug.rb

@@ -1,40 +0,0 @@
-# encoding: UTF-8
-
-# prints arguments to STDOUT or log depending on context
-# optional block should return an array of values; the resulting output is then
-# wrapped in separator lines
-# the last argument may be an options hash with members :inspect and/or :tag
-#
-# examples:
-#   dbg("IMPORTANT", foo, bar)
-#   dbg { [lipsum] }
-#   dbg(foo, bar, :inspect => false, :tag => false) do |args|
-#      args << lorem
-#      args << ipsum
-#   end
-def dbg(*args, &block)
-  defaults = { :inspect => true, :tag => true }
-  options = args.last.is_a?(Hash) && (defaults.keys & args.last.keys).any?
-  options = defaults.merge(options ? args.pop : {})
-
-  tty = defined?(Rails::Console) || Rails.env.test? # STDOUT is usually available here
-  meth = tty ? method(:puts) : Rails.logger.method(:debug)
-
-  if block
-    meth.call "=" * 80
-    block_args = yield [] # XXX: ideally we'd pass the `dbg` method itself here, but the need for `.call` makes for a weird API
-    block_args << options
-    dbg(*block_args)
-    meth.call "-" * 80
-    return unless args.length > 0
-  end
-
-  prefix = "#{args.shift} " if [String, Symbol].include?(args.first.class) # XXX: undocumented and unexpected
-
-  serializer = options[:inspect] ? :inspect : :to_s
-  msg = args.map(&serializer).join(" | ")
-  msg = "#{prefix}#{msg}"
-  msg = "[DEBUG] #{msg}" if options[:tag]
-
-  meth.call msg
-end