tripod 0.3.2 → 0.3.3

data/README.md

@@ -118,6 +118,8 @@ Note: Tripod doesn't supply a database. You need to install one. I recommend [Fu
 
         Resource.graph("http://mygraph") #=> Retruns a criteria object with a graph restriction (note: if graph_uri set on the class, it will default to using this)
 
+        Resource.find_by_sparql('SELECT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }') #=> allows arbitrary sparql. Again, use ?uri for the variable of the subjects (and ?graph for the graph).
+
 ## Chainable criteria
 
         Person.all.where("?uri <http://name> 'Ric'").where("?uri <http://knows> <http://asa>).first

data/lib/tripod/finders.rb

@@ -62,7 +62,7 @@ module Tripod::Finders
     #
     # @return [ Array ] An array of hydrated resources of this class's type.
     def find_by_sparql(sparql_query, opts={})
-      uris_and_graphs = _select_uris_and_graphs(criteria, opts)
+      uris_and_graphs = _select_uris_and_graphs(sparql_query, opts)
       _create_and_hydrate_resources(uris_and_graphs)
     end
 

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/tripod/finders_spec.rb

@@ -120,4 +120,35 @@ describe Tripod::Finders do
     end
   end
 
+  describe '.find_by_sparql' do
+
+    before do
+      # save these into the db
+      bill.save!
+      ric.save!
+    end
+
+    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.name.should == "ric"
+      res.first.knows.should == [RDF::URI.new("http://bill")]
+    end
+
+    it 'uses the uri and graph variables if supplied' do
+      res = Person.find_by_sparql('SELECT ?bob ?geoff WHERE { GRAPH ?geoff { ?bob ?p ?o } }', :uri_variable => 'bob', :graph_variable => 'geoff')
+      res.length.should == 2
+    end
+
+    it "returns non-new records" do
+      res = Person.find_by_sparql('SELECT ?uri ?graph WHERE { GRAPH ?graph { ?uri ?p ?o } }')
+      res.first.new_record?.should be_false
+    end
+
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70205083592080 !ruby/object:Gem::Requirement
+  requirement: &70137501007220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083592080
+  version_requirements: *70137501007220
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70205083591380 !ruby/object:Gem::Requirement
+  requirement: &70137501006540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083591380
+  version_requirements: *70137501006540
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70205083590920 !ruby/object:Gem::Requirement
+  requirement: &70137501006080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083590920
+  version_requirements: *70137501006080
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70205083589940 !ruby/object:Gem::Requirement
+  requirement: &70137501005120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083589940
+  version_requirements: *70137501005120
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70205083589120 !ruby/object:Gem::Requirement
+  requirement: &70137501004320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083589120
+  version_requirements: *70137501004320
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70205083588320 !ruby/object:Gem::Requirement
+  requirement: &70137501003540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083588320
+  version_requirements: *70137501003540
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70205083587160 !ruby/object:Gem::Requirement
+  requirement: &70137501002360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083587160
+  version_requirements: *70137501002360
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70205083586480 !ruby/object:Gem::Requirement
+  requirement: &70137501001680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083586480
+  version_requirements: *70137501001680
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70205083584700 !ruby/object:Gem::Requirement
+  requirement: &70137500999880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70205083584700
+  version_requirements: *70137500999880
 description: RDF ruby ORM
 email:
 - ric@swirrl.com