triannon 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2328d724cb403823e2e7e9fbf5565a1244c1453
-  data.tar.gz: 2424be58316b9d29eb4f8e48eee1ea1914a9b07c
+  metadata.gz: 9061e8fc2e0127540ae750118289a5f79a7f6969
+  data.tar.gz: 2785857023cdd9a5a2e5caa3ecb7810f613430cb
 SHA512:
-  metadata.gz: 7de9938713c92a1c0e654ee71f44bfe558429e7ab2907a8a89752c12520e22e7bece73db6a54106f70e944075b346eb66fefe19c7317f4d7c60198cb6f5ce1a6
-  data.tar.gz: dd44726e702079259c81c29ad89c19e8f9597e0a9493a44041e4021fbba90b4bd9c0901fbfdb57efc4907726472b01fdb802126d1420eaabcbf2ff6d002c6bac
+  metadata.gz: e149fc61982e7323f0a2401a316737f0dc0132fc2f3374f167317b149c0ec9541c47e5ec5364596c977c3d55f96bb006b213d5c78e966d091b770098d18fd5d4
+  data.tar.gz: edac1a83ba367c2064a0ba1c17662948531634873924c0740a947e272bf90004a8d2128edc9b2e73589fae1522b3d24dcedccec458459a7ee3d062de860d974d

data/README.md

@@ -35,6 +35,7 @@ $ rails g triannon:install
 Edit the `config/triannon.yml` file:
 
 * `ldp_url:` Points to the root annotations container on your LDP server
+* `solr_url:` Points to the baseurl of Solr instance configured for Triannon
 * `triannon_base_url:` Used as the base url for all annotations hosted by your Triannon server.  Identifiers from the LDP server will be appended to this base-url.  Generally something like "https://your-triannon-rails-box/annotations", as "/annotations" is added to the path by the Triannon gem
 
 Generate the root annotations container on the LDP server
@@ -45,20 +46,39 @@ $ rake triannon:create_root_container
 
 ## Running the application in development
 
-There is a bundled rake task for running the test app:
+There is a bundled rake task for running the test app, but there is some one-time set up.
 
+### One time setup
+
+##### Set up a local instance of Fedora4
 ```console
-# One time setup: run the following 3 commands
 $ rake jetty:download
 $ rake jetty:unzip
+```
+##### Set up a Triannon flavored Solr
+```console
+$ cp config/solr/solr.xml jetty/solr
+$ cp config/solr/triannon-core jetty/solr
+```
+
+##### Set up a runnable Rails app that uses triannon gem
+```console
 $ rake engine_cart:generate # (first run only)
+```
 
-# Configure config/triannon.yml as specified above
-$ vi config/triannon.yml
+##### Configure spec/internal/config/triannon.yml as specified above
+```console
+$ vi spec/internal/config/triannon.yml
+```
 
-# Generate root annotations container
+##### Generate root annotations container
+```console
 $ rake triannon:create_root_container
+```
 
 # Run the test app
+```console
+$ rake jetty:start
 $ rake triannon:server
+$ rake jetty:stop # at some point
 ```

data/app/models/triannon/annotation.rb

@@ -59,143 +59,50 @@ module Triannon
     end
 
     def graph
-      @graph ||= data_to_graph
+      @graph ||= begin
+        g = data_to_graph
+        Triannon::Graph.new g if g.kind_of? RDF::Graph
+      end
     end
 
+    # @param [RDF::Graph]
     def graph= g
-      @graph = g
+      @graph = Triannon::Graph.new g if g.kind_of? RDF::Graph
     end
     
-    # @return json-ld representation of graph with OpenAnnotation context as a url
+    # @return json-ld representation of anno with OpenAnnotation context as a url
     def jsonld_oa
-      inline_context = graph.dump(:jsonld, :context => Triannon::JsonldContext::OA_CONTEXT_URL)
-      hash_from_json = JSON.parse(inline_context)
-      hash_from_json["@context"] = Triannon::JsonldContext::OA_CONTEXT_URL
-      hash_from_json.to_json
+      graph.jsonld_oa
     end
     
-    # @return json-ld representation of graph with IIIF context as a url
+    # @return json-ld representation of anno with IIIF context as a url
     def jsonld_iiif
