tripod 0.9.11 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9c2c92e357b7825de2a0e0553a165f642e3f1a
-  data.tar.gz: 488f952481dd46680238d0d332217091e1763d85
+  metadata.gz: cc6eabb51253efb188e06ee368e07a0a889e3879
+  data.tar.gz: c714ca5b1320c2fd26669951cc318b0c89a27cb6
 SHA512:
-  metadata.gz: 1c6e1c3dbdd4522b1e2a8d812478de1681761f712ce6c4272d2688faa63fe3a2d8c725e77ef0c58bf51abb9c66ae55339bb75b0d3ccb2b5f1129ab26d465e333
-  data.tar.gz: 3addfc697fcc94c825453570e008e91f8729d61ce2dc0488f1a03220934a92f64ccfcebb232052179e778ec06d6556b2de0723bf343ab4de106264683b01f798
+  metadata.gz: 2adbfe9b6a9bcb9dae25e1550c06db0d249dc99ce9e00cf27b6923402f4fddc9eb8f0da52a75f69e115a64950c1b0efdeb4e4bb3925182de78ea6263048bd2e3
+  data.tar.gz: 0485201ce47c65d4db7470f4c5ffe3603aa545cd730cbd154de1293ff736f36eab86ec5c1c90752fada3acfb0e86350ef6c1419a4c3c7374305704df24b692fe

data/lib/tripod/attributes.rb

@@ -20,8 +20,7 @@ module Tripod::Attributes
   #
   # @return Native Ruby object (e.g. String, DateTime) or array of them, depending on whether the field is multivalued or not
   def read_attribute(name, field=nil)
-    field ||= self.fields[name]
-    raise Tripod::Errors::FieldNotPresent.new unless field
+    field ||= self.class.get_field(name)
 
     attr_values = read_predicate(field.predicate)
    
@@ -88,4 +87,4 @@ module Tripod::Attributes
       value
     end
   end
-end
+end

data/lib/tripod/criteria.rb

@@ -41,9 +41,16 @@ module Tripod
     # Note: the subject being returned by the query must be identified by ?uri
     # e.g. my_criteria.where("?uri a <http://my-type>")
     #
-    # TODO: make it also take a hash?
-    def where(sparql_snippet)
-      where_clauses << sparql_snippet
+    def where(filter)
+      if filter.is_a?(String) # we gotta Sparql snippet
+        where_clauses << filter
+      elsif filter.is_a?(Hash)
+        filter.each_pair do |key, value|
+          field = resource_class.get_field(key)
+          value = RDF::Literal.new(value) unless value.respond_to?(:to_base)
+          where_clauses << "?uri <#{ field.predicate }> #{ value.to_base }"
+        end
+      end
       self
     end
 

data/lib/tripod/fields.rb

@@ -41,6 +41,18 @@ module Tripod::Fields
       add_field(name, predicate, options)
     end
 
+    # Return the field object on a +Resource+ associated with the given name.
+    #
+    # @example Get the field.
+    #   Person.get_field(:name)
+    #
+    # @param [ Symbol ] name The name of the field.
+    def get_field(name)
+      field = self.fields[name]
+      raise Tripod::Errors::FieldNotPresent.new unless field
+      field
+    end
+
     protected
 
     # Define a field attribute for the +Resource+.
@@ -153,4 +165,4 @@ module Tripod::Fields
       Tripod::Fields::Standard.new(name, predicate, options)
     end
   end
-end
+end

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("DESCRIBE #{uris_sparql_str}", "application/n-triples")
+        ntriples_string = Tripod::SparqlClient::Query.query("CONSTRUCT { ?s ?p ?o } WHERE { ?s ?p ?o .  VALUES ?s { #{uris_sparql_str} } }", "application/n-triples")
         graph = _rdf_graph_from_ntriples_string(ntriples_string, graph)
       end
 
