iqvoc_inflectionals 1.0.1 → 1.1.0

data/.gitignore

@@ -4,3 +4,4 @@
 /db/*.sqlite
 /config/database.yml
 /config/initializers/secret_token.rb
+*.gem

data/Gemfile

@@ -1,7 +1,8 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem 'iqvoc',        '~> 3.3.3'
-gem 'iqvoc_skosxl', '~> 1.1.4'
+gem 'rails', '~> 3.2.1'
+gem 'iqvoc', '~> 3.5.1'
+gem 'iqvoc_skosxl', '~> 1.2.0'
 
 group :development, :test do
   gem 'sqlite3'

data/Gemfile.lock

@@ -1,35 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.1)
+      actionpack (= 3.2.1)
+      mail (~> 2.4.0)
+    actionpack (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.1)
+      activesupport (= 3.2.1)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+      arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.1)
+      activemodel (= 3.2.1)
+      activesupport (= 3.2.1)
+    activesupport (3.2.1)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
+    arel (3.0.0)
     authlogic (3.1.0)
       activerecord (>= 3.0.7)
       activerecord (>= 3.0.7)
@@ -38,55 +37,54 @@ GEM
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
-    iq_rdf (0.1.0)
+    iq_rdf (0.1.2)
       builder
       bundler
-    iqvoc (3.3.3)
+    iqvoc (3.5.1)
       authlogic
       bundler
       cancan
-      iq_rdf (~> 0.1.0)
+      iq_rdf (~> 0.1.2)
       json
       kaminari
-      rails (~> 3.1.3)
+      rails (~> 3.2.1)
       rails_autolink
-    iqvoc_skosxl (1.1.4)
+    iqvoc_skosxl (1.2.0)
       bundler
-      iqvoc
+      iqvoc (~> 3.5.1)
+    journey (1.0.1)
     json (1.6.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    mail (2.3.0)
+    mail (2.4.1)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.0.4)
     polyglot (0.3.3)
-    rack (1.3.6)
+    rack (1.4.1)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.1)
+      actionmailer (= 3.2.1)
+      actionpack (= 3.2.1)
+      activerecord (= 3.2.1)
+      activeresource (= 3.2.1)
+      activesupport (= 3.2.1)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    rails_autolink (1.0.4)
-      rails (>= 3.1.0)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.1)
+    rails_autolink (1.0.5)
+      rails (~> 3.1)
+    railties (3.2.1)
+      actionpack (= 3.2.1)
+      activesupport (= 3.2.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -94,10 +92,10 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    spork (0.9.0.rc9)
+    spork (0.9.0)
     spork-testunit (0.0.7)
       spork (>= 0.6.0)
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -114,8 +112,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  iqvoc (~> 3.3.3)
-  iqvoc_skosxl (~> 1.1.4)
+  iqvoc (~> 3.5.1)
+  iqvoc_skosxl (~> 1.2.0)
+  rails (~> 3.2.1)
   spork (~> 0.9.0.rc)
   spork-testunit
   sqlite3

data/app/models/inflectional/base.rb

@@ -8,7 +8,7 @@ class Inflectional::Base < ActiveRecord::Base
   self.rdf_namespace = 'umt'
   self.rdf_predicate = 'inflectional'
 
-  set_table_name 'inflectionals'
+  self.table_name ='inflectionals'
 
   validates :value, :presence => true
   validates :label_id, :presence => true
@@ -310,7 +310,7 @@ class Inflectional::Base < ActiveRecord::Base
 
   def self.referenced_by(label_class)
     # To something with the label class
-    label_class.send(:include, Inflectional::LabelExtension)
+    label_class.send(:include, Iqvoc::Inflectionals::LabelExtensions)
   end
 
   def self.deep_cloning_relations

data/config/engine.rb

@@ -4,9 +4,7 @@ module Iqvoc
   module Inflectionals
 
     class Engine < Rails::Engine
-
       paths["lib/tasks"] << "lib/engine_tasks"
-
     end
 
   end

data/config/environments/development.rb

@@ -1,55 +1,9 @@
+require 'debug'
+require 'iqvoc/environments/development'
+
 if Iqvoc::Inflectionals.const_defined?(:Application)
   Iqvoc::Inflectionals::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-
-    # In the development environment your application's code is reloaded on
-    # every request.  This slows down response time but is perfect for development
-    # since you don't have to restart the web server when you make code changes.
-    config.cache_classes = false
-
-    # Log error messages when you accidentally call methods on nil.
-    config.whiny_nils = true
-
-    # Show full error reports and disable caching
-    config.consider_all_requests_local = true
-    config.action_controller.perform_caching = false
-
-    # Don't care if the mailer can't send
-    config.action_mailer.raise_delivery_errors = false
-
-    # Print deprecation notices to the Rails logger
-    config.active_support.deprecation = :log
-
-    # Only use best-standards-support built into browsers
-    config.action_dispatch.best_standards_support = :builtin
-
-    # The default URI prefix for RDF data. This will be followed by a document-
-    # specific snippet like (specimenType) and the id.
-
-    # Do not compress assets
-    config.assets.compress = false
-
-    # Expands the lines which load the assets
-    config.assets.debug = true
-
-    # The JDBC driver URL for the connection to the virtuoso triple store.
-    # Login credentials have to be stored here too. See
-    # http://docs.openlinksw.com/virtuoso/VirtuosoDriverJDBC.html#jdbcurl4mat for
-    # more details.
-    # Example: "jdbc:virtuoso://localhost:1111/UID=dba/PWD=dba"
-    # Use nil to disable virtuoso triple synchronization
-    # Rails.application.config.virtuoso_jdbc_driver_url = "jdbc:virtuoso://virtuoso.dyndns.org:1111/UID=iqvoc/PWD=vocpass!/charset=UTF-8"
-    config.virtuoso_jdbc_driver_url = nil
-
-    # Set up the virtuoso synchronization (which is a triggered pull from the
-    # virtuoso server) to be run in a new thread.
-    # This is needed in environments where the web server only runs in a single
-    # process/thread (mostly in development environments).
-    # When a synchronization would be triggered e.g. from a running
-    # update action in the UPB, the update would trigger virtuoso to do a HTTP GET
-    # back to the UPB to fetch the RDF data. But the only process in the UPB would be
-    # blocked by the update... => Deadlock. You can avoid this by using the threaded
-    # mode.
-    config.virtuoso_sync_threaded = false
+    Iqvoc::Environments.setup_development(config)
   end
 end

data/config/environments/production.rb

@@ -1,64 +1,8 @@
+require 'iqvoc/environments/production'
+
 if Iqvoc::Inflectionals.const_defined?(:Application)
   Iqvoc::Inflectionals::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-
-    # The production environment is meant for finished, "live" apps.
-    # Code is not reloaded between requests
-    config.cache_classes = true
-
-    # Full error reports are disabled and caching is turned on
-    config.consider_all_requests_local = false
-    config.action_controller.perform_caching = true
-
-    # Specifies the header that your server uses for sending files
-    config.action_dispatch.x_sendfile_header = "X-Sendfile"
-
-    # For nginx:
-    # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
-
-    # If you have no front-end server that supports something like X-Sendfile,
-    # just comment this out and Rails will serve the files
-
-    # See everything in the log (default is :info)
-    # config.log_level = :debug
-
-    # Use a different logger for distributed setups
-    # config.logger = SyslogLogger.new
-
-    # Use a different cache store in production
-    # config.cache_store = :mem_cache_store
-
-    # Disable Rails's static asset server
-    # In production, Apache or nginx will already do this
-    config.serve_static_assets = false
-
-    # Enable serving of images, stylesheets, and javascripts from an asset server
-    # config.action_controller.asset_host = "http://assets.example.com"
-
-    # Disable delivery errors, bad email addresses will be ignored
-    # config.action_mailer.raise_delivery_errors = false
-
-    # Enable threaded mode
-    # config.threadsafe!
-
-    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-    # the I18n.default_locale when a translation can not be found)
-    config.i18n.fallbacks = true
-
-    # Send deprecation notices to registered listeners
-    config.active_support.deprecation = :notify
-
-    # Disable Rails's static asset server
-    # In production, Apache or nginx will already do this
-    config.serve_static_assets = false
-
-    # Compress JavaScripts and CSS
-    config.assets.compress = true
-
-    # Don't fallback to assets pipeline if a precompiled asset is missed
-    config.assets.compile = false
-
-    # Generate digests for assets URLs
-    config.assets.digest = true
+    Iqvoc::Environments.setup_production(config)
   end
 end

data/config/environments/test.rb

@@ -1,46 +1,9 @@
+require 'debug'
+require 'iqvoc/environments/test'
+
 if Iqvoc::Inflectionals.const_defined?(:Application)
   Iqvoc::Inflectionals::Application.configure do
     # Settings specified here will take precedence over those in config/environment.rb
-
-    config.autoload_paths += [Rails.root.join("test")]
-
-    # The test environment is used exclusively to run your application's
-    # test suite.  You never need to work with it otherwise.  Remember that
-    # your test database is "scratch space" for the test suite and is wiped
-    # and recreated between test runs.  Don't rely on the data there!
-    config.cache_classes = true
-
-    # Log error messages when you accidentally call methods on nil.
-    config.whiny_nils = true
-
-    # Show full error reports and disable caching
-    config.consider_all_requests_local = true
-    config.action_controller.perform_caching = false
-
-    # Raise exceptions instead of rendering exception templates
-    config.action_dispatch.show_exceptions = false
-
-    # Disable request forgery protection in test environment
-    config.action_controller.allow_forgery_protection = false
-
-    # Tell Action Mailer not to deliver emails to the real world.
-    # The :test delivery method accumulates sent emails in the
-    # ActionMailer::Base.deliveries array.
-    config.action_mailer.delivery_method = :test
-
-    # Use SQL instead of Active Record's schema dumper when creating the test database.
-    # This is necessary if your schema can't be completely dumped by the schema dumper,
-    # like if you have constraints or database-specific column types
-    # config.active_record.schema_format = :sql
-
-    # Print deprecation notices to the stderr
-    config.active_support.deprecation = :stderr
-
-    # Configure static asset server for tests with Cache-Control for performance
-    config.serve_static_assets = true
-    config.static_cache_control = "public, max-age=3600"
-
-    # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-    config.assets.allow_debugging = true
+    Iqvoc::Environments.setup_test(config)
   end
 end

data/config/initializers/iqvoc.rb

@@ -2,7 +2,7 @@
 
 require 'iqvoc/xllabel' # XXX: this basically duplicates iqvoc_skosxl's initializer - but is required to ensure correct loading order!?
 
-Iqvoc.title = "iQvoc Inflectionals"
+Iqvoc.config.register_setting("title", "iQvoc Inflectionals")
 
 #Iqvoc.searchable_class_names << "Inflectional::Base" # XXX: application's responsibility!?
 

data/iqvoc_inflectionals.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "iqvoc_inflectionals"
 
-  s.add_dependency "rails", "~> 3.1.3"
-  s.add_dependency "iqvoc"
-  s.add_dependency "iqvoc_skosxl"
+  s.add_dependency "rails", "~> 3.2.1"
+  s.add_dependency "iqvoc", "~> 3.5.1"
+  s.add_dependency "iqvoc_skosxl", "~> 1.2.0"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/iqvoc/inflectionals/label_extensions.rb

@@ -2,22 +2,74 @@
 
 require "active_support/concern"
 
-module Iqvoc::Inflectionals::LabelExtensions
-  extend ActiveSupport::Concern
+module Iqvoc
+  module Inflectionals
+    module LabelExtensions
+      extend ActiveSupport::Concern
 
-  included do
-    include Inflectional::LabelExtension
+      included do
+        attr_reader :inflectionals_attributes
+        after_save :overwrite_inflectionals!
+    
+        after_save do |label|
+          # ensure a matching inflectional exists
+          if Inflectional::Base.where(:label_id => label.id, :value => label.value).none?
+            label.inflectionals.create(:value => label.value)
+          end
+        end
 
-    after_save do |label|
-      # ensure a matching inflectional exists
-      if Inflectional::Base.where(:label_id => label.id, :value => label.value).none?
-        label.inflectionals.create(:value => label.value)
+        has_many :inflectionals,
+            :class_name  => "Inflectional::Base",
+            :foreign_key => "label_id",
+            :dependent   => :destroy
       end
-    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 = OriginMapping.replace_umlauts(value)
+
+        diff = OriginMapping.sanitize_for_base_form(converted_literal_form).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
 
-    has_many :inflectionals,
-        :class_name  => "Inflectional::Base",
-        :foreign_key => "label_id",
-        :dependent   => :destroy
+        self.base_form = new_base_form
+        save(:validate => false)
+
+        send(Inflectional::Base.name.to_relation_name)
+      end
+
+      def inflectionals_attributes=(str)
+        @inflectionals_attributes = str.split("\r\n")
+      end
+
+      def overwrite_inflectionals!
+        return unless inflectionals_attributes
+        transaction do
+          send(Inflectional::Base.name.to_relation_name).delete_all
+          inflectionals_attributes.each do |value|
+            send(Inflectional::Base.name.to_relation_name).create!(:value => value)
+          end
+        end
+      end
+      
+    end
   end
 end

data/lib/iqvoc/inflectionals/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module Inflectionals
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_inflectionals
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,41 +11,41 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70113691097300 !ruby/object:Gem::Requirement
+  requirement: &70349800951440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70113691097300
+  version_requirements: *70349800951440
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70113691096880 !ruby/object:Gem::Requirement
+  requirement: &70349800949700 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70113691096880
+  version_requirements: *70349800949700
 - !ruby/object:Gem::Dependency
   name: iqvoc_skosxl
-  requirement: &70113691093340 !ruby/object:Gem::Requirement
+  requirement: &70349800948360 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113691093340
+  version_requirements: *70349800948360
 description: ''
 email:
 - robert.glaser@innoq.com
@@ -59,7 +59,6 @@ files:
 - README.md
 - Rakefile
 - app/models/inflectional/base.rb
-- app/models/inflectional/label_extension.rb
 - app/views/partials/inflectional/_base.html.erb
 - app/views/partials/inflectional/_edit_base.html.erb
 - app/views/partials/inflectional/_search_result.html.erb
@@ -72,8 +71,8 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
-- config/initializers/engine_extensions.rb
 - config/initializers/iqvoc.rb
+- config/initializers/label_extensions.rb
 - config/initializers/secret_token.rb.template
 - config/initializers/session_store.rb
 - config/locales/activerecord.de.yml

data/app/models/inflectional/label_extension.rb

@@ -1,58 +0,0 @@
-# encoding: UTF-8
-
-require "active_support/concern"
-
-module Inflectional::LabelExtension
-  extend ActiveSupport::Concern
-
-  included do
-    attr_reader :inflectionals_attributes
-    after_save :overwrite_inflectionals!
-  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 = OriginMapping.replace_umlauts(value)
-
-    diff = OriginMapping.sanitize_for_base_form(converted_literal_form).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)
-
-    send(Inflectional::Base.name.to_relation_name)
-  end
-
-  def inflectionals_attributes=(str)
-    @inflectionals_attributes = str.split("\r\n")
-  end
-
-  def overwrite_inflectionals!
-    return unless inflectionals_attributes
-    transaction do
-      send(Inflectional::Base.name.to_relation_name).delete_all
-      inflectionals_attributes.each do |value|
-        send(Inflectional::Base.name.to_relation_name).create!(:value => value)
-      end
-    end
-  end
-end