triannon 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfed3de76ceff6faec0e84730e6d0e66177c0e2c
-  data.tar.gz: 08d53c74dc0facd2974a95640101e971eadcf0df
+  metadata.gz: 54a4a66f7d3970f51d9378924c414dc14ac866fe
+  data.tar.gz: d1454821e3b02177c5f3c81e72c06ddd556c460a
 SHA512:
-  metadata.gz: c0d4eb37e3692bdf5b25b94bf931fe581ed3653cc1d417a0e74aeedbf33f92c2cdd3ae4b548db8a4f03fe0c5b2d5fe025c7c094bf922e09c892bc40877b67f97
-  data.tar.gz: 0910a11f4e22e70d90a14538918a7f73f142d7adc6fb7cde4f1e3f50a4f1e39dc24c5caac307089d4620d54d0d7c0d7b13d393e1ca7c964b48e3116504b91172
+  metadata.gz: 5dade8b77d9d3f4aa003ec5f327d9d8cc6ac6707999392d2f5d8eb7defc434cc5fdf30dede163d74611aa113265c8546cc3d3724c12d055c4a47094ce1633339
+  data.tar.gz: 34f4a938d2ab43fd3a2c410c2fa7d4c9fd922bce5675bcab518f42f84eb81ee8f592e402b92a57ae53311c9fc05aac41a772bbe3f5f17c7935b7e05f4c9a7d7f

data/README.md

@@ -87,6 +87,8 @@ Note that OA (Open Annotation) is the default context if none is specified.
 ### Create an anno
 `POST`: `http://(host)/annotations`
 * the body of the HTTP request should contain the annotation, as jsonld, turtle, or rdfxml
+  * Wrap the annotation in an object, as such:
+  * `{ "commit" => "Create Annotation", "annotation" => { "data" => oa_jsonld } }`
 * the `Content-Type` header should be the mime type matching the body
 * the anno to be created should NOT already have an assigned @id
 * to get a particular format back, use the HTTP `Accept` header

data/app/models/triannon/annotation.rb

@@ -43,9 +43,12 @@ module Triannon
 
     def save
       _run_save_callbacks do
-        # check if valid?
-        graph
+        # TODO: check if valid anno?
         @id = Triannon::LdpWriter.create_anno self if graph && graph.size > 2
+        # reload from storage to get the anno id within the graph
+        # TODO:  do graph manipulation to add id instead?
+        @graph = Triannon::LdpLoader.load id
+        id
       end
     end
 
@@ -99,10 +102,7 @@ protected
 
     # Add annotation to Solr as a Solr document
     def solr_save
-      # to be certain we are in sync, and to get the anno id within the graph, reload 
-      # the graph from Trianon storage
-      graph_from_storage = Triannon::LdpLoader.load id
-      solr_hash = graph_from_storage.solr_hash
+      solr_hash = graph.solr_hash if graph && graph.id_as_url
       solr_writer.add(solr_hash) if solr_hash && solr_hash.size > 0
     end
 

data/app/services/triannon/ldp_loader.rb

@@ -92,8 +92,8 @@ module Triannon
     # @return [Array<RDF::Statements>] the RDF statements represented in the ttl 
     def statements_from_ttl_minus_fedora ttl
       # RDF::Turtle::Reader.new(ttl).statements.to_a
-      g = RDF::Graph.new.from_ttl(ttl)
-      RDF::FCRepo4.remove_fedora_triples(g).statements
+      g = RDF::Graph.new.from_ttl(ttl) if ttl
+      RDF::FCRepo4.remove_fedora_triples(g).statements if g
     end
 
     def conn

data/app/services/triannon/ldp_writer.rb

@@ -34,8 +34,10 @@ module Triannon
     #  May be a compound id, such as  uuid1/t/uuid2, in which case the LDP container object uuid2 and its children
     #  are deleted from the LDP store, but LDP containers  uuid1/t  and uuid1  are not deleted from the LDP store.
     def self.delete_container id
-      ldpw = Triannon::LdpWriter.new nil
-      ldpw.delete_containers id
+      if id && id.size > 0
+        ldpw = Triannon::LdpWriter.new nil
+        ldpw.delete_containers id
+      end
     end
     
     class << self
@@ -101,6 +103,7 @@ module Triannon
     #  e.g. [@base_uri/(uuid1)/t/(uuid2), @base_uri/(uuid1)/t/(uuid3)] or [@base_uri/(uuid)] or (uuid)
     # @return true if a resource was deleted;  false otherwise
     def delete_containers ldp_container_uris
+      return false if !ldp_container_uris || ldp_container_uris.empty?
       if ldp_container_uris.kind_of? String
         ldp_container_uris = [ldp_container_uris]
       end
@@ -126,6 +129,7 @@ module Triannon
     #   or (anno_id)/b for a body resource (inside the body container of anno_id)
     # @return [String] uuid representing the unique id of the newly created LDP container
     def create_resource ttl, parent_path = nil
+      return if !ttl || ttl.empty?
       resp = conn.post do |req|
         req.url parent_path if parent_path
         req.headers['Content-Type'] = 'application/x-turtle'

data/lib/triannon/version.rb

@@ -1,3 +1,3 @@
 module Triannon
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails