semantic_naming 2.0.1 → 2.0.2

data/lib/semantic_naming/source_class.rb

@@ -54,9 +54,38 @@ module N
       qry.where(:class, RDF.type, RDFS.Class)
       qry.where(:subclass, RDFS.subClassOf, :class)
       subtype_list = qry.execute
+      
+      build_hierarchy_from(subtype_list, rdf_types)
+    end
+    
+    # This works like the subclass_hierarchy method, with the exception that
+    # 
+    # * Ontology information is only used for subtype relations
+    # * Resources are considered a "type" if they appear as an rdf:type attribute
+    # * Only types that are actively used (that is they appear as an rdf:type attribute)
+    #   are included
+    def self.used_subclass_hierarchy
+      all_types_qry = Query.new(SourceClass).distinct.select(:type)
+      all_types_qry.where(:element, RDF.type, :type)
+      all_types = all_types_qry.execute
+      
+      qry = Query.new(SourceClass).distinct.select(:class, :subclass)
+      qry.where(:element, RDF.type, :class)
+      qry.where(:other, RDF.type, :subclass)
+      qry.where(:subclass, RDFS.subClassOf, :class)
+      subtype_list = qry.execute
+      
+      build_hierarchy_from(subtype_list, all_types)
+    end
+    
+    private
+    
+    # If all_types is given, it must be a true superset of all
+    # types in the query result
+    def self.build_hierarchy_from(query_result, all_types = nil)
       hierarchy = {}
       # Sift through the triples and add the sub-items
-      subtype_list.each do |sub_items|
+      query_result.each do |sub_items|
         klass, subklass = sub_items
         hierarchy[klass] ||= {}
         hierarchy[klass][subklass] = true
@@ -72,12 +101,17 @@ module N
         end
       end
       
+      all_types ||= hierarchy.keys
+      
       # Join with the general types and remove the children
-      types.each do |type|
+      all_types.each do |type|
         xtype = (hierarchy[type] ||= {})
         hierarchy.delete(type) if(xtype.delete(:is_child))
       end
       
+      hierarchy.delete(N::RDFS.Class)
+      hierarchy.delete(N::OWL.Class) if(defined?(N::OWL))
+      
       hierarchy
     end
     

data/test/source_class_test.rb

@@ -49,5 +49,9 @@ class TypeTest < Test::Unit::TestCase
     assert_equal({N::RDFTEST.Type1 => { N::RDFTEST.Type2 => {}, N::RDFTEST.Type3 => {} }, N::RDFTEST.Type4 => { N::RDFTEST.Type3 => {}}}, hierarchy)
   end
   
+  def test_used_subclass_hierarchy
+    hierarchy = N::SourceClass.used_subclass_hierarchy
+    assert_equal({N::RDFTEST.Type1 => { N::RDFTEST.Type2 => {}}}, hierarchy)
+  end
   
 end

metadata

@@ -5,7 +5,7 @@ homepage: http://talia.discovery-project.eu/
 executables: []
 
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 post_install_message: 
 date: 2009-11-04 23:00:00 +00:00
 files: