sparql 1.1.5 → 1.1.6

data/lib/sparql/grammar/terminals11.rb

@@ -94,16 +94,16 @@ module SPARQL::Grammar
     STR_EXPR = %r(ABS|ADD|ALL|ASC|ASK|AS|AVG|BASE|BINDINGS|BIND
                  |BNODE|BOUND|BY|CEIL|CLEAR|COALESCE|CONCAT
                  |CONSTRUCT|CONTAINS|COPY|COUNT|CREATE|DATATYPE|DAY
-                 |DEFAULT|DELETE\sDATA|DELETE\sWHERE|DELETE
+                 |DEFAULT|DELETE#{WS}DATA|DELETE#{WS}WHERE|DELETE
                  |DESCRIBE|DESC|DISTINCT|DROP|ENCODE_FOR_URI|EXISTS
                  |FILTER|FLOOR|FROM|GRAPH|GROUP_CONCAT|GROUP|HAVING
-                 |HOURS|IF|INSERT\sDATA|INSERT|INTO|IN|IRI
+                 |HOURS|IF|INSERT#{WS}DATA|INSERT|INTO|IN|IRI
                  |LANGMATCHES|LANGTAG|LANG|LCASE|LIMIT|LOAD
                  |MAX|MD5|MINUS|MINUTES|MIN|MONTH|MOVE
                  |NAMED|NOT|NOW|OFFSET|OPTIONAL
                  |ORDER|PREFIX|RAND|REDUCED|REGEX|REPLACE|ROUND|SAMPLE|SECONDS
                  |SELECT|SEPARATOR|SERVICE
-                 |SHA1|SHA224|SHA256|SHA384|SHA512
+                 |SHA1|SHA224|SHA256|SHA384|SHA512|SILENT
                  |STRAFTER|STRBEFORE|STRDT|STRENDS|STRLANG|STRLEN|STRSTARTS|STRUUID|SUBSTR|STR|SUM
                  |TIMEZONE|TO|TZ|UCASE|UNDEF|UNION|URI|USING|UUID|VALUES
                  |WHERE|WITH|YEAR
@@ -111,7 +111,7 @@ module SPARQL::Grammar
                  |true
                  |false
                  |&&|!=|!|<=|>=|\^\^|\|\||[\(\),.;\[\]\{\}\+\-=<>\?\^\|\*\/a]
-              )xi.freeze
+              )xim.freeze
 
     # Map terminals to canonical form
     STR_MAP = (%w{ABS ADD ALL ASC ASK AS AVG BASE BINDINGS BIND
@@ -126,7 +126,7 @@ module SPARQL::Grammar
       NAMED NOT NOW OFFSET OPTIONAL
       ORDER PREFIX RAND REDUCED REGEX REPLACE ROUND SAMPLE SECONDS
       SELECT SEPARATOR SERVICE
-      SHA1 SHA224 SHA256 SHA384 SHA512
+      SHA1 SHA224 SHA256 SHA384 SHA512 SILENT
       STRAFTER STRBEFORE STRDT STRENDS STRLANG STRLEN STRSTARTS STRUUID SUBSTR STR SUM
       TIMEZONE TO TZ UCASE UNDEF UNION URI USING UUID
       VALUES WHERE WITH YEAR

data/lib/sparql/results.rb

@@ -4,11 +4,11 @@ module SPARQL
   # This module is a mixin for RDF::Query::Solutions
   module Results
     MIME_TYPES = {
-      :json => 'application/sparql-results+json',
-      :html => 'text/html',
+      json: 'application/sparql-results+json',
+      html: 'text/html',
       :xml  => 'application/sparql-results+xml',
-      :csv => 'text/csv',
-      :tsv => 'text/tab-separated-values'
+      csv: 'text/csv',
+      tsv: 'text/tab-separated-values'
     }
     
     ##
@@ -22,16 +22,16 @@ module SPARQL
         variable_names.inject({}) do |memo, n|
           memo.merge case s = solution[n]
           when RDF::URI
-            {n => {:type => "uri", :value => s.to_s }}
+            {n => {type: "uri", value: s.to_s }}
           when RDF::Node
-            {n => {:type => "bnode", :value => s.id }}
+            {n => {type: "bnode", value: s.id }}
           when RDF::Literal
             if s.datatype?
-              {n => {:type => "typed-literal", :datatype => s.datatype.to_s, :value => s.to_s }}
+              {n => {type: "typed-literal", datatype: s.datatype.to_s, value: s.to_s }}
             elsif s.language
-              {n => {:type => "literal", "xml:lang" => s.language.to_s, :value => s.to_s }}
+              {n => {type: "literal", "xml:lang" => s.language.to_s, value: s.to_s }}
             else
-              {n => {:type => "literal", :value => s.to_s }}
+              {n => {type: "literal", value: s.to_s }}
             end
           else
             {}
@@ -40,8 +40,8 @@ module SPARQL
       end
 
       {
-        :head     => { :vars => variable_names },
-        :results  => { :bindings => bindings}
+        :head     => { vars: variable_names },
+        :results  => { bindings: bindings}
       }.to_json
     end
     
@@ -52,12 +52,12 @@ module SPARQL
     def to_xml
       require 'builder' unless defined?(::Builder)
       
-      xml = ::Builder::XmlMarkup.new(:indent => 2)
+      xml = ::Builder::XmlMarkup.new(indent: 2)
       xml.instruct!
-      xml.sparql(:xmlns => "http://www.w3.org/2005/sparql-results#") do
+      xml.sparql(xmlns: "http://www.w3.org/2005/sparql-results#") do
         xml.head do
           variable_names.each do |n|
-            xml.variable(:name => n)
+            xml.variable(name: n)
           end
         end
         xml.results do
@@ -66,7 +66,7 @@ module SPARQL
               variable_names.each do |n|
                 s = solution[n]
                 next unless s
-                xml.binding(:name => n) do
+                xml.binding(name: n) do
                   case s
                   when RDF::URI
                     xml.uri(s.to_s)
@@ -96,8 +96,8 @@ module SPARQL
     def to_html
       require 'builder' unless defined?(::Builder)
       
-      xml = ::Builder::XmlMarkup.new(:indent => 2)
-      xml.table(:class => "sparql") do
+      xml = ::Builder::XmlMarkup.new(indent: 2)
+      xml.table(class: "sparql") do
         xml.tbody do
           xml.tr do
             variable_names.each do |n|
@@ -123,7 +123,7 @@ module SPARQL
       require 'csv' unless defined?(::CSV)
       bnode_map = {}
       bnode_gen = "_:a"
-      CSV.generate(:row_sep => "\r\n") do |csv|
+      CSV.generate(row_sep: "\r\n") do |csv|
         csv << variable_names.to_a
         self.each do |solution|
           csv << variable_names.map do |n|
@@ -194,7 +194,7 @@ module SPARQL
       case solutions
       when RDF::Queryable
         content_type = first_content_type(content_types, RDF::Format.content_types.keys) || 'text/plain'
-        format = RDF::Writer.for(:content_type => content_type).to_sym
+        format = RDF::Writer.for(content_type: content_type).to_sym
       else
         content_type = first_content_type(content_types, SPARQL::Results::MIME_TYPES.values) || 'application/sparql-results+xml'
         format = SPARQL::Results::MIME_TYPES.invert[content_type]
@@ -207,19 +207,19 @@ module SPARQL
       case format
       when :json
         require 'json' unless defined?(::JSON)
-        {:boolean => solutions}.to_json
+        {boolean: solutions}.to_json
       when :xml
         require 'builder' unless defined?(::Builder)
-        xml = ::Builder::XmlMarkup.new(:indent => 2)
+        xml = ::Builder::XmlMarkup.new(indent: 2)
         xml.instruct!
-        xml.sparql(:xmlns => "http://www.w3.org/2005/sparql-results#") do
+        xml.sparql(xmlns: "http://www.w3.org/2005/sparql-results#") do
           xml.boolean(solutions.to_s)
         end
       when :html
         require 'builder' unless defined?(::Builder)
         content_type = "text/html"
-        xml = ::Builder::XmlMarkup.new(:indent => 2)
-        xml.div(solutions.to_s, :class => "sparql")
+        xml = ::Builder::XmlMarkup.new(indent: 2)
+        xml.div(solutions.to_s, class: "sparql")
       else
         raise RDF::WriterError, "Unknown format #{(format || content_type).inspect} for #{solutions.class}"
       end
@@ -229,9 +229,9 @@ module SPARQL
       rescue LoadError => e
         require 'rdf/ntriples'
       end
-      fmt = RDF::Format.for(format ? format.to_sym : {:content_type => content_type})
+      fmt = RDF::Format.for(format ? format.to_sym : {content_type: content_type})
       unless fmt
-        fmt = RDF::Format.for(:file_extension => format.to_sym) || RDF::NTriples::Format
+        fmt = RDF::Format.for(file_extension: format.to_sym) || RDF::NTriples::Format
         format = fmt.to_sym
       end
       format ||= fmt.to_sym

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-11 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -20,7 +20,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.12
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,21 +70,21 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.9
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sxp
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -141,20 +144,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.6
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -223,42 +229,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: spira
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -311,19 +303,26 @@ files:
 - lib/sparql/algebra/operator/bnode.rb
 - lib/sparql/algebra/operator/bound.rb
 - lib/sparql/algebra/operator/ceil.rb
+- lib/sparql/algebra/operator/clear.rb
 - lib/sparql/algebra/operator/coalesce.rb
 - lib/sparql/algebra/operator/compare.rb
 - lib/sparql/algebra/operator/concat.rb
 - lib/sparql/algebra/operator/construct.rb
 - lib/sparql/algebra/operator/contains.rb
+- lib/sparql/algebra/operator/copy.rb
 - lib/sparql/algebra/operator/count.rb
+- lib/sparql/algebra/operator/create.rb
 - lib/sparql/algebra/operator/dataset.rb
 - lib/sparql/algebra/operator/datatype.rb
 - lib/sparql/algebra/operator/day.rb
+- lib/sparql/algebra/operator/delete.rb
+- lib/sparql/algebra/operator/delete_data.rb
+- lib/sparql/algebra/operator/delete_where.rb
 - lib/sparql/algebra/operator/desc.rb
 - lib/sparql/algebra/operator/describe.rb
 - lib/sparql/algebra/operator/distinct.rb
 - lib/sparql/algebra/operator/divide.rb
+- lib/sparql/algebra/operator/drop.rb
 - lib/sparql/algebra/operator/encode_for_uri.rb
 - lib/sparql/algebra/operator/equal.rb
 - lib/sparql/algebra/operator/exists.rb
@@ -339,6 +338,8 @@ files:
 - lib/sparql/algebra/operator/hours.rb
 - lib/sparql/algebra/operator/if.rb
 - lib/sparql/algebra/operator/in.rb
+- lib/sparql/algebra/operator/insert.rb
+- lib/sparql/algebra/operator/insert_data.rb
 - lib/sparql/algebra/operator/iri.rb
 - lib/sparql/algebra/operator/is_blank.rb
 - lib/sparql/algebra/operator/is_iri.rb
@@ -351,12 +352,15 @@ files:
 - lib/sparql/algebra/operator/left_join.rb
 - lib/sparql/algebra/operator/less_than.rb
 - lib/sparql/algebra/operator/less_than_or_equal.rb
+- lib/sparql/algebra/operator/load.rb
 - lib/sparql/algebra/operator/max.rb
 - lib/sparql/algebra/operator/md5.rb
 - lib/sparql/algebra/operator/min.rb
 - lib/sparql/algebra/operator/minus.rb
 - lib/sparql/algebra/operator/minutes.rb
+- lib/sparql/algebra/operator/modify.rb
 - lib/sparql/algebra/operator/month.rb
+- lib/sparql/algebra/operator/move.rb
 - lib/sparql/algebra/operator/multiply.rb
 - lib/sparql/algebra/operator/negate.rb
 - lib/sparql/algebra/operator/not.rb
@@ -399,10 +403,14 @@ files:
 - lib/sparql/algebra/operator/tz.rb
 - lib/sparql/algebra/operator/ucase.rb
 - lib/sparql/algebra/operator/union.rb
+- lib/sparql/algebra/operator/update.rb
+- lib/sparql/algebra/operator/using.rb
 - lib/sparql/algebra/operator/uuid.rb
+- lib/sparql/algebra/operator/with.rb
 - lib/sparql/algebra/operator/year.rb
 - lib/sparql/algebra/query.rb
 - lib/sparql/algebra/sxp_extensions.rb
+- lib/sparql/algebra/update.rb
 - lib/sparql/algebra/version.rb
 - lib/sparql/extensions.rb
 - lib/sparql/grammar.rb
@@ -423,7 +431,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -434,6 +442,6 @@ rubyforge_project: sparql
 rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: SPARQL library for Ruby.
+summary: SPARQL Query and Update library for Ruby.
 test_files: []
 has_rdoc: false