sparql 0.3.0 → 0.3.1

data/README.markdown

@@ -56,7 +56,7 @@ an implementation with support for HTTP Get headers (such as `Net::HTTP`).
 
 ### Result formats
 
-{SPARQL.serialize_results} may be used on it's own, or in conjunction with {Rack::SPARQL} or {Sinatra::SPARQL}
+`SPARQL.serialize_results` may be used on it's own, or in conjunction with {Rack::SPARQL} or {Sinatra::SPARQL}
 to provide content-negotiated query results. For basic `SELECT` and `ASK` this includes HTML, XML and JSON formats.
 `DESCRIBE` and `CONSTRUCT` create an `RDF::Graph`, which can be serialized through [HTTP Content Netogiation][conneg]
 using available RDF writers. For best results, require [Linked Data][] to enable

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/sparql

@@ -24,7 +24,7 @@ def run(input, options = {})
     SPARQL::Algebra.parse(input, {:debug => options[:debug]})
   else
     # Only do grammar debugging if we're generating SSE
-    SPARQL::Grammar.parse(input, options.merge(:debug => options.has_key?(:to_sse)))
+    SPARQL::Grammar.parse(input, options)
   end
 
   puts ("\nSSE:\n" + query.to_sse) if options[:debug] || options[:to_sse]

data/lib/sparql.rb

@@ -60,7 +60,7 @@ module SPARQL
   # @option options [RDF::URI, String, Array<RDF::URI, String>] :named_graph_uri
   #   One or more URIs used to initialize the `queryable` as a named context.
   # @return [RDF::Graph, RDF::Query::Solutions, Boolean]
-  #   Note, results may be used with SPARQL.serialize_results to obtain appropriate
+  #   Note, results may be used with {SPARQL.serialize_results} to obtain appropriate
   #   output encoding.
   # @raise  [SPARQL::MalformedQuery] on invalid input
   def self.execute(query, queryable, options = {})

data/lib/sparql/algebra.rb

@@ -309,7 +309,7 @@ module SPARQL
     ##
     # Parses input from the given file name or URL.
     #
-    # @param  [String, #to_s] filename
+    # @param  [String, #to_s] sse
     # @param  [Hash{Symbol => Object}] options
     #   any additional options (see {Operator#initialize})
     # @option options [RDF::URI, #to_s] :base_uri

data/lib/sparql/algebra/extensions.rb

@@ -13,8 +13,14 @@ class Object
   
   ##
   # Make sure the object is in SXP form and transform it to a string form
+  # @return String
   def to_sse
-    self.to_sxp_bin.to_sxp
+    if SXP::VERSION::MAJOR.to_i >= 1 || SXP::VERSION::MINOR.to_i >= 1
+      # FIXME: Right now, this depends on un-merged request, so requires bundler to work
+      SXP::Generator.string(self.to_sxp_bin)
+    else
+      self.to_sxp_bin.to_sxp
+    end
   end
 end
 

data/lib/sparql/algebra/operator.rb

@@ -160,11 +160,15 @@ module SPARQL; module Algebra
     ##
     # Initializes a new operator instance.
     #
-    # @param  [Array<RDF::Term>] operands
-    # @param  [Hash{Symbol => Object}] options
-    #   any additional options
-    # @option options [Boolean] :memoize (false)
-    #   whether to memoize results for particular operands
+    # @overload initialize(*operands)
+    #   @param  [Array<RDF::Term>] operands
+    #
+    # @overload initialize(*operands, options)
+    #   @param  [Array<RDF::Term>] operands
+    #   @param  [Hash{Symbol => Object}] options
+    #     any additional options
+    #   @option options [Boolean] :memoize (false)
+    #     whether to memoize results for particular operands
     # @raise  [TypeError] if any operand is invalid
     def initialize(*operands)
       @options  = operands.last.is_a?(Hash) ? operands.pop.dup : {}
@@ -199,7 +203,7 @@ module SPARQL; module Algebra
     # Set Base URI associated with SPARQL document, typically done
     # when reading SPARQL from a URI
     #
-    # @param [RDF::URI] base
+    # @param [RDF::URI] uri
     # @return [RDF::URI]
     def self.base_uri=(uri)
       @base_uri = RDF::URI(uri)

data/lib/sparql/algebra/operator/bgp.rb

@@ -15,8 +15,8 @@ module SPARQL; module Algebra
       ##
       # A `graph` is an RDF::Query with a context.
       #
