tripod 0.10.9 → 0.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ee076fa76f2dd85f1f03f328f38e4e2813612b
-  data.tar.gz: af419e68c83352681b72f40c7d009929f6878ddf
+  metadata.gz: 17e09d56a300cfbce5e1e35feb3be1821a129eee
+  data.tar.gz: 8b149e9c78c869ec7f307e84d2e609840b0271fe
 SHA512:
-  metadata.gz: 7c99e9887bf0e13489e3bcc33aa4d29a83780d82a78b8c1767b308129dba8df70da0e5f3ff966492ac30d962e80fb91d91628481258ae2607814fc826ea6180b
-  data.tar.gz: 65136c91f3e23f23f7061c1b113620176e555eff080f12a104a531edfe24a30022ad6ea64d5c4e4cccda22a320dea8d98db027acc248a13269c9acae7f376d21
+  metadata.gz: 8c32107cb6bb6d0065f5584e08be54f54ac08222a63ebf8a9e4dbf88ccbcc01425bfb9e61d0c4f4aa938d76cf9439b22f44ee6387f80cb03f537f44b4f8e549e
+  data.tar.gz: 42054adedd9b7975e3ddef60678b7118f596e75982ff6d7cfd731c9ed745767bb382cc9f9326e552cdf98935efc7ab8afc1236ec8bc4aee9b2a492244b71ea13

data/lib/tripod.rb

@@ -49,6 +49,9 @@ module Tripod
   mattr_accessor :data_endpoint
   @@data_endpoint = 'http://127.0.0.1:3030/tripod/data'
 
+  mattr_accessor :extra_endpoint_params
+  @@extra_endpoint_params = {}
+
   mattr_accessor :timeout_seconds
   @@timeout_seconds = 30
 

data/lib/tripod/sparql_client.rb

@@ -16,7 +16,9 @@ module Tripod::SparqlClient
     # @return [ RestClient::Response ]
     def self.query(sparql, accept_header, extra_params={}, response_limit_bytes = :default)
 
-      params = {:query => sparql}.merge(extra_params).to_query
+      non_sparql_params = (Tripod.extra_endpoint_params).merge(extra_params)
+      params_hash = {:query => sparql}.merge(non_sparql_params)
+      params = self.to_query(params_hash)
       request_url = Tripod.query_endpoint
       streaming_opts = {:accept => accept_header, :timeout_seconds => Tripod.timeout_seconds}
       streaming_opts.merge!(_response_limit_options(response_limit_bytes)) if Tripod.response_limit_bytes
@@ -25,8 +27,8 @@ module Tripod::SparqlClient
       stream_data = -> {
         Tripod.logger.debug "TRIPOD: About to run query: #{sparql}"
         Tripod.logger.debug "TRIPOD: Streaming from url: #{request_url}"
+        Tripod.logger.debug "TRIPOD: non sparql params #{non_sparql_params.to_s}"
         Tripod.logger.debug "TRIPOD: Streaming opts: #{streaming_opts.inspect}"
-
         Tripod::Streaming.get_data(request_url, params, streaming_opts)
       }
 
@@ -43,6 +45,20 @@ module Tripod::SparqlClient
 
     end
 
+    # Tripod helper to turn a hash to a query string, allowing multiple params in arrays
+    # e.g. :query=>'foo', :graph=>['bar', 'baz'] 
+    #  -> query=foo&graph=bar&graph=baz
+    # based on the ActiveSupport implementation, but with different behaviour for arrays
+    def self.to_query hash
+      hash.collect_concat do |key, value|
+        if value.class == Array
+          value.collect { |v| v.to_query( key ) }
+        else
+          value.to_query(key)
+        end
+      end.sort * '&'
+    end
+
     # Runs a SELECT +query+ against the endpoint. Returns a Hash of the results.
     #
     # @param [ String ] query The query to run

data/lib/tripod/streaming.rb

@@ -49,8 +49,13 @@ module Tripod
             total_request_time = Time.now - request_start_time
           end
 
-          Tripod.logger.debug "TRIPOD: #{total_bytes} bytes streamed in: #{stream_duration} secs"
-          Tripod.logger.debug "TRIPOD: total request time: #{total_request_time} secs"
+          if Tripod.logger.debug?
+            Tripod.logger.debug "TRIPOD: #{total_bytes} bytes streamed in: #{stream_duration} secs"          
+            time_str = "TRIPOD: total request time: #{total_request_time} secs" 
+            time_str += "!!! SLOW !!! " if total_request_time >= 1.0
+            Tripod.logger.debug time_str
+          end
+          
         end
       rescue Timeout::Error => timeout
         raise Tripod::Errors::Timeout.new

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.10.9"
+  VERSION = "0.10.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.10.10
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client