tripod 0.10.6 → 0.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de26dbd697bf235132169fcd79cd217f12703968
-  data.tar.gz: 51f05ee55133a0efdb7fc818721e6fab2992b994
+  metadata.gz: 28357534b22227c55bd266ea70d5ef438876e164
+  data.tar.gz: b1cca62a80cc3d792a78347df41b5291ae79a9ab
 SHA512:
-  metadata.gz: dc24de2078906bcbef21306de4803fff5792b6be1f124a8ce543b8269edddc0b85623f51634211b92a0d8fddc52b2f2fe71c9e42af73076c880eac18fc6522a0
-  data.tar.gz: 568716881b92d6d8b0c31380a45235afaebc04694b130c6f7340a55f592601a8de90c5493746d8e51d67c46ebdd005d7858316f3c6a864e15df3af332f02a098
+  metadata.gz: 23a8ac7dfb43dc3350b06f8f14f4b4dfeba832927d6e0a690dec71b1136204919c66d7bd1fdaca18b2bf60b421684363e0120a732fbac41bcd1f4ec82b6437fd
+  data.tar.gz: 464e6b785fbe6522e118cc6874b881474c9ace312b97e0adfc689ae2b56575352a4abffdbec7ddadc857e6b52320f584afddff409aa151572872bfdd906d0bf5

data/lib/tripod.rb

@@ -93,7 +93,6 @@ require "tripod/predicates"
 require "tripod/attributes"
 require "tripod/callbacks"
 require "tripod/validations/is_url"
-require "tripod/rdf_type"
 require "tripod/errors"
 require "tripod/repository"
 require "tripod/fields"
@@ -105,9 +104,6 @@ require "tripod/eager_loading"
 require "tripod/serialization"
 require "tripod/state"
 require "tripod/graphs"
-require "tripod/embeds"
-require "tripod/embeds/many"
-require "tripod/embedded_resource"
 require "tripod/version"
 
 # these need to be at the end

data/lib/tripod/components.rb

@@ -17,11 +17,9 @@ module Tripod::Components
   include Tripod::Attributes
   include Tripod::Callbacks
   include Tripod::Validations
-  include Tripod::RdfType
   include Tripod::Persistence
   include Tripod::Fields
   include Tripod::Links
