tripod 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8873c49c672b410661df8ca87c7702c31476e989
-  data.tar.gz: 4526e140d24120ea3a71ba4d18d019a1d299ee9f
+  metadata.gz: 0e8b2231c1e29b1c0505ed07246fed4759caec36
+  data.tar.gz: 7f11adc9aeb2eb8da2cc0bdc9cdc7e5c6aed0375
 SHA512:
-  metadata.gz: dfce073aec904468e271f84a28899922b26a4ce9acd2cfda3dda50484e6087a174e56cda90616ff349cc33add8813a267d6000b1f563aca72ebd928e713dd28f
-  data.tar.gz: 734e1c9747d1266a79e811bb28f30051da8676e6b3a38812c4673b7c9b5e53b38e6633d927088de2693d9910c1df781d3e7731efacc982f8653edc740d8de244
+  metadata.gz: 631ba8493a054ed194a00582d6da8bb834d5e30493a82f3097ff5f0c6219637d7dec3049ec6fad916c280e2b9cd2327caed7500ee4d87c2c987c2f223207f4ae
+  data.tar.gz: 8504919b265ce0582f2d0d1a60795214bd119867a02ec32892d7be22d40a48ebe6228d5ab2e38c1f582a1dcd561658757236b3192e8ba3791a2d1f7c91c8cdcf

data/lib/tripod.rb

@@ -58,6 +58,11 @@ module Tripod
   mattr_accessor :response_limit_bytes
   @@response_limit_bytes = 5.megabytes
 
+  # this is a default to cope with headers in stardog
+  # override if you wish to remove the text/plain fallback
+  mattr_accessor :ntriples_header_str
+  @@ntriples_header_str = "application/n-triples, text/plain"
+
   mattr_accessor :cache_store
 
   mattr_accessor :logger

data/lib/tripod/finders.rb

@@ -109,7 +109,7 @@ module Tripod::Finders
         uris_sparql_str = uris.map{ |u| "<#{u.to_s}>" }.join(" ")
 
         # Do a big describe statement, and read the results into an in-memory repo
-        ntriples_string = Tripod::SparqlClient::Query.query("CONSTRUCT { ?s ?p ?o } WHERE { VALUES ?s { #{uris_sparql_str} }.  ?s ?p ?o . }", "application/n-triples")
+        ntriples_string = Tripod::SparqlClient::Query.query("CONSTRUCT { ?s ?p ?o } WHERE { VALUES ?s { #{uris_sparql_str} }.  ?s ?p ?o . }", Tripod.ntriples_header_str)
         graph = _rdf_graph_from_ntriples_string(ntriples_string, graph)
       end
 
@@ -149,7 +149,7 @@ module Tripod::Finders
 
     # given a construct or describe query, return a graph of triples.
     def _graph_of_triples_from_construct_or_describe(construct_query)
-      ntriples_str = Tripod::SparqlClient::Query.query(construct_query, "application/n-triples")
+      ntriples_str = Tripod::SparqlClient::Query.query(construct_query, Tripod.ntriples_header_str)
       _rdf_graph_from_ntriples_string(ntriples_str, graph=nil)
     end
 
@@ -207,7 +207,7 @@ module Tripod::Finders
     # @option options [ String ] uri_variable The name of the uri variable in the query, if not 'uri'
     # @option options [ String ] accept_header The http accept header (default application/n-triples)
     def _raw_describe_select_results(select_sparql, opts={})
-      accept_header = opts[:accept_header] || "application/n-triples"
+      accept_header = opts[:accept_header] || Tripod.ntriples_header_str
       query = _describe_query_for_select(select_sparql, :uri_variable => opts[:uri_variable])
       Tripod::SparqlClient::Query.query(query, accept_header)
     end

data/lib/tripod/repository.rb

@@ -55,7 +55,7 @@ module Tripod::Repository
     g
   end
 
-  def retrieve_triples_from_database(accept_header="application/n-triples")
+  def retrieve_triples_from_database(accept_header=Tripod.ntriples_header_str)
     Tripod::SparqlClient::Query.query(self.class.all_triples_query(uri, graph_uri: self.graph_uri), accept_header)
   end
 

data/lib/tripod/resource_collection.rb

@@ -53,10 +53,10 @@ module Tripod
     def to_nt
       time_serialization('nt') do
         if @criteria
-          @criteria.serialize(:return_graph => @return_graph, :accept_header => "application/n-triples")
+          @criteria.serialize(:return_graph => @return_graph, :accept_header => Tripod.ntriples_header_str)
         elsif @sparql_query_str && @resource_class
           # run the query as a describe.
-          @resource_class._raw_describe_select_results(@sparql_query_str, :accept_header => "application/n-triples")
+          @resource_class._raw_describe_select_results(@sparql_query_str, :accept_header => Tripod.ntriples_header_str)
         else
           # for n-triples we can just concatenate them
           nt = ""

data/lib/tripod/serialization.rb

@@ -15,7 +15,7 @@ module Tripod::Serialization
 
   # Serialises this resource's triples to n-triples
   def to_nt
-    retrieve_triples_from_database(accept_header="application/n-triples")
+    retrieve_triples_from_database(accept_header=Tripod.ntriples_header_str)
   end
 
   # Serialises this resource's triples to JSON-LD

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

data/spec/tripod/repository_spec.rb

@@ -30,7 +30,7 @@ describe Tripod::Repository do
 
         context 'graph_uri set on object' do
           it 'populates the object with triples, restricted to the graph_uri' do
-            Tripod::SparqlClient::Query.should_receive(:query).with(Person.all_triples_query(person.uri, graph_uri: person.graph_uri), 'application/n-triples').and_call_original
+            Tripod::SparqlClient::Query.should_receive(:query).with(Person.all_triples_query(person.uri, graph_uri: person.graph_uri), Tripod.ntriples_header_str).and_call_original
             person.hydrate!
             person.repository.should_not be_empty
           end
@@ -38,7 +38,7 @@ describe Tripod::Repository do
 
         context 'graph_uri not set on object' do
           it 'populates the object with triples, not to a graph' do
-            Tripod::SparqlClient::Query.should_receive(:query).with(Person.all_triples_query(person.uri), 'application/n-triples').and_call_original
+            Tripod::SparqlClient::Query.should_receive(:query).with(Person.all_triples_query(person.uri), Tripod.ntriples_header_str).and_call_original
             graphless_resource.hydrate!
             graphless_resource.repository.should_not be_empty
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client