rdf-virtuoso 0.0.12 → 0.0.13

data/README.md

@@ -16,8 +16,9 @@ This example assumes you have a local installation of Virtoso running at standar
 
 #### Setup Repository connection connection with auth
 
-    uri = "http://localhost:8890"
-    REPO = RDF::Virtuoso::Repository.new(uri, :username => 'admin', :password => 'secret', :auth_method => 'digest')
+    uri        = "http://localhost:8890/sparql"
+    update_uri = "http://localhost:8890/sparql-auth"
+    repo       = RDF::Virtuoso::Repository.new(uri, :update_uri => update_uri, :username => 'admin', :password => 'secret', :auth_method => 'digest')
 
 :auth_method can be 'digest' or 'basic'. a repository connection without auth requires only uri
 
@@ -28,7 +29,7 @@ This example assumes you have a local installation of Virtoso running at standar
     subject = RDF::URI.new("http://subject")
 
     query = QUERY.insert([subject, :p, "object"]).graph(graph).where([subject, :p, :o])
-    result = REPO.insert(query)
+    result = repo.insert(query)
 
 #### A count query example
 
@@ -51,7 +52,7 @@ or you can use the RDF::Virtuoso::Prefixes class in a query:
     type   =  RDF::FOO.Document
 
     query  = QUERY.select.where([:s, type, :o]).count(:s).prefixes(prefixes).graph(graph)
-    result = REPO.select(query)
+    result = repo.select(query)
     
 Results will be an array of RDF::Query::Solution that can be accessed by bindings or iterated
 

data/lib/active_rdf/persistence.rb

@@ -16,13 +16,13 @@ module ActiveRDF
     end
 
     module ClassMethods
-
       def connection
         # TODO: make this behave like AM/AR Connection
-        CLIENT
+        #CLIENT
+        REPOSITORY
       end
 
-      def create(attrs = nil) 
+      def create(attrs = nil)
         object = new(attrs)
         object.save
         object
@@ -56,9 +56,10 @@ module ActiveRDF
       end
 
       def count
-        query = "SELECT COUNT(DISTINCT ?s) WHERE { GRAPH <#{self.graph}> { ?s a <#{self.type}> }}"
-        result = CLIENT.select(query)
-        result.first['callret-0'].to_i
+        #query = "SELECT COUNT(DISTINCT ?s) WHERE { GRAPH <#{self.graph}> { ?s a <#{self.type}> }}"
+        query = RDF::Virtuoso::Query.select(:s).count(:s).distinct.where([:s, RDF.type, self.type ])
+        result = connection.select(query)
+        result.first[:count].to_i
       end
 
       def find(object_or_id, conditions = {})
@@ -78,7 +79,7 @@ module ActiveRDF
 
       def execute(sql)
         results = []
-        solutions = CLIENT.select(sql)
+        solutions = connection.select(sql)
         solutions.each do |solution|
           record = new
           solution.each_binding do |name, value|
@@ -103,7 +104,8 @@ module ActiveRDF
       end
 
       def destroy_all
-        query = "DELETE FROM <#{self.graph}> { ?s ?p ?o } WHERE { GRAPH <#{self.graph}> { ?s a <#{self.type}> . ?s ?p ?o } }"
+        #query = "DELETE FROM <#{self.graph}> { ?s ?p ?o } WHERE { GRAPH <#{self.graph}> { ?s a <#{self.type}> . ?s ?p ?o } }"
+        query = RDF::Virtuoso::Query.delete([:s, :p, :o]).graph(self.graph).where([:s, RDF.type, self.type],[:s, :p, :o])
         connection.delete(query)
       end
 
@@ -129,11 +131,8 @@ module ActiveRDF
 
     def destroy
       subject = subject_for(self.id)
