semantic_naming 2.1.3 → 2.2.0

data/lib/ontology_graph/graph.rb

@@ -50,18 +50,18 @@ module OntologyGraph
       return unless(N::URI.active_rdf?)
       
       # First select all classes and add them as nodes
-      class_qry = Query.new(N::URI).select(:class).where(:class, N::RDF.type, N::RDFS.Class)
+      class_qry = ActiveRDF::Query.new(N::URI).select(:class).where(:class, N::RDF.type, N::RDFS.Class)
       types = class_qry.execute
       types.each { |t| @class_hash[t.to_s] = ClassNode.new(t.to_s) }
       
       # Now, look for all subclass relationships and add them
-      subtype_qry = Query.new(N::URI).distinct.select(:class, :subclass)
+      subtype_qry = ActiveRDF::Query.new(N::URI).distinct.select(:class, :subclass)
       subtype_qry.where(:subclass, RDFS.subClassOf, :class)
       subtype_list = subtype_qry.execute
       subtype_list.each  { |cl, subcl| add_relation(cl, subcl) }
       
       # Flag all classes that are actually used
-      used_types_qry = Query.new(N::URI).distinct.select(:type)
+      used_types_qry = ActiveRDF::Query.new(N::URI).distinct.select(:type)
       used_types_qry.where(:element, RDF.type, :type)
       used_types = used_types_qry.execute
       used_types.each { |t| get_or_create_node(t).flag_used }

data/lib/semantic_naming/namespace.rb

@@ -19,9 +19,9 @@ module N
     # (e.g. Onotology classes)
     def elements_with_type(type, element_type = N::URI)
       return unless(rdf_active? && is_iri?)
-      qry = ::Query.new(element_type).distinct.select(:s)
+      qry = ActiveRDF::Query.new(element_type).distinct.select(:s)
       qry.where(:s, RDF.type, type)
-      qry.filter_regexp(:s, "^#{@uri_s}")
+      qry.regexp(:s, "^#{@uri_s}")
       qry.execute
     end
     

data/lib/semantic_naming/source_class.rb

@@ -26,7 +26,7 @@ module N
     # graph but cause an RDF query on each call
     def instances(return_type)
       return nil unless(active_rdf? && is_iri?)
-      qry = Query.new(URI).distinct.select(:s)
+      qry = ActiveRDF::Query.new(URI).distinct.select(:s)
       qry.where(:s, RDF.type, self)
       qry.execute
     end

data/lib/semantic_naming/uri.rb

@@ -256,7 +256,7 @@ module N
     # Check if the ActiveRDF library is present.
     def self.active_rdf?
       unless(defined?(@active_rdf))
-        @active_rdf = defined?(::ConnectionPool) &&  (::ConnectionPool.read_adapters.size > 0)
+        @active_rdf = defined?(ActiveRDF::ConnectionPool) &&  (ActiveRDF::ConnectionPool.read_adapters.size > 0)
       end
       
       @active_rdf
@@ -282,7 +282,7 @@ module N
     # Gets the rdfs:labels from the rdf store
     def rdfs_labels
      if(active_rdf? && is_iri?)
-        labels = Query.new(N::URI).distinct.select(:label).where(self, N::RDFS.label, :label).execute
+        labels = ActiveRDF::Query.new(N::URI).distinct.select(:label).where(self, N::RDFS.label, :label).execute
         if(labels && labels.size > 0)
           labels
         end # else nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: semantic_naming
 version: !ruby/object:Gem::Version 
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors: 
   - Daniel Hahn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 +01:00
+date: 2010-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: []