tripod 0.7.21 → 0.7.22

data/lib/tripod/errors.rb

@@ -9,4 +9,5 @@ require 'tripod/errors/rdf_parse_failed'
 require 'tripod/errors/timeout'
 require 'tripod/errors/sparql_response_too_large'
 require 'tripod/errors/bad_sparql_request'
-require 'tripod/errors/bad_data_request'
+require 'tripod/errors/bad_data_request'
+require 'tripod/errors/sparql_query_missing_variables'

data/lib/tripod/errors/sparql_query_missing_variables.rb

@@ -0,0 +1,16 @@
+module Tripod
+  class SparqlQueryMissingVariables < StandardError
+    attr_reader :missing_variables, :expected_variables, :received_variables
+
+    def initialize(missing_variables, expected_variables, received_variables)
+      raise ArgumentError.new("Missing parameters should be an array") unless missing_variables.is_a?(Array)
+      @missing_variables = missing_variables
+      @expected_variables = expected_variables
+      @received_variables = received_variables
+    end
+
+    def to_s
+      "Missing parameters: #{@missing_variables.map(&:to_s).join(', ')}"
+    end
+  end
+end

data/lib/tripod/sparql_query.rb

@@ -15,8 +15,12 @@ module Tripod
     cattr_accessor :KEYWORDS
     @@KEYWORDS = %w(CONSTRUCT ASK DESCRIBE SELECT)
 
-    def initialize(query_string)
-      @query = query_string.strip
+    def initialize(query_string, interpolations=nil)
+      query_string.strip!
+
+      @query = interpolate_query(query_string, interpolations) if interpolations
+
+      @query ||= query_string
 
       if self.has_prefixes?
         @prefixes, @body = self.extract_prefixes
@@ -68,8 +72,24 @@ module Tripod
       first_query
     end
 
+    def self.get_expected_variables(query_string)
+      query_string.scan(/[.]?\%\{(\w+)\}[.]?/).flatten.uniq.map(&:to_sym)
+    end
+
     private
 
+    def interpolate_query(query_string, interpolations)
+      expected_variables = self.class.get_expected_variables(query_string)
+      interpolations = interpolations.symbolize_keys.select{ |k,v| v && v.length > 0 } # remove ones that have no value
+      missing_variables = expected_variables - interpolations.keys
+
+      if missing_variables.any?
+        raise SparqlQueryMissingVariables.new(missing_variables, expected_variables, interpolations)
+      end
+
+      query_string % interpolations # do the interpolating
+    end
+
     def get_query_type
       if /^CONSTRUCT/i.match(self.body)
         :construct

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.7.21"
+  VERSION = "0.7.22"
 end

data/spec/tripod/sparql_query_spec.rb

@@ -39,6 +39,19 @@ WHERE abc # bar
 # baz'
       end
     end
+
+    context 'given a query with interpolations' do
+      it 'should interpolate the query' do
+        q = Tripod::SparqlQuery.new('SELECT xyz WHERE %{foo}', foo: 'bar')
+        q.query.should == 'SELECT xyz WHERE bar'
+      end
+
+      context 'where there are missing interpolation values' do
+        it "should raise a 'missing variables' exception" do
+          expect { Tripod::SparqlQuery.new('SELECT xyz WHERE %{foo}', {bar: 'baz'}) }.to raise_error(Tripod::SparqlQueryMissingVariables)
+        end
+      end
+    end
   end
 
   describe "#has_prefixes?" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.7.21
+  version: 0.7.22
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70318503679660 !ruby/object:Gem::Requirement
+  requirement: &70146245932300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503679660
+  version_requirements: *70146245932300
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70318503679120 !ruby/object:Gem::Requirement
+  requirement: &70146245945380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503679120
+  version_requirements: *70146245945380
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70318503695080 !ruby/object:Gem::Requirement
+  requirement: &70146245943140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503695080
+  version_requirements: *70146245943140
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70318503694540 !ruby/object:Gem::Requirement
+  requirement: &70146245941340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503694540
+  version_requirements: *70146245941340
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70318503694060 !ruby/object:Gem::Requirement
+  requirement: &70146245940160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503694060
+  version_requirements: *70146245940160
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70318503693520 !ruby/object:Gem::Requirement
+  requirement: &70146245953620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503693520
+  version_requirements: *70146245953620
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70318503693020 !ruby/object:Gem::Requirement
+  requirement: &70146245951720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503693020
+  version_requirements: *70146245951720
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70318503692320 !ruby/object:Gem::Requirement
+  requirement: &70146245947140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70318503692320
+  version_requirements: *70146245947140
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70318503691520 !ruby/object:Gem::Requirement
+  requirement: &70146245961480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503691520
+  version_requirements: *70146245961480
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70318503690980 !ruby/object:Gem::Requirement
+  requirement: &70146245960340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70318503690980
+  version_requirements: *70146245960340
 description: RDF ruby ORM
 email:
 - ric@swirrl.com
@@ -153,6 +153,7 @@ files:
 - lib/tripod/errors/rdf_parse_failed.rb
 - lib/tripod/errors/rdf_type_not_set.rb
 - lib/tripod/errors/resource_not_found.rb
+- lib/tripod/errors/sparql_query_missing_variables.rb
 - lib/tripod/errors/sparql_response_too_large.rb
 - lib/tripod/errors/timeout.rb
 - lib/tripod/errors/uri_not_set.rb