-      # @param [RDF::URI, RDF::Query::Variable] context
-      # @param [RDF::Query] bgp
+      # @overload self.new(*patterns)
+      #   @param [Array<RDF::Query::Pattern>] patterns
       # @return [RDF::Query]
       def self.new(*patterns)
         RDF::Query.new(*(patterns + [{:context => false}]))

data/lib/sparql/algebra/operator/minus.rb

@@ -16,7 +16,7 @@ module SPARQL; module Algebra
       ##
       # Returns the operand with its sign reversed.
       #
-      # @param  [RDF::Literal::Numeric] numeric
+      # @param  [RDF::Literal::Numeric] term
       #   a numeric literal
       # @return [RDF::Literal::Numeric]
       # @raise  [TypeError] if the operand is not a numeric literal

data/lib/sparql/algebra/operator/plus.rb

@@ -16,7 +16,7 @@ module SPARQL; module Algebra
       ##
       # Returns the operand with its sign unchanged.
       #
-      # @param  [RDF::Literal::Numeric] numeric
+      # @param  [RDF::Literal::Numeric] term
       #   a numeric literal
       # @return [RDF::Literal::Numeric]
       # @raise  [TypeError] if the operand is not a numeric literal

data/lib/sparql/extensions.rb

@@ -25,14 +25,19 @@ module RDF::Queryable
   #
   # Used to implement the SPARQL `describe` operator.
   #
-  # @param [Array<RDF::Term>] *terms
-  #   List of terms to include in the results.
-  # @param [Hash{Symbol => Object}] options
-  # @option options [Boolean] :non_subjects (true)
-  #   If `term` is not a `subject` within `self`
-  #   then add all `subject`s referencing the term as a `predicate` or `object`.
-  # @option options [RDF::Graph] graph
-  #   Graph containing statements already considered.
+  # @overload concise_bounded_description(*terms, &block)
+  #   @param [Array<RDF::Term>] terms
+  #     List of terms to include in the results.
+  #
+  # @overload concise_bounded_description(*terms, options, &block)
+  #   @param [Array<RDF::Term>] terms
+  #     List of terms to include in the results.
+  #   @param [Hash{Symbol => Object}] options
+  #   @option options [Boolean] :non_subjects (true)
+  #     If `term` is not a `subject` within `self`
+  #     then add all `subject`s referencing the term as a `predicate` or `object`.
+  #   @option options [RDF::Graph] graph
+  #     Graph containing statements already considered.
   # @yield [statement]
   # @yieldparam [RDF::Statement] statement
   # @yieldreturn [void] ignored

data/lib/sparql/grammar/lexer.rb

@@ -94,7 +94,11 @@ module SPARQL; module Grammar
       end
     end
 
-    include RUBY_VERSION >= '1.9' ? Unicode : UTF_8
+    if RUBY_VERSION < '1.9'
+      include UTF_8
+    else
+      include Unicode
+    end
 
     KEYWORD              = /#{KEYWORDS.join('|')}|#{FUNCTIONS.join('|')}/i
     DELIMITER            = /\^\^|[{}()\[\],;\.]/

data/lib/sparql/grammar/parser.rb

@@ -1038,7 +1038,9 @@ module SPARQL; module Grammar
     # Current ProdData element
     def prod_data; @prod_data.last; end
     
-    # @param [String] str Error string
+    ##
+    # @param [String] node Location
+    # @param [String] message Error string
     # @param [Hash] options
     # @option options [URI, #to_s] :production
     # @option options [Token] :token
@@ -1050,7 +1052,9 @@ module SPARQL; module Grammar
 
     ##
     # Progress output when parsing
-    # @param [String] str
+    #
+    # @param [String] node Location
+    # @param [String] message
     def progress(node, message, options = {})
       depth = options[:depth] || @productions.length
       $stderr.puts("[#{@lineno}]#{' ' * depth}#{node}: #{message}") if @options[:progress]
@@ -1059,30 +1063,33 @@ module SPARQL; module Grammar
     ##
     # Progress output when debugging
     #
-    # @overload: May be called with node, message and an option hash
+    # May be called with node, message and an option hash
+    # @overload debug(node, message, options)
     #   @param [String] node processing node
     #   @param [String] message
     #   @param [Hash{Symbol => Object}] options
     #   @option options [Boolean] :debug output debug messages to $stderr
     #   @option options [Integer] :depth (@productions.length)
     #     Processing depth for indenting message output.
-    #   @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
     #
-    # @overload: May be called with node and an option hash
+    # May be called with node and an option hash
+    # @overload debug(node, options)
     #   @param [String] node processing node
     #   @param [Hash{Symbol => Object}] options
     #   @option options [Boolean] :debug output debug messages to $stderr
     #   @option options [Integer] :depth (@productions.length)
     #     Processing depth for indenting message output.
