triannon 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9061e8fc2e0127540ae750118289a5f79a7f6969
-  data.tar.gz: 2785857023cdd9a5a2e5caa3ecb7810f613430cb
+  metadata.gz: 38673b232f1a66c6710ed058242fcd79fb49ec92
+  data.tar.gz: eedb16b6f71893c5a8559d3f45628790392eaf61
 SHA512:
-  metadata.gz: e149fc61982e7323f0a2401a316737f0dc0132fc2f3374f167317b149c0ec9541c47e5ec5364596c977c3d55f96bb006b213d5c78e966d091b770098d18fd5d4
-  data.tar.gz: edac1a83ba367c2064a0ba1c17662948531634873924c0740a947e272bf90004a8d2128edc9b2e73589fae1522b3d24dcedccec458459a7ee3d062de860d974d
+  metadata.gz: d4791ad9be0bb23424dfdfe2de1e63249a527d30aa8c908f5b2718a4c166c0d9f8a013271f7a349ba0d6d1c250675782bacd27975dfd14d9d57b15ce0919e342
+  data.tar.gz: dc163e2632dfb58b34f4bd07517e04701fc05ce8a54f8c047b3829289f575b00c3de726d993d6e734decc0c997ed55cb0990f7c696b9a5e642d83f2b520c853e

data/app/models/triannon/annotation.rb

@@ -26,11 +26,12 @@ module Triannon
       a
     end
 
-    def self.find(key)
-      oa_graph = Triannon::LdpLoader.load key
+    # @param [String] id the unique id of the annotation.  Can include base_uri prefix or omit it.
+    def self.find(id)
+      oa_graph = Triannon::LdpLoader.load id
       anno = Triannon::Annotation.new
       anno.graph = oa_graph
-      anno.id = key
+      anno.id = id
       anno
     end
 
@@ -65,9 +66,13 @@ module Triannon
       end
     end
 
-    # @param [RDF::Graph]
+    # @param either a Triannon::Graph or RDF::Graph object
     def graph= g
-      @graph = Triannon::Graph.new g if g.kind_of? RDF::Graph
+      if g.is_a? Triannon::Graph
+        @graph = g
+      elsif g.kind_of? RDF::Graph
+        @graph = Triannon::Graph.new g
+      end
     end
     
     # @return json-ld representation of anno with OpenAnnotation context as a url
@@ -94,8 +99,10 @@ protected
 
     # Add annotation to Solr as a Solr document
     def solr_save
-      # pass in id we got from LDP Store
-      solr_writer.add(graph.solr_hash(id))
+      # 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_writer.add(graph_from_storage.solr_hash)
     end
 
     # Delete annotation from Solr

data/app/services/triannon/ldp_loader.rb

@@ -4,8 +4,10 @@ module Triannon
   # Loads an existing Annotation from the LDP server
   class LdpLoader
 
-    def self.load key
-      l = Triannon::LdpLoader.new key
+
+    # @param [String] id the unique id of the annotation.  Can include base_uri prefix or omit it.
+    def self.load id
+      l = Triannon::LdpLoader.new id
       l.load_anno_container
       l.load_bodies
       l.load_targets
@@ -21,15 +23,16 @@ module Triannon
 
     attr_accessor :ldp_annotation
 
-    def initialize key = nil
-      @key = key
+    # @param [String] id the unique id of the annotation.  Can include base_uri prefix or omit it.
+    def initialize id = nil
+      @id = id
       @base_uri = Triannon.config[:ldp_url]
       @ldp_annotation = Triannon::AnnotationLdp.new
     end
 
     # load annotation container object into @ldp_annotation's (our Triannon::AnnotationLdp object) graph
     def load_anno_container
-      load_object_into_annotation_graph(@key)
+      load_object_into_annotation_graph(@id)
     end
 
     # load body objects into @ldp_annotation's (our Triannon::AnnotationLdp object) graph

data/app/services/triannon/ldp_to_oa_mapper.rb

@@ -15,14 +15,22 @@ module Triannon
     def initialize ldp_anno
       @ldp_anno = ldp_anno
       @ldp_anno_graph = ldp_anno.stripped_graph
-      @oa_graph = RDF::Graph.new
+      g = RDF::Graph.new
+      @oa_graph = Triannon::Graph.new g
     end
 
     def extract_base
+      root_subject_solns = @ldp_anno_graph.query Triannon::Graph.anno_query
+      if root_subject_solns.count == 1
+        @id = root_subject_solns[0].s.to_s.split('/').last
+        base_url = Triannon.config[:triannon_base_url]
+        base_url.strip!
+        base_url.chop! if base_url[-1] == '/'
+        @root_uri = RDF::URI.new(base_url + "/#{@id}")
+      end
+      
       @ldp_anno_graph.each_statement do |stmnt|
         if stmnt.predicate == RDF.type && stmnt.object == RDF::OpenAnnotation.Annotation
-          @id = stmnt.subject.to_s.split('/').last
-          @root_uri = RDF::URI.new(Triannon.config[:triannon_base_url] + "/#{@id}")
           @oa_graph << [@root_uri, RDF.type, RDF::OpenAnnotation.Annotation]
         elsif stmnt.predicate == RDF::OpenAnnotation.motivatedBy
           @oa_graph << [@root_uri, stmnt.predicate, stmnt.object]

data/lib/triannon/graph.rb

@@ -49,17 +49,15 @@ module Triannon
       hash_from_json.to_json
     end
 
-    # NOTE: NEVER get here before anno is stored
-    # the graph should have an assigned url for the @id of the root;  it shouldn't be a blank node
-    # @param [String] the Triannon id for this anno. Defaults to nil, in which case id_as_url will be used.
+    # DO NOT CALL before anno is stored.
+    # The graph should have an assigned url for the @id of the root;  it shouldn't be a blank node
     # @return [Hash] a hash to be written to Solr, populated appropriately
-    def solr_hash(triannon_id=nil)
+    def solr_hash
       doc_hash = {}
       # chars in Solr/Lucene query syntax are a big pain in Solr id fields, so we only use
       # the uuid portion of the Triannon anno id, not the full url
-      triannon_id ||= id_as_url
-      solr_id = triannon_id.sub(Triannon.config[:ldp_url], "")
-      doc_hash[:id] = solr_id.sub(/^\//, "")
+      solr_id = id_as_url.sub(Triannon.config[:triannon_base_url], "")
+      doc_hash[:id] = solr_id.sub(/^\//, "") # remove first char slash if it is there
 
       # use short strings for motivation field
       doc_hash[:motivation] = motivated_by.map { |m| m.sub(RDF::OpenAnnotation.to_s, "") }

data/lib/triannon/version.rb

@@ -1,3 +1,3 @@
 module Triannon
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0.rc1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -158,28 +158,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement