rdf-4store 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/rdf/four_store/repository.rb

@@ -17,7 +17,7 @@ module RDF::FourStore
 
     attr_reader :endpointURI, :dataURI, :updateURI, :statusURI, :sizeURI
 
-    DEFAULT_CONTEXT = "local:".freeze
+    DEFAULT_CONTEXT = "default:".freeze
 
     ##
     # Constructor of RDF::FourStore::Repository
@@ -146,12 +146,10 @@ module RDF::FourStore
     # @see RDF::Mutable#insert_statement
     # @private
     def insert_statement(statement)
-      #TODO: save the given RDF::Statement.  Don't save duplicates.
-      #
-      #unless has_statement?(statement)
+      unless has_statement?(statement)
         dump = dump_statement(statement)
         post_data(dump, statement.context)
-      #end
+      end
     end
 
     ##
@@ -184,58 +182,84 @@ module RDF::FourStore
     # @yield  [statement]
     # @yieldparam [Statement]
     # @return [Enumerable<Statement>]
-    def query(pattern, &block)
-      case pattern
-      when RDF::Statement
-        h = {
-          :subject => pattern.subject || :s,
-          :predicate => pattern.predicate || :p,
-          :object => pattern.object || :o,
-          :context => pattern.context || nil
-        }
-        super(RDF::Query::Pattern.new(h), &block)
-      when Array
-        h = {
-          :subject => pattern[0] || :s,
-          :predicate => pattern[1] || :p,
-          :object => pattern[2]  || :o,
-          :context => pattern[3]  || nil
-        }
-        super(RDF::Query::Pattern.new(h), &block)
-      when Hash
-        pattern[:subject] ||= :s
-        pattern[:predicate] ||= :p
-        pattern[:object] ||= :o
-        super(RDF::Query::Pattern.new(pattern), &block)
-      else
-        super(pattern, &block)
-      end
-    end
+#     def query(pattern, &block)
+#       case pattern
+#       when RDF::Statement
+#         h = {
+#           :subject => pattern.subject || :s,
+#           :predicate => pattern.predicate || :p,
+#           :object => pattern.object || :o,
+#           :context => pattern.context || nil
+#         }
+#         super(RDF::Query::Pattern.new(h), &block)
+#       when Array
+#         h = {
+#           :subject => pattern[0] || :s,
+#           :predicate => pattern[1] || :p,
+#           :object => pattern[2]  || :o,
+#           :context => pattern[3]  || nil
+#         }
+#         super(RDF::Query::Pattern.new(h), &block)
+#       when Hash
+#         pattern[:subject] ||= :s
+#         pattern[:predicate] ||= :p
+#         pattern[:object] ||= :o
+#         super(RDF::Query::Pattern.new(pattern), &block)
+#       else
+#         super(pattern, &block)
+#       end
+#     end
 
     def query_pattern(pattern, &block)
-      context = pattern.context || DEFAULT_CONTEXT
+      pattern = pattern.dup
+      pattern.subject ||= RDF::Query::Variable.new
+      pattern.predicate ||= RDF::Query::Variable.new
+      pattern.object ||= RDF::Query::Variable.new
+      pattern.context ||= nil
       str = pattern.to_s
-      q = "CONSTRUCT { #{str} } WHERE { GRAPH <#{context}> { #{str} } } "
+      q = ""
+      if pattern.context
+        q = "CONSTRUCT { #{str} } WHERE { GRAPH <#{pattern.context}> { #{str} } } "
+      else
+        q = "CONSTRUCT { #{str} } WHERE { #{str} } "
+      end
       result = @client.query(q)
       if result
         if block_given?
           result.each_statement(&block)
         else
-          result
+          result.solutions.to_a.extend(RDF::Enumerable, RDF::Queryable)
         end
       end
     end
 
+    ##
+    # Makes a RDF string from a RDF Statement
+    #
+    # @param [RDF::Statement] statement
+    # @return [String]
     def dump_statement(statement)
       dump_statements([statement])
     end
-    
+
+    ##
+    # Makes a RDF string from RDF Statements
+    # Blank nodes are quoted to be used as constants in queries
+    #
+    # @param [Array(RDF::Statement)] statements
+    # @return [String]
+    # @see http://4store.org/presentations/bbc-2009-09-21/slides.html#(38)
     def dump_statements(statements)
       graph = RDF::Graph.new
       graph.insert_statements(statements)
-      RDF::Writer.for(:ntriples).dump(graph)
+      dump = RDF::Writer.for(:ntriples).dump(graph)
+      dump.gsub(/(_:\w+?) /, "<#{DEFAULT_CONTEXT}\\1> ")
     end
- 
+
+    ##
+    # Uploads a RDF string to a repository
+    # @param [String] content
+    # @param [String] context
     def post_data(content, context = nil)
       context ||= DEFAULT_CONTEXT
       uri = URI.parse(@dataURI)
@@ -252,13 +276,17 @@ module RDF::FourStore
       end
     end
 
-    def post_update(content, context = nil)
+    ##
+    # Sends a SPARUL query to update content in a repository
+    # @param [String] query
+    # @param [String] context
+    def post_update(query, context = nil)
       context ||= DEFAULT_CONTEXT
       uri = URI.parse(@updateURI)
 
       req = Net::HTTP::Post.new(uri.path)
       req.form_data = {
-        'update' => content,
+        'update' => query,
         'graph' => context,
         'content-type' => 'triples',
       }

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rdf-4store
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Fumihiro Kato
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +09:00
+date: 2010-12-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 2
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 2
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 1
         - 4
@@ -90,7 +85,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
@@ -114,7 +108,7 @@ files:
 - lib/rdf/4store.rb
 - lib/rdf/four_store/repository.rb
 - lib/rdf/four_store/version.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/fumi/rdf-4store
 licenses: 
 - Public Domain
@@ -128,7 +122,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
@@ -139,7 +132,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"