iqvoc_inflectionals 2.1.0 → 2.5.0

data/README.md

@@ -1,5 +1,6 @@
-Inflectionals for iQvoc
+[![Build Status](https://travis-ci.org/innoq/iqvoc_inflectionals.svg?branch=master)](https://travis-ci.org/innoq/iqvoc_inflectionals)
 
+Inflectionals for iQvoc
 
 Getting Started
 ===============
@@ -7,7 +8,3 @@ Getting Started
 1. Initialize database:
 
     $ rake db:create iqvoc:db:migrate_all iqvoc:db:seed_all
-
-2. Generate secret token:
-
-    $ rake iqvoc:setup:generate_secret_token

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

@@ -0,0 +1,2 @@
+@import 'framework';
+@import 'iqvoc/manifest';

data/app/models/concerns/inflectionable.rb

@@ -0,0 +1,67 @@
+module Inflectionable
+  extend ActiveSupport::Concern
+
+  included do
+    attr_reader :inflectionals_attributes
+    after_save :overwrite_inflectionals!
+    after_save :create_default_inflectional
+
+    has_many :inflectionals,
+      :class_name => "Inflectional::Base",
+      :foreign_key => "label_id",
+      :dependent => :destroy
+  end
+
+  def endings
+    Inflectional::Base.for_language_and_code(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)
+    end
+
+    self.base_form = new_base_form
+    save(:validate => false)
+
+    inflectionals
+  end
+
+  def inflectionals_attributes=(str)
+    @inflectionals_attributes = str.split("\r\n")
+  end
+
+  def overwrite_inflectionals!
+    return unless inflectionals_attributes
+    transaction do
+      inflectionals.delete_all
+      inflectionals_attributes.each do |value|
+        inflectionals.create!(:value => value)
+      end
+    end
+  end
+
+  def create_default_inflectional
+    # ensure a matching inflectional exists
+    if value && inflectionals.where(:value => value).none?
+      inflectionals.create(:value => value)
+    end
+  end
+end

data/app/models/inflectional/base.rb

@@ -1,17 +1,18 @@
 # encoding: UTF-8
 
 require 'digest/md5'
+require 'iqvoc/rdfapi'
 
 class Inflectional::Base < ActiveRecord::Base
 
   class_attribute :rdf_namespace, :rdf_predicate
-  self.rdf_namespace = 'umt'
+  self.rdf_namespace = 'iqvoc'
   self.rdf_predicate = 'inflectional'
 
   self.table_name ='inflectionals'
 
   validates :value, :presence => true
-  validates :label_id, :presence => true
+  # validates :label_id, :presence => true
 
   belongs_to :label, :class_name => Iqvoc::XLLabel.base_class_name
 
@@ -19,6 +20,21 @@ class Inflectional::Base < ActiveRecord::Base
     self.normal_hash = self.class.normalize(self.value)
   end
 
+  def self.build_from_rdf(subject, predicate, object)
+    unless object =~ Iqvoc::RDFAPI::LITERAL_REGEXP
+      raise InvalidStringLiteralError, "#{self.name}#build_from_rdf: Object (#{object}) must be a string literal"
+    end
+
+    lang = $3
+    value = begin
+      JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
+    rescue JSON::ParserError
+      $1
+    end
+
+    where(:label => subject, :value => value).first_or_create
+  end
+
   def self.by_query_value(query)
     where(["LOWER(#{table_name}.value) LIKE ?", query.to_s.downcase])
   end
@@ -289,8 +305,9 @@ class Inflectional::Base < ActiveRecord::Base
   def self.single_query(params = {})
     query_str = build_query_string(params)
 
-    by_query_value(query_str).
-      includes(:label).merge(Label::UMT::Base.by_language(params[:languages].to_a).published.order("LOWER(#{Label::Base.table_name}.value)"))
+    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.map { |result| SearchResult.new(result) }
   end
 
   # def self.single_query(params = {})
@@ -310,7 +327,7 @@ class Inflectional::Base < ActiveRecord::Base
 
   def self.referenced_by(label_class)
     # To something with the label class
-    label_class.send(:include, Iqvoc::Inflectionals::LabelExtensions)
+    label_class.send(:include, Inflectionable)
   end
 
   def self.deep_cloning_relations
@@ -334,12 +351,11 @@ class Inflectional::Base < ActiveRecord::Base
   end
 
   def build_rdf(document, subject)
-    subject.Umt.inflectional(value, :lang => label.language)
+    subject.send(rdf_namespace).send(rdf_predicate, value, :lang => label.language)
   end
 
   def self.normalize(str)
-    str = str.to_s.mb_chars.downcase
-    Digest::MD5.hexdigest(str)
+    Digest::MD5.hexdigest(str.to_s.mb_chars.downcase)
   end
 
 end

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

@@ -1,8 +1,5 @@
-<%= f.input :inflectionals_attributes,
-  :as => :text,
-  :label => t("txt.views.labels.inflectionals"),
-  :value => label.send(klass.name.to_relation_name).map(&:value).join("\n"),
-  :input_html => {
+<%= 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 => 40
-  } %>
+    :cols => 80 %>

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

@@ -6,7 +6,9 @@
       <%= t("txt.views.search_results.no_results") %>
     <% else %>
       <% result[:result].group_by{|i| i.label}.each do |key, value| %>
-        <%= link_to(key.value, label_path(:id => key)) %> (<%= value.map(&:value).join(", ") %>)<br>
+        <% concept = key.concepts_for_labeling_class(Labeling::SKOSXL::PrefLabel).try(:first) %>
+        <% concept_path = concept ? concept_path(:id => concept.origin) : '' %>
+        <%= link_to(key.value, label_path(:id => key), :data => { 'pref-label-for' => concept_path }) %> (<%= value.map(&:value).join(", ") %>)<br>
       <% end %>
     <% end %>
   </span>

data/bin/rails

@@ -0,0 +1,10 @@
+#!/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__)
+require 'rails/commands'

data/bin/rake

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

data/bin/spring

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast
+# It gets overwritten when you run the `spring binstub` command
+
+unless defined?(Spring)
+  require "rubygems"
+  require "bundler"
+
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
+    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
+    ENV["GEM_HOME"] = ""
+    Gem.paths = ENV
+
+    gem "spring", match[1]
+    require "spring/binstub"
+  end
+end

data/config/database.yml.mysql

@@ -1,20 +1,20 @@
 development:
   adapter: mysql2
-  database: iqvoc_skosxl_development
+  database: iqvoc_inflectionals_development
   username: root
   password:
   encoding: utf8
 
 test:
   adapter: mysql2
-  database: iqvoc_skosxl_test
+  database: iqvoc_inflectionals_test
   username: root
   password:
   encoding: utf8
 
 production:
   adapter: mysql2
-  database: iqvoc_skosxl_production
+  database: iqvoc_inflectionals_production
   username: root
   password:
   encoding: utf8

data/config/engine.rb

@@ -7,7 +7,7 @@ module Iqvoc
       paths["lib/tasks"] << "lib/engine_tasks"
 
       initializer "iqvoc_inflectionals.load_migrations" do |app|
-        app.config.paths['db/migrate'] += Iqvoc::Inflectionals::Engine.paths['db/migrate'].existent
+        app.config.paths['db/migrate'].concat(Iqvoc::Inflectionals::Engine.paths['db/migrate'].existent)
       end
     end
 

data/config/environments/development.rb

@@ -1,4 +1,3 @@
-require 'debug'
 require 'iqvoc/environments/development'
 
 if Iqvoc::Inflectionals.const_defined?(:Application)

data/config/environments/test.rb

@@ -1,4 +1,3 @@
-require 'debug'
 require 'iqvoc/environments/test'
 
 if Iqvoc::Inflectionals.const_defined?(:Application)

data/config/initializers/iqvoc.rb

@@ -1,10 +1,13 @@
 # initializer for both iqvoc and iqvoc_skosxl
 
-require 'iqvoc/xllabel' # XXX: this basically duplicates iqvoc_skosxl's initializer - but is required to ensure correct loading order!?
+# This basically duplicates iqvoc_skosxl's initializer —
+# but is required to ensure correct loading order!?
+require 'iqvoc/xllabel'
 
 Iqvoc.config.register_setting("title", "iQvoc Inflectionals")
 
-#Iqvoc.searchable_class_names << "Inflectional::Base" # XXX: application's responsibility!?
+# Application's responsibility!
+# Iqvoc.searchable_class_names << "Inflectional::Base"
 
 Iqvoc::XLLabel.additional_association_class_names.
     merge!("Inflectional::Base" => "label_id")

data/config/secrets.yml

@@ -0,0 +1,11 @@
+development:
+  secret_key_base: development
+
+test:
+  secret_key_base: test
+
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
+
+heroku:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

data/iqvoc_inflectionals.gemspec

@@ -15,11 +15,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "iqvoc_inflectionals"
 
-  s.add_dependency "iqvoc", "~> 4.1.0"
-  s.add_dependency "iqvoc_skosxl", "~> 2.1.0"
+  s.add_dependency "iqvoc", ">= 4.5.0", "~> 4.6"
+  s.add_dependency "iqvoc_skosxl", "~> 2.5.0"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 end

data/lib/iqvoc/inflectionals/version.rb

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

data/lib/tasks/inflectionals.rake

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+
+namespace :iqvoc_inflectionals do
+  desc "Generate inflectionals based on a mapping table in the Inflectional model class."
+  task :generate_inflectionals => :environment do
+    Iqvoc::XLLabel.base_class.find_each do |label|
+      label.generate_inflectionals!
+    end
+  end
+end

data/test/fixtures/hobbies.nt

@@ -0,0 +1,11 @@
+<http://hobbies.com/computer_programming> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
+<http://hobbies.com/computer_programming> <http://www.w3.org/2004/02/skos/core#prefLabel> "Computer programming"@en .
+<http://hobbies.com/computer_programming> <http://www.w3.org/2008/05/skos-xl#prefLabel> <http://hobbies.com/computer_programming-xl-preflabel-en> .
+<http://hobbies.com/computer_programming-xl-preflabel-en> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://hobbies.com/computer_programming-xl-preflabel-en> <http://www.w3.org/2008/05/skos-xl#literalForm> "Computer programming (used as xl:prefLabel)"@en .
+<http://hobbies.com/computer_programming-xl-preflabel-en> <http://try.iqvoc.net/schema#inflectional> "Computer programmings"@en .
+<http://hobbies.com/computering> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://hobbies.com/computering> <http://www.w3.org/2008/05/skos-xl#literalForm> "Computering"@en .
+<http://hobbies.com/nerding> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://hobbies.com/nerding> <http://www.w3.org/2008/05/skos-xl#literalForm> "Nerding"@en .
+<http://hobbies.com/nerding> <http://try.iqvoc.net/schema#inflectional> "Nerding"@en .

data/test/test_helper.rb

@@ -1,3 +1,3 @@
-ENV["RAILS_ENV"] = "test"
+ENV["RAILS_ENV"] ||= "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'

data/test/unit/import_test.rb

@@ -0,0 +1,32 @@
+# 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/")
+  end
+
+  test "import inflectionals" do
+    assert_difference "Concept::SKOS::Base.count" do
+      @importer.run
+    end
+
+    concept = Concept::SKOS::Base.first
+
+    assert_equal 2, concept.pref_labels.first.inflectionals.count
+    assert_equal 1, concept.pref_labels.first.inflectionals.where(:value => "Computer programming (used as xl:prefLabel)").count
+    assert_equal 1, concept.pref_labels.first.inflectionals.where(:value => "Computer programmings").count
+
+    nerding = Label::SKOSXL::Base.where(:origin => "nerding").first
+
+    # test for duplicate inflectionals not getting created
+    assert_not_nil nerding
+    assert_equal 1, nerding.inflectionals.count
+    assert_equal "Nerding", nerding.inflectionals.first.value
+  end
+
+end

data/test/unit/inflectional_test.rb

@@ -24,10 +24,6 @@ class InflectionalTest < ActiveSupport::TestCase
     end
 
     assert_equal @words.count, Inflectional::Base.count
-    Inflectional::Base.all.each do |inflectional|
-      normalized = Inflectional::Base.normalize(inflectional.value)
-      assert_equal normalized, inflectional.normal_hash
-    end
   end
 
   test "base form sanitizer extension for origin generator" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_inflectionals
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Robert Glaser
@@ -10,36 +10,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.5.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: iqvoc_skosxl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.5.0
 description: ''
 email:
 - robert.glaser@innoq.com
@@ -47,16 +53,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
+- app/assets/stylesheets/manifest.css.scss
+- app/models/concerns/inflectionable.rb
 - app/models/inflectional/base.rb
 - app/views/partials/inflectional/_base.html.erb
 - app/views/partials/inflectional/_edit_base.html.erb
 - app/views/partials/inflectional/_search_result.html.erb
+- bin/rails
+- bin/rake
+- bin/spring
 - config.ru
 - config/application.rb
 - config/boot.rb
@@ -69,29 +80,27 @@ files:
 - config/environments/production.rb
 - 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
 - config/locales/activerecord.en.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
+- config/secrets.yml
 - db/migrate/20120109143704_create_inflectionals.rb
-- db/schema.rb
 - 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
+- lib/tasks/inflectionals.rake
 - public/.gitkeep
-- script/ci/travis-before-build
-- script/ci/travis-build
 - script/rails
+- test/fixtures/hobbies.nt
 - test/test_helper.rb
+- test/unit/import_test.rb
 - test/unit/inflectional_test.rb
 homepage: ''
 licenses: []
@@ -102,20 +111,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: iqvoc_inflectionals
-rubygems_version: 2.0.0
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: ''
 test_files:
+- test/fixtures/hobbies.nt
 - test/test_helper.rb
+- test/unit/import_test.rb
 - test/unit/inflectional_test.rb