tripod 0.5.2 → 0.6.1

data/lib/tripod/errors/timeout.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+module Tripod::Errors
+  class Timeout < StandardError
+  end
+end

data/lib/tripod/errors.rb

@@ -6,7 +6,7 @@ require 'tripod/errors/graph_uri_not_set'
 require 'tripod/errors/rdf_type_not_set'
 require 'tripod/errors/validations'
 require 'tripod/errors/rdf_parse_failed'
-
+require 'tripod/errors/timeout'
 require 'tripod/errors/sparql_response_too_large'
 require 'tripod/errors/bad_sparql_request'
 require 'tripod/errors/bad_data_request'

data/lib/tripod/fields.rb

@@ -34,6 +34,7 @@ module Tripod::Fields
 
 
     def new_value_for_field(value, field)
+      return unless value
       if field.is_uri?
         RDF::URI.new(value.to_s)
       elsif field.datatype

data/lib/tripod/persistence.rb

@@ -4,6 +4,11 @@
 module Tripod::Persistence
   extend ActiveSupport::Concern
 
+  included do
+    extend ActiveModel::Callbacks
+    define_model_callbacks :save, :destroy
+  end
+
   class Tripod::Persistence::Transaction
 
     def initialize
@@ -67,33 +72,34 @@ module Tripod::Persistence
   #
   # @return [ true, false ] True is success, false if not.
   def save(opts={})
+    run_callbacks :save do
+      raise Tripod::Errors::GraphUriNotSet.new() unless @graph_uri
 
-    raise Tripod::Errors::GraphUriNotSet.new() unless @graph_uri
+      transaction = Tripod::Persistence::Transaction.get_transaction(opts[:transaction])
 
-    transaction = Tripod::Persistence::Transaction.get_transaction(opts[:transaction])
+      if self.valid?
 
-    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) }
+            }
+          };
+        "
 
-      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) }
-          }
-        };
-      "
+        if transaction
+          transaction.query ||= ""
+          transaction.query += query
+        else
+          Tripod::SparqlClient::Update::update(query)
+        end
 
-      if transaction
-        transaction.query ||= ""
-        transaction.query += query
+        @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
-        Tripod::SparqlClient::Update::update(query)
+        false
       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
   end
 
@@ -125,25 +131,26 @@ module Tripod::Persistence
   end
 
   def destroy(opts={})
+    run_callbacks :destroy do
+      transaction = Tripod::Persistence::Transaction.get_transaction(opts[:transaction])
 
-    transaction = Tripod::Persistence::Transaction.get_transaction(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}};
+      "
 
-    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}};
-    "
+      if transaction
+        transaction.query ||= ""
+        transaction.query += query
+      else
+        Tripod::SparqlClient::Update::update(query)
+      end
 
-    if transaction
-      transaction.query ||= ""
-      transaction.query += query
-    else
-      Tripod::SparqlClient::Update::update(query)
+      @destroyed = true
+      true
     end
-
-    @destroyed = true
-    true
   end
 
   def update_attribute(name, value)

data/lib/tripod/predicates.rb

@@ -46,10 +46,12 @@ module Tripod::Predicates
     # remove existing
     remove_predicate(predicate_uri)
 
-    # ... and replace
-    objects = [objects] unless objects.kind_of?(Array)
-    objects.each do |object|
-      @repository << RDF::Statement.new( @uri, RDF::URI.new(predicate_uri.to_s), object )
+    if objects
+      # ... and replace
+      objects = [objects] unless objects.kind_of?(Array)
+      objects.each do |object|
+        @repository << RDF::Statement.new( @uri, RDF::URI.new(predicate_uri.to_s), object )
+      end
     end
 
     # returns the new values

data/lib/tripod/sparql_client.rb