-      inline_context = graph.dump(:jsonld, :context => Triannon::JsonldContext::IIIF_CONTEXT_URL)
-      hash_from_json = JSON.parse(inline_context)
-      hash_from_json["@context"] = Triannon::JsonldContext::IIIF_CONTEXT_URL
-      hash_from_json.to_json
-    end
-
-    # @return [String] the id of this annotation as a url
-    # TODO:  re-usable as part of Triannon::Graph class?
-    def url
-      if graph_exists?
-        solution = graph.query Triannon::Graph.anno_query
-        if solution && solution.size == 1
-          solution.first.s.to_s
-        # TODO:  raise exception if no URL?
-        end
-      end
+      graph.jsonld_iiif
     end
 
-    # FIXME:  this should be part of validation:  RDF.type should be RDF::OpenAnnotation.Annotation
-    # @return [String] should always be a string representation of RDF::OpenAnnotation.Annotation
-    def type
-      if graph_exists?
-        q = RDF::Query.new
-        q << [:s, RDF::OpenAnnotation.hasTarget, nil] # must have a target
-        q << [:s, RDF.type, :type]
-        solution = graph.query q
-        solution.distinct!
-        if solution && solution.size == 1
-          solution.first.type.to_s
-        # TODO:  raise exception if no type?
-        end
-      end
+    # @return [String] the id of this annotation as a url or nil if no graph
+    def id_as_url
+      graph.id_as_url if graph_exists?
     end
 
-    # @return [Array] of uris expressing the OA motivated_by values
-    # TODO:  re-usable as part of Triannon::Graph class?
+    # @return [Array<String>] of urls expressing the OA motivated_by values or nil if no graph
     def motivated_by
-      if graph_exists?
-        q = Triannon::Graph.anno_query.dup
-        q << [:s, RDF::OpenAnnotation.motivatedBy, :motivated_by]
-        solution = graph.query q
-        if solution && solution.size > 0
-          motivations = []
-          solution.each {|res|
-            motivations << res.motivated_by.to_s
-          }
-          motivations
-        # TODO:  raise exception if none?
-        end
-      end
+      graph.motivated_by if graph_exists?
     end
 
 protected
 
-    # TODO: WRITE_COMMENTS_AND_TESTS_FOR_THIS_METHOD
+    # Add annotation to Solr as a Solr document
     def solr_save
-#      puts "TO DO: send add to Solr (after save)"
-#      pp solr_hash
+      # pass in id we got from LDP Store
+      solr_writer.add(graph.solr_hash(id))
     end
 
-    # TODO: WRITE_COMMENTS_AND_TESTS_FOR_THIS_METHOD
+    # Delete annotation from Solr
     def solr_delete
-#      puts "TO DO: send delete to Solr (after destroy)"
+      solr_writer.delete(id)
     end
     
-    # TODO: WRITE_COMMENTS_AND_TESTS_FOR_THIS_METHOD
-    # TODO:  re-usable as part of Triannon::Graph class?
-    # 
-    # @return [Hash] a hash to be written to Solr, populated appropriately
-    def solr_hash
-      doc_hash = {}
-      tid = url.sub(Triannon.config[:ldp_url], "")
-      tid.sub(/^\//, "")
-      doc_hash[:id] = tid
-      doc_hash[:motivation] = motivated_by.map { |m| m.sub(RDF::OpenAnnotation.to_s, "") }
-      # date field format: 1995-12-31T23:59:59Z; or w fractional seconds: 1995-12-31T23:59:59.999Z
-#      doc_hash[:annotated_at] =
-#      doc_hash[:annotated_by_stem]
-      doc_hash[:target_url] = predicate_urls RDF::OpenAnnotation.hasTarget
-      doc_hash[:target_type] = ['external_URI'] if doc_hash[:target_url].size > 0
-      doc_hash[:body_url] = predicate_urls RDF::OpenAnnotation.hasBody
-      doc_hash[:body_type] = []
-      doc_hash[:body_type] << 'external_URI' if doc_hash[:body_url].size > 0
-      doc_hash[:body_chars_exact] = body_chars
-      doc_hash[:body_type] << 'content_as_text' if doc_hash[:body_chars_exact].size > 0
-      doc_hash[:body_type] << 'no_body' if doc_hash[:body_type].size == 0
-      doc_hash[:anno_jsonld] = jsonld_oa
-      doc_hash
-    end
-    
-    # TODO: WRITE_COMMENTS_AND_TESTS_FOR_THIS_METHOD
-    # TODO:  re-usable as part of Triannon::Graph class?
-    # @param [RDF::URI] predicate either RDF::OpenAnnotation.hasTarget or RDF::OpenAnnotation.hasBody
-    # @return [Array<String>] urls for the predicate, as an Array of Strings
-    def predicate_urls(predicate)
-      predicate_solns = graph.query([nil, predicate, nil])
-      urls = []
-      predicate_solns.each { |predicate_stmt |
-        predicate_obj = predicate_stmt.object
-        urls << predicate_obj.to_str if predicate_obj.is_a?(RDF::URI)
-      }
-      urls
-    end
-    
-    # TODO: WRITE_COMMENTS_AND_TESTS_FOR_THIS_METHOD
-    # TODO:  re-usable as part of Triannon::Graph class?
-    # @return [Array<String>] body chars as Strings, in an Array (one element for each contentAsText body)
-    def body_chars
-      result = []
-      q = RDF::Query.new
-      q << [nil, RDF::OpenAnnotation.hasBody, :body]
-      q << [:body, RDF.type, RDF::Content.ContentAsText]
-      q << [:body, RDF::Content.chars, :body_chars]
-      solns = graph.query q
-      solns.each { |soln| 
-        result << soln.body_chars.value.strip
-      }
-      result
-    end
-
 private
 
     # loads RDF::Graph from data attribute.  If data is in json-ld, converts it to turtle.
@@ -235,5 +142,9 @@ private
       graph && graph.size > 0
     end
 
+    def solr_writer
+      @sw ||= Triannon::SolrWriter.new
+    end
+
   end
 end

data/app/services/triannon/ldp_writer.rb

@@ -128,7 +128,7 @@ module Triannon
         req.body = ttl
       end
       if resp.status != 200 && resp.status != 201
-        raise "Unable to create LDP resource in container #{url}: Response Status: #{resp.status}\nResponse Body: #{resp.body}\nAnnotation sent: #{body}"
+        raise "Unable to create LDP resource in container #{parent_path}: Response Status: #{resp.status}\nResponse Body: #{resp.body}\nAnnotation sent: #{body}"
       end
       new_url = resp.headers['Location'] ? resp.headers['Location'] : resp.headers['location']
       new_url.split('/').last if new_url

data/app/services/triannon/solr_writer.rb

@@ -0,0 +1,53 @@
+module Triannon
+  class SolrWriter
+    
+    def initialize
+      @rsolr_client = RSolr.connect :url => Triannon.config[:solr_url]
+      @logger = Rails.logger
+      @max_retries = Triannon.config[:max_solr_retries] || 5
+      @base_sleep_seconds = Triannon.config[:base_sleep_seconds] || 1
+      @max_sleep_seconds = Triannon.config[:max_sleep_seconds] || 5
+    end
+    
+    # Add the document to Solr, retrying if an error occurs.
+    # See https://github.com/ooyala/retries for info on with_retries.
+    # @param [Hash] doc a Hash representation of the solr document to be added
+    def add(doc)
+      id = doc[:id]
+
+      handler = Proc.new do |exception, attempt_cnt, total_delay|
+        @logger.debug "#{exception.inspect} on Solr add attempt #{attempt_cnt} for #{id}"
+      end
+
+      with_retries(:handler => handler, 
+                    :max_tries => @max_retries, 
+                    :base_sleep_seconds => @base_sleep_seconds, 
+                    :max_sleep_seconds => @max_sleep_seconds) do |attempt|
+        @logger.debug "Solr add attempt #{attempt} for #{id}"
+        # add it and commit within 0.5 seconds
+        @rsolr_client.add(doc, :add_attributes => {:commitWithin => 500})
+        @logger.info "Successfully indexed #{id} to Solr on attempt #{attempt}"
+      end
+    end
+    
+    # Delete the document from Solr, retrying if an error occurs.
+    # See https://github.com/ooyala/retries for info on with_retries.
+    # @param [String] the id of the solr document to be deleted
+    def delete(id)
+      handler = Proc.new do |exception, attempt_cnt, total_delay|
+        @logger.debug "#{exception.inspect} on Solr delete attempt #{attempt_cnt} for #{id}"
+      end  
+
+      with_retries(:handler => handler, 
+                    :max_tries => @max_retries, 
+                    :base_sleep_seconds => @base_sleep_seconds, 
+                    :max_sleep_seconds => @max_sleep_seconds) do |attempt|
+        @logger.debug "Solr delete attempt #{attempt} for #{id}"
+        @rsolr_client.delete_by_id(id)
+        @rsolr_client.commit
+        @logger.info "Successfully deleted #{id} from Solr"
+      end      
+    end
+    
+  end
+end

data/app/views/triannon/annotations/index.html.erb

@@ -1,7 +1,7 @@
 <h1>Annotations</h1>
 <ul>
   <% @annotations.each do |a| %>
-  <li><%= link_to a.url, annotation_path(a) %></li>
+  <li><%= link_to a.id_as_url, annotation_path(a) %></li>
   <% end %>
 </ul>
 

data/app/views/triannon/annotations/show.html.erb

@@ -1,7 +1,7 @@
 <h1>Annotation</h1>
 <p>
 <strong>Url (@id):</strong>
-<%= @annotation.url %>
+<%= @annotation.id_as_url %>
 </p>
 <p>
 <strong>Motivated By:</strong>

data/config/solr/solr.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+ All (relative) paths are relative to the installation path
+  
+  persistent: Save changes made via the API to this file
+  sharedLib: path to a lib directory that will be shared across all cores
+-->
+<solr persistent="false" sharedLib="lib">
+
+  <!--
+  adminPath: RequestHandler path to manage cores.  
+    If 'null' (or absent), cores will not be manageable via REST
+  -->
+  <cores adminPath="/admin/cores" defaultCoreName="development">
+    <core name="development" instanceDir="development-core" />
+    <core name="test" instanceDir="test-core" />
+    <core name="triannon" instanceDir="triannon-core" />
+  </cores>
+</solr>

data/config/solr/{solrconfig.xml → triannon-core/conf/solrconfig.xml}

@@ -190,7 +190,7 @@
   <requestHandler name="/doc" class="solr.SearchHandler" >
     <lst name="defaults">
       <str name="echoParams">explicit</str>
-      <str name="fl">anno_jsonld</str>
+      <str name="fl">*</str>
       <int name="rows">1</int>
       <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
       <str name="wt">ruby</str>

data/config/triannon.yml

@@ -1,6 +1,15 @@
 development:
-  ldp_url: yer_ldp_url_here
+  ldp_url: yer_ldp_store_url_here
+  solr_url: yer_triannon_solr_url_here
+  triannon_base_url: http://your.triannon-server.com/annotations/
+  max_solr_retries: 5
+  base_sleep_seconds: 1
+  max_sleep_seconds: 5
 test: &test
   ldp_url: yer_ldp_url_here
+  solr_url: yer_triannon_solr_url_here
+  triannon_base_url: http://your.triannon-server.com/annotations/
 production:
-  ldp_url: yer_ldp_url_here
+  ldp_url: yer_ldp_url_here
+  solr_url: yer_triannon_solr_url_here
+  triannon_base_url: http://your.triannon-server.com/annotations/

data/lib/generators/triannon/install_generator.rb

@@ -10,12 +10,18 @@ module Triannon
       default_yml =<<-YML
 development:
   ldp_url: http://localhost:8983/fedora/rest/anno
-  triannon_base_url: http://your.triannon-server.com
+  solr_url: http://localhost:8983/solr/triannon
+  triannon_base_url: http://your.triannon-server.com/annotations/
+  max_solr_retries: 5
+  base_sleep_seconds: 1
+  max_sleep_seconds: 5
 test: &test
   ldp_url: http://localhost:8983/fedora/rest/anno
-  triannon_base_url: http://your.triannon-server.com
+  solr_url: http://localhost:8983/solr/triannon
+  triannon_base_url: http://your.triannon-server.com/annotations/
 production:
   ldp_url:
+  solr_url:
   triannon_base_url:
       YML
       create_file 'config/triannon.yml', default_yml

data/lib/triannon.rb

@@ -5,7 +5,9 @@ require 'rdf/ldp'
 require 'rdf/fcrepo4'
 require 'rdf/triannon_vocab'
 require 'bootstrap-sass'
-require 'faraday'
+require 'faraday' # for writing to LDP store
+require 'rsolr'
+require 'retries' # for writing to Solr
 
 module Triannon
   require "triannon/engine"

data/lib/triannon/graph.rb

@@ -1,7 +1,10 @@
 module Triannon
   # a wrapper class for RDF::Graph that adds methods specific to Triannon
+  # this is intended to be used for an RDF::Graph of a single annotation
   class Graph
     
+# Class Methods ----------------------------------------------------------------
+
     # given an RDF::Resource (an RDF::Node or RDF::URI), look for all the statements with that object
     #  as the subject, and recurse through the graph to find all descendant statements pertaining to the subject
     # @param subject the RDF object to be used as the subject in the graph query.  Should be an RDF::Node or RDF::URI
@@ -19,13 +22,139 @@ module Triannon
     # @return [RDF::Query] query for a subject :s with type of RDF::OpenAnnotation.Annotation
     def self.anno_query
       q = RDF::Query.new
-      q << [:s, RDF.type, RDF::URI("http://www.w3.org/ns/oa#Annotation")]
+      q << [:s, RDF.type, RDF::OpenAnnotation.Annotation]
     end
     
+    
+# Instance Methods ----------------------------------------------------------------
+
+    # instantiate this class for an RDF::Graph of a single annotation
     def initialize(rdf_graph)
       @graph = rdf_graph
     end
     
+    # @return json-ld representation of graph with OpenAnnotation context as a url
+    def jsonld_oa
+      inline_context = @graph.dump(:jsonld, :context => Triannon::JsonldContext::OA_CONTEXT_URL)
+      hash_from_json = JSON.parse(inline_context)
+      hash_from_json["@context"] = Triannon::JsonldContext::OA_CONTEXT_URL
+      hash_from_json.to_json
+    end
+    
+    # @return json-ld representation of graph with IIIF context as a url
+    def jsonld_iiif
+      inline_context = @graph.dump(:jsonld, :context => Triannon::JsonldContext::IIIF_CONTEXT_URL)
+      hash_from_json = JSON.parse(inline_context)
+      hash_from_json["@context"] = Triannon::JsonldContext::IIIF_CONTEXT_URL
+      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.
+    # @return [Hash] a hash to be written to Solr, populated appropriately
+    def solr_hash(triannon_id=nil)
+      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(/^\//, "")
+
+      # use short strings for motivation field
+      doc_hash[:motivation] = motivated_by.map { |m| m.sub(RDF::OpenAnnotation.to_s, "") }
+
+      # date field format: 1995-12-31T23:59:59Z; or w fractional seconds: 1995-12-31T23:59:59.999Z
+      if annotated_at
+        begin
+          dt = Time.parse(annotated_at)
+          doc_hash[:annotated_at] = dt.iso8601 if dt
+        rescue ArgumentError
+          # ignore invalid datestamps
+        end
+      end
+#      doc_hash[:annotated_by_stem] # not yet implemented
+
+      doc_hash[:target_url] = predicate_urls RDF::OpenAnnotation.hasTarget
+      # TODO: recognize more target types
+      doc_hash[:target_type] = ['external_URI'] if doc_hash[:target_url].size > 0
+
+      doc_hash[:body_url] = predicate_urls RDF::OpenAnnotation.hasBody
+      doc_hash[:body_type] = []
+      doc_hash[:body_type] << 'external_URI' if doc_hash[:body_url].size > 0
+      doc_hash[:body_chars_exact] = body_chars.map {|bc| bc.strip}
+      doc_hash[:body_type] << 'content_as_text' if doc_hash[:body_chars_exact].size > 0
+      doc_hash[:body_type] << 'no_body' if doc_hash[:body_type].size == 0
+
+      doc_hash[:anno_jsonld] = jsonld_oa
+      doc_hash
+    end
+    
+
+    # Canned Query methods ----------------------------------------------------------------
+  
+    # @return [String] the id of this annotation as a url string
+    def id_as_url
+      solution = @graph.query self.class.anno_query
+      if solution && solution.size == 1
+        solution.first.s.to_s
+      # TODO:  raise exception if not a URI or missing?
+      end
+    end
+
+    # @return [Array<String>] Array of urls expressing the OA motivated_by values
+    def motivated_by
+      motivations = []
+      q = self.class.anno_query.dup
+      q << [:s, RDF::OpenAnnotation.motivatedBy, :motivated_by]
+      solution = @graph.query q
+      if solution && solution.size > 0
+        solution.each {|res|
+          motivations << res.motivated_by.to_s
+        }
+      end
+      # TODO:  raise exception if none? (validation)
+      motivations
+    end
+
+    # @param [RDF::URI] predicate either RDF::OpenAnnotation.hasTarget or RDF::OpenAnnotation.hasBody
+    # @return [Array<String>] urls for the predicate, as an Array of Strings
+    def predicate_urls(predicate)
+      urls = []
+      predicate_solns = @graph.query [nil, predicate, nil]
+      predicate_solns.each { |predicate_stmt |
+        predicate_obj = predicate_stmt.object
+        urls << predicate_obj.to_str.strip if predicate_obj.is_a?(RDF::URI)
+      }
+      urls
+    end
+    
+    # For all bodies that are of type ContentAsText, get the characters as a single String in the returned Array.
+    # @return [Array<String>] body chars as Strings, in an Array (one element for each contentAsText body)
+    def body_chars
+      result = []
+      q = RDF::Query.new
+      q << [nil, RDF::OpenAnnotation.hasBody, :body]
+      q << [:body, RDF.type, RDF::Content.ContentAsText]
+      q << [:body, RDF::Content.chars, :body_chars]
+      solns = @graph.query q
+      solns.each { |soln| 
+        result << soln.body_chars.value
+      }
+      result
+    end
+    
+    # @return [String] The datetime from the annotatedAt property, or nil
+    def annotated_at
+      solution = @graph.query [nil, RDF::OpenAnnotation.annotatedAt, nil]
+      if solution && solution.size == 1
+        solution.first.object.to_s
+      end
+    end
+
+
+    # Changing the Graph ----------------------------------------------------------------
+
     # remove all RDF::OpenAnnotation.hasBody and .hasTarget statements
     #  and any other statements associated with body and target objects, 
     #  leaving all statements to be stored as part of base object in LDP store
@@ -59,10 +188,9 @@ module Triannon
     # transform an outer blank node into a null relative URI
     def make_null_relative_uri_out_of_blank_node
       anno_stmts = @graph.query([nil, RDF.type, RDF::OpenAnnotation.Annotation])
-      # FIXME: should actually look for subject with type of RDF::OpenAnnotation.Annotation
       anno_rdf_obj = anno_stmts.first.subject
       if anno_rdf_obj.is_a?(RDF::Node)
-        # we need to use the null relative URI representation of blank nodes to write to LDP
+        # use null relative URI representation of blank node
         anno_subject = RDF::URI.new
       else # it's already a URI
         anno_subject = anno_rdf_obj

data/lib/triannon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,6 +124,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rsolr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: retries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +289,7 @@ files:
 - app/services/triannon/ldp_to_oa_mapper.rb
 - app/services/triannon/ldp_writer.rb
 - app/services/triannon/root_annotation_creator.rb
+- app/services/triannon/solr_writer.rb
 - app/views/layouts/triannon/application.html.erb
 - app/views/triannon/annotations/_form.html.erb
 - app/views/triannon/annotations/edit.html.erb
@@ -269,8 +298,9 @@ files:
 - app/views/triannon/annotations/show.html.erb
 - config/initializers/mime_types.rb
 - config/routes.rb
-- config/solr/schema.xml
-- config/solr/solrconfig.xml
+- config/solr/solr.xml
+- config/solr/triannon-core/conf/schema.xml
+- config/solr/triannon-core/conf/solrconfig.xml
 - config/triannon.yml
 - lib/generators/triannon/install_generator.rb
 - lib/rdf/triannon_vocab.rb