iqvoc_inflectionals 2.5.0 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbaf231d13d8a227e3d93723e27efc0100d11ab6
-  data.tar.gz: fa0415b3aeb2471df661fdcee8593b446959d6cd
+  metadata.gz: b28bd25f25c0382a44c31ed385058ee53394cddc
+  data.tar.gz: 3e19663335b8390017deef4fe12c71ec2f87f133
 SHA512:
-  metadata.gz: c4b5bb7e188e5b2631ceb535df21c5a28adfbefa4cde1b2a4727d87ed6b0d0169ae6ad9225481ebab7e92d272d8b7e42a9231f11be63b130828a96e5c9dee546
-  data.tar.gz: 76dab572f88fe431e0a273a808795d049469620763e8ec976b6987614304d0f15667a87423eb49947abee0d5f8488808d1219052bad1e095f99fca59be58079e
+  metadata.gz: f5cef71544e61fabacd3067605bcbcededfdfdd100e4ec43456936020cfab8be85b9245c73765e02ef27b8113123f99abe863e1a4e5f9499d34197d630de95cd
+  data.tar.gz: eba135aaa0ae49e62ccf15e5676d26a67cde32a8122c64d5ec52d8313f3d9606c048180878d0e49a952edf352828bc902b1db2e7b7d5731b201c630281e18b3e

data/.travis.yml

@@ -1,15 +1,19 @@
 language: ruby
 cache: bundler
-bundler_args:
+bundler_args: "--without production --retry 3"
 rvm:
-- 1.9.3
+# - 1.9.3
 - 2.0
-- 2.1
-- jruby-19mode
+- 2.2
+- ruby-head
+# - jruby-19mode
+# - jruby-head
 env:
 - DB=sqlite
 - DB=mysql
-before_install: cp config/database.yml.$DB config/database.yml
+before_install:
+- cp config/database.yml.$DB config/database.yml
+- gem update bundler
 before_script:
 - bundle exec rake db:drop RAILS_ENV=test
 - bundle exec rake db:create RAILS_ENV=test

data/Gemfile

@@ -1,10 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'iqvoc', '~> 4.6.0', :github => 'innoq/iqvoc'
-gem 'iqvoc_skosxl', '~> 2.5.0', :github => 'innoq/iqvoc_skosxl'
+gem 'iqvoc', '~> 4.10.0', :github => 'innoq/iqvoc', branch: 'master'
+gem 'iqvoc_skosxl', '~> 2.8.0', :github => 'innoq/iqvoc_skosxl', branch: 'master'
 
 group :development, :test do
-  gem 'spring'
   gem 'pry-rails'
 
   platforms :ruby do

data/Gemfile.lock

@@ -1,20 +1,22 @@
 GIT
   remote: git://github.com/innoq/iqvoc.git
-  revision: fe2356c73c1acc920c56649d33bff8ddb9185aaf
+  revision: 872456feda103f7f3df4e771ab1ba608a985cac6
+  branch: master
   specs:
-    iqvoc (4.6.0)
-      apipie-rails
+    iqvoc (4.10.0)
+      apipie-rails (~> 0.3.5)
       authlogic (~> 3.4.2)
-      bootstrap-sass (~> 3.1.1.0)
-      bootstrap_form (~> 2.1.1)
+      autoprefixer-rails (~> 5.1.8)
+      bootstrap-sass (~> 3.3.1.0)
+      bootstrap_form (~> 2.2.0)
       bundler
       cancancan
       carrierwave
       database_cleaner
       delayed_job_active_record (~> 4.0.1)
-      faraday
+      faraday (= 0.9.0)
       faraday_middleware
-      font-awesome-rails
+      font-awesome-rails (~> 4.2.0)
       iq_rdf (>= 0.1.15)
       iq_triplestorage
       json
@@ -23,262 +25,309 @@ GIT
       linkeddata
       maruku
       nokogiri
-      rails (~> 4.1.0)
+      rails (~> 4.2.0)
       rails_autolink
-      sass-rails (~> 4.0.2)
+      sass-rails (~> 5.0.0)
       uglifier (>= 1.3.0)
 
 GIT
   remote: git://github.com/innoq/iqvoc_skosxl.git
-  revision: 6775e81428fdf2c0ea6c775b98f9292459ad9ead
+  revision: 76b2f925be425d8236379d7487023a7053629ad2
+  branch: master
   specs:
