tripod 0.0.8 → 0.0.9

data/lib/tripod.rb

@@ -27,6 +27,7 @@ require "active_support/core_ext"
 require 'active_support/json'
 require "active_support/inflector"
 require "active_model"
+require "guid"
 
 require 'rdf'
 require 'rdf/rdfxml'

data/lib/tripod/persistence.rb

@@ -3,6 +3,61 @@
 # This module defines behaviour for persisting to the database.
 module Tripod::Persistence
   extend ActiveSupport::Concern
+
+  class Tripod::Persistence::Transaction
+
+    def initialize
+      self.transaction_id = Guid.new.to_s
+    end
+
+    attr_accessor :transaction_id
+    attr_accessor :query
+
+    def commit
+      Tripod::SparqlClient::Update::update(self.query)
+      clear_transaction
+    end
+
+    def abort
+      clear_transaction
+    end
+
+    def clear_transaction
+      self.transaction_id = nil
+      self.query = ""
+      Tripod::Persistence.transactions.delete(self.transaction_id)
+    end
+
+    def self.valid_transaction(transaction)
+      transaction && transaction.class == Tripod::Persistence::Transaction
+    end
+
+    def self.get_transcation(trans)
+      transaction = nil
+
+      if Tripod::Persistence::Transaction.valid_transaction(trans)
+
+        transaction_id = trans.transaction_id
+
+        Tripod::Persistence.transactions ||= {}
+
+        if Tripod::Persistence.transactions[transaction_id]
+          # existing transaction
+          transaction = Tripod::Persistence.transactions[transaction_id]
+        else
+          # new transaction
+          transaction = Tripod::Persistence.transactions[transaction_id] = trans
+        end
+      end
+
+      transaction
+    end
+
+  end
+
+  # hash of transactions against their ids.
+  mattr_accessor :transactions
+
   # Save the resource.
   # Note: regardless of whether it's a new_record or not, we always make the
   # db match the contents of this resource's statements.
@@ -11,19 +66,30 @@ module Tripod::Persistence
   #   resource.save
   #
   # @return [ true, false ] True is success, false if not.
-  def save()
+  def save(opts={})
+
+    transaction = Tripod::Persistence::Transaction.get_transcation(opts[:transaction])
+
     if self.valid?
+
       query = "
         DELETE {GRAPH ?g {<#{@uri.to_s}> ?p ?o}} WHERE {GRAPH ?g {<#{@uri.to_s}> ?p ?o}};
         INSERT DATA {
           GRAPH <#{@graph_uri}> {
             #{ @repository.dump(:ntriples) }
           }
-        }
+        };
       "
-      success = Tripod::SparqlClient::Update::update(query)
-      @new_record = false if success
-      success
+
+      if transaction
+        transaction.query ||= ""
+        transaction.query += query
+      else
+        Tripod::SparqlClient::Update::update(query)
+      end
+
+      @new_record = false # if running in a trans, just assume it worked. If the query is dodgy, it will throw an exception later.
+      true
     else
       false
     end
@@ -39,26 +105,43 @@ module Tripod::Persistence
   # @raise [Tripod::Errors::Validations] if invalid
   #
   # @return [ true ] True is success.
-  def save!()
+  def save!(opts={})
     # try to save
-    unless self.save()
+    unless self.save(opts)
+
       # if we get in here, save failed.
-      self.class.fail_validate!(self)
+
+      # abort the transaction
+      transaction = Tripod::Persistence::Transaction.get_transcation(opts[:transaction])
+      transaction.abort() if transaction
+
+      self.class.fail_validate!(self) # throw an exception
+
       # TODO: similar stuff for callbacks?
     end
     return true
   end
 
