tripod 0.4.0 → 0.4.2

data/lib/tripod/errors/resource_not_found.rb

@@ -3,6 +3,18 @@ module Tripod::Errors
 
   # not found error.
   class ResourceNotFound < StandardError
+
+    attr_accessor :uri
+
+    def initialize(uri=nil)
+      @uri = uri
+    end
+
+    def message
+      msg = "Resource Not Found"
+      msg += ": #{@uri.to_s}" if @uri
+      msg
+    end
   end
 
 end

data/lib/tripod/fields/standard.rb

@@ -4,7 +4,8 @@ module Tripod::Fields
   class Standard
 
     # Set readers for the instance variables.
-    attr_accessor :name, :predicate, :options, :datatype, :multivalued
+    attr_accessor :name, :predicate, :options, :datatype, :is_uri, :multivalued
+    alias_method :is_uri?, :is_uri
 
     # Create the new field with a name and optional additional options.
     #
@@ -22,8 +23,8 @@ module Tripod::Fields
       @options = options
       @predicate = RDF::URI.new(predicate.to_s)
       @datatype = RDF::URI.new(options[:datatype].to_s) if options[:datatype]
+      @is_uri = !!options[:is_uri]
       @multivalued = options[:multivalued] || false
     end
-
   end
 end

data/lib/tripod/fields.rb

@@ -34,7 +34,9 @@ module Tripod::Fields
 
 
     def new_value_for_field(value, field)
-      if field.datatype
+      if field.is_uri?
+        RDF::URI.new(value.to_s)
+      elsif field.datatype
         RDF::Literal.new(value, :datatype => field.datatype)
       else
         value

data/lib/tripod/finders.rb

@@ -30,7 +30,7 @@ module Tripod::Finders
         if result.length > 0
           graph_uri = result[0]["g"]["value"]
         else
-          raise Tripod::Errors::ResourceNotFound.new
+          raise Tripod::Errors::ResourceNotFound.new(uri)
         end
       end
 
@@ -42,7 +42,7 @@ module Tripod::Finders
 
       # check that there are triples for the resource (catches case when someone has deleted data
       # between our original check for the graph and hydrating the object.
-      raise Tripod::Errors::ResourceNotFound.new if resource.repository.empty?
+      raise Tripod::Errors::ResourceNotFound.new(uri) if resource.repository.empty?
 
       # return the instantiated, hydrated resource
       resource

data/lib/tripod/repository.rb

@@ -28,13 +28,19 @@ module Tripod::Repository
 
     if graph
       graph.each_statement do |statement|
-        # only use statements about this resource for hydrating
-        if statement.subject.to_s == @uri.to_s
-          @repository << statement
-        end
+        # Note that we use all statements, even those not about this resource, in case we're being
+        # passed eager-loaded ones.
+        @repository << statement
       end
     else
-      triples = Tripod::SparqlClient::Query.query("DESCRIBE <#{uri}>", "application/n-triples")
+
+      graph_selector = self.graph_uri.present? ? "<#{graph_uri.to_s}>" : "?g"
+
+      triples = Tripod::SparqlClient::Query.query(
+        "CONSTRUCT {<#{uri}> ?p ?o} WHERE { GRAPH #{graph_selector} { <#{uri}> ?p ?o } }",
+        "application/n-triples"
+      )
+
       @repository = RDF::Repository.new
       RDF::Reader.for(:ntriples).new(triples) do |reader|
         reader.each_statement do |statement|
@@ -45,6 +51,15 @@ module Tripod::Repository
 
   end
 
+  # returns a graph of all triples in the repository
+  def repository_as_graph
+    g = RDF::Graph.new
+    @repository.each_statement do |s|
+      g << s
+    end
+    g
+  end
+
   # returns a graph of triples from the underlying repository where this resource's uri is the subject.
   def get_triples_for_this_resource
     triples_graph = RDF::Graph.new

data/lib/tripod/sparql_client.rb

@@ -17,6 +17,10 @@ module Tripod::SparqlClient
     def self.query(sparql, accept_header, extra_params={})
 
       begin