-  include Tripod::Embeds
   include Tripod::Finders
   include Tripod::Repository
   include Tripod::EagerLoading

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("CONSTRUCT { ?s ?p ?o } WHERE { VALUES ?s { #{uris_sparql_str} }  ?s ?p ?o . }", "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
 
@@ -172,20 +172,16 @@ module Tripod::Finders
     def _describe_query_for_select(select_sparql, opts={})
       uri_variable = opts[:uri_variable] || "uri"
       "
-      CONSTRUCT {
-        ?tripod_construct_s ?tripod_construct_p ?tripod_construct_o .
-      #  ?tripod_construct_o ?tripod_construct_ep ?tripod_construct_eo .
-      }
-      WHERE {
-        {
-          SELECT (?#{uri_variable} as ?tripod_construct_s)
+        CONSTRUCT { ?tripod_construct_s ?tripod_construct_p ?tripod_construct_o } 
+        WHERE { 
+          ?tripod_construct_s ?tripod_construct_p ?tripod_construct_o .        
           {
-            #{select_sparql}
+            SELECT (?#{uri_variable} as ?tripod_construct_s)
+            { 
+              #{select_sparql} 
+            } 
           }
-        }        
-       ?tripod_construct_s ?tripod_construct_p ?tripod_construct_o .        
-      #  OPTIONAL { ?tripod_construct_o ?tripod_construct_ep ?tripod_construct_eo . }        
-      }
+        }
       "
     end
 
@@ -220,10 +216,6 @@ module Tripod::Finders
         data_graph = RDF::Graph.new
         repo.query( [RDF::URI.new(u), :predicate, :object] ) do |statement|
           data_graph << statement
-
-          if statement.object.is_a? RDF::Node
-            repo.query( [statement.object, :predicate, :object] ) {|s| data_graph << s}
-          end
         end
 
         # use it to hydrate this resource

data/lib/tripod/repository.rb

@@ -56,7 +56,11 @@ module Tripod::Repository
   end
 
   def retrieve_triples_from_database(accept_header="application/n-triples")
-    Tripod::SparqlClient::Query.query(self.class.all_triples_query(uri, graph_uri: self.graph_uri), accept_header)
+    graph_selector = self.graph_uri.present? ? "<#{graph_uri.to_s}>" : "?g"
+    Tripod::SparqlClient::Query.query(
+      "CONSTRUCT {<#{uri}> ?p ?o} WHERE { GRAPH #{graph_selector} { <#{uri}> ?p ?o } }",
+      accept_header
+    )
   end
 
   # returns a graph of triples from the underlying repository where this resource's uri is the subject.
@@ -83,12 +87,6 @@ module Tripod::Repository
       repo
     end
 
-    def all_triples_query(uri, opts={})
-      graph_uri = opts.fetch(:graph_uri, nil)
-      graph_selector = graph_uri.present? ? "<#{graph_uri.to_s}>" : "?g"
-      "CONSTRUCT {<#{uri}> ?p ?o . ?o ?ep ?eo . } WHERE { GRAPH #{graph_selector} { <#{uri}> ?p ?o . OPTIONAL { ?o ?ep ?eo } } }"
-    end
-
   end
 
-end
+end

data/lib/tripod/resource.rb

@@ -13,6 +13,8 @@ module Tripod::Resource
     validates_presence_of :graph_uri
     # uri is a valid linked data url
     validates :uri, is_url: true
+    # every instance of a resource has an rdf type field, which is set at the class level
+    class_attribute :_RDF_TYPE
     # the Graph URI is set at the class level by default also, although this can be overridden in the constructor
     class_attribute :_GRAPH_URI
   end
@@ -50,7 +52,7 @@ module Tripod::Resource
     run_callbacks :initialize do
       graph_uri ||= self.class.get_graph_uri unless ignore_graph
       @graph_uri = RDF::URI(graph_uri) if graph_uri
-      set_rdf_type
+      self.rdf_type = self.class.get_rdf_type if respond_to?(:rdf_type=) && self.class.get_rdf_type
     end
   end
 
@@ -105,6 +107,17 @@ module Tripod::Resource
       other.class == Class ? self <= other : other.is_a?(self)
     end
 
+    # makes a "field" on this model called rdf_type
+    # and sets a class level _RDF_TYPE variable with the rdf_type passed in.
+    def rdf_type(new_rdf_type)
+      self._RDF_TYPE = RDF::URI.new(new_rdf_type.to_s)
+      field :rdf_type, RDF.type, :multivalued => true, :is_uri => true # things can have more than 1 type and often do
+    end
+
+    def get_rdf_type
+      self._RDF_TYPE
+    end
+
     def graph_uri(new_graph_uri)
       self._GRAPH_URI = new_graph_uri
     end
@@ -117,4 +130,4 @@ module Tripod::Resource
 end
 
 # causes any hooks to be fired, if they've been setup on_load of :tripod.
-ActiveSupport.run_load_hooks(:triploid, Tripod::Resource)
+ActiveSupport.run_load_hooks(:triploid, Tripod::Resource)

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.10.6"
+  VERSION = "0.10.7"
 end

data/spec/app/models/dog.rb

@@ -14,6 +14,4 @@ class Dog
 
   linked_to :arch_enemy, 'http://example.com/archenemy', class_name: 'Dog'
   linked_to :enemies, 'http://example.com/enemy', class_name: 'Dog'
-
-  embeds :fleas, 'http://example.com/fleas'
-end
+end

data/spec/spec_helper.rb

@@ -31,7 +31,7 @@ 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: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'
@@ -41,4 +41,4 @@ end
 Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
   name = File.basename(file, ".rb")
   autoload name.camelize.to_sym, name
-end
+end

data/spec/tripod/repository_spec.rb

@@ -30,7 +30,9 @@ describe Tripod::Repository do
 
         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(Person.all_triples_query(person.uri, graph_uri: person.graph_uri), 'application/n-triples').and_call_original
+            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
@@ -38,7 +40,9 @@ describe Tripod::Repository do
 
         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(Person.all_triples_query(person.uri), 'application/n-triples').and_call_original
+            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
@@ -69,4 +73,4 @@ describe Tripod::Repository do
   end
 
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.10.6
+  version: 0.10.7
 platform: ruby
 authors:
 - Ric Roberts