tripod 0.7.26 → 0.8

data/lib/tripod/finders.rb

@@ -12,30 +12,45 @@ module Tripod::Finders
     #   Person.find('http://ric')
     #   Person.find(RDF::URI('http://ric'))
     # @example Find a single resource by uri and graph
+    #   Person.find('http://ric', :graph_uri => 'http://example.com/people')
+    # @example Find a single resource by uri, looking in any graph (i.e. the UNION graph)
+    #   Person.find('http://ric', :ignore_graph => true)
+    # @example Find a single resource by uri and graph (DEPRECATED)
     #   Person.find('http://ric', 'http://example.com/people')
     #   Person.find(RDF::URI('http://ric'), Person.find(RDF::URI('http://example.com/people')))
     #
     # @param [ String, RDF::URI ] uri The uri of the resource to find
-    # @param [ String, RDF::URI ] graph_uri The uri of the graph from which to get the resource
+    # @param [ Hash, String, RDF::URI ] opts Either an options hash (see above), or (for backwards compatibility) the uri of the graph from which to get the resource
     #
     # @raise [ Tripod::Errors::ResourceNotFound ] If no resource found.
     #
     # @return [ Resource ] A single resource
-    def find(uri, graph_uri=nil)
-
-      unless graph_uri
-        # do a quick select to see what graph to use.
-        select_query = "SELECT ?g WHERE { GRAPH ?g {<#{uri.to_s}> ?p ?o } } LIMIT 1"
-        result = Tripod::SparqlClient::Query.select(select_query)
-        if result.length > 0
-          graph_uri = result[0]["g"]["value"]
-        else
-          raise Tripod::Errors::ResourceNotFound.new(uri)
-        end
+    def find(uri, opts={})
+      if opts.is_a?(String) # backward compatibility hack
+        graph_uri = opts
+        ignore_graph = false
+      else
+        graph_uri = opts.fetch(:graph_uri, nil)
+        ignore_graph = opts.fetch(:ignore_graph, false)
       end
 
-      # instantiate and hydrate the resource
-      resource = self.new(uri, graph_uri.to_s)
+      resource = nil
+      if ignore_graph
+        resource = self.new(uri, :ignore_graph => true)
+      else
+        graph_uri ||= self.get_graph_uri
+        unless graph_uri
+          # do a quick select to see what graph to use.
+          select_query = "SELECT ?g WHERE { GRAPH ?g {<#{uri.to_s}> ?p ?o } } LIMIT 1"
+          result = Tripod::SparqlClient::Query.select(select_query)
+          if result.length > 0
+            graph_uri = result[0]["g"]["value"]
+          else
+            raise Tripod::Errors::ResourceNotFound.new(uri)
+          end
+        end
+        resource = self.new(uri, :graph_uri => graph_uri.to_s)
+      end
 
       resource.hydrate!
       resource.new_record = false
@@ -183,7 +198,8 @@ module Tripod::Finders
       uris_and_graphs.each_pair do |u,g|
 
         # instantiate a new resource
-        r = self.new(u,g)
+        g ||= {}
+        r = self.new(u, g)
 
         # make a graph of data for this resource's uri
         data_graph = RDF::Graph.new

data/lib/tripod/resource.rb

@@ -27,19 +27,30 @@ module Tripod::Resource
   #
   # @example Instantiate a new Resource
   #   Person.new('http://swirrl.com/ric.rdf#me')
+  # @example Instantiate a new Resource in a particular graph
+  #   Person.new('http://swirrl.com/ric.rdf#me', :graph_uri => 'http://swirrl.com/graph/people')
+  # @example Instantiate a new Resource in a particular graph (DEPRECATED)
+  #   Person.new('http://swirrl.com/ric.rdf#me', 'http://swirrl.com/graph/people')
   #
   # @param [ String, RDF::URI ] uri The uri of the resource.
-  # @param [ String, RDF::URI ] graph_uri The graph_uri where this resource will be saved to. If ommitted, this resource cannot be persisted.
+  # @param [ Hash, String, RDF::URI ] opts An options hash (see above), or the graph_uri where this resource will be saved to. If graph URI is ommitted and can't be derived from the object's class, this resource cannot be persisted.
   #
   # @return [ Resource ] A new +Resource+
-  def initialize(uri, graph_uri=nil)
+  def initialize(uri, opts={})
+    if opts.is_a?(String)
+      graph_uri = opts
+    else
+      graph_uri = opts.fetch(:graph_uri, nil)
+      ignore_graph = opts.fetch(:ignore_graph, false)
+    end
+
     raise Tripod::Errors::UriNotSet.new('uri missing') unless uri
     @uri = RDF::URI(uri.to_s)
     @repository = RDF::Repository.new
     @new_record = true
 
     run_callbacks :initialize do
-      graph_uri ||= self.class.get_graph_uri
+      graph_uri ||= self.class.get_graph_uri unless ignore_graph
       @graph_uri = RDF::URI(graph_uri) if graph_uri
       self.rdf_type = self.class.get_rdf_type if respond_to?(:rdf_type=) && self.class.get_rdf_type
     end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.7.26"
+  VERSION = "0.8"
 end

data/spec/tripod/finders_spec.rb

