iqvoc_skosxl 1.2.0 → 1.2.1

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 gem 'rails', '3.2.1'
-gem 'iqvoc', '~> 3.5.1' #, :path => '../iqvoc'
+gem 'iqvoc', '~> 3.5.5'
 
 group :development do
   gem 'awesome_print'
@@ -17,7 +17,7 @@ group :development, :test do
     gem 'sqlite3'
   end
   platforms :jruby do
-    gem 'activerecord-jdbcsqlite-adapter'
+    gem 'activerecord-jdbcsqlite3-adapter'
     gem 'activerecord-jdbcmysql-adapter'
   end
 end

data/Gemfile.lock

@@ -22,6 +22,14 @@ GEM
       activesupport (= 3.2.1)
       arel (~> 3.0.0)
       tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2)
+    activerecord-jdbcmysql-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-mysql (~> 5.1.0)
+    activerecord-jdbcsqlite3-adapter (1.2.2)
+      activerecord-jdbc-adapter (~> 1.2.2)
+      jdbc-sqlite3 (~> 3.7.2)
+    activerecord-oracle_enhanced-adapter (1.4.1)
     activeresource (3.2.1)
       activemodel (= 3.2.1)
       activesupport (= 3.2.1)
@@ -53,23 +61,29 @@ GEM
     factory_girl_rails (1.6.0)
       factory_girl (~> 2.5.0)
       railties (>= 3.0.0)
+    fastercsv (1.5.4)
     ffi (1.0.11)
+    ffi (1.0.11-java)
     hike (1.2.1)
     i18n (0.6.0)
     iq_rdf (0.1.2)
       builder
       bundler
-    iqvoc (3.5.1)
+    iqvoc (3.5.5)
       authlogic
       bundler
       cancan
+      fastercsv
       iq_rdf (~> 0.1.2)
       json
       kaminari
       rails (~> 3.2.1)
       rails_autolink
+    jdbc-mysql (5.1.13)
+    jdbc-sqlite3 (3.7.2)
     journey (1.0.1)
     json (1.6.5)
+    json (1.6.5-java)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -82,6 +96,7 @@ GEM
     multi_json (1.0.4)
     mysql2 (0.3.11)
     nokogiri (1.5.0)
+    nokogiri (1.5.0-java)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.1)
@@ -134,17 +149,18 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activerecord-jdbcmysql-adapter
-  activerecord-jdbcsqlite-adapter
+  activerecord-jdbcsqlite3-adapter
   activerecord-oracle_enhanced-adapter
   awesome_print
   capybara
   database_cleaner
   factory_girl_rails
-  iqvoc (~> 3.5.1)
+  iqvoc (~> 3.5.5)
   mysql2
   nokogiri (~> 1.5.0)
   rails (= 3.2.1)

data/app/models/concept/skosxl/extension.rb

@@ -24,23 +24,7 @@ module Concept
               end
             end
           end
-
-        end
-
-        def valid_label_language
-          (@labelings_by_id || {}).each { |labeling_class_name, origin_mappings|
-            origin_mappings.each { |language, new_origins|
-              new_origins = new_origins.split(Iqvoc::InlineDataHelper::Splitter)
-              Iqvoc::XLLabel.base_class.by_origin(new_origins).each do |label|
-                if label.language != language.to_s
-                  errors.add(:base,
-                      I18n.t("txt.controllers.versioned_concept.label_error") % label)
-                end
-              end
-            }
-          }
         end
-
       end
 
       def labelings_by_id=(hash)
@@ -52,6 +36,20 @@ module Concept
           self.send(relation_name).by_label_language(language).
               map { |l| l.target.origin }.join(Iqvoc::InlineDataHelper::Joiner)
       end
+      
+      def valid_label_language
+        (@labelings_by_id || {}).each { |labeling_class_name, origin_mappings|
+          origin_mappings.each { |language, new_origins|
+            new_origins = new_origins.split(Iqvoc::InlineDataHelper::Splitter)
+            Iqvoc::XLLabel.base_class.by_origin(new_origins).each do |label|
+              if label.language != language.to_s
+                errors.add(:base,
+                    I18n.t("txt.controllers.versioned_concept.label_error") % label)
+              end
+            end
+          }
+        }
+      end
 
     end
   end

data/app/models/label/relation/base.rb

@@ -9,27 +9,28 @@ class Label::Relation::Base < ActiveRecord::Base
   belongs_to :domain, :class_name => "Label::Base"
   belongs_to :range,  :class_name => "Label::Base"
 