-    iqvoc_skosxl (2.5.0)
-      iqvoc (~> 4.6, >= 4.5.0)
+    iqvoc_skosxl (2.8.0)
+      iqvoc (~> 4.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.6)
-      actionview (= 4.1.6)
-      activesupport (= 4.1.6)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.6)
-      activesupport (= 4.1.6)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.6)
-      activesupport (= 4.1.6)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.1.6)
-      activemodel (= 4.1.6)
-      activesupport (= 4.1.6)
-      arel (~> 5.0.0)
-    activerecord-jdbc-adapter (1.3.7)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
+      arel (~> 6.0)
+    activerecord-jdbc-adapter (1.3.14)
       activerecord (>= 2.2)
-    activerecord-jdbcmysql-adapter (1.3.7)
-      activerecord-jdbc-adapter (~> 1.3.7)
+    activerecord-jdbcmysql-adapter (1.3.14)
+      activerecord-jdbc-adapter (~> 1.3.14)
       jdbc-mysql (>= 5.1.22)
-    activerecord-jdbcsqlite3-adapter (1.3.7)
-      activerecord-jdbc-adapter (~> 1.3.7)
-      jdbc-sqlite3 (~> 3.7.2)
-    activesupport (4.1.6)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord-jdbcsqlite3-adapter (1.3.14)
+      activerecord-jdbc-adapter (~> 1.3.14)
+      jdbc-sqlite3 (>= 3.7.2, < 3.9)
+    activesupport (4.2.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    apipie-rails (0.2.6)
+    addressable (2.4.0)
+    apipie-rails (0.3.5)
       json
-    arel (5.0.1.20140414130214)
-    authlogic (3.4.3)
+    arel (6.0.0)
+    authlogic (3.4.6)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       request_store (~> 1.0)
-      scrypt (~> 1.2)
-    bootstrap-sass (3.1.1.1)
+      scrypt (>= 1.2, < 3.0)
+    autoprefixer-rails (5.1.11)
+      execjs
+      json
+    bcp47 (0.3.3)
+      i18n
+    bootstrap-sass (3.3.1.0)
       sass (~> 3.2)
-    bootstrap_form (2.1.1)
+    bootstrap_form (2.2.0)
     builder (3.2.2)
-    cancancan (1.9.2)
+    cancancan (1.13.1)
     carrierwave (0.10.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
     coderay (1.1.0)
-    database_cleaner (1.3.0)
-    delayed_job (4.0.4)
-      activesupport (>= 3.0, < 4.2)
-    delayed_job_active_record (4.0.2)
-      activerecord (>= 3.0, < 4.2)
+    concurrent-ruby (1.0.0)
+    database_cleaner (1.5.1)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
+    delayed_job_active_record (4.0.3)
+      activerecord (>= 3.0, < 5.0)
       delayed_job (>= 3.0, < 4.1)
-    ebnf (0.3.6)
-      haml (~> 4.0)
+    ebnf (1.0.0)
       rdf (~> 1.1)
       sxp (~> 0.1, >= 0.1.3)
-    equivalent-xml (0.5.1)
+    equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erubis (2.7.0)
-    execjs (2.2.2)
+    execjs (2.6.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
+    faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.3)
-    ffi (1.9.3-java)
+    ffi (1.9.8)
+    ffi (1.9.8-java)
     ffi-compiler (0.1.3)
       ffi (>= 1.0.0)
       rake
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    haml (4.0.5)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
+    haml (4.0.7)
       tilt
-    hike (1.2.3)
-    htmlentities (4.3.2)
-    i18n (0.6.11)
+    htmlentities (4.3.4)
+    i18n (0.7.0)
     iq_rdf (0.1.15)
       activesupport
       builder
       bundler
     iq_triplestorage (0.2.2)
-    jdbc-mysql (5.1.30)
-    jdbc-sqlite3 (3.7.2.1)
-    json (1.8.1)
-    json (1.8.1-java)
-    json-ld (1.1.7)
-      rdf (~> 1.1, >= 1.1.4)
-    kaminari (0.16.1)
+    jdbc-mysql (5.1.33)
+    jdbc-sqlite3 (3.8.7)
+    json (1.8.2)
+    json (1.8.2-java)
+    json-ld (1.99.0)
+      multi_json (~> 1.11)
+      rdf (~> 1.99)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     kaminari-bootstrap (3.0.1)
       kaminari (>= 0.13.0)
       rails
-    linkeddata (1.1.1)
-      equivalent-xml (>= 0.4.0)
-      json-ld (>= 1.1.1)
-      nokogiri (>= 1.6.1)
-      rdf (>= 1.1.1)
-      rdf-aggregate-repo (>= 1.1.0)
-      rdf-isomorphic (>= 1.1.0)
-      rdf-json (>= 1.1.0)
-      rdf-microdata (>= 1.1.1)
-      rdf-n3 (>= 1.1.0)
-      rdf-rdfa (>= 1.1.1)
-      rdf-rdfxml (>= 1.1.0)
-      rdf-trig (>= 1.1.2)
-      rdf-trix (>= 1.1.0)
-      rdf-turtle (>= 1.1.2)
-      sparql (>= 1.1.2)
-      sparql-client (>= 1.1.1)
-    mail (2.6.1)
+    link_header (0.0.8)
+    linkeddata (1.99.0)
+      equivalent-xml (~> 0.6)
+      json-ld (~> 1.99)
+      nokogiri (~> 1.6)
+      rdf (~> 1.99)
+      rdf-aggregate-repo (~> 1.99)
+      rdf-isomorphic (~> 1.99)
+      rdf-json (~> 1.1, >= 1.1.2)
+      rdf-microdata (~> 2.0, >= 2.0.2)
+      rdf-n3 (~> 1.99)
+      rdf-rdfa (~> 1.99)
+      rdf-rdfxml (~> 1.1, >= 1.1.5)
+      rdf-reasoner (~> 0.3)
+      rdf-tabular (~> 0.3)
+      rdf-trig (~> 1.99, >= 1.99.0.1)
+      rdf-trix (~> 1.99)
+      rdf-turtle (~> 1.99)
+      rdf-vocab (~> 0.8, >= 0.8.6)
+      rdf-xsd (~> 1.1, >= 1.1.5)
+      sparql (~> 1.99)
+      sparql-client (~> 1.99)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
+    mail (2.6.3)
       mime-types (>= 1.16, < 3)
     maruku (0.7.2)
     method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
-    multi_json (1.10.1)
+    mime-types (2.99.1)
+    mini_portile (0.6.2)
+    minitest (5.6.1)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
+    mysql2 (0.3.17)
     net-http-persistent (2.9.4)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    nokogiri (1.6.3.1-java)
-    pry (0.10.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry (0.10.0-java)
+    pry (0.10.1-java)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    pry-rails (0.3.2)
+    pry-rails (0.3.3)
       pry (>= 0.9.10)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.6)
-      actionmailer (= 4.1.6)
-      actionpack (= 4.1.6)
-      actionview (= 4.1.6)
-      activemodel (= 4.1.6)
-      activerecord (= 4.1.6)
-      activesupport (= 4.1.6)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.6)
-      sprockets-rails (~> 2.0)
+      railties (= 4.2.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
     rails_autolink (1.1.6)
       rails (> 3.1)
-    railties (4.1.6)
-      actionpack (= 4.1.6)
-      activesupport (= 4.1.6)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rdf (1.1.6)
-    rdf-aggregate-repo (1.1.0)
-      rdf (>= 1.1)
-    rdf-isomorphic (1.1.0)
-      rdf (>= 1.1)
-    rdf-json (1.1.0)
-      rdf (>= 1.1.0)
-    rdf-microdata (1.1.2)
+    rake (11.1.2)
+    rdf (1.99.1)
+      link_header (~> 0.0, >= 0.0.8)
+    rdf-aggregate-repo (1.99.0)
+      rdf (~> 1.99)
+    rdf-isomorphic (1.99.0)
+      rdf (~> 1.99)
+    rdf-json (1.99.0)
+      rdf (~> 1.99)
+    rdf-microdata (2.0.2)
       htmlentities (~> 4.3)
       nokogiri (~> 1.6)
       rdf (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-n3 (1.1.2)
-      rdf (~> 1.1, >= 1.1.5)
-    rdf-rdfa (1.1.4.1)
+    rdf-n3 (1.99.0)
+      rdf (~> 1.99)
+    rdf-rdfa (1.99.0)
       haml (~> 4.0)
       htmlentities (~> 4.3)
-      rdf (~> 1.1, >= 1.1.6)
+      rdf (~> 1.99)
+      rdf-aggregate-repo (~> 1.1)
       rdf-xsd (~> 1.1)
-    rdf-rdfxml (1.1.3)
+    rdf-rdfxml (1.99.0)
       htmlentities (~> 4.3)
-      rdf (~> 1.1, >= 1.1.6)
-      rdf-rdfa (~> 1.1, >= 1.1.4.1)
+      rdf (~> 1.99)
+      rdf-rdfa (~> 1.99)
+      rdf-xsd (~> 1.99)
+    rdf-reasoner (0.3.0)
+      rdf (~> 1.1, >= 1.1.4.2)
+      rdf-turtle (~> 1.1)
+      rdf-vocab (~> 0.8)
       rdf-xsd (~> 1.1)
-    rdf-trig (1.1.3.1)
-      ebnf (~> 0.3, >= 0.3.5)
-      rdf (~> 1.1, >= 1.1.2.1)
-      rdf-turtle (~> 1.1, >= 1.1.3)
-    rdf-trix (1.1.0)
-      rdf (>= 1.1)
-    rdf-turtle (1.1.4)
-      ebnf (~> 0.3, >= 0.3.6)
-      rdf (~> 1.1, >= 1.1.4)
-    rdf-xsd (1.1.2)
+    rdf-tabular (0.3.0)
+      addressable (~> 2.3)
+      bcp47 (~> 0.3, >= 0.3.3)
+      json-ld (~> 1.1)
+      rdf (~> 1.1, >= 1.1.7)
+      rdf-vocab (~> 0.8)
+      rdf-xsd (~> 1.1)
+    rdf-trig (1.99.0.1)
+      ebnf (~> 1.0)
+      rdf (~> 1.99)
+      rdf-turtle (~> 1.99)
+    rdf-trix (1.99.0)
       rdf (~> 1.1)
-    request_store (1.1.0)
-    sass (3.2.19)
-    sass-rails (4.0.3)
+    rdf-turtle (1.99.0)
+      ebnf (~> 1.0)
+      rdf (~> 1.99)
+    rdf-vocab (0.8.7.1)
+      rdf (~> 1.1, >= 1.1.10)
+    rdf-xsd (1.99.0)
+      rdf (~> 1.99)
+    request_store (1.3.1)
+    sass (3.4.21)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
-    scrypt (1.2.1)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    scrypt (2.0.2)
       ffi-compiler (>= 0.0.2)
       rake
-    slop (3.5.0)
-    sparql (1.1.4)
-      builder (~> 3.0)
-      ebnf (~> 0.3, >= 0.3.5)
-      rdf (~> 1.1, >= 1.1.4)
-      rdf-aggregate-repo (~> 1.1, >= 1.1.0)
+    slop (3.6.0)
+    sparql (1.99.0)
+      builder (~> 3.2)
+      ebnf (~> 1.0)
+      rdf (~> 1.99)
+      rdf-aggregate-repo (~> 1.99)
       rdf-xsd (~> 1.1)
       sparql-client (~> 1.1)
       sxp (~> 0.1)
-    sparql-client (1.1.3.1)
+    sparql-client (1.99.0)
       net-http-persistent (~> 2.9)
       rdf (~> 1.1)
     spoon (0.0.4)
       ffi
-    spring (1.1.3)
-    sprockets (2.11.0)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.0.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.10)
     sxp (0.1.5)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    thread_safe (0.3.4-java)
-    tilt (1.4.1)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
+    tilt (2.0.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
@@ -289,9 +338,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
   activerecord-jdbcsqlite3-adapter
-  iqvoc (~> 4.6.0)!
-  iqvoc_skosxl (~> 2.5.0)!
+  iqvoc (~> 4.10.0)!
+  iqvoc_skosxl (~> 2.8.0)!
   mysql2
   pry-rails
-  spring
   sqlite3
+
+BUNDLED WITH
+   1.12.4

data/app/assets/stylesheets/manifest.css.scss

@@ -1,2 +1,3 @@
+@import 'iqvoc/settings/bootstrap-variables';
 @import 'framework';
 @import 'iqvoc/manifest';

data/app/models/concerns/inflectionable.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Inflectionable
   extend ActiveSupport::Concern
 
@@ -7,45 +8,36 @@ module Inflectionable
     after_save :create_default_inflectional
 
     has_many :inflectionals,
-      :class_name => "Inflectional::Base",
-      :foreign_key => "label_id",
-      :dependent => :destroy
+             :class_name => "Inflectional::Base",
+             :foreign_key => "label_id",
+             :dependent => :destroy
   end
 
   def endings
     Inflectional::Base.for_language_and_code(language, inflectional_code)
   end
 
+  def candidates
+    Inflectional::Base.candidates_for(base_form, language, inflectional_code)
+  end
+
   def generate_inflectionals!
     return send(Inflectional::Base.name.to_relation_name) if base_form.blank?
 
-    converted_literal_form = Iqvoc::Origin.new(value).to_s
-
-    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)]
-    end
-
-    Rails.logger.debug "converted_literal_form => #{converted_literal_form} (#{converted_literal_form.size}) |
-    base_form => #{base_form} (#{base_form.size}) |
-    new_base_form => #{new_base_form} |
-    value => #{value} (#{value.size}) |
-    diff => #{diff}"
-
-    endings.each do |ending|
-      value = ending == "." ? new_base_form : (new_base_form + ending.downcase)
-      send(Inflectional::Base.name.to_relation_name).create!(:value => value)
+    candidates.each do |candidate|
+      if candidate && inflectionals.where(value: candidate).none?
+        send(Inflectional::Base.name.to_relation_name).create!(value: candidate)
+      end
     end
 
-    self.base_form = new_base_form
-    save(:validate => false)
+    # self.base_form = new_base_form
+    save(validate: false)
 
     inflectionals
   end
 
   def inflectionals_attributes=(str)
-    @inflectionals_attributes = str.split("\r\n")
+    @inflectionals_attributes = str.split("\r\n").uniq
   end
 
   def overwrite_inflectionals!
@@ -53,7 +45,7 @@ module Inflectionable
     transaction do
       inflectionals.delete_all
       inflectionals_attributes.each do |value|
-        inflectionals.create!(:value => value)
+        inflectionals.create!(value: value)
       end
     end
   end

data/app/models/inflectional/base.rb

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 
 require 'digest/md5'
-require 'iqvoc/rdfapi'
 
 class Inflectional::Base < ActiveRecord::Base
 
@@ -16,12 +15,15 @@ class Inflectional::Base < ActiveRecord::Base
 
   belongs_to :label, :class_name => Iqvoc::XLLabel.base_class_name
 
-  before_save do
-    self.normal_hash = self.class.normalize(self.value)
+  def value=(str)
+    write_attribute(:value, str)
+
+    value_hash = self.class.normalize(str)
+    write_attribute(:normal_hash, value_hash)
   end
 
   def self.build_from_rdf(subject, predicate, object)
-    unless object =~ Iqvoc::RDFAPI::LITERAL_REGEXP
+    unless object =~ RDFAPI::LITERAL_REGEXP
       raise InvalidStringLiteralError, "#{self.name}#build_from_rdf: Object (#{object}) must be a string literal"
     end
 
@@ -85,28 +87,6 @@ class Inflectional::Base < ActiveRecord::Base
       :"CA"	=> [".", "E", "EN", "ES", "S"],
       :"CB"	=> [".", "EN", "ES"],
       :"CC"	=> [".", "E", "EN", "ES"],
-      :"AD"	=> [".", "N", "ST", "T"],
-      :"AE"	=> [".", "N", "T"],
-      :"AX"	=> ["E", "N", "ST", "T", "TE", "TEN", "TET"],
-      :"AY"	=> ["E", "EN", "EST", "ET", "ST", "T", "TE", "TEN", "TET"],
-      :"AZ"	=> ["E", "N", "ST", "T", "TE", "TEN", "TET"],
-      :"B0"	=> [".", "EN", "EST", "ET", "ST", "T"],
-      :"B5"	=> ["T", "ST", "TEN", "TE", "TET"],
-      :"BA"	=> [".", "EN", "EST", "ET", "T"],
-      :"BB"	=> [".", "E", "EN", "EST", "ET", "ST"],
-      :"BC"	=> [".", "EN", "EST", "ET", "ST"],
-      :"BD"	=> [".", "EN", "EST", "ET"],
-      :"BF"	=> ["E", "EN", "EST", "ET"],
-      :"C0"	=> [".", "ST", "T"],
-      :"C1"	=> [".", "E", "ST", "T"],
-      :"C3"	=> ["ST", "T"],
-      :"C4"	=> [".", "ST"],
-      :"C7"	=> [".", "D", "DE", "DEM", "DEN", "DER", "DES"],
-      :"C8"	=> [".", "T", "TE", "TEN", "TET"],
-      :"C9"	=> [".", "D", "DE", "DEM", "DEN", "DER", "DES", "S"],
-      :"CA"	=> [".", "E", "EN", "ES", "S"],
-      :"CB"	=> [".", "EN", "ES"],
-      :"CC"	=> [".", "E", "EN", "ES"],
       :"CD"	=> [".", "SE", "SEN"],
       :"CE"	=> [".", "E", "ER", "ERN", "ES", "S"],
       :"CF"	=> [".", "EN", "S"],
@@ -166,7 +146,6 @@ class Inflectional::Base < ActiveRecord::Base
       :"NI"	=> ["IS", "ES", "ISES"],
       :"NL"	=> ["EX", "ICES"],
       :"NQ"	=> [".", "TA", "S"],
-      :"PP"	=> [".", "."],
       :"T0"	=> [".", "E"],
       :"TA"	=> [".", "E", "S"],
       :"TF"	=> [".", "E", "EN"],
@@ -237,7 +216,6 @@ class Inflectional::Base < ActiveRecord::Base
       :"NH" =>	["IS", "ES"],
       :"NM" =>	["EX", "ICES", "EXES"],
       :"NO" =>	["X", "CES", "XES"],
-      :"PP" =>	[".", "."],
       :"R0" =>	["R", "ST"],
       :"R1" =>	[".", "R", "ST"],
       :"R2" =>	[".", "R", "ST", "LY"],
@@ -249,6 +227,7 @@ class Inflectional::Base < ActiveRecord::Base
       :"R8" =>	["E", "ER", "EST", "LY"],
       :"R9" =>	["LE", "LY"],
       :"RA" =>	["Y", "ILY"],
+      :"U2"	=> ["A", "AS", "ATA"],
       :"V0" =>	[".", "S", "D"],
       :"V1" =>	[".", "S", "ED"],
       :"V2" =>	[".", "ED"],
@@ -298,6 +277,16 @@ class Inflectional::Base < ActiveRecord::Base
     MAPPINGS
   end
 
+  def self.candidates_for(base_form, language, inflectional_code)
+    return [] if language.blank? || inflectional_code.blank? || base_form.blank?
+
+    endings = for_language_and_code(language, inflectional_code)
+
+    endings.map do |ending|
+      ending == '.' ? base_form : (base_form + ending.downcase)
+    end
+  end
+
   def self.forces_multi_query?
     true
   end
@@ -306,7 +295,7 @@ class Inflectional::Base < ActiveRecord::Base
     query_str = build_query_string(params)
 
     scope = by_query_value(query_str).includes(:label)
-    scope = scope.references(:labels).merge(Label::UMT::Base.by_language(params[:languages].to_a).published.order("LOWER(#{Label::Base.table_name}.value)"))
+    scope = scope.references(:labels).merge(Iqvoc::XLLabel.base_class.by_language(params[:languages].to_a).published.order("LOWER(#{Label::Base.table_name}.value)"))
     scope.map { |result| SearchResult.new(result) }
   end
 
@@ -358,4 +347,12 @@ class Inflectional::Base < ActiveRecord::Base
     Digest::MD5.hexdigest(str.to_s.mb_chars.downcase)
   end
 
+  def ==(other)
+    self.normal_hash == other.try(:normal_hash)
+  end
+
+  def eql?(other)
+    self == other
+  end
+
 end

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

@@ -1,12 +1,21 @@
 <div class="relation panel">
   <h2><%= t("txt.views.labels.inflectionals") %></h2>
   <% labels_inflectionals_values = label.send(klass.name.to_relation_name).map(&:value) %>
-  <%= labels_inflectionals_values.join(', ') %>
+
+  <% if labels_inflectionals_values.any? %>
+    <ul>
+      <% labels_inflectionals_values.each do |inf| %>
+        <li><%= inf %></li>
+      <% end %>
+    </ul>
+  <% end %>
+
   <%
     all_inflectionals = Inflectional::Base.where(:value => labels_inflectionals_values).all
     # subtract initial and current version from the inflectionals collection
     inflectionals_labels = Iqvoc::XLLabel.base_class.find(all_inflectionals.map(&:label_id)-[label.published_version_id, label.id].compact)
   %>
+
   <% if inflectionals_labels.present? %>
     <p><%= t("txt.views.labels.inflectionals_used_in") %></p>
     <ul>

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

@@ -1,5 +1,9 @@
 <%= f.text_area :inflectionals_attributes,
-    :label => t("txt.views.labels.inflectionals"),
-    :value => label.send(klass.name.to_relation_name).map(&:value).join("\n"),
-    :rows => 10,
-    :cols => 80 %>
+    label: t("txt.views.labels.inflectionals"),
+    value: label.send(klass.name.to_relation_name).map(&:value).join("\n"),
+    rows: 10,
+    cols: 80,
+    data: {
+      generated_inflectionals: label.candidates.to_json
+    }
+%>

data/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/bin/rails

@@ -1,10 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
 require 'rails/commands'

data/bin/rake

@@ -1,7 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path("../spring", __FILE__)
-rescue LoadError
-end
-require 'bundler/setup'
-load Gem.bin_path('rake', 'rake')
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/db/migrate/20150108155020_add_fk_constraints_iqvoc_inflectionals.rb

@@ -0,0 +1,5 @@
+class AddFkConstraintsIqvocInflectionals < ActiveRecord::Migration
+  def change
+    add_foreign_key :inflectionals, :labels, column: 'label_id', on_update: :cascade, on_delete: :cascade
+  end
+end

data/db/migrate/20160127131143_add_inflectional_attributes_to_label.rb

@@ -0,0 +1,6 @@
+class AddInflectionalAttributesToLabel < ActiveRecord::Migration
+  def change
+    add_column :labels, :base_form, :string  unless column_exists?(:labels, :base_form)
+    add_column :labels, :inflectional_code, :string unless column_exists?(:labels, :inflectional_code)
+  end
+end

data/db/migrate/20160331092532_change_inflectional_value_collation.rb

@@ -0,0 +1,13 @@
+class ChangeInflectionalValueCollation < ActiveRecord::Migration
+  def up
+    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      execute("ALTER TABLE inflectionals MODIFY value varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin;")
+    end
+  end
+
+  def down
+    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      execute("ALTER TABLE inflectionals MODIFY value varchar(4000) CHARACTER SET utf8 COLLATE utf8_general_ci;")
+    end
+  end
+end

data/iqvoc_inflectionals.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "iqvoc_inflectionals"
 
-  s.add_dependency "iqvoc", ">= 4.5.0", "~> 4.6"
-  s.add_dependency "iqvoc_skosxl", "~> 2.5.0"
+  s.add_dependency "iqvoc", ">= 4.5.0", "~> 4.10"
+  s.add_dependency "iqvoc_skosxl", "~> 2.8.0"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/iqvoc/inflectionals/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module Inflectionals
-    VERSION = "2.5.0"
+    VERSION = "2.8.0"
   end
 end

data/test/unit/import_test.rb

@@ -1,13 +1,12 @@
 # encoding: UTF-8
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
-require "iqvoc/skos_importer"
 
 class ImportTest < ActiveSupport::TestCase
   TEST_DATA = File.open(File.expand_path("../../fixtures/hobbies.nt", __FILE__))
 
   setup do
-    @importer = Iqvoc::SkosImporter.new(TEST_DATA, "http://hobbies.com/")
+    @importer = SkosImporter.new(TEST_DATA, "http://hobbies.com/")
   end
 
   test "import inflectionals" do

data/test/unit/inflectional_generation_test.rb

@@ -0,0 +1,94 @@
+# encoding: UTF-8
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class InflectionalGenerationTest < ActiveSupport::TestCase
+
+  test "inflectional candidates generation (without instantiating)" do
+    # german example
+    generated_candidates = Inflectional::Base.candidates_for('Baum', 'de', 'D5')
+    expected_candidates = %w(Baum Baume Baumes Baums)
+    assert_equal expected_candidates.size, generated_candidates.size
+    expected_candidates.each { |inf| assert generated_candidates.include?(inf), "inflectional '#{inf}' expected" }
+
+    # english example
+    generated_candidates = Inflectional::Base.candidates_for('tree', 'en', 'D7')
+    expected_candidates = %w(tree trees)
+    assert_equal expected_candidates.size, generated_candidates.size
+    expected_candidates.each { |inf| assert generated_candidates.include?(inf), "inflectional '#{inf}' expected" }
+  end
+
+  test "simple inflectional generation" do
+    label = Iqvoc::XLLabel.base_class.create!(
+      value: 'Eisenbahnfahrzeug',
+      language: 'de',
+      base_form: 'Eisenbahnfahrzeug',
+      inflectional_code: 'CA')
+
+    label.generate_inflectionals!
+
+    generated_inflectionals = label.inflectionals.reload.map(&:value)
+    expected_inflectionals = %w(Eisenbahnfahrzeug Eisenbahnfahrzeuge Eisenbahnfahrzeugen Eisenbahnfahrzeuges Eisenbahnfahrzeugs)
+
+    assert_equal expected_inflectionals.size, generated_inflectionals.size
+    expected_inflectionals.each { |inf| assert generated_inflectionals.include?(inf), "inflectional '#{inf}' expected" }
+  end
+
+  test "inflectional generation with german ß" do
+    label = Iqvoc::XLLabel.base_class.create!(
+      value: 'Außenwirtschaftsbeziehung',
+      language: 'de',
+      base_form: 'Außenwirtschaftsbeziehung',
+      inflectional_code: 'D0')
+
+    label.generate_inflectionals!
+
+    generated_inflectionals = label.inflectionals.reload.map(&:value)
+    expected_inflectionals = %w(Außenwirtschaftsbeziehung Außenwirtschaftsbeziehungen)
+    assert_equal expected_inflectionals.size, generated_inflectionals.size
+    expected_inflectionals.each { |inf| assert generated_inflectionals.include?(inf), "inflectional '#{inf}' expected" }
+  end
+
+  test "inflectional generation with umlaut" do
+    label = Iqvoc::XLLabel.base_class.create!(
+      value: 'Marschgewässer',
+      language: 'de',
+      base_form: 'Marschgewässer',
+      inflectional_code: 'D9')
+
+    label.generate_inflectionals!
+
+    generated_inflectionals = label.inflectionals.reload.map(&:value)
+    expected_inflectionals = %w(Marschgewässer Marschgewässern Marschgewässers)
+    assert_equal expected_inflectionals.size, generated_inflectionals.size
+    expected_inflectionals.each { |inf| assert generated_inflectionals.include?(inf), "inflectional '#{inf}' expected" }
+  end
+
+  test "inflectional generation with hyphen" do
+    label = Iqvoc::XLLabel.base_class.create!(
+      value: 'Eisen- und Stahlindustrie',
+      language: 'de',
+      base_form: 'Eisen- und Stahlindustrie',
+      inflectional_code: 'FF')
+
+    label.generate_inflectionals!
+
+    generated_inflectionals = label.inflectionals.reload.map(&:value)
+    expected_inflectionals = ['Eisen- und Stahlindustrie']
+    assert_equal expected_inflectionals.size, generated_inflectionals.size
+    expected_inflectionals.each { |inf| assert generated_inflectionals.include?(inf), "inflectional '#{inf}' expected" }
+
+    label = Iqvoc::XLLabel.base_class.create!(
+      value: 'Agrar-Umweltindikator',
+      language: 'de',
+      base_form: 'Agrar-Umweltindikator',
+      inflectional_code: 'D7')
+
+    label.generate_inflectionals!
+
+    generated_inflectionals = label.inflectionals.reload.map(&:value)
+    expected_inflectionals = ['Agrar-Umweltindikator', 'Agrar-Umweltindikators']
+    assert_equal expected_inflectionals.size, generated_inflectionals.size
+    expected_inflectionals.each { |inf| assert generated_inflectionals.include?(inf), "inflectional '#{inf}' expected" }
+  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 => Iqvoc::Origin.new("foo").to_s)
+        :origin => Origin.new("foo").to_s)
     label.inflectionals.create!(:value => "bar")
 
     assert_equal 2, Inflectional::Base.count