-      query = 
-<<-q 
-DELETE FROM <#{graph}> { <#{subject}> ?p ?o } 
-WHERE { <#{subject}> ?p ?o }
-q
+      #p subject
+      query = RDF::Virtuoso::Query.delete([subject, :p, :o]).graph(graph).where([subject, :p, :o])
       result = connection.delete(query)
     end
 

data/lib/active_rdf/version.rb

@@ -2,7 +2,7 @@ module ActiveRDF
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 10
+    TINY  = 13
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/rdf/virtuoso/query.rb

@@ -83,7 +83,6 @@ module RDF::Virtuoso
     end
 
     def self.insert(*patterns)
-      # options = variables.last.is_a?(Hash) ? variables.pop : {}
       options = patterns.last.is_a?(Hash) ? patterns.pop : {}
       self.new(:insert, options).insert(*patterns) 
     end
@@ -385,7 +384,10 @@ module RDF::Virtuoso
     end
 
     ##
-    # @private
+    # @private 
+    # make RDF::Query::Pattern from triple array if not already done
+    # include :context in Statement
+    # @return [RDF::Query::Pattern]
     def build_patterns(patterns)
       patterns.map do |pattern|
         case pattern
@@ -540,10 +542,21 @@ module RDF::Virtuoso
 
       unless patterns.empty? && ([:describe, :insert_data, :delete_data, :create, :clear, :drop].include?(form))
         buffer << 'WHERE {'
-
+        
         buffer << '{' if options[:unions]
-
-        buffer += serialize_patterns(patterns)
+        
+        # iterate patterns
+        # does patterns have :context hash? build with GRAPH statement
+        if patterns.any? { |p| p.has_context? }
+          patterns.each do | pattern|
+            buffer << "GRAPH #{serialize_value(RDF::URI(pattern.context))} {"
+            buffer << serialize_patterns(pattern)
+            buffer << '}'
+          end
+        else
+          buffer += serialize_patterns(patterns)
+        end
+         
         if options[:optionals]
           options[:optionals].each do |patterns|
             buffer << 'OPTIONAL {'
@@ -591,8 +604,12 @@ module RDF::Virtuoso
     ##
     # @private
     def serialize_patterns(patterns)
-      patterns.map do |p|
-        p.to_triple.map { |v| serialize_value(v) }.join(' ') << " ."
+      if patterns.is_a?(RDF::Query::Pattern)
+        patterns.to_triple.map { |v| serialize_value(v) }.join(' ') << " ."
+      else
+        patterns.map do |p|
+          p.to_triple.map { |v| serialize_value(v) }.join(' ') << " ."
+        end
       end
     end
 
@@ -624,7 +641,7 @@ module RDF::Virtuoso
       # the N-Triples serializer is fine unless it's a variable:
       case
         when value.is_a?(String) then value.inspect
-        when value.variable? then value.to_s
+        when value.is_a?(RDF::Query::Variable) then value.to_s
         else RDF::NTriples.serialize(value)
       end
     end

data/lib/rdf/virtuoso/version.rb

@@ -1,5 +1,5 @@
 module RDF
   module Virtuoso
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

data/spec/active_rdf/persistence_spec.rb

@@ -17,12 +17,12 @@ describe ActiveRDF::Persistence do
 
     it "formats the destroy query correctly" do
       subject = resource.subject_for(resource.id)
-      query = 
-<<-q
-DELETE FROM <#{resource.graph}> { <#{subject}> ?p ?o } 
-WHERE { <#{subject}> ?p ?o }
-q
-
+#      query = 
+#<<-q
+#DELETE FROM <#{resource.graph}> { <#{subject}> ?p ?o } 
+#WHERE { <#{subject}> ?p ?o }
+#q
+      query = RDF::Virtuoso::Query.delete([subject, :p, :o]).graph(resource.graph).where([subject, :p, :o])
       resource.connection.should_receive(:delete).with(query)
       resource.destroy
     end

data/spec/query_spec.rb

@@ -127,7 +127,14 @@ describe RDF::Virtuoso::Query do
       ).to_s.should == 
         "SELECT * WHERE { ?s ?p ?o . ?s <#{RDF.type}> <#{RDF::DC.Document}> . }"
     end
-    
+
+    it "should support SELECT WHERE patterns from different GRAPH contexts" do
+      @graph1 = "http://example1.org/"
+      @graph2 = "http://example2.org/"
+      @query.select.where([:s, :p, :o, :context => @graph1],[:s, RDF.type, RDF::DC.Document, :context => @graph2]).to_s.should == 
+        "SELECT * WHERE { GRAPH <#{@graph1}> { ?s ?p ?o . } GRAPH <#{@graph2}> { ?s <#{RDF.type}> <#{RDF::DC.Document}> . } }"
+    end
+        
     it "should support string objects in SPARQL queries" do
       @query.select.where([:s, :p, "dummyobject"]).to_s.should == "SELECT * WHERE { ?s ?p \"dummyobject\" . }"
     end
@@ -158,7 +165,7 @@ describe RDF::Virtuoso::Query do
       @query.select.count(:s).where([:s, :p, :o]).to_s.should == "SELECT (COUNT (?s) AS ?count) WHERE { ?s ?p ?o . }"
     end
 
-    it "should support aggregates SUM, MIN, MAX, AVG, SAMPLE" do
+    it "should support aggregates SUM, MIN, MAX, AVG, SAMPLE, GROUP_CONCAT, GROUP_DIGEST" do
       @query.select.where([:s, :p, :o]).sum(:s).to_s.should == "SELECT (SUM (?s) AS ?sum) WHERE { ?s ?p ?o . }"
       @query.select.where([:s, :p, :o]).min(:s).to_s.should == "SELECT (MIN (?s) AS ?min) WHERE { ?s ?p ?o . }"
       @query.select.where([:s, :p, :o]).max(:s).to_s.should == "SELECT (MAX (?s) AS ?max) WHERE { ?s ?p ?o . }"

data/spec/repository_spec.rb

@@ -9,8 +9,6 @@ describe RDF::Virtuoso do
   context "when connecting to a Virtuoso server" do
     it "should support connecting to a Virtuoso SPARQL endpoint" do
       repo = RDF::Virtuoso::Repository.new(@uri)
-            p repo
-
       repo.instance_variable_get("@sparul_endpoint").should == "/sparql"
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-virtuoso
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -161,17 +161,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: api_smith
   requirement: !ruby/object:Gem::Requirement
@@ -197,25 +197,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/rdf/virtuoso.rb
+- lib/active_rdf.rb
 - lib/rdf/virtuoso/version.rb
-- lib/rdf/virtuoso/parser.rb
+- lib/rdf/virtuoso/query.rb
 - lib/rdf/virtuoso/prefixes.rb
 - lib/rdf/virtuoso/repository.rb
-- lib/rdf/virtuoso/query.rb
-- lib/active_rdf.rb
-- lib/active_rdf/version.rb
-- lib/active_rdf/reflections.rb
-- lib/active_rdf/association_reflection.rb
+- lib/rdf/virtuoso/parser.rb
+- lib/rdf/virtuoso.rb
 - lib/active_rdf/persistence.rb
+- lib/active_rdf/reflections.rb
+- lib/active_rdf/version.rb
 - lib/active_rdf/errors.rb
-- lib/active_rdf/model.rb
+- lib/active_rdf/association_reflection.rb
 - lib/active_rdf/exceptions.rb
+- lib/active_rdf/model.rb
 - spec/repository_spec.rb
+- spec/prefixes_spec.rb
 - spec/query_spec.rb
 - spec/spec_helper.rb
 - spec/active_rdf/persistence_spec.rb
-- spec/prefixes_spec.rb
 homepage: https://github.com/digibib/rdf-virtuoso
 licenses: []
 post_install_message: