sparql-client 2.2.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63643389b5260847e6a5ff81f8ec4e7a8d754adf
-  data.tar.gz: b0ed32a9d7f1fd58efe6de87ab64f2eb0f10a758
+  metadata.gz: 996cb716d6311ccd569174d200c39d05a035e3b7
+  data.tar.gz: 23d718dd6a3e23cec61d02df0689d46dd87cf481
 SHA512:
-  metadata.gz: fcfec9d172d4bb98f27136bdde32f242780080b05b1fa92390fa69f3c4faea3aad03971dc7d19b22026e228065210b86ccd543d6a749d7fe1d132737480e9459
-  data.tar.gz: b0a1ce446f6930c620b78aee2978cd46b0c9d54f9fec3c08ea00c91f5761eeae083a19f07f00d8a48867505addb370d986d54ad9cb345dcd026826244caed2c3
+  metadata.gz: 2ae85660825933ff2779a03acc8837f3cc82442edd6b5e725e44e2fd4558c346cce7d1bfd8a03d63fbc0ef5bbd4e7a6bfccb626575106d1b256f5a6e36eb8a71
+  data.tar.gz: a89eaac82c304cc3fc28d6b63c0c3e317728d20d2773262871fd111a2bf4dd8fe3597a87dbcfddf2284975bd12af7183856f9dcc603b2be1178a46e5f189e6db

data/README.md

@@ -93,10 +93,10 @@ This is a [Ruby][] implementation of a [SPARQL][] client for [RDF.rb][].
 ## Dependencies
 
 * [Ruby](http://ruby-lang.org/) (>= 2.2.2)
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 2.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (~> 3.0)
 * [Net::HTTP::Persistent](http://rubygems.org/gems/net-http-persistent) (>= 1.4)
-* Soft dependency on [SPARQL](http://rubygems.org/gems/sparql) (>= 2.0)
-* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.6)
+* Soft dependency on [SPARQL](http://rubygems.org/gems/sparql) (~> 3.0)
+* Soft dependency on [Nokogiri](http://rubygems.org/gems/nokogiri) (>= 1.7)
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-2.2.1
+3.0.0

data/lib/sparql/client/query.rb

@@ -17,12 +17,6 @@ module SPARQL; class Client
     # @return [Hash{Symbol => Object}]
     attr_reader :options
 
-    ##
-    # Values returned from previous query.
-    #
-    # @return [Array<[key, RDF::Value]>]
-    attr_reader :values
-
     ##
     # Creates a boolean `ASK` query.
     #
@@ -528,6 +522,71 @@ module SPARQL; class Client
       self
     end
 
+    ##
+    # Specify inline data for a query
+    #
+    # @overload values
+    #   Values returned from previous query.
+    #
+    #   @return [Array<Array(key, RDF::Value)>]
+    #
+    # @overload values(vars, *data)
+    #   @example single variable with multiple values
+    #     query.select
+    #      .where([:s, RDF::URI('http://purl.org/dc/terms/title'), :title])
+    #      .values(:title, "This title", "Another title")
+    #
+    #   @example multiple variables with multiple values
+    #     query.select
+    #      .where([:s, RDF::URI('http://purl.org/dc/terms/title'), :title],
+    #             [:s, RDF.type, :type])
+    #      .values([:type, :title],
+    #              [RDF::URI('http://pcdm.org/models#Object'), "This title"],
+    #              [RDF::URI('http://pcdm.org/models#Collection', 'Another title'])
+    #
+    #   @example multiple variables with UNDEF
+    #     query.select
+    #      .where([:s, RDF::URI('http://purl.org/dc/terms/title'), :title],
+    #             [:s, RDF.type, :type])
+    #      .values([:type, :title],
+    #              [nil "This title"],
+    #              [RDF::URI('http://pcdm.org/models#Collection', nil])
+    #
+    #   @param [Symbol, Array<Symbol>] vars
+    #   @param [Array<RDF::Term, String, nil>] *data
+    #   @return [Query]
+    def values(*args)
+      return @values if args.empty?
+      vars, *data = *args
+      vars = Array(vars).map {|var| RDF::Query::Variable.new(var)}
+      if vars.length == 1
+        # data may be a in array form or simple form
+        if data.any? {|d| d.is_a?(Array)} && !data.all? {|d| d.is_a?(Array)}
+          raise ArgumentError, "values data must all be in array form or all simple"
+        end
+        data = data.map {|d| Array(d)}
+      end
+
+      # Each data value must be an array with the same number of entries as vars
+      unless data.all? {|d| d.is_a?(Array) && d.all? {|dd| dd.is_a?(RDF::Value) || dd.is_a?(String) || dd.nil?}}
+        raise ArgumentError, "values data must each be an array of terms, strings, or nil"
+      end
+
+      # Turn strings into Literals
+      data = data.map do |d|
+        d.map do |nil_literal_or_term|
+          case nil_literal_or_term
+          when nil then nil
+          when String then RDF::Literal(nil_literal_or_term)
+          when RDF::Value then graph_uri_or_var
+          else raise ArgumentError
+          end
+        end
+      end
+      options[:values] = [vars, *data]
+      self
+    end
+
     ##
     # @return expects_statements?
     def expects_statements?
@@ -712,6 +771,18 @@ module SPARQL; class Client
       if options[:filters]
         buffer += options[:filters].map(&:to_s)
       end
+      if options[:values]
+        vars = options[:values].first.map {|var| SPARQL::Client.serialize_value(var)}
+        buffer << "VALUES (#{vars.join(' ')}) {"
+        options[:values][1..-1].each do |data_block_value|
+          buffer << '('
+          buffer << data_block_value.map do |value|
+            value.nil? ? 'UNDEF' : SPARQL::Client.serialize_value(value)
+          end.join(' ')
+          buffer << ')'
+        end
+        buffer << '}'
+      end
       if options[:graph]
         buffer << '}' # GRAPH
       end

data/lib/sparql/client/repository.rb

@@ -10,7 +10,6 @@ module SPARQL; class Client
     ##
     # @param [URI, #to_s]    uri
     #   Endpoint of this repository
-    # @param [String, #to_s] title (nil)
     # @param [Hash{Symbol => Object}] options passed to RDF::Repository
     def initialize(uri: nil, **options, &block)
       raise ArgumentError, "uri is a required parameter" unless uri

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql-client
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Arto Bendiken
@@ -10,28 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -53,45 +47,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: sparql
+  name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rdf-spec
+  name: sparql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -126,28 +108,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.12
 description: |-
   Executes SPARQL queries and updates against a remote SPARQL 1.0 or 1.1 endpoint,
                               or against a local repository. Generates SPARQL queries using a simple DSL.