@@ -20,14 +20,10 @@ class InflectionalTest < ActiveSupport::TestCase
   test "hashing of values within the label callback" do
     @words.each do |word|
       Label::SKOSXL::Base.create!(:value => word,
-          :origin => Iqvoc::Origin.new(word).to_s)
+          :origin => Origin.new(word).to_s)
     end
 
     assert_equal @words.count, Inflectional::Base.count
   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: 2.5.0
+  version: 2.8.0
 platform: ruby
 authors:
 - Robert Glaser
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
@@ -21,7 +21,7 @@ dependencies:
         version: 4.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,21 +31,21 @@ dependencies:
         version: 4.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.10'
 - !ruby/object:Gem::Dependency
   name: iqvoc_skosxl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.8.0
 description: ''
 email:
 - robert.glaser@innoq.com
@@ -65,8 +65,10 @@ files:
 - app/views/partials/inflectional/_base.html.erb
 - app/views/partials/inflectional/_edit_base.html.erb
 - app/views/partials/inflectional/_search_result.html.erb
+- bin/bundle
 - bin/rails
 - bin/rake
+- bin/setup
 - bin/spring
 - config.ru
 - config/application.rb
@@ -80,7 +82,6 @@ files:
 - config/environments/production.rb
 - config/environments/test.rb
 - config/initializers/iqvoc.rb
