iqvoc 3.5.5 → 3.5.6

data/lib/iqvoc/skos_importer.rb

@@ -136,7 +136,7 @@ module Iqvoc
         end
         e.squish!
         e.gsub!(/^:(.*)$/) do
-          ":#{OriginMapping.merge($1)}" # Force correct origins in the default namespace
+          ":#{Iqvoc::Origin.new($1)}" # Force correct origins in the default namespace
         end
       end
 

data/lib/iqvoc/version.rb

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

data/lib/iqvoc/versioning.rb

@@ -20,53 +20,67 @@ module Iqvoc
     extend ActiveSupport::Concern
 
     included do
-
       # ********* Relations
 
       belongs_to :published_version, :foreign_key => 'published_version_id', :class_name => name
 
       belongs_to :locking_user, :foreign_key => 'locked_by', :class_name => 'User'
+    end
 
+    module ClassMethods
       # ********* Scopes
 
-      scope :by_origin, lambda { |origin|
-        where(:origin => origin)
-      }
-
-      scope :published, lambda {
-        where(arel_table[:published_at].not_eq(nil))
-      }
-      scope :unpublished,  lambda {
-        where(:published_at => nil)
-      }
-      # The following scope returns all objects which should be selectable by the editor
-      scope :editor_selectable, lambda {
-        where(
-          arel_table[:published_at].not_eq(nil).or( # == published (is there a way to OR combine two scopes? `published OR where(...)`)
-            arel_table[:published_at].eq(nil).and(arel_table[:published_version_id].eq(nil)) # this are all unpublished with no published version
-          )
-        )
-      }
-
-      scope :in_edit_mode, lambda {
-        where(arel_table[:locked_by].not_eq(nil))
-      }
-
-      scope :unpublished_or_follow_up, lambda {
-        where(
-          arel_table[:published_at].eq(nil).or(
-            arel_table[:follow_up].not_eq(nil)
-          )
-        )
-      }
-
-      scope :unsynced, lambda {
-        where(:rdf_updated_at => nil)
-      }
-
+      def by_origin(origin)
+         where(:origin => origin)
+       end
+
+       def published
+         where(arel_table[:published_at].not_eq(nil))
+       end
+
+       def unpublished
+         where(:published_at => nil)
+       end
+
+       # The following method returns all objects which should be selectable by the editor
+       def editor_selectable
+         where(
+           arel_table[:published_at].not_eq(nil).or( # == published (is there a way to OR combine two scopes? `published OR where(...)`)
+             arel_table[:published_at].eq(nil).and(arel_table[:published_version_id].eq(nil)) # this are all unpublished with no published version
+           )
+         )
+       end
+
+       def in_edit_mode
+         where(arel_table[:locked_by].not_eq(nil))
+       end
+
+       def unpublished_or_follow_up
+         where(
+           arel_table[:published_at].eq(nil).or(
+             arel_table[:follow_up].not_eq(nil)
+           )
+         )
+       end
+
+       def unsynced
+         where(:rdf_updated_at => nil)
+       end
+
+       def include_to_deep_cloning(*association_names)
+         (@@include_to_deep_cloning ||= {})[self] ||= []
+         association_names.each do |association_name|
+           @@include_to_deep_cloning[self] << association_name
+         end
+       end
+
+       def includes_to_deep_cloning
+         (@@include_to_deep_cloning ||= {})[self] ||= []
+         (@@include_to_deep_cloning.keys & self.ancestors).map{|c| @@include_to_deep_cloning[c]}.flatten.compact
+       end
     end
 
-    # ********* Methods
+    # ********* Instance methods
 
     def branch(user)
       new_version = self.dup(:include => self.class.includes_to_deep_cloning)
@@ -133,21 +147,5 @@ module Iqvoc
       write_attribute(:to_review, true)
     end
 
-    module ClassMethods
-
-      def include_to_deep_cloning(*association_names)
-        (@@include_to_deep_cloning ||= {})[self] ||= []
-        association_names.each do |association_name|
-          @@include_to_deep_cloning[self] << association_name
-        end
-      end
-
-      def includes_to_deep_cloning
-        (@@include_to_deep_cloning ||= {})[self] ||= []
-        (@@include_to_deep_cloning.keys & self.ancestors).map{|c| @@include_to_deep_cloning[c]}.flatten.compact
-      end
-
-    end
-
   end
 end

data/test/integration/concept_scheme_test.rb

@@ -24,14 +24,14 @@ class ConceptSchemeTest < ActionDispatch::IntegrationTest
 
   test "list top concepts in rdf scheme" do
     visit "/scheme.ttl"
