iqvoc_inflectionals 1.1.1 → 1.1.3

data/Gemfile

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.2.1'
-gem 'iqvoc', '~> 3.5.1'
-gem 'iqvoc_skosxl', '~> 1.2.0'
+gem 'rails',        '~> 3.2.1'
+gem 'iqvoc',        '~> 3.5.1'#, :path => '../iqvoc'
+gem 'iqvoc_skosxl', '~> 1.2.0'#, :path => '../iqvoc_skosxl'
 
 group :development, :test do
   gem 'sqlite3'
@@ -10,6 +10,6 @@ end
 
 group :test do
   gem 'test-unit'
-  gem 'spork', '~> 0.9.0.rc' # v0.9 required for spork-testunit
+  gem 'spork'
   gem 'spork-testunit'
 end

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.1)
-      actionpack (= 3.2.1)
+    actionmailer (3.2.2)
+      actionpack (= 3.2.2)
       mail (~> 2.4.0)
-    actionpack (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
+    actionpack (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
@@ -14,77 +14,79 @@ GEM
       rack-cache (~> 1.1)
       rack-test (~> 0.6.1)
       sprockets (~> 2.1.2)
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-    activesupport (3.2.1)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    arel (3.0.2)
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
     builder (3.0.0)
     cancan (1.6.7)
     erubis (2.7.0)
+    fastercsv (1.5.4)
     hike (1.2.1)
     i18n (0.6.0)
-    iq_rdf (0.1.2)
+    iq_rdf (0.1.5)
       builder
       bundler
-    iqvoc (3.5.1)
+    iqvoc (3.5.6)
       authlogic
       bundler
       cancan
+      fastercsv
       iq_rdf (~> 0.1.2)
       json
       kaminari
       rails (~> 3.2.1)
       rails_autolink
-    iqvoc_skosxl (1.2.0)
+    iqvoc_skosxl (1.2.3)
       bundler
       iqvoc (~> 3.5.1)
-    journey (1.0.1)
+    journey (1.0.3)
     json (1.6.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    mail (2.4.1)
+    mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.4)
+    multi_json (1.1.0)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.1)
-      actionmailer (= 3.2.1)
-      actionpack (= 3.2.1)
-      activerecord (= 3.2.1)
-      activeresource (= 3.2.1)
-      activesupport (= 3.2.1)
+    rails (3.2.2)
+      actionmailer (= 3.2.2)
+      actionpack (= 3.2.2)
+      activerecord (= 3.2.2)
+      activeresource (= 3.2.2)
+      activesupport (= 3.2.2)
       bundler (~> 1.0)
-      railties (= 3.2.1)
+      railties (= 3.2.2)
     rails_autolink (1.0.5)
       rails (~> 3.1)
-    railties (3.2.1)
-      actionpack (= 3.2.1)
-      activesupport (= 3.2.1)
+    railties (3.2.2)
+      actionpack (= 3.2.2)
+      activesupport (= 3.2.2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -93,20 +95,20 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     spork (0.9.0)
-    spork-testunit (0.0.7)
+    spork-testunit (0.0.8)
       spork (>= 0.6.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
-    test-unit (2.4.5)
+    test-unit (2.4.8)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby
@@ -115,7 +117,7 @@ DEPENDENCIES
   iqvoc (~> 3.5.1)
   iqvoc_skosxl (~> 1.2.0)
   rails (~> 3.2.1)
-  spork (~> 0.9.0.rc)
+  spork
   spork-testunit
   sqlite3
   test-unit

data/app/views/partials/inflectional/_base.html.erb

@@ -11,11 +11,7 @@
     <p><%= t("txt.views.labels.inflectionals_used_in") %></p>
     <ul>
       <% inflectionals_labels.each do |inf| %>
-        <% if inf.published? %>
-          <li><%= link_to inf.value, label_path(:id => inf) %></li>
-        <% else %>
-          <li><%= link_to inf.value, versioned_label_path(:id => inf) %></li>
-        <% end %>
+        <li><%= link_to inf.value, label_path(:published => inf.published? ? nil : 0, :id => inf) %></li>
       <% end %>
     </ul>
   <% end %>

data/config/initializers/origin_filters.rb

@@ -0,0 +1,3 @@
+require "iqvoc/inflectionals/base_form_sanitizer"
+
+Iqvoc::Origin::Filters.register(:sanitize_base_form, Iqvoc::Inflectionals::BaseFormSanitizer)

data/lib/iqvoc/inflectionals/base_form_sanitizer.rb

@@ -0,0 +1,13 @@
+module Iqvoc
+  module Inflectionals
+    
+    class BaseFormSanitizer < Iqvoc::Origin::Filters::GenericFilter
+      def call(obj, str)
+        str = str.gsub(/[,\/\.\[\]]/, '')
+    
+        run(obj, str)
+      end
+    end
+    
+  end
+end

data/lib/iqvoc/inflectionals/label_extensions.rb

@@ -31,9 +31,9 @@ module Iqvoc
       def generate_inflectionals!
         return send(Inflectional::Base.name.to_relation_name) if base_form.blank?
 
-        converted_literal_form = OriginMapping.replace_umlauts(value)
+        converted_literal_form = Iqvoc::Origin.new(value).replace_umlauts.to_s
 
-        diff = OriginMapping.sanitize_for_base_form(converted_literal_form).size - base_form.size
+        diff = Iqvoc::Origin.new(converted_literal_form).sanitize_base_form.to_s.size - base_form.size
 
         unless base_form.blank?
           new_base_form = converted_literal_form[0..(base_form.length-1)]

data/lib/iqvoc/inflectionals/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module Inflectionals
-    VERSION = "1.1.1"
+    VERSION = "1.1.3"
   end
 end

data/test/unit/inflectional_test.rb

@@ -10,7 +10,7 @@ class InflectionalTest < ActiveSupport::TestCase
 
   test "instance creation" do
     label = Label::SKOSXL::Base.create!(:value => "foo",
-        :origin => OriginMapping.merge("foo"))
+        :origin => Iqvoc::Origin.new("foo").to_s)
     label.inflectionals.create!(:value => "bar")
 
     assert_equal 2, Inflectional::Base.count
@@ -20,7 +20,7 @@ class InflectionalTest < ActiveSupport::TestCase
   test "hashing of values within the label callback" do
     @words.each do |word|
       Label::SKOSXL::Base.create!(:value => word,
-          :origin => OriginMapping.merge(word))
+          :origin => Iqvoc::Origin.new(word).to_s)
     end
 
     assert_equal @words.count, Inflectional::Base.count
@@ -30,4 +30,8 @@ class InflectionalTest < ActiveSupport::TestCase
     end
   end
 
+  test "base form sanitizer extension for origin generator" do
+    assert_equal "commaslashdotbracketbracket", Iqvoc::Origin.new("comma,slash/dot.bracket[bracket]").sanitize_base_form.to_s
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_inflectionals
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.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: rails
-  requirement: &70264289902000 !ruby/object:Gem::Requirement
+  requirement: &70116973005100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264289902000
+  version_requirements: *70116973005100
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70264289901500 !ruby/object:Gem::Requirement
+  requirement: &70116973003740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264289901500
+  version_requirements: *70116973003740
 - !ruby/object:Gem::Dependency
   name: iqvoc_skosxl
-  requirement: &70264289901040 !ruby/object:Gem::Requirement
+  requirement: &70116973003060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,7 +45,7 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264289901040
+  version_requirements: *70116973003060
 description: ''
 email:
 - robert.glaser@innoq.com
@@ -73,6 +73,7 @@ files:
 - config/environments/test.rb
 - config/initializers/iqvoc.rb
 - config/initializers/label_extensions.rb
+- config/initializers/origin_filters.rb
 - config/initializers/secret_token.rb.template
 - config/initializers/session_store.rb
 - config/locales/activerecord.de.yml
@@ -83,6 +84,7 @@ files:
 - db/seeds.rb
 - iqvoc_inflectionals.gemspec
 - lib/engine_tasks/db.rake
+- lib/iqvoc/inflectionals/base_form_sanitizer.rb
 - lib/iqvoc/inflectionals/label_extensions.rb
 - lib/iqvoc/inflectionals/version.rb
 - lib/iqvoc_inflectionals.rb