tripod 0.10.3 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d15c9a2a73060d3bb197938d1b54e7ac5cd389c
-  data.tar.gz: 8ef936705121bbe021c213b0ad1e21612e977adc
+  metadata.gz: de26dbd697bf235132169fcd79cd217f12703968
+  data.tar.gz: 51f05ee55133a0efdb7fc818721e6fab2992b994
 SHA512:
-  metadata.gz: 5d0298f5a4e5c2c9edfece03b5a902898eadbde2f5301d7bcafd2fa2c018d706cbc591dbde42da4705630d999f18ac1d3537438ab4ff41ba8299211024b3d259
-  data.tar.gz: 988bbe224cc037aba6e6c70c676a59b59a82fdae8b225f2c7467f9e4461845638fea8bd074a6f0f5987df9a4f248eb785c56312dd9b5526d73932f13032412d4
+  metadata.gz: dc24de2078906bcbef21306de4803fff5792b6be1f124a8ce543b8269edddc0b85623f51634211b92a0d8fddc52b2f2fe71c9e42af73076c880eac18fc6522a0
+  data.tar.gz: 568716881b92d6d8b0c31380a45235afaebc04694b130c6f7340a55f592601a8de90c5493746d8e51d67c46ebdd005d7858316f3c6a864e15df3af332f02a098

data/lib/tripod.rb

@@ -93,6 +93,7 @@ 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"
@@ -104,6 +105,9 @@ 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,9 +17,11 @@ 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/embedded_resource.rb

@@ -0,0 +1,27 @@
+module Tripod::EmbeddedResource
+  extend ActiveSupport::Concern
+
+  include ActiveModel::Validations
+
+  include Tripod::Predicates
+  include Tripod::Attributes
+  include Tripod::Validations
+  include Tripod::Fields
+  include Tripod::RdfType
+
+  attr_reader :uri
+
+  def initialize(opts={})
+    @uri = opts.fetch(:node, RDF::Node.new) # use a blank node for the URI
+    @repository = opts.fetch(:repository, RDF::Repository.new)
+    set_rdf_type
+  end
+
+  def to_statements
+    @repository.statements
+  end
+
+  def ==(resource)
+    (@uri == resource.uri)
+  end
+end

data/lib/tripod/embeds.rb

@@ -0,0 +1,35 @@
+module Tripod::Embeds
+  extend ActiveSupport::Concern
+
+  included do
+    validate :embedded_are_valid
+  end
+
+  def get_embeds(name, predicate, opts)
+    klass = opts.fetch(:class, nil)
+    klass ||= (self.class.name.deconstantize + '::' + name.to_s.classify).constantize
+    Many.new(klass, predicate, self)
+  end
+
+  def embedded_are_valid
+    self.class.get_embedded.each do |name|
+      self.errors.add(name, 'contains an invalid resource') unless self.send(name).all? {|resource| resource.valid? }
+    end
+  end
+
+  module ClassMethods
+    def embeds(name, predicate, opts={})
+      re_define_method name do
+        get_embeds(name, predicate, opts)
+      end
+
+      # use this as a way to get to all the embedded properties for validation
+      @_EMBEDDED ||= []
+      @_EMBEDDED << name
+    end
+
+    def get_embedded
+      @_EMBEDDED || []
+    end
+  end
+end

data/lib/tripod/embeds/many.rb

