tripod 0.2 → 0.2.1

data/lib/tripod/finders.rb

@@ -4,6 +4,81 @@
 module Tripod::Finders
   extend ActiveSupport::Concern
 
+  # FOLLOWING METHODS NOT PART OF THE PUBLIC API:
+  ## private methods
+  def self.included(base)
+
+    class << base
+
+      private
+
+      def select_uris_and_graphs(criteria, opts)
+        select_results = Tripod::SparqlClient::Query.select(criteria)
+
+        # data will contain a map of uris against graphs.
+        data = {}
+
+        select_results.each do |r|
+          uri_variable = opts[:uri_variable] || 'uri'
+          graph_variable = opts[:graph_variable] || 'graph'
+          data[ r[uri_variable]["value"] ] = r[graph_variable]["value"]
+        end
+
+        data
+      end
+
+      def create_and_hydrate_resources(uris_and_graphs, opts={})
+
+        triples_repository = create_resources(uris_and_graphs)
+        resources = hydrate_resources(uris_and_graphs, triples_repository, opts)
+
+      end
+
+      def create_resources(uris_and_graphs)
+
+        triples_repository = RDF::Repository.new()
+
+        if uris_and_graphs.keys.length > 0
+          uris_sparql_str = uris_and_graphs.keys.map{ |u| "<#{u}>" }.join(" ")
+
+          # Do a big describe statement, and read the results into an in-memory repo
+          triples = Tripod::SparqlClient::Query::describe("DESCRIBE #{uris_sparql_str}")
+          RDF::Reader.for(:ntriples).new(triples) do |reader|
+            reader.each_statement do |statement|
+              triples_repository << statement
+            end
+          end
+        end
+
+        triples_repository
+      end
+
+      def hydrate_resources(uris_and_graphs, triples_repository, opts={})
+
+        resources =[]
+
+        uris_and_graphs.each_pair do |u,g|
+          r = self.new(u,g)
+          data_graph = RDF::Graph.new
+          triples_repository.query( [RDF::URI.new(u), :predicate, :object] ) do |statement|
+            data_graph << statement
+          end
+
+          hydrate_opts = {:graph => data_graph}
+          hydrate_opts[:only] = opts[:only_hydrate]
+
+          r.hydrate!(:graph => data_graph)
+          r.new_record = false
+          resources << r
+        end
+
+        resources
+      end
+
+    end
+
+  end
+
   module ClassMethods
 
     # Find a +Resource+ by its uri (and, optionally, by its graph if there are more than one).
@@ -59,51 +134,13 @@ module Tripod::Finders
     #
     # @option options [ String ] uri_variable The name of the uri variable in thh query, if not 'uri'
     # @option options [ String ] graph_variable The name of the uri variable in thh query, if not 'graph'
+    # @option options [ String, RDF:URI, Array] only_hydrate a single predicate or list of predicates to hydrate the returned objects with. If ommited, does a full hydrate
     #
     # @return [ Array ] An array of hydrated resources of this class's type.
     def where(criteria, opts={})
-
-      # 1. Run the select.
-      select_results = Tripod::SparqlClient::Query.select(criteria)
-
-      # data will contain a map of uris against graphs.
-      data = {}
-
-      select_results.each do |r|
-        uri_variable = opts[:uri_variable] || 'uri'
-        graph_variable = opts[:graph_variable] || 'graph'
-        data[ r[uri_variable]["value"] ] = r[graph_variable]["value"]
-      end
-
-      resources = []
-
-      if data.keys.length > 0
-
-        uris_sparql_str = data.keys.map{ |u| "<#{u}>" }.join(" ")
-
-        # 2. Do a big describe statement, and read the results into an in-memory repo
-        triples = Tripod::SparqlClient::Query::describe("DESCRIBE #{uris_sparql_str}")
-        triples_repository = RDF::Repository.new()
-        RDF::Reader.for(:ntriples).new(triples) do |reader|
-          reader.each_statement do |statement|
-            triples_repository << statement
-          end
-        end
-
-        # 3. for each of our uris, make a resource, with a graph of triples for that uri from the in-mem repo
-        data.each_pair do |u,g|
-          r = self.new(u,g)
-          data_graph = RDF::Graph.new
-          triples_repository.query( [RDF::URI.new(u), :predicate, :object] ) do |statement|
-            data_graph << statement
-          end
-          r.hydrate!(:graph => data_graph)
-          r.new_record = false
-          resources << r
-        end
-      end
-      resources
-
+      uris_and_graphs = select_uris_and_graphs(criteria, opts)
+      create_and_hydrate_resources(uris_and_graphs, opts)
     end
+
   end
 end

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.2"
+  VERSION = "0.2.1"
 end

data/tripod.gemspec

@@ -2,7 +2,7 @@
 require File.expand_path('../lib/tripod/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["RicSwirrl"]
+  gem.authors       = ["Ric Roberts", "Bill Roberts", "Asa Calow"]
   gem.email         = ["ric@swirrl.com"]
   gem.description   = %q{RDF ruby ORM}
   gem.summary       = %q{Active Model style RDF ORM}

metadata

@@ -1,11 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
-- RicSwirrl
+- Ric Roberts
+- Bill Roberts
+- Asa Calow
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -13,7 +15,7 @@ date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70356011065320 !ruby/object:Gem::Requirement
+  requirement: &70338965901200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011065320
+  version_requirements: *70338965901200
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70356011064380 !ruby/object:Gem::Requirement
+  requirement: &70338965900320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +34,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011064380
+  version_requirements: *70338965900320
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70356011063560 !ruby/object:Gem::Requirement
+  requirement: &70338965915940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011063560
+  version_requirements: *70338965915940
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70356011079140 !ruby/object:Gem::Requirement
+  requirement: &70338965914940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011079140
+  version_requirements: *70338965914940
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70356011078020 !ruby/object:Gem::Requirement
+  requirement: &70338965913560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011078020
+  version_requirements: *70338965913560
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70356011076860 !ruby/object:Gem::Requirement
+  requirement: &70338965912940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011076860
+  version_requirements: *70338965912940
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70356011076360 !ruby/object:Gem::Requirement
+  requirement: &70338965912360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011076360
+  version_requirements: *70338965912360
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70356011075640 !ruby/object:Gem::Requirement
+  requirement: &70338965911540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011075640
+  version_requirements: *70338965911540
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70356011074860 !ruby/object:Gem::Requirement
+  requirement: &70338965910800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +111,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70356011074860
+  version_requirements: *70338965910800
 description: RDF ruby ORM
 email:
 - ric@swirrl.com