@@ -171,7 +171,18 @@ module Tripod::Finders
     # @option options [ String ] uri_variable The name of the uri variable in the query, if not 'uri'
     def _describe_query_for_select(select_sparql, opts={})
       uri_variable = opts[:uri_variable] || "uri"
-      "DESCRIBE ?#{uri_variable} WHERE { #{select_sparql} }"
+      "
+        CONSTRUCT { ?tripod_construct_s ?tripod_construct_p ?tripod_construct_o } 
+        WHERE { 
+          ?tripod_construct_s ?tripod_construct_p ?tripod_construct_o .        
+          {
+            SELECT (?#{uri_variable} as ?tripod_construct_s)
+            { 
+              #{select_sparql} 
+            } 
+          }
+        }
+      "
     end
 
     # For a select query, get a raw serialisation of the DESCRIPTION of the resources from the database.
@@ -238,4 +249,4 @@ module Tripod::Finders
     end
 
   end
-end
+end

data/lib/tripod/sparql_client.rb

@@ -97,30 +97,4 @@ module Tripod::SparqlClient
 
   end
 
-  module Data
-    class DataClient
-      def self.submit(graph_uri, data, method)
-        url = "#{Tripod.data_endpoint}?graph=#{graph_uri}"
-        begin
-          RestClient::Request.execute(
-            :method => method,
-            :url => url,
-            :timeout => Tripod.timeout_seconds,
-            :payload => data
-          )
-          true
-        rescue RestClient::BadRequest => e
-          raise Tripod::Errors::BadDataRequest.new(e.http_body, e)
-        end
-      end
-    end
-
-    def self.append(graph_uri, data)
-      DataClient.submit(graph_uri, data, :post)
-    end
-
-    def self.replace(graph_uri, data)
-      DataClient.submit(graph_uri, data, :put)
-    end
-  end
 end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.9.11"
+  VERSION = "0.10.0"
 end

data/spec/spec_helper.rb

@@ -28,9 +28,13 @@ end
 
 # configure any settings for testing...
 Tripod.configure do |config|
-  config.update_endpoint = 'http://127.0.0.1:3030/tripod-test/update'
-  config.query_endpoint = 'http://127.0.0.1:3030/tripod-test/sparql'
-  config.data_endpoint = 'http://127.0.0.1:3030/tripod-test/data'
+  # config.update_endpoint = 'http://127.0.0.1:3030/tripod-test/update'
+  # config.query_endpoint = 'http://127.0.0.1:3030/tripod-test/sparql'
+  # config.data_endpoint = 'http://127.0.0.1:3030/tripod-test/data'
+  
+  config.update_endpoint = 'http://127.0.0.1:3002/sparql/raw/update'
+  config.query_endpoint = 'http://127.0.0.1:3002/sparql/raw'
+  #config.data_endpoint = 'http://127.0.0.1:3030/tripod-test/data'
 end
 
 # Autoload every model for the test suite that sits in spec/app/models.

data/spec/tripod/criteria_spec.rb

@@ -31,19 +31,40 @@ describe Tripod::Criteria do
 
   describe "#where" do
 
-    it "should add the sparql snippet to the where clauses" do
-      resource_criteria.where("blah")
-      resource_criteria.where_clauses.should == ["?uri ?p ?o", "blah"]
-    end
+    context 'given a string' do
+      it "should add the sparql snippet to the where clauses" do
+        resource_criteria.where("blah")
+        resource_criteria.where_clauses.should == ["?uri ?p ?o", "blah"]
+      end
 
-    it "should return an instance of Criteria" do
-      resource_criteria.where("blah").class == Tripod::Criteria
-    end
+      it "should return an instance of Criteria" do
+        resource_criteria.where("blah").class == Tripod::Criteria
+      end
 
-    it "should return an instance of Criteria with the where clauses added" do
-      resource_criteria.where("blah").where_clauses.should == ["?uri ?p ?o", "blah"]
+      it "should return an instance of Criteria with the where clauses added" do
+        resource_criteria.where("blah").where_clauses.should == ["?uri ?p ?o", "blah"]
+      end
     end
 
+    context 'given a hash' do
+      context 'with a native Ruby value' do
+        let(:value) { 'blah' }
+
+        it 'should construct a sparql snippet with the appropriate predicate, treating the value as a literal' do
+          criteria = resource_criteria.where(label: value)
+          criteria.where_clauses[1].should == "?uri <#{ RDF::RDFS.label }> \"#{ value }\""
+        end
+      end
+
+      context 'with a native RDF value' do
+        let(:value) {  RDF::URI.new('http://example.com/bob') }
+
+        it 'should construct a sparql snippet with the appropriate predicate' do
+          criteria = resource_criteria.where(label: value)
+          criteria.where_clauses[1].should == "?uri <#{ RDF::RDFS.label }> <#{ value.to_s }>"
+        end
+      end
+    end
   end
 
   describe "#extras" do
@@ -114,4 +135,4 @@ describe Tripod::Criteria do
     end
   end
 
-end
+end

data/spec/tripod/fields_spec.rb

@@ -39,4 +39,14 @@ describe Tripod::Fields do
       end
     end
   end
-end
+
+  describe '.get_field' do
+    it 'should raise an error if the field does not exist' do
+      expect { Person.send(:get_field, :shoe_size) }.to raise_error(Tripod::Errors::FieldNotPresent)
+    end
+
+    it 'should return the field for the given name' do
+      Person.send(:get_field, :age).name.should == :age
+    end
+  end
+end

data/spec/tripod/finders_spec.rb

@@ -190,7 +190,7 @@ describe Tripod::Finders do
     end
 
     it 'should return the first resources of this type' do
-      Person.first.should == ric
+      Person.first.should == bill
     end
   end
 
@@ -205,11 +205,12 @@ describe Tripod::Finders do
     it 'returns an array of resources which match those in the db' do
       res = Person.find_by_sparql('SELECT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }')
       res.length.should == 2
-      res.first.should == ric
-      res.last.should == bill
+      res.first.should == bill
+      res.last.should == ric
 
-      res.first.name.should == "ric"
-      res.first.knows.should == [RDF::URI.new("http://example.com/id/bill")]
+      r = res.last
+      r.name.should == "ric"
+      r.knows.should == [RDF::URI.new("http://example.com/id/bill")]
     end
 
     it 'uses the uri and graph variables if supplied' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -255,7 +255,6 @@ files:
 - spec/tripod/repository_spec.rb
 - spec/tripod/resource_spec.rb
 - spec/tripod/serialization_spec.rb
-- spec/tripod/sparql_client_spec.rb
 - spec/tripod/sparql_query_spec.rb
 - spec/tripod/state_spec.rb
 - spec/tripod/streaming_spec.rb
@@ -280,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: tripod
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Active Model style RDF ORM
@@ -303,7 +302,6 @@ test_files:
 - spec/tripod/repository_spec.rb
 - spec/tripod/resource_spec.rb
 - spec/tripod/serialization_spec.rb
-- spec/tripod/sparql_client_spec.rb
 - spec/tripod/sparql_query_spec.rb
 - spec/tripod/state_spec.rb
 - spec/tripod/streaming_spec.rb

data/spec/tripod/sparql_client_spec.rb

@@ -1,128 +0,0 @@
-require "spec_helper"
-
-describe Tripod::SparqlClient do
-  describe Data do
-
-    let(:data) { 'some-data-goes-here' }
-
-    describe "Query#query" do
-
-      let(:query) { "SELECT * WHERE {?s ?p ?o}" }
-      let(:bad_query) { "SELECT * WHERE ?s ?p ?o}" }
-
-      before do
-        p = Person.new('http://example.com/id/garry')
-        p.name = "garry"
-        p.save!
-        p
-      end
-
-      describe "using Tripod::Streaming to get the data" do
-        before(:each) do
-          Tripod::Streaming.stub(get_data: "some data")
-        end
-
-        example do
-          Tripod::SparqlClient::Query.query(query, "application/sparql-results+json")
-
-          expect(Tripod::Streaming).to have_received(:get_data).with(
-            Tripod.query_endpoint,
-            "query=#{CGI.escape(query)}",
-            {
-              accept: "application/sparql-results+json",
-              timeout_seconds: Tripod.timeout_seconds,
-              response_limit_bytes: Tripod.response_limit_bytes
-            }
-          )
-        end
-
-        context "with an integer response limit (number of bytes)" do
-          it "uses the limit" do
-            Tripod::SparqlClient::Query.query(
-              query, "application/sparql-results+json", {}, 1024
-            )
-
-            expect(Tripod::Streaming).to have_received(:get_data).with(
-              kind_of(String), kind_of(String), hash_including(response_limit_bytes: 1024)
-            )
-          end
-        end
-
-        context "with a :default response limit" do
-          it "uses the Tripod response limit" do
-            Tripod::SparqlClient::Query.query(
-              query, "application/sparql-results+json", {}, :default
-            )
-
-            expect(Tripod::Streaming).to have_received(:get_data).with(
-              kind_of(String), kind_of(String), hash_including(:response_limit_bytes)
-            )
-          end
-        end
-
-        context "with a :no_response_limit response limit" do
-          it "doesn't pass a limit" do
-            Tripod::SparqlClient::Query.query(
-              query, "application/sparql-results+json", {}, :no_response_limit
-            )
-
-            expect(Tripod::Streaming).to have_received(:get_data).with(
-              kind_of(String), kind_of(String), hash_not_including(:response_limit_bytes)
-            )
-          end
-        end
-      end
-
-      it "should execute the query and return the format requested" do
-        JSON.parse(Tripod::SparqlClient::Query.query(query, "application/sparql-results+json"))["results"]["bindings"].length > 0
-      end
-
-      context "with a bad query" do
-        it "should raise a bad request error" do
-          lambda {
-            Tripod::SparqlClient::Query.query(bad_query, "application/sparql-results+json")
-          }.should raise_error
-        end
-      end
-    end
-
-    describe "Data#append" do
-      it "should add the graph uri to the configured data endpoint" do
-        RestClient::Request.should_receive(:execute).with(hash_including(url: 'http://127.0.0.1:3030/tripod-test/data?graph=http://example.com/foo'))
-        Tripod::SparqlClient::Data.append('http://example.com/foo', data)
-      end
-
-      it "should send the data as the payload" do
-        RestClient::Request.should_receive(:execute).with(hash_including(payload: data))
-        Tripod::SparqlClient::Data.append('http://example.com/foo', data)
-      end
-
-      it "should HTTP POST the data" do
-        RestClient::Request.should_receive(:execute).with(hash_including(method: :post))
-        Tripod::SparqlClient::Data.append('http://example.com/foo', data)
-      end
-
-      context "which fails with a 400 error" do
-        before do
-          WebMock.enable!
-          stub_http_request(:post, 'http://127.0.0.1:3030/tripod-test/data?graph=http://example.com/foo').to_return(body: 'Error 400: Trousers missing', status: 400)
-        end
-
-        it "should raise a 'parse failed' exception" do
-          lambda { Tripod::SparqlClient::Data.append('http://example.com/foo', data) }.should raise_error(Tripod::Errors::BadDataRequest)
-        end
-
-        after do
-          WebMock.disable!
-        end
-      end
-    end
-
-    describe "Data#replace" do
-      it "should HTTP PUT the data" do
-        RestClient::Request.should_receive(:execute).with(hash_including(method: :put))
-        Tripod::SparqlClient::Data.replace('http://example.com/foo', data)
-      end
-    end
-  end
-end