-  def destroy()
+  def destroy(opts={})
+
+    transaction = Tripod::Persistence::Transaction.get_transcation(opts[:transaction])
+
     query = "
       # delete from default graph:
       DELETE {<#{@uri.to_s}> ?p ?o} WHERE {<#{@uri.to_s}> ?p ?o};
       # delete from named graphs:
       DELETE {GRAPH ?g {<#{@uri.to_s}> ?p ?o}} WHERE {GRAPH ?g {<#{@uri.to_s}> ?p ?o}};
     "
-    success = Tripod::SparqlClient::Update::update(query)
-    @destroyed = true if success
-    success
+
+    if transaction
+      transaction.query ||= ""
+      transaction.query += query
+    else
+      Tripod::SparqlClient::Update::update(query)
+    end
+
+    @destroyed = true
+    true
   end
 
   module ClassMethods #:nodoc:

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/tripod/persistence_spec.rb

@@ -29,6 +29,7 @@ describe Tripod::Persistence do
     p
   end
 
+
   describe "#save" do
 
     context 'graph not set' do
@@ -100,4 +101,73 @@ describe Tripod::Persistence do
       lambda {unsaved_person.save!}.should raise_error(Tripod::Errors::Validations)
     end
   end
+
+  describe "transactions" do
+
+    it "only save on commit" do
+
+      transaction = Tripod::Persistence::Transaction.new
+
+      unsaved_person.save(transaction: transaction)
+      saved_person['http://pred2'] = 'blah'
+      saved_person.save(transaction: transaction)
+
+      # nothing should have changed yet.
+      lambda {Person.find(unsaved_person.uri)}.should raise_error(Tripod::Errors::ResourceNotFound)
+      Person.find(saved_person.uri)['http://pred2'].first.to_s.should == RDF::URI.new('http://obj2').to_s
+
+      transaction.commit
+
+      # things should have changed now.
+      lambda {Person.find(unsaved_person.uri)}.should_not raise_error()
+      Person.find(saved_person.uri)['http://pred2'].first.should == 'blah'
+
+    end
+
+    it "silently ignore invalid saves" do
+      transaction = Tripod::Persistence::Transaction.new
+
+      unsaved_person.uri = nil
+      unsaved_person.save(transaction: transaction).should be_false
+
+      saved_person['http://pred2'] = 'blah'
+      saved_person.save(transaction: transaction).should be_true
+
+      transaction.commit
+
+      # transaction should be gone
+      Tripod::Persistence.transactions[transaction.transaction_id].should be_nil
+
+      # unsaved person still not there
+      lambda {Person.find(unsaved_person.uri)}.should raise_error(Tripod::Errors::ResourceNotFound)
+
+      # saved person SHOULD be updated
+      Person.find(saved_person.uri)['http://pred2'].first.should == 'blah'
+    end
+
+    it "can be aborted" do
+      transaction = Tripod::Persistence::Transaction.new
+      unsaved_person.save(transaction: transaction)
+      transaction.abort()
+
+      # unsaved person still not there
+      lambda {Person.find(unsaved_person.uri)}.should raise_error(Tripod::Errors::ResourceNotFound)
+
+      #transaction gone.
+      transaction.query.should be_blank
+      Tripod::Persistence.transactions[transaction.transaction_id].should be_nil
+    end
+
+    it "should be removed once committed" do
+      transaction = Tripod::Persistence::Transaction.new
+      unsaved_person.save(transaction: transaction)
+      transaction.commit()
+
+      #transaction gone.
+      transaction.query.should be_blank
+      Tripod::Persistence.transactions[transaction.transaction_id].should be_nil
+    end
+
+  end
+
 end

data/tripod.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rdf-rdfxml"
   gem.add_dependency "rdf-n3"
   gem.add_dependency "rdf-json"
+  gem.add_dependency "guid"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70194090276740 !ruby/object:Gem::Requirement
+  requirement: &70271542059420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194090276740
+  version_requirements: *70271542059420
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70194090276180 !ruby/object:Gem::Requirement
+  requirement: &70271542058760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70194090276180
+  version_requirements: *70271542058760
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70194090275760 !ruby/object:Gem::Requirement
+  requirement: &70271542058220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194090275760
+  version_requirements: *70271542058220
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70194090275180 !ruby/object:Gem::Requirement
+  requirement: &70271542057540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70194090275180
+  version_requirements: *70271542057540
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70194090274760 !ruby/object:Gem::Requirement
+  requirement: &70271542057020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194090274760
+  version_requirements: *70271542057020
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70194090274160 !ruby/object:Gem::Requirement
+  requirement: &70271542056460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194090274160
+  version_requirements: *70271542056460
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70194090273720 !ruby/object:Gem::Requirement
+  requirement: &70271542055920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70194090273720
+  version_requirements: *70271542055920
+- !ruby/object:Gem::Dependency
+  name: guid
+  requirement: &70271542055420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70271542055420
 description: RDF ruby ORM
 email:
 - ric@swirrl.com