sparql-client 0.0.3 → 0.0.4

data/CONTRIBUTORS

@@ -0,0 +1 @@
+* Nicholas Humfrey <njh@aelius.com>

data/README

@@ -68,8 +68,8 @@ Documentation
 Dependencies
 ------------
 
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.1.7)
-* [JSON](http://rubygems.org/gems/json_pure) (>= 1.2.3)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 0.1.10)
+* [JSON](http://rubygems.org/gems/json_pure) (>= 1.4.0)
 
 Installation
 ------------
@@ -107,6 +107,10 @@ Authors
 * [Arto Bendiken](mailto:arto.bendiken@gmail.com) - <http://ar.to/>
 * [Ben Lavender](mailto:blavender@gmail.com) - <http://bhuga.net/>
 
+Contributors
+------------
+* [Nicholas Humfrey](mailto:njh@aelius.com) - <http://www.aelius.com/njh/>
+
 License
 -------
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/sparql/client/repository.rb

@@ -3,7 +3,7 @@ module SPARQL; class Client
   # A read-only repository view of a SPARQL endpoint.
   #
   # @see RDF::Repository
-  class Repository < ::RDF::Repository
+  class Repository < RDF::Repository
     # @return [SPARQL::Client]
     attr_reader :client
 
@@ -24,8 +24,7 @@ module SPARQL; class Client
     # @see    RDF::Repository#each
     def each(&block)
       unless block_given?
-        require 'enumerator' unless defined?(::Enumerable::Enumerator)
-        ::Enumerable::Enumerator.new(self, :each)
+        RDF::Enumerator.new(self, :each)
       else
         client.construct([:s, :p, :o]).where([:s, :p, :o]).each_statement(&block)
       end
@@ -70,8 +69,7 @@ module SPARQL; class Client
     # @see    RDF::Repository#each_subject?
     def each_subject(&block)
       unless block_given?
-        require 'enumerator' unless defined?(::Enumerable::Enumerator)
-        ::Enumerable::Enumerator.new(self, :each_subject)
+        RDF::Enumerator.new(self, :each_subject)
       else
         client.select(:s, :distinct => true).where([:s, :p, :o]).each { |solution| block.call(solution[:s]) }
       end
@@ -86,8 +84,7 @@ module SPARQL; class Client
     # @see    RDF::Repository#each_predicate?
     def each_predicate(&block)
       unless block_given?
-        require 'enumerator' unless defined?(::Enumerable::Enumerator)
-        ::Enumerable::Enumerator.new(self, :each_predicate)
+        RDF::Enumerator.new(self, :each_predicate)
       else
         client.select(:p, :distinct => true).where([:s, :p, :o]).each { |solution| block.call(solution[:p]) }
       end
@@ -102,8 +99,7 @@ module SPARQL; class Client
     # @see    RDF::Repository#each_object?
     def each_object(&block)
       unless block_given?
-        require 'enumerator' unless defined?(::Enumerable::Enumerator)
-        ::Enumerable::Enumerator.new(self, :each_object)
+        RDF::Enumerator.new(self, :each_object)
       else
         client.select(:o, :distinct => true).where([:s, :p, :o]).each { |solution| block.call(solution[:o]) }
       end
@@ -158,6 +154,37 @@ module SPARQL; class Client
       client.ask.whether([:s, :p, :o]).false?
     end
 
+    ##
+    # Queries `self` for RDF statements matching the given `pattern`.
+    #
+    # @example
+    #     repository.query([nil, RDF::DOAP.developer, nil])
+    #     repository.query(:predicate => RDF::DOAP.developer)
+    #
+    # @param  [Query, Statement, Array(Value), Hash] pattern
+    # @yield  [statement]
+    # @yieldparam [Statement]
+    # @return [Enumerable<Statement>]
+    def query(pattern, &block)
+      case pattern
+        when RDF::Query::Pattern
+          query = client.construct(pattern).where(pattern)
+          if block_given?
+            query.each_statement(&block)
+          else
+            query.solutions.to_a.extend(RDF::Enumerable, RDF::Queryable)
+          end
+        when RDF::Statement
+          query(RDF::Query::Pattern.new({
+            :subject   => pattern.subject   || :s,
+            :predicate => pattern.predicate || :p,
+            :object    => pattern.object    || :o,
+          }), &block)
+        else
+          super(pattern, &block)
+      end
+    end
+
     ##
     # Returns `false` to indicate that this is a read-only repository.
     #

data/lib/sparql/client/version.rb

@@ -2,7 +2,7 @@ module SPARQL; class Client
   module VERSION
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
     EXTRA = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Arto Bendiken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 +02:00
+date: 2010-05-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +23,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 1
-        - 6
-        version: 0.1.6
+        - 10
+        version: 0.1.10
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -56,8 +56,8 @@ dependencies:
         segments: 
         - 0
         - 5
-        - 3
-        version: 0.5.3
+        - 4
+        version: 0.5.4
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -65,13 +65,13 @@ dependencies:
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 1
-        - 7
-        version: 0.1.7
+        - 10
+        version: 0.1.10
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -79,13 +79,13 @@ dependencies:
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        - 3
-        version: 1.2.3
+        - 4
+        - 0
+        version: 1.4.0
   type: :runtime
   version_requirements: *id005
 description: SPARQL client for RDF.rb.
@@ -98,6 +98,7 @@ extra_rdoc_files: []
 
 files: 
 - AUTHORS
+- CONTRIBUTORS
 - README
 - UNLICENSE
 - VERSION