iqvoc_skosxl 1.2.2 → 1.2.3

data/Gemfile

@@ -23,6 +23,7 @@ group :development, :test do
 end
 
 group :test do
+  gem 'test-unit'
   gem 'nokogiri', '~> 1.5.0'
   gem 'capybara'
   gem 'database_cleaner'

data/Gemfile.lock

@@ -136,6 +136,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
+    test-unit (2.4.7)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
@@ -165,4 +166,5 @@ DEPENDENCIES
   nokogiri (~> 1.5.0)
   rails (= 3.2.1)
   sqlite3
+  test-unit
   uglifier (>= 1.0.3)

data/app/controllers/labels_controller.rb

@@ -59,7 +59,6 @@ class LabelsController < ApplicationController
   def create
     authorize! :create, Iqvoc::XLLabel.base_class
     @label = Iqvoc::XLLabel.base_class.new(params[:label])
-    @label.origin = OriginMapping.merge(@label.value)
     if @label.valid?
       if @label.save
         flash[:notice] = I18n.t("txt.controllers.versioned_label.success")
@@ -85,11 +84,11 @@ class LabelsController < ApplicationController
 
     # @pref_labelings = PrefLabeling.by_label(@label).all(:include => {:owner => :pref_labels}).sort
     # @alt_labelings = AltLabeling.by_label(@label).all(:include => {:owner => :pref_labels}).sort
-    
+
     if params[:full_consistency_check]
       @label.valid_with_full_validation?
     end
-    
+
     Iqvoc::XLLabel.note_class_names.each do |note_class_name|
       @label.send(note_class_name.to_relation_name).build if @label.send(note_class_name.to_relation_name).empty?
     end

data/app/models/concept/skosxl/extension.rb

@@ -36,7 +36,7 @@ module Concept
           self.send(relation_name).by_label_language(language).
               map { |l| l.target.origin }.join(Iqvoc::InlineDataHelper::Joiner)
       end