@@ -25,7 +25,7 @@ module Tripod::SparqlClient
       stream_data = -> {
         if defined?(Rails)
           Rails.logger.debug "TRIPOD: About to run query: #{sparql}"
-          Rails.logger.debug "TRIPOD: Straming fron url: #{request_url}"
+          Rails.logger.debug "TRIPOD: Streaming fron url: #{request_url}"
           Rails.logger.debug "TRIPOD: Streaming opts: #{streaming_opts.inspect}"
         end
 

data/lib/tripod/streaming.rb

@@ -22,18 +22,20 @@ module Tripod
       total_bytes = 0
       response_string = ""
 
-      http.request_get(uri.request_uri, 'Accept' => accept) do |res|
-
-        Rails.logger.debug "TRIPOD: response code: #{res.code}" if defined?(Rails)
-
-        raise Tripod::Errors::BadSparqlRequest.new(res.body) if res.code.to_s != "200"
-
-        res.read_body do |seg|
-          total_bytes += seg.size
-          response_string += seg.to_s
-          # if there's a limit, stop when we reach it
-          raise Tripod::Errors::SparqlResponseTooLarge.new if limit_in_bytes && (total_bytes > limit_in_bytes)
+      begin
+        http.request_get(uri.request_uri, 'Accept' => accept) do |res|
+          Rails.logger.debug "TRIPOD: response code: #{res.code}" if defined?(Rails)
+          raise Tripod::Errors::BadSparqlRequest.new(res.body) if res.code.to_s != "200"
+
+          res.read_body do |seg|
+            total_bytes += seg.size
+            response_string += seg.to_s
+            # if there's a limit, stop when we reach it
+            raise Tripod::Errors::SparqlResponseTooLarge.new if limit_in_bytes && (total_bytes > limit_in_bytes)
+          end
         end
+      rescue Timeout::Error => timeout
+        raise Tripod::Errors::Timeout.new
       end
 
       response_string

data/lib/tripod/version.rb

@@ -1,3 +1,3 @@
 module Tripod
-  VERSION = "0.5.2"
+  VERSION = "0.6.1"
 end

data/spec/app/models/person.rb

@@ -12,4 +12,9 @@ class Person
   field :age, 'http://example.com/age', :datatype => RDF::XSD.integer
   field :important_dates, 'http://example.com/importantdates', :datatype => RDF::XSD.date, :multivalued => true
 
+  before_save :pre_save
+  before_destroy :pre_destroy
+
+  def pre_save;; end
+  def pre_destroy;; end
 end

data/spec/tripod/persistence_spec.rb

@@ -63,6 +63,11 @@ describe Tripod::Persistence do
       p2.hydrate!
       p2.repository.dump(:ntriples).should == saved_person.repository.dump(:ntriples)
     end
+
+    it 'runs the callbacks' do
+      unsaved_person.should_receive(:pre_save)
+      unsaved_person.save
+    end
   end
 
   describe ".destroy" do
@@ -76,6 +81,10 @@ describe Tripod::Persistence do
       p2.repository.should be_empty # nothing there any more!
     end
 
+    it 'should run the callbacks' do
+      saved_person.should_receive(:pre_destroy)
+      saved_person.destroy
+    end
   end
 
   describe ".save!" do

data/spec/tripod/predicates_spec.rb

@@ -63,10 +63,16 @@ describe Tripod::Predicates do
       end
     end
 
+    context 'given a nil value' do
+      it 'just removes the predicate' do
+        person.write_predicate('http://example.com/name', nil)
+        person.read_predicate('http://example.com/name').should be_empty
+      end
+    end
   end
 
   describe '#remove_predicate' do
-    it 'remnoves the values where the predicate matches' do
+    it 'removes the values where the predicate matches' do
       person.remove_predicate('http://example.com/blog')
       person.read_predicate('http://example.com/blog').should be_empty
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tripod
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70274754940040 !ruby/object:Gem::Requirement
+  requirement: &70363921370680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754940040
+  version_requirements: *70363921370680
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70274754955340 !ruby/object:Gem::Requirement
+  requirement: &70363921385640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754955340
+  version_requirements: *70363921385640
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
-  requirement: &70274754953840 !ruby/object:Gem::Requirement
+  requirement: &70363921384140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754953840
+  version_requirements: *70363921384140
 - !ruby/object:Gem::Dependency
   name: rdf
-  requirement: &70274754952740 !ruby/object:Gem::Requirement
+  requirement: &70363921383140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754952740
+  version_requirements: *70363921383140
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
-  requirement: &70274754951700 !ruby/object:Gem::Requirement
+  requirement: &70363921381980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754951700
+  version_requirements: *70363921381980
 - !ruby/object:Gem::Dependency
   name: rdf-n3
-  requirement: &70274754950180 !ruby/object:Gem::Requirement
+  requirement: &70363921380580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754950180
+  version_requirements: *70363921380580
 - !ruby/object:Gem::Dependency
   name: rdf-json
-  requirement: &70274754949060 !ruby/object:Gem::Requirement
+  requirement: &70363921379380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754949060
+  version_requirements: *70363921379380
 - !ruby/object:Gem::Dependency
   name: json-ld
-  requirement: &70274754947900 !ruby/object:Gem::Requirement
+  requirement: &70363921378320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754947900
+  version_requirements: *70363921378320
 - !ruby/object:Gem::Dependency
   name: guid
-  requirement: &70274754963140 !ruby/object:Gem::Requirement
+  requirement: &70363921393360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754963140
+  version_requirements: *70363921393360
 - !ruby/object:Gem::Dependency
   name: dalli
-  requirement: &70274754961160 !ruby/object:Gem::Requirement
+  requirement: &70363921391420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -122,7 +122,7 @@ dependencies:
         version: '2.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70274754961160
+  version_requirements: *70363921391420
 description: RDF ruby ORM
 email:
 - ric@swirrl.com
@@ -153,6 +153,7 @@ files:
 - lib/tripod/errors/rdf_type_not_set.rb
 - lib/tripod/errors/resource_not_found.rb
 - lib/tripod/errors/sparql_response_too_large.rb
+- lib/tripod/errors/timeout.rb
 - lib/tripod/errors/uri_not_set.rb
 - lib/tripod/errors/validations.rb
 - lib/tripod/extensions.rb