iqvoc_compound_forms 1.0.2 → 1.1.0

data/Gemfile

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
-gem 'iqvoc',        '~> 3.3.3'
-gem 'iqvoc_skosxl', '~> 1.1.3'
+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.3)
+  iqvoc (~> 3.5.1)
+  iqvoc_skosxl (~> 1.2.0)
+  rails (~> 3.2.1)
   spork (~> 0.9.0.rc)
   spork-testunit
   sqlite3

data/app/models/compound_form/base.rb

@@ -5,7 +5,7 @@ class CompoundForm::Base < ActiveRecord::Base
   self.rdf_namespace = 'umt'
   self.rdf_predicate = 'compoundForm'
 
-  set_table_name 'compound_forms'
+  self.table_name ='compound_forms'
 
   belongs_to :domain, :class_name => 'Label::Base', :foreign_key => 'domain_id'
 

data/app/models/compound_form/content/base.rb

@@ -2,7 +2,7 @@
 
 class CompoundForm::Content::Base < ActiveRecord::Base
 
-  set_table_name 'compound_form_contents'
+  self.table_name ='compound_form_contents'
 
   belongs_to :compound_form, :class_name => 'CompoundForm::Base', :foreign_key => 'compound_form_id'
   belongs_to :label,         :class_name => 'Label::Base', :foreign_key => 'label_id'

data/config/environments/development.rb

@@ -1,55 +1,9 @@
+require 'debug'
+require 'iqvoc/environments/development'
+
 if Iqvoc::CompoundForms.const_defined?(:Application)
   Iqvoc::CompoundForms::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 = false
-
-    # 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::CompoundForms.const_defined?(:Application)
   Iqvoc::CompoundForms::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::CompoundForms.const_defined?(:Application)
   Iqvoc::CompoundForms::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 Compound Forms"
+Iqvoc.config.register_setting("title", "iQvoc Compound Forms")
 
 Iqvoc::XLLabel.additional_association_class_names.
     merge!("CompoundForm::Base" => "domain_id",

data/iqvoc_compound_forms.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "iqvoc_compound_forms"
 
-  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/compound_forms/label_extensions.rb

@@ -37,36 +37,35 @@ module Iqvoc::CompoundForms::LabelExtensions
     validate :compound_form_contents_size
   end
 
-  module InstanceMethods
-    def compound_in
-      CompoundForm::Base.joins(:compound_form_contents).
-          where(:compound_form_contents => { :label_id => id }).
-          includes(:domain).map(&:domain)
-    end
+  def compound_in
+    CompoundForm::Base.joins(:compound_form_contents).
+        where(:compound_form_contents => { :label_id => id }).
+        includes(:domain).map(&:domain)
+  end
 
-    # Serialized setters and getters (\r\n or , separated)
-    def inline_compound_form_origins
-      @inline_compound_form_origins || []
-    end
+  # Serialized setters and getters (\r\n or , separated)
+  def inline_compound_form_origins
+    @inline_compound_form_origins || []
+  end
 
-    def inline_compound_form_origins=(value_collection)
-      # write to instance variable and write it on after_safe
-      @inline_compound_form_origins = []
+  def inline_compound_form_origins=(value_collection)
+    # write to instance variable and write it on after_safe
+    @inline_compound_form_origins = []
 
-      value_collection.reject(&:blank?).each do |value|
-        @inline_compound_form_origins << value.split(/\r\n|, */).map(&:strip). # XXX: use Iqvoc::InlineDataHelper?
-            reject(&:blank?).uniq
-      end
+    value_collection.reject(&:blank?).each do |value|
+      @inline_compound_form_origins << value.split(/\r\n|, */).map(&:strip). # XXX: use Iqvoc::InlineDataHelper?
+          reject(&:blank?).uniq
     end
+  end
 
-    def compound_form_contents_size
-      if @full_validation
-        compound_forms.each do |cf|
-          if cf.compound_form_contents.count < 2
-            errors.add :base, I18n.t("txt.models.label.compound_form_contents_error")
-          end
+  def compound_form_contents_size
+    if @full_validation
+      compound_forms.each do |cf|
+        if cf.compound_form_contents.count < 2
+          errors.add :base, I18n.t("txt.models.label.compound_form_contents_error")
         end
       end
     end
   end
+
 end

data/lib/iqvoc/compound_forms/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module CompoundForms
-    VERSION = "1.0.2"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_compound_forms
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  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: &70120934922880 !ruby/object:Gem::Requirement
+  requirement: &70106648761580 !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: *70120934922880
+  version_requirements: *70106648761580
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70120934922460 !ruby/object:Gem::Requirement
+  requirement: &70106648759840 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70120934922460
+  version_requirements: *70106648759840
 - !ruby/object:Gem::Dependency
   name: iqvoc_skosxl
-  requirement: &70120934916100 !ruby/object:Gem::Requirement
+  requirement: &70106648758380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70120934916100
+  version_requirements: *70106648758380
 description: ''
 email:
 - robert.glaser@innoq.com