-      
+
       def valid_label_language
         (@labelings_by_id || {}).each { |labeling_class_name, origin_mappings|
           origin_mappings.each { |language, new_origins|

data/app/models/label/relation/base.rb

@@ -12,17 +12,17 @@ class Label::Relation::Base < ActiveRecord::Base
   def self.by_domain(domain)
     where(:domain_id => domain)
   end
-  
+
   def self.by_range(range)
     where(:range_id => range)
   end
-  
+
   def self.by_range_origin(origin)
     includes(:range).merge(Label::Base.by_origin(origin))
   end
-  
+
   def self.range_editor_selectable
-    # includes(:range) & Iqvoc::XLLabel.base_class.editor_selectable 
+    # includes(:range) & Iqvoc::XLLabel.base_class.editor_selectable
     # Doesn't work correctly (kills label_relations.type condition :-( )
     includes(:range).
     where("labels.published_at IS NOT NULL OR (labels.published_at IS NULL AND labels.published_version_id IS NULL) ")

data/app/models/label/skosxl/base.rb

@@ -8,17 +8,23 @@ class Label::SKOSXL::Base < Label::Base
   self.rdf_namespace = "skosxl"
   self.rdf_class = "Label"
 
+  attr_protected :origin
+
   # ********** Validations
 
   validate :two_versions_exist, :on => :create
   validate :origin_has_to_be_escaped
 
   # ********** Hooks
-  
+
   after_initialize do
     @full_validation = false
   end
 
+  before_validation do |label|
+    label.origin = Iqvoc::Origin.new("#{value}-#{language}").to_s if label.origin.blank?
+  end
+
   after_save do |label|
     # Handle save or destruction of inline relations for use with widgets
     (@inline_assigned_relations ||= {}).each do |relation_class_name, origins|
@@ -96,7 +102,7 @@ class Label::SKOSXL::Base < Label::Base
   def self.with_associations
     includes(:labelings => :owner)
   end
-  
+
   def self.for_dashboard
     unpublished_or_follow_up.includes(:locking_user)
   end
@@ -206,7 +212,7 @@ class Label::SKOSXL::Base < Label::Base
   # Validations
 
   def origin_has_to_be_escaped
-    if origin != OriginMapping.merge(origin)
+    if origin != Iqvoc::Origin.new(origin).to_s
       errors.add :origin, I18n.t("txt.models.label.origin_invalid")
     end
   end

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

@@ -7,11 +7,11 @@ class Labeling::SKOSXL::Base < Labeling::Base
   def self.by_label_origin(origin)
     includes(:target).merge(self.label_class.by_origin(origin))
   end
-  
+
   def self.by_label_language(language)
     includes(:target).merge(self.label_class.by_language(language))
   end
-  
+
   def self.label_editor_selectable
     includes(:target).merge(self.label_class.editor_selectable)
   end
@@ -66,7 +66,7 @@ class Labeling::SKOSXL::Base < Labeling::Base
   def self.edit_partial_name(obj)
     "partials/labeling/skosxl/edit_base"
   end
-  
+
   # def by_label_language(language)
   #   includes(:target).merge(self.label_class.by_language(language))
   # end

data/config/application.rb

@@ -46,7 +46,7 @@ module Iqvoc::SKOSXL
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password, :password_confirmation]
-    
+
     # Enable the asset pipeline
     config.assets.enabled = true
 

data/config/initializers/iqvoc.rb

@@ -1,4 +1,6 @@
-# Search
+silence_warnings do
+  Iqvoc::Label = nil
+end
 
 Iqvoc.searchable_class_names = ['Labeling::SKOSXL::Base'] +
     Iqvoc::Concept.labeling_class_names.keys + Iqvoc::Concept.note_class_names

data/config/locales/activerecord.de.yml

@@ -1,10 +1,10 @@
 de:
   activerecord:
     models:
-      label/skosxl/base: 
+      label/skosxl/base:
         one: XL-Label
         other: XL-Labels
-      label/skosxl/relation/base: 
+      label/skosxl/relation/base:
         one: Label-Relation
         other: Label-Relationen
       labeling/skosxl/base:

data/config/locales/activerecord.en.yml

@@ -1,10 +1,10 @@
 en:
   activerecord:
     models:
-      label/skosxl/base: 
+      label/skosxl/base:
         one: XL Label
         other: XL Labels
-      label/skosxl/relation/base: 
+      label/skosxl/relation/base:
         one: Label Relation
         other: Label Relations
       labeling/skosxl/base:

data/config/locales/de.yml

@@ -2,4 +2,4 @@ de:
   txt:
     models:
       label:
-        origin_invalid: "enthält ungültige Zeichen."
+        origin_invalid: enthält ungültige Zeichen.

data/config/locales/en.yml

@@ -2,4 +2,4 @@ en:
   txt:
     models:
       label:
-        origin_invalid: "Origin contains invalid characters."
+        origin_invalid: Origin contains invalid characters.

data/lib/iqvoc/skosxl/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SKOSXL
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
   end
 end

data/test/factories.rb

@@ -1,7 +1,6 @@
 FactoryGirl.define do
 
   factory :xllabel, :class => Iqvoc::XLLabel.base_class do |l|
-    l.origin 'Forest'
     l.language 'en'
     l.value 'Forest'
     l.published_at 3.days.ago

data/test/unit/hygiene_test.rb

@@ -0,0 +1,4 @@
+# encoding: UTF-8
+
+require Iqvoc::Engine.find_root_with_flag("app").join("test").join("unit").
+    join("hygiene_test")

data/test/unit/label_test.rb

@@ -4,26 +4,37 @@ require 'test_helper'
 
 class LabelTest < ActiveSupport::TestCase
 
-  def setup
+  setup do
     @current_label = FactoryGirl.create(:xllabel_with_association)
     @user = FactoryGirl.create(:user)
   end
 
-  def test_should_not_create_more_than_two_versions_of_a_label
+  test "should not create two similar labels" do
     first_new_label = Label::SKOSXL::Base.new(@current_label.attributes)
     second_new_label = Label::SKOSXL::Base.new(@current_label.attributes)
     assert first_new_label.save
-    assert_equal second_new_label.save, false
+    assert_equal false, second_new_label.save
   end
 
-  def test_should_validate_origin_for_escaping
+  test "language interpolation for label origin" do
+    assert_equal "Forest-en", @current_label.origin
+  end
+
+  test "should create two labels with equal values but different languages" do
+    l1 = FactoryGirl.create(:xllabel, :language => "de")
+    l2 = FactoryGirl.build(:xllabel, :language => "en")
+    assert_equal true, l2.save
+    assert_equal "Forest-en", l2.origin
+  end
+
+  test "should validate origin for escaping" do
     label = FactoryGirl.build(:xllabel)
     assert label.valid_with_full_validation?
 
     label.origin = "FoÖ/Bär"
     assert label.invalid_with_full_validation?
 
-    label.origin = OriginMapping.merge("FoÖ/Bär")
+    label.origin = Iqvoc::Origin.new("FoÖ/Bär").to_s
     assert label.valid_with_full_validation?
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_skosxl
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70170522496760 !ruby/object:Gem::Requirement
+  requirement: &70213534282900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70170522496760
+  version_requirements: *70213534282900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70170522496340 !ruby/object:Gem::Requirement
+  requirement: &70213534297700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70170522496340
+  version_requirements: *70213534297700
 description: ''
 email:
 - till.schulte-coerne@innoq.com
@@ -119,6 +119,7 @@ files:
 - test/integration/labels_order_test.rb
 - test/integration_test_helper.rb
 - test/test_helper.rb
+- test/unit/hygiene_test.rb
 - test/unit/label_test.rb
 homepage: http://innoq.com
 licenses: []
@@ -152,4 +153,5 @@ test_files:
 - test/integration/labels_order_test.rb
 - test/integration_test_helper.rb
 - test/test_helper.rb
+- test/unit/hygiene_test.rb
 - test/unit/label_test.rb