@@ -0,0 +1,31 @@
+module Tripod::Embeds
+  class Many
+    include Enumerable
+
+    def initialize(klass, predicate, parent)
+      @parent = parent
+      @predicate = predicate
+      nodes = @parent.read_predicate(@predicate) # gets the UUIDs of the associated blank nodes
+      @resources = nodes.map do |node|
+        repository = RDF::Repository.new
+        @parent.repository.query([node, :predicate, :object]) {|statement| repository << statement}
+        klass.new(node: node, repository: repository)
+      end
+    end
+
+    def each(&block)
+      @resources.each(&block)
+    end
+
+    def <<(resource)
+      @parent.repository.insert(*resource.to_statements)
+      @parent.append_to_predicate(@predicate, resource.uri)
+    end
+
+    def delete(resource)
+      statements = @parent.repository.query([resource.uri, :predicate, :object]).to_a
+      statements << [@parent.uri, RDF::URI.new(@predicate), resource.uri]
+      @parent.repository.delete(*statements)
+    end
+  end
+end

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 { ?s ?p ?o .  VALUES ?s { #{uris_sparql_str} } }", "application/n-triples")
+        ntriples_string = Tripod::SparqlClient::Query.query("CONSTRUCT { ?s ?p ?o } WHERE { VALUES ?s { #{uris_sparql_str} }  ?s ?p ?o . }", "application/n-triples")
         graph = _rdf_graph_from_ntriples_string(ntriples_string, graph)
       end
 
@@ -172,16 +172,20 @@ 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 } 
-        WHERE { 
-          ?tripod_construct_s ?tripod_construct_p ?tripod_construct_o .        
+      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)
           {
-            SELECT (?#{uri_variable} as ?tripod_construct_s)
-            { 
-              #{select_sparql} 
-            } 
+            #{select_sparql}
           }
-        }
+        }        
+       ?tripod_construct_s ?tripod_construct_p ?tripod_construct_o .        
+      #  OPTIONAL { ?tripod_construct_o ?tripod_construct_ep ?tripod_construct_eo . }        
+      }
       "
     end
 
@@ -216,6 +220,10 @@ 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/rdf_type.rb

@@ -0,0 +1,25 @@
+module Tripod::RdfType
+  extend ActiveSupport::Concern
+
+  included do
+    # every instance of a resource has an rdf type field, which is set at the class level
+    class_attribute :_RDF_TYPE
+  end
+
+  def set_rdf_type
+    self.rdf_type = self.class.get_rdf_type if respond_to?(:rdf_type=) && self.class.get_rdf_type
+  end
+
+  module ClassMethods
+    # 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
+  end
+end

data/lib/tripod/repository.rb

@@ -56,11 +56,7 @@ module Tripod::Repository
   end
 
   def retrieve_triples_from_database(accept_header="application/n-triples")
-    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
-    )
+    Tripod::SparqlClient::Query.query(self.class.all_triples_query(uri, graph_uri: self.graph_uri), accept_header)
   end
 
   # returns a graph of triples from the underlying repository where this resource's uri is the subject.
@@ -87,6 +83,12 @@ 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,8 +13,6 @@ 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
@@ -52,7 +50,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
-      self.rdf_type = self.class.get_rdf_type if respond_to?(:rdf_type=) && self.class.get_rdf_type
+      set_rdf_type
     end
   end
 
@@ -107,17 +105,6 @@ 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
@@ -130,4 +117,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.3"
+  VERSION = "0.10.6"
 end

data/spec/app/models/dog.rb

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

data/spec/app/models/flea.rb

@@ -0,0 +1,8 @@
+class Flea
+  include Tripod::EmbeddedResource
+
+  rdf_type 'http://example.com/flea'
+
+  field :name, 'http://example.com/flea/name'
+  validates_presence_of :name
+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/embedded_resource_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+module Tripod
+  describe EmbeddedResource do
+    describe 'an instance' do
+      let(:flea) { Flea.new }
+
+      it 'should have getters & setters on fields' do
+        flea.name = 'Bob'
+        expect(flea.name).to eq('Bob')
+      end
+    end
+  end
+end

data/spec/tripod/embeds_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe Tripod::Embeds do
+  let(:uri) { 'http://example.com/id/spot' }
+  let(:dog) {
+    d = Dog.new(uri)
+    d.name = "Spot"
+    d
+  }
+  let(:flea) {
+    f = Flea.new
+    f.name = 'Starsky'
+    f
+  }
+
+  it 'should set and get embedded resources through the proxy' do
+    dog.fleas << flea
+    expect(dog.fleas.include?(flea)).to eq(true)
+  end
+
+  it 'should validate embedded resources' do
+    dog.fleas << Flea.new
+    expect(dog.valid?).to eq(false)
+  end
+
+  context 'given a saved instance' do
+    before do
+      dog.fleas << flea
+      dog.save
+    end
+
+    context 'retrieved by uri' do
+      let(:dogg) { Dog.find(uri) }
+
+      it 'should hydrate embedded resources from the triple store' do
+        f = dogg.fleas.first
+        expect(f.name).to eq(flea.name)
+      end
+    end
+
+    context 'retrieved as part of a resource collection' do
+      let(:dogg) { Dog.all.resources.first }
+
+      # RR: this is commented out as I backed out the (slow) update to the hydration CONSTRUCT
+      it 'should hydrate embedded resources from the triple store' #do
+      #   f = dogg.fleas.first
+      #   expect(f.name).to eq(flea.name)
+      # end
+    end
+  end
+
+
+  describe 'delete' do
+    before do
+      dog.fleas << flea
+    end
+
+    it 'should remove all trace of the resource' do
+      dog.fleas.delete(flea)
+      expect(dog.fleas.include?(flea)).to eq(false)
+    end
+  end
+end