+        if defined?(Rails)
+          Rails.logger.debug "TRIPOD: About to run query:"
+          Rails.logger.debug sparql
+        end
         params = {:query => sparql}.merge(extra_params)
         hdrs = {:accept => accept_header, :params => params}
 
@@ -33,7 +37,7 @@ module Tripod::SparqlClient
         if Tripod.cache_store # if a cache store is configured
           # SHA-2 the key to keep the it within the small limit for many cache stores (e.g. Memcached is 250bytes)
           # Note: SHA2's are pretty certain to be unique http://en.wikipedia.org/wiki/SHA-2.
-          key = 'SPARQL-QUERY-' + Digest::SHA2.hexdigest([format, headers, sparql].join(" "))
+          key = 'SPARQL-QUERY-' + Digest::SHA2.hexdigest([extra_params, accept_header, sparql].join(" "))
           Tripod.cache_store.fetch(key, &make_the_call)
         else
           make_the_call.call()

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

data/spec/app/models/person.rb

@@ -6,7 +6,7 @@ class Person
   graph_uri 'http://example.com/graph'
 
   field :name, 'http://example.com/name'
-  field :father, 'http://example.com/father'
+  field :father, 'http://example.com/father', :is_uri => true
   field :knows, 'http://example.com/knows', :multivalued => true
   field :aliases, 'http://exmample.com/alias', :multivalued => true
   field :age, 'http://example.com/age', :datatype => RDF::XSD.integer

data/spec/tripod/attributes_spec.rb

@@ -26,10 +26,7 @@ describe Tripod::Attributes do
     end
 
     context "for a uri" do
-
       it "should return an RDF::URI" do
-        puts person[:father]
-
         person[:father].class.should == RDF::URI
       end
 
@@ -62,6 +59,15 @@ describe Tripod::Attributes do
       it "should return a single value" do
         person.read_attribute(:hat_type, field).should == 'fez'
       end
+
+      context "and the value is a URI" do
+        let(:field) { Person.send(:field_for, :hat_type, 'http://example.com/hat', {is_uri: true}) }
+        before do
+          person.stub(:read_predicate).with('http://example.com/hat').and_return(['fez'])
+        end
+
+
+      end
     end
 
     context "where field is given and is multi-valued" do
@@ -95,6 +101,13 @@ describe Tripod::Attributes do
       person.read_predicate('http://example.com/age').first.datatype.should == RDF::XSD.integer
     end
 
+    context "where the attribute is a uri" do
+      it "should convert a string to an RDF::URI" do
+        person[:father] = 'http://example.com/darth'
+        person.read_predicate('http://example.com/father').first.should be_a(RDF::URI)
+      end
+    end
+
     context "where the attribute is multi-valued" do
       it "should co-erce all the values to the correct datatype" do
         person[:important_dates] = [Date.today]

data/spec/tripod/fields_spec.rb

@@ -8,7 +8,6 @@ describe Tripod::Fields do
       b = Person.new('http://example.com/id/barry')
       b.name = 'Barry'
       b
-      b
     end
 
     it "creates a getter for the field, which accesses data for the predicate, returning a single String" do

data/spec/tripod/finders_spec.rb

@@ -2,14 +2,14 @@ require "spec_helper"
 
 describe Tripod::Finders do
 
-  let(:ric) do
+  let!(:ric) do
     r = Person.new('http://example.com/id/ric')
     r.name = "ric"
     r.knows = RDF::URI.new("http://example.com/id/bill")
     r
   end
 
-  let(:bill) do
+  let!(:bill) do
     b = Person.new('http://example.com/id/bill')
     b.name = "bill"
     b
@@ -48,10 +48,31 @@ describe Tripod::Finders do
     end
 
     context 'with graph_uri supplied' do
-      it 'should use that graph to call new' do
-        ric # trigger the lazy load
-        Person.should_receive(:new).with(ric.uri, 'http://example.com/graphx').and_call_original
-        Person.find(ric.uri, "http://example.com/graphx")
+
+      let!(:another_person) do
+        p = Person.new('http://example.com/anotherperson', 'http://example.com/graphx')
+        p.name = 'a.n.other'
+        p.save!
+        p
+      end
+
+      context 'when there are triples about the resource in that graph' do
+
+        it 'should use that graph to call new' do
+          Person.should_receive(:new).with(another_person.uri, 'http://example.com/graphx').and_call_original
+          Person.find(another_person.uri, "http://example.com/graphx")
+        end
+
+      end
+
+      context 'when there are no triples about the resource in that graph' do
+        it 'should raise nto found' do
+
+          lambda {
+            Person.find(another_person.uri, "http://example.com/graphy")
+          }.should raise_error(Tripod::Errors::ResourceNotFound)
+
+        end
       end
     end
 

