sparql 1.0.3 → 1.0.4

data/lib/sparql/grammar/parser11.rb

@@ -168,7 +168,7 @@ module SPARQL::Grammar
       when '&&'            then add_prod_datum(:ConditionalAndExpression, token.value)
       when '||'            then add_prod_datum(:ConditionalOrExpression, token.value)
       when '!'             then add_prod_datum(:UnaryExpression, token.value)
-      when 'a'             then add_prod_datum(:Verb, RDF.type)
+      when 'a'             then add_prod_datum(:Verb, (a = RDF.type.dup; a.lexical = 'a'; a))
       when /true|false/    then add_prod_datum(:literal, RDF::Literal::Boolean.new(token.value.downcase))
       when /ASC|DESC/      then add_prod_datum(:OrderDirection, token.value.downcase.to_sym)
       when /DISTINCT|REDUCED/  then add_prod_datum(:DISTINCT_REDUCED, token.value.downcase.to_sym)
@@ -434,14 +434,12 @@ module SPARQL::Grammar
 
     # [59]  	GraphGraphPattern	  ::=  	'GRAPH' VarOrIRIref GroupGraphPattern
     production(:GraphGraphPattern) do |input, data, callback|
-      if data[:query]
-        name = (data[:VarOrIRIref]).last
-        bgp = data[:query].first
-        if name
-          add_prod_data(:query, SPARQL::Algebra::Expression.for(:graph, name, bgp))
-        else
-          add_prod_data(:query, bgp)
-        end
+      name = (data[:VarOrIRIref]).last
+      bgp = data[:query] ? data[:query].first : SPARQL::Algebra::Operator::BGP.new
+      if name
+        add_prod_data(:query, SPARQL::Algebra::Expression.for(:graph, name, bgp))
+      else
+        add_prod_data(:query, bgp)
       end
     end
 
@@ -1281,7 +1279,7 @@ module SPARQL::Grammar
     #
     # @yieldreturn [String] added to message
     def debug(*args)
-      return unless @options[:debug] || RDF::Turtle.debug?
+      return unless @options[:debug]
       options = args.last.is_a?(Hash) ? args.pop : {}
       debug_level = options.fetch(:level, 1)
       return unless debug_level <= DEBUG_LEVEL

data/lib/sparql/grammar/terminals11.rb

@@ -1,4 +1,4 @@
-require 'rdf/ll1/lexer'
+require 'ebnf/ll1/lexer'
 
 module SPARQL::Grammar
   module Terminals
@@ -91,9 +91,9 @@ module SPARQL::Grammar
     # 129
     PNAME_NS             = /#{PN_PREFIX}?:/
     # 130
-    PNAME_LN             = /#{PNAME_NS}#{PN_LOCAL}/
+    PNAME_LN             = /(?:#{PNAME_NS})(?:#{PN_LOCAL})/
     # 131
-    BLANK_NODE_LABEL     = /_:((?:[0-9]|#{PN_CHARS_U})(?:#{PN_CHARS}|\.)*)/
+    BLANK_NODE_LABEL     = /_:(?:[0-9]|#{PN_CHARS_U})((#{PN_CHARS}|\.)*#{PN_CHARS})?/
     # 132
     VAR1                 = /\?#{VARNAME}/
     # 133
@@ -128,11 +128,11 @@ module SPARQL::Grammar
     STRING_LITERAL_LONG2 = /"""((?:"|"")?(?:[^"\\]|#{ECHAR}|#{UCHAR}))*"""/m
 
     # 151
-    WS                   = / |\t|\r|\n  /
+    WS                   = / |\t|\r|\n/
     # 150
-    NIL                  = /\(#{WS}*\)/
+    NIL                  = /\(#{WS}*\)/m
     # 152
-    ANON                 = /\[#{WS}*\]/
+    ANON                 = /\[#{WS}*\]/m
 
     # String terminals, case insensitive
     STR_EXPR = %r(ABS|ADD|ALL|ASC|ASK|AS|BASE|BINDINGS|BIND

data/lib/sparql/results.rb

@@ -136,7 +136,7 @@ module SPARQL
     format = options[:format].to_sym if options[:format]
     content_type = options[:content_type].to_s.split(';').first
     content_types = options[:content_types] || ['*/*']
-    format ||= RDF::Query::Solutions::MIME_TYPES.invert[content_type] if content_type
+    format ||= SPARQL::Results::MIME_TYPES.invert[content_type] if content_type
 
     if !format && !content_type
       case solutions
@@ -144,8 +144,8 @@ module SPARQL
         content_type = first_content_type(content_types, RDF::Format.content_types.keys) || 'text/plain'
         format = RDF::Writer.for(:content_type => content_type).to_sym
       else
-        content_type = first_content_type(content_types, RDF::Query::Solutions::MIME_TYPES.values) || 'application/sparql-results+xml'
-        format = RDF::Query::Solutions::MIME_TYPES.invert[content_type]
+        content_type = first_content_type(content_types, SPARQL::Results::MIME_TYPES.values) || 'application/sparql-results+xml'
+        format = SPARQL::Results::MIME_TYPES.invert[content_type]
       end
     end
 
@@ -194,7 +194,7 @@ module SPARQL
       end
     end
 
-    content_type ||= RDF::Query::Solutions::MIME_TYPES[format] if format
+    content_type ||= SPARQL::Results::MIME_TYPES[format] if format
     
     serialization.instance_eval do
       if RUBY_VERSION < "1.9"
@@ -257,7 +257,7 @@ module SPARQL
   def serialize_exception(exception, options = {})
     format = options[:format]
     content_type = options[:content_type]
-    content_type ||= RDF::Query::Solutions::MIME_TYPES[format]
+    content_type ||= SPARQL::Results::MIME_TYPES[format]
     serialization = case content_type
     when 'text/html'
       title = exception.respond_to?(:title) ? exception.title : exception.class.to_s

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.0.4
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,23 +29,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ebnf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -80,23 +71,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sparql-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,7 +99,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-xsd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -120,7 +106,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -128,7 +113,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -136,7 +120,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -144,7 +127,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -152,7 +134,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,7 +141,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -168,7 +148,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -176,7 +155,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -184,7 +162,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -192,7 +169,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -200,7 +176,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -208,7 +183,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -216,7 +190,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -224,7 +197,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -232,7 +204,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -240,7 +211,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -248,7 +218,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -256,7 +225,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -264,7 +232,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -272,7 +239,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spira
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -280,7 +246,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -288,7 +253,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -296,7 +260,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -384,27 +347,26 @@ files:
 homepage: http://github.com/ruby-rdf/sparql
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sparql
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SPARQL library for Ruby.
 test_files: []
 has_rdoc: false