-  scope :by_domain, lambda { |domain|
+  def self.by_domain(domain)
     where(:domain_id => domain)
-  }
-
-  scope :by_range, lambda { |range|
+  end
+  
+  def self.by_range(range)
     where(:range_id => range)
-  }
-
-  scope :by_range_origin, lambda { |origin|
+  end
+  
+  def self.by_range_origin(origin)
     includes(:range).merge(Label::Base.by_origin(origin))
-  }
-
-  scope :range_editor_selectable, lambda {
-   # includes(:range) & Iqvoc::XLLabel.base_class.editor_selectable # Doesn't work correctly (kills label_relations.type condition :-( )
-   includes(:range).where("labels.published_at IS NOT NULL OR (labels.published_at IS NULL AND labels.published_version_id IS NULL) ")
-  }
+  end
+  
+  def self.range_editor_selectable
+    # includes(:range) & Iqvoc::XLLabel.base_class.editor_selectable 
+    # Doesn't work correctly (kills label_relations.type condition :-( )
+    includes(:range).
+    where("labels.published_at IS NOT NULL OR (labels.published_at IS NULL AND labels.published_version_id IS NULL) ")
+  end
 
-  scope :range_in_edit_mode, lambda {
+  def self.range_in_edit_mode
     joins(:range).merge(Iqvoc::XLLabel.base_class.in_edit_mode)
-  }
-
+  end
 
   def self.view_section(obj)
     "relations"

data/app/models/label/skosxl/base.rb

@@ -89,16 +89,17 @@ class Label::SKOSXL::Base < Label::Base
 
   # ********** Scopes
 
-  scope :by_origin, lambda { |origin|
+  def self.by_origin(origin)
     where(:origin => origin)
-  }
-
-  scope :with_associations, lambda { includes(:labelings => :owner) }
+  end
 
-  scope :for_dashboard, lambda {
-    unpublished_or_follow_up.
-      includes(:locking_user)
-  }
+  def self.with_associations
+    includes(:labelings => :owner)
+  end
+  
+  def self.for_dashboard
+    unpublished_or_follow_up.includes(:locking_user)
+  end
 
   # ********** Methods
 

data/app/models/labeling/skosxl/base.rb

@@ -1,20 +1,20 @@
 class Labeling::SKOSXL::Base < Labeling::Base
 
-  scope :target_in_edit_mode, lambda {
+  def self.target_in_edit_mode
     includes(:target).merge(Iqvoc::XLLabel.base_class.in_edit_mode)
-  }
+  end
 
-  scope :by_label_origin, lambda { |origin|
+  def self.by_label_origin(origin)
     includes(:target).merge(self.label_class.by_origin(origin))
-  }
-
-  scope :by_label_language, lambda { |language|
+  end
+  
+  def self.by_label_language(language)
     includes(:target).merge(self.label_class.by_language(language))
-  }
-
-  scope :label_editor_selectable, lambda { # Lambda because self.label_class is currently not known + we don't want to call it at load time!
+  end
+  
+  def self.label_editor_selectable
     includes(:target).merge(self.label_class.editor_selectable)
-  }
+  end
 
   def self.create_for(o, t)
     find_or_create_by_owner_id_and_target_id(o.id, t.id)
@@ -66,6 +66,10 @@ class Labeling::SKOSXL::Base < Labeling::Base
   def self.edit_partial_name(obj)
     "partials/labeling/skosxl/edit_base"
   end
+  
+  # def by_label_language(language)
+  #   includes(:target).merge(self.label_class.by_language(language))
+  # end
 
   def build_search_result_rdf(document, result)
     result.Sdc::link(IqRdf.build_uri(owner.origin))

data/config/locales/activerecord.en.yml

@@ -1,4 +1,4 @@
-de:
+en:
   activerecord:
     models:
       label/skosxl/base: 

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120119000000) do
+ActiveRecord::Schema.define(:version => 20120201120736) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"
@@ -44,6 +44,7 @@ ActiveRecord::Schema.define(:version => 20120119000000) do
     t.date     "rdf_updated_at"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "top_term",                             :default => false
   end
 
   add_index "concepts", ["origin"], :name => "ix_concepts_on_origin", :length => {"origin"=>255}

data/lib/iqvoc/skosxl/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SKOSXL
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_skosxl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000 Z
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70319992012880 !ruby/object:Gem::Requirement
+  requirement: &70305772581040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70319992012880
+  version_requirements: *70305772581040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70319992012460 !ruby/object:Gem::Requirement
+  requirement: &70305772580620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319992012460
+  version_requirements: *70305772580620
 description: ''
 email:
 - till.schulte-coerne@innoq.com
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: iQvoc SKOS-XL extension