data/spec/tripod/repository_spec.rb

@@ -22,21 +22,36 @@ describe Tripod::Repository do
         Person.new(@uri, @graph_uri)
       end
 
-      context 'no graph passed' do
+      let(:graphless_resource) do
+        Resource.new(@uri)
+      end
 
-        context 'no predicate restrictions passed' do
+      context 'no graph passed' do
 
-          it 'populates the repository with a graph of triples from the db' do
-            Tripod::SparqlClient::Query.should_receive(:query).with("DESCRIBE <#{@uri}>", "application/n-triples").and_call_original
+        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(
+              "CONSTRUCT {<#{person.uri}> ?p ?o} WHERE { GRAPH <#{person.graph_uri}> { <#{person.uri}> ?p ?o } }",
+              "application/n-triples").and_call_original
             person.hydrate!
             person.repository.should_not be_empty
           end
+        end
 
+        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(
+              "CONSTRUCT {<#{graphless_resource.uri}> ?p ?o} WHERE { GRAPH ?g { <#{graphless_resource.uri}> ?p ?o } }",
+              "application/n-triples").and_call_original
+            graphless_resource.hydrate!
+            graphless_resource.repository.should_not be_empty
+          end
         end
+
       end
 
       context 'graph passed' do
-        it 'populates the repository with the graph of triples passed in, ingoring triples not about this resource' do
+        it 'populates the repository with the graph of triples passed in' do
           @graph = RDF::Graph.new
 
           person.repository.statements.each do |s|
@@ -44,12 +59,12 @@ describe Tripod::Repository do
           end
 
           @graph << RDF::Statement.new( 'http://example.com/anotherresource', 'http://example.com/pred', 'http://example.com/obj')
-          @graph.statements.count.should ==2 # there'll already be a statement about type in the person.
+          @graph.statements.count.should == 2 # there'll already be a statement about type in the person.
 
           person.hydrate!(:graph => @graph)
           person.repository.should_not be_empty
-          person.repository.statements.count.should == 1 # not the extra ones
-          person.repository.statements.first.should == @graph.statements.first
+          person.repository.statements.count.should == 2 # not the extra ones
+          person.repository.statements.to_a.should == @graph.statements.to_a
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70364886263520 !ruby/object:Gem::Requirement
+  requirement: &70208187066620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886263520
+  version_requirements: *70208187066620
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70364886262400 !ruby/object:Gem::Requirement
+  requirement: &70208187061260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886262400
+  version_requirements: *70208187061260
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70364886261680 !ruby/object:Gem::Requirement
+  requirement: &70208187091120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886261680
+  version_requirements: *70208187091120
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70364886260440 !ruby/object:Gem::Requirement
+  requirement: &70208187100360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886260440
+  version_requirements: *70208187100360
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70364886259940 !ruby/object:Gem::Requirement
+  requirement: &70208187094320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886259940
+  version_requirements: *70208187094320
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70364886258140 !ruby/object:Gem::Requirement
+  requirement: &70208186978440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886258140
+  version_requirements: *70208186978440
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70364886255600 !ruby/object:Gem::Requirement
+  requirement: &70208186977380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886255600
+  version_requirements: *70208186977380
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70364886254440 !ruby/object:Gem::Requirement
+  requirement: &70208186975660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886254440
+  version_requirements: *70208186975660
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70364886240960 !ruby/object:Gem::Requirement
+  requirement: &70208186974980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886240960
+  version_requirements: *70208186974980
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70364886240040 !ruby/object:Gem::Requirement
+  requirement: &70208186973620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70364886240040
+  version_requirements: *70208186973620
 description: RDF ruby ORM
 email:
 - ric@swirrl.com