-    
+
     assert page.has_content? ":scheme a skos:ConceptScheme"
     assert page.has_content? "skos:hasTopConcept :#{@concept.origin}"
   end
-  
+
   test "top terms rdf" do
     visit "/#{@concept.origin}.ttl"
-    
+
     assert page.has_content? "skos:topConceptOf :scheme"
   end
 

data/test/integration/tree_test.rb

@@ -23,9 +23,9 @@ class TreeTest < ActionDispatch::IntegrationTest
     narrower_concept = concept.narrower_relations.first.target
 
     visit hierarchical_concepts_path(:lang => :de, :format => :html)
-    assert page.has_link?(concept.pref_label.to_s), 
+    assert page.has_link?(concept.pref_label.to_s),
       "Concept #{concept.pref_label} isn't visible in the hierarchical concepts list"
-    assert !page.has_content?(narrower_concept.pref_label.to_s), 
+    assert !page.has_content?(narrower_concept.pref_label.to_s),
       "Narrower relation (#{narrower_concept.pref_label}) shouldn't be visible in the hierarchical concepts list"
   end
 

data/test/integration_test_helper.rb

@@ -16,6 +16,8 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_helper')
 require 'capybara/rails'
+require 'test/unit/failure'
+require 'test/unit/error'
 require 'fileutils'
 
 module ActionController
@@ -51,12 +53,36 @@ module ActionController
     def create_snapshot
       filename = "#{self.class.name.underscore}_#{method_name}.html"
       filepath = File.join(CAPYBARA_SNAPSHOTS_DIR, filename)
-      if File.writable?(filepath)
-        File.open(filepath, "w") do |f|
-          f.write page.body
-        end
+      File.open(filepath, "w") do |f|
+        f.write page.body
       end
     end
 
   end
 end
+
+module Test
+  module Unit
+
+    module FailureHandler
+
+      def add_failure_with_snapshot(*args)
+        create_snapshot
+        add_failure_without_snapshot(*args)
+      end
+      alias_method_chain :add_failure, :snapshot
+
+    end
+
+    module ErrorHandler
+
+      def add_error_with_snapshot(*args)
+        create_snapshot
+        add_error_without_snapshot(*args)
+      end
+      alias_method_chain :add_error, :snapshot
+
+    end
+
+  end
+end

data/test/unit/hygiene_test.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+
+class HygieneTest < ActiveSupport::TestCase
+
+  test "trailing whitespace" do
+    begin
+      assert_no_occurrence '[[:blank:]]$', "trailing whitespace"
+    rescue Test::Unit::AssertionFailedError => exc
+      warn "[WARNING] #{exc}"
+    end
+  end
+
+  test "mixed whitespace" do
+    tab = "	"
+    space = " "
+    assert_no_occurrence "#{space}#{tab}\|#{tab}#{space}", "mixed whitespace", true
+  end
+
+  def assert_no_occurrence(pattern, error_message, extended=false)
+    extra_options = extended ? "E" : ""
+    lines = `git grep -In#{extra_options} '#{pattern}' | grep -v '^vendor/'`
+    assert_not_equal 0, $?.to_i, "#{error_message}:\n#{lines}"
+  end
+
+end

data/test/unit/origin_test.rb