data/spec/tripod/repository_spec.rb

@@ -30,9 +30,7 @@ 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(
-              "CONSTRUCT {<#{person.uri}> ?p ?o} WHERE { GRAPH <#{person.graph_uri}> { <#{person.uri}> ?p ?o } }",
-              "application/n-triples").and_call_original
+            Tripod::SparqlClient::Query.should_receive(:query).with(Person.all_triples_query(person.uri, graph_uri: person.graph_uri), 'application/n-triples').and_call_original
             person.hydrate!
             person.repository.should_not be_empty
           end
@@ -40,9 +38,7 @@ 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(
-              "CONSTRUCT {<#{graphless_resource.uri}> ?p ?o} WHERE { GRAPH ?g { <#{graphless_resource.uri}> ?p ?o } }",
-              "application/n-triples").and_call_original
+            Tripod::SparqlClient::Query.should_receive(:query).with(Person.all_triples_query(person.uri), 'application/n-triples').and_call_original
             graphless_resource.hydrate!
             graphless_resource.repository.should_not be_empty
           end
@@ -73,4 +69,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.3
+  version: 0.10.6
 platform: ruby
 authors:
 - Ric Roberts
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -214,6 +214,9 @@ files:
 - lib/tripod/criteria.rb
 - lib/tripod/criteria/execution.rb
 - lib/tripod/eager_loading.rb
+- lib/tripod/embedded_resource.rb
+- lib/tripod/embeds.rb
+- lib/tripod/embeds/many.rb
 - lib/tripod/errors.rb
 - lib/tripod/errors/bad_data_request.rb
 - lib/tripod/errors/bad_sparql_request.rb
@@ -239,6 +242,7 @@ files:
 - lib/tripod/locale/en.yml
 - lib/tripod/persistence.rb
 - lib/tripod/predicates.rb
+- lib/tripod/rdf_type.rb
 - lib/tripod/repository.rb
 - lib/tripod/resource.rb
 - lib/tripod/resource_collection.rb
@@ -250,6 +254,7 @@ files:
 - lib/tripod/validations/is_url.rb
 - lib/tripod/version.rb
 - spec/app/models/dog.rb
+- spec/app/models/flea.rb
 - spec/app/models/person.rb
 - spec/app/models/resource.rb
 - spec/spec_helper.rb
@@ -257,6 +262,8 @@ files:
 - spec/tripod/criteria_execution_spec.rb
 - spec/tripod/criteria_spec.rb
 - spec/tripod/eager_loading_spec.rb
+- spec/tripod/embedded_resource_spec.rb
+- spec/tripod/embeds_spec.rb
 - spec/tripod/fields_spec.rb
 - spec/tripod/finders_spec.rb
 - spec/tripod/graphs_spec.rb
@@ -297,6 +304,7 @@ specification_version: 4
 summary: Active Model style RDF ORM
 test_files:
 - spec/app/models/dog.rb
+- spec/app/models/flea.rb
 - spec/app/models/person.rb
 - spec/app/models/resource.rb
 - spec/spec_helper.rb
@@ -304,6 +312,8 @@ test_files:
 - spec/tripod/criteria_execution_spec.rb
 - spec/tripod/criteria_spec.rb
 - spec/tripod/eager_loading_spec.rb
+- spec/tripod/embedded_resource_spec.rb
+- spec/tripod/embeds_spec.rb
 - spec/tripod/fields_spec.rb
 - spec/tripod/finders_spec.rb
 - spec/tripod/graphs_spec.rb