-    #   @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
     #
-    # @overload: May be called with only options, in which case the block is used to return the output message
-    #   @param [String] node processing node
+    # May be called with only options,
+    # in which case the block is used to return the output message
+    # @overload debug(options)
     #   @param [Hash{Symbol => Object}] options
     #   @option options [Boolean] :debug output debug messages to $stderr
     #   @option options [Integer] :depth (@productions.length)
     #     Processing depth for indenting message output.
-    #   @yieldreturn [String] appended to message, to allow for lazy-evaulation of message
+    #
+    # @yieldreturn [String]
+    #   appended to message, to allow for lazy-evaulation of message
     def debug(*args)
       options = args.last.is_a?(Hash) ? args.pop : @options
       return unless options[:debug]
@@ -1309,10 +1316,8 @@ module SPARQL; module Grammar
     
     # add a pattern
     #
-    # @param [String] production:: Production generating pattern
-    # @param [RDF::Term] subject:: the subject of the pattern
-    # @param [RDF::Term] predicate:: the predicate of the pattern
-    # @param [RDF::Term, Node, Literal] object:: the object of the pattern
+    # @param [String] production Production generating pattern
+    # @param [Hash{Symbol => Object}] options
     def add_pattern(production, options)
       progress(production, "add_pattern: #{options.inspect}")
       progress(production, "[:pattern, #{options[:subject]}, #{options[:predicate]}, #{options[:object]}]")

data/lib/sparql/results.rb

@@ -177,7 +177,6 @@ module SPARQL
       end
       fmt = RDF::Format.for(format ? format.to_sym : {:content_type => content_type})
       fmt ||= RDF::NTriples::Format
-      puts "fmt: #{fmt.inspect}, format: #{format.inspect}, content_type: #{content_type}"
       format ||= fmt.to_sym
       content_type ||= fmt.content_type.first
       results = solutions.dump(format, options)
@@ -195,8 +194,14 @@ module SPARQL
 
     content_type ||= RDF::Query::Solutions::MIME_TYPES[format] if format
     
-    serialization.instance_variable_set(:"@content_type", content_type)
-    def serialization.content_type; @content_type; end
+    serialization.instance_eval do
+      if RUBY_VERSION < "1.9"
+        singleton = class << self; self end
+        singleton.send :define_method, :content_type, lambda { content_type }
+      else
+        define_singleton_method(:content_type) { content_type }
+      end
+    end
     
     serialization
   end
@@ -260,8 +265,14 @@ module SPARQL
       exception.message
     end
     
-    serialization.instance_variable_set(:"@content_type", content_type)
-    def serialization.content_type; @content_type; end
+    serialization.instance_eval do
+      if RUBY_VERSION < "1.9"
+        singleton = class << self; self end
+        singleton.send :define_method, :content_type, lambda { content_type }
+      else
+        define_singleton_method(:content_type) { content_type }
+      end
+    end
 
     serialization
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70303058490440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70303058490440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70303058489780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70303058489780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70303058489140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: 1.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70303058489140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: sxp
-  requirement: &70303058488380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70303058488380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: sparql-client
-  requirement: &70303058487660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70303058487660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
-  requirement: &70303058486880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +103,15 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *70303058486880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70303058471320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +119,15 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *70303058471320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70303058470380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +135,15 @@ dependencies:
         version: 1.4.1
   type: :development
   prerelease: false
-  version_requirements: *70303058470380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70303058469520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +151,15 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70303058469520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: linkeddata
-  requirement: &70303058468620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +167,15 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70303058468620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: rdf-spec
-  requirement: &70303058467640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +183,15 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70303058467640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
-  requirement: &70303058466820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +199,15 @@ dependencies:
         version: 0.0.4
   type: :development
   prerelease: false
-  version_requirements: *70303058466820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70303058465960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +215,15 @@ dependencies:
         version: 0.2.8
   type: :development
   prerelease: false
-  version_requirements: *70303058465960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70303058465200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,21 +231,31 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70303058465200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70303058464360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70303058464360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: spira
-  requirement: &70303058463780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,18 +263,28 @@ dependencies:
         version: 0.0.12
   type: :development
   prerelease: false
-  version_requirements: *70303058463780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70303058448580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70303058448580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.2
 description: ! "\n    Implements SPARQL grammar parsing to SPARQL Algebra, SPARQL
   Algebra processing\n    and includes SPARQL Client for accessing remote repositories."
 email: public-rdf-ruby@w3.org
@@ -301,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: sparql
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: SPARQL library for Ruby.