@@ -0,0 +1,75 @@
+# 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 File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class FoobarStripper < Iqvoc::Origin::Filters::GenericFilter
+  def call(obj, str)
+    str = str.gsub("foobar", "")
+    run(obj, str)
+  end
+end
+
+class OriginTest < ActiveSupport::TestCase
+
+  def test_should_replace_umlauts
+    assert_equal "AeaeUeueOeoess", Iqvoc::Origin.new("ÄäÜüÖöß").to_s
+  end
+
+  def test_should_camalize_string
+    assert_equal "AWeighting", Iqvoc::Origin.new("'A' Weighting").to_s
+  end
+
+  def test_should_handle_numbers_at_the_beginning
+    assert_equal "_123", Iqvoc::Origin.new("123").to_s
+  end
+
+  def test_should_handle_whitespaces_at_strange_positions
+    assert_equal "test12", Iqvoc::Origin.new("test 12 ").to_s
+  end
+
+  def test_should_preserve_underlines
+    assert_equal "_test", Iqvoc::Origin.new("_test").to_s
+    assert_equal "a_Test", Iqvoc::Origin.new("a_Test").to_s
+  end
+
+  def test_should_preserve_case
+    assert_equal "test", Iqvoc::Origin.new("test").to_s
+    assert_equal "Test", Iqvoc::Origin.new("Test").to_s
+    assert_equal "_5test", Iqvoc::Origin.new("5test").to_s
+    assert_equal "_5Test", Iqvoc::Origin.new("5Test").to_s
+  end
+
+  def test_should_replace_brackets
+    assert_equal "--Energie-Ressource", Iqvoc::Origin.new("[Energie/Ressource]").to_s
+  end
+
+  def test_should_replace_comma
+    assert_equal "-", Iqvoc::Origin.new(",").to_s
+  end
+
+  def test_should_merge_all_together
+    assert_equal "--Energie-Ressource", Iqvoc::Origin.new("[Energie - Ressource]").to_s
+    assert_equal "--Hydrosphaere-WasserUndGewaesser", Iqvoc::Origin.new("[Hydrosphäre - Wasser und Gewässer]").to_s
+  end
+  
+  def test_register_custom_filter
+    Iqvoc::Origin::Filters.register(:strip_foobars, FoobarStripper)
+    assert_equal "trololo_", Iqvoc::Origin.new("trololo_foobar").strip_foobars.to_s
+    assert_equal "trololo_", Iqvoc::Origin.new("trololo_foobar").to_s
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 3.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70225955354300 !ruby/object:Gem::Requirement
+  requirement: &70105304325980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70225955354300
+  version_requirements: *70105304325980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70225955352820 !ruby/object:Gem::Requirement
+  requirement: &70105304325580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225955352820
+  version_requirements: *70105304325580
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70225955349560 !ruby/object:Gem::Requirement
+  requirement: &70105304325060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225955349560
+  version_requirements: *70105304325060
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70225955347600 !ruby/object:Gem::Requirement
+  requirement: &70105304324600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225955347600
+  version_requirements: *70105304324600
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70225955344200 !ruby/object:Gem::Requirement
+  requirement: &70105304324180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225955344200
+  version_requirements: *70105304324180
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70225955341860 !ruby/object:Gem::Requirement
+  requirement: &70105304323680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70225955341860
+  version_requirements: *70105304323680
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70225955340160 !ruby/object:Gem::Requirement
+  requirement: &70105304323240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225955340160
+  version_requirements: *70105304323240
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &70225955338400 !ruby/object:Gem::Requirement
+  requirement: &70105304322720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225955338400
+  version_requirements: *70105304322720
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70225955337300 !ruby/object:Gem::Requirement
+  requirement: &70105304322280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225955337300
+  version_requirements: *70105304322280
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -237,7 +237,6 @@ files:
 - app/models/note/skos/example.rb
 - app/models/note/skos/history_note.rb
 - app/models/note/skos/scope_note.rb
-- app/models/origin_mapping.rb
 - app/models/rdf_store.rb
 - app/models/search_extension.rb
 - app/models/user.rb
@@ -317,7 +316,6 @@ files:
 - config/database.yml
 - config/database.yml.mysql
 - config/database.yml.sqlite
-- config/deploy.rb
 - config/engine.rb
 - config/environment.rb
 - config/environments/development.rb
@@ -388,12 +386,13 @@ files:
 - lib/iqvoc/environments/production.rb
 - lib/iqvoc/environments/test.rb
 - lib/iqvoc/instance_configuration.rb
+- lib/iqvoc/maker.rb
+- lib/iqvoc/origin.rb
 - lib/iqvoc/rdf_helper.rb
 - lib/iqvoc/skos_importer.rb
 - lib/iqvoc/version.rb
 - lib/iqvoc/versioning.rb
 - lib/iqvoc.rb
-- lib/maker.rb
 - lib/ojdbc14.jar
 - lib/string.rb
 - lib/tasks/heroku.rake
@@ -419,9 +418,10 @@ files:
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/unit/concept_test.rb
+- test/unit/hygiene_test.rb
 - test/unit/instance_configuration_test.rb
 - test/unit/note_test.rb
-- test/unit/origin_mapping_test.rb
+- test/unit/origin_test.rb
 - test/unit/skos_import_test.rb
 - vendor/assets/images/ajax-loader.gif
 - vendor/assets/images/file.gif
@@ -489,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: iQvoc
@@ -514,7 +514,8 @@ test_files:
 - test/performance/browsing_test.rb
 - test/test_helper.rb
 - test/unit/concept_test.rb
+- test/unit/hygiene_test.rb
 - test/unit/instance_configuration_test.rb
 - test/unit/note_test.rb
-- test/unit/origin_mapping_test.rb
+- test/unit/origin_test.rb
 - test/unit/skos_import_test.rb