@@ -48,7 +48,31 @@ describe Tripod::Finders do
     end
 
     context 'with graph_uri supplied' do
+      let!(:another_person) do
+        p = Person.new('http://example.com/anotherperson', :graph_uri => '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, :graph_uri => 'http://example.com/graphx').and_call_original
+          Person.find(another_person.uri, :graph_uri => 'http://example.com/graphx')
+        end
+
+      end
+
+      context 'when there are no triples about the resource in that graph' do
+        it 'should raise not found' do
+          expect {
+            Person.find(another_person.uri, :graph_uri => "http://example.com/graphy")
+          }.to raise_error(Tripod::Errors::ResourceNotFound)
+        end
+      end
+    end
 
+    context 'with graph_uri supplied (deprecated)' do
       let!(:another_person) do
         p = Person.new('http://example.com/anotherperson', 'http://example.com/graphx')
         p.name = 'a.n.other'
@@ -57,21 +81,18 @@ describe Tripod::Finders do
       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")
+          Person.should_receive(:new).with(another_person.uri, :graph_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 {
+        it 'should raise not found' do
+          expect {
             Person.find(another_person.uri, "http://example.com/graphy")
-          }.should raise_error(Tripod::Errors::ResourceNotFound)
-
+          }.to raise_error(Tripod::Errors::ResourceNotFound)
         end
       end
     end
@@ -79,8 +100,40 @@ describe Tripod::Finders do
     context 'with no graph_uri supplied' do
        it 'should look up the graph to call new' do
         ric # trigger the lazy load
-        Person.should_receive(:new).with(ric.uri, Person._GRAPH_URI).and_call_original
-        Person.find(ric.uri, Person._GRAPH_URI)
+        Person.should_receive(:new).with(ric.uri, :graph_uri => Person.get_graph_uri).and_call_original
+        Person.find(ric.uri)
+      end
+    end
+
+    context "looking in any graph" do
+      context 'model has no default graph URI' do
+        let!(:resource) do
+          r = Resource.new('http://example.com/foo', :graph_uri => 'http://example/graph/foo')
+          r.label = 'Foo'
+          r.save!
+          r
+        end
+
+        it 'should find a resource regardless of which graph it is in' do
+          Resource.find(resource.uri, :ignore_graph => true).should_not be_nil
+        end
+      end
+
+      context 'model has a default graph URI' do
+        let!(:another_person) do
+          p = Person.new('http://example.com/anotherperson', :graph_uri => 'http://example.com/graphx')
+          p.name = 'a.n.other'
+          p.save!
+          p
+        end
+
+        it 'should override the default graph URI and find the resource regardless' do
+          Person.find(another_person.uri, :ignore_graph => true).should_not be_nil
+        end
+
+        it 'should return the resource without a graph URI' do
+          Person.find(another_person.uri, :ignore_graph => true).graph_uri.should be_nil
+        end
       end
     end
   end

data/spec/tripod/resource_spec.rb

@@ -34,12 +34,22 @@ describe Tripod::Resource do
 
     context 'with a URI and a graph URI' do
       let(:person) do
-        Person.new('http://example.com/foobar', 'http://example.com/foobar/graph')
+        Person.new('http://example.com/foobar', :graph_uri => 'http://example.com/foobar/graph')
       end
 
       it "overrides the default graph URI with what's given" do
         person.graph_uri.should == RDF::URI.new('http://example.com/foobar/graph')
       end
     end
+
+    context 'with a URI, ignoring the graph URI' do
+      let(:person) do
+        Person.new('http://example.com/foobar', :ignore_graph => true)
+      end
+
+      it "should ignore the class-level graph URI" do
+        person.graph_uri.should be_nil
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.7.26
+  version: '0.8'
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70123156202840 !ruby/object:Gem::Requirement
+  requirement: &70287154647860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156202840
+  version_requirements: *70287154647860
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70123156218380 !ruby/object:Gem::Requirement
+  requirement: &70287154647280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156218380
+  version_requirements: *70287154647280
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70123156217780 !ruby/object:Gem::Requirement
+  requirement: &70287154646820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156217780
+  version_requirements: *70287154646820
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70123156216920 !ruby/object:Gem::Requirement
+  requirement: &70287154646240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156216920
+  version_requirements: *70287154646240
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70123156216500 !ruby/object:Gem::Requirement
+  requirement: &70287154645760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156216500
+  version_requirements: *70287154645760
 - !ruby/object:Gem::Dependency
   name: rdf-turtle
-  requirement: &70123156216040 !ruby/object:Gem::Requirement
+  requirement: &70287154645080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156216040
+  version_requirements: *70287154645080
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70123156215580 !ruby/object:Gem::Requirement
+  requirement: &70287154644500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156215580
+  version_requirements: *70287154644500
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70123156215040 !ruby/object:Gem::Requirement
+  requirement: &70287154643580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70123156215040
+  version_requirements: *70287154643580
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70123156214380 !ruby/object:Gem::Requirement
+  requirement: &70287154643100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156214380
+  version_requirements: *70287154643100
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70123156213660 !ruby/object:Gem::Requirement
+  requirement: &70287154642500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70123156213660
+  version_requirements: *70287154642500
 description: RDF ruby ORM
 email:
 - ric@swirrl.com