-- config/initializers/origin_filters.rb
 - config/initializers/session_store.rb
 - config/locales/activerecord.de.yml
 - config/locales/activerecord.en.yml
@@ -89,10 +90,12 @@ files:
 - config/routes.rb
 - config/secrets.yml
 - db/migrate/20120109143704_create_inflectionals.rb
+- db/migrate/20150108155020_add_fk_constraints_iqvoc_inflectionals.rb
+- db/migrate/20160127131143_add_inflectional_attributes_to_label.rb
+- db/migrate/20160331092532_change_inflectional_value_collation.rb
 - db/seeds.rb
 - iqvoc_inflectionals.gemspec
 - lib/engine_tasks/db.rake
-- lib/iqvoc/inflectionals/base_form_sanitizer.rb
 - lib/iqvoc/inflectionals/version.rb
 - lib/iqvoc_inflectionals.rb
 - lib/tasks/inflectionals.rake
@@ -101,6 +104,7 @@ files:
 - test/fixtures/hobbies.nt
 - test/test_helper.rb
 - test/unit/import_test.rb
+- test/unit/inflectional_generation_test.rb
 - test/unit/inflectional_test.rb
 homepage: ''
 licenses: []
@@ -121,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iqvoc_inflectionals
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ''
@@ -129,4 +133,5 @@ test_files:
 - test/fixtures/hobbies.nt
 - test/test_helper.rb
 - test/unit/import_test.rb
+- test/unit/inflectional_generation_test.rb
 - test/unit/inflectional_test.rb

data/config/initializers/origin_filters.rb

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

data/lib/iqvoc/inflectionals/base_form_sanitizer.rb

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