triannon 0.0.3 → 0.0.4

data/app/views/layouts/triannon/application.html.erb

@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Cerberus</title>
+  <title>Triannon</title>
   <%= stylesheet_link_tag    "triannon/application", media: "all" %>
   <%= javascript_include_tag "triannon/application" %>
   <%= csrf_meta_tags %>
@@ -21,7 +21,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </button>
-          <%= link_to "Cerberus", root_path, class: 'navbar-brand' %>
+          <%= link_to "Triannon", root_path, class: 'navbar-brand' %>
         </div>
         <div class="navbar-collapse collapse">
           <ul class="nav navbar-nav">

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

@@ -12,7 +12,7 @@
   <% end %>
 
   <div class="field">
-    <%= f.label 'data (as JSON-LD)' %><br>
+    <%= f.label 'data (as json-ld or turtle)' %><br>
     <%= f.text_area :data %>
   </div>
   <div class="actions">

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

@@ -5,19 +5,19 @@
 </p>
 <p>
 <strong>Target:</strong>
-<%= link_to @annotation.has_target, @annotation.has_target %>
+<%= @annotation.has_target.map{|t| link_to(t, t)}.join(", ").html_safe %>
 </p>
 <p>
 <strong>Body (blank node with text):</strong>
-<pre>
-<%= @annotation.has_body %>
-</pre>
+<% if @annotation.has_body.size > 0 -%>
+<%= @annotation.has_body.map{|b| "<pre>" + b + "</pre>"}.join.html_safe %>
+<% else %>
+(no body for this annotation)
+<% end -%>
 </p>
 <p>
 <strong>Motivated By:</strong>
-<% @annotation.motivated_by { |m|%>
-<%= link_to @annotation.m, @annotation.m %>
-<% } %>
+<%= @annotation.motivated_by.map{|m| link_to(m, m)}.join(", ").html_safe %>
 </p>
 <p>
 <strong>Type:</strong>

data/config/initializers/mime_types.rb

@@ -0,0 +1,4 @@
+# Add new mime types for use in respond_to blocks:
+Mime::Type.register "application/ld+json", :jsonld
+Mime::Type.register "application/x-turtle", :ttl, ["text/turtle"]
+Mime::Type.register "application/rdf+xml", :rdfxml, ["text/rdf+xml", "text/rdf"]

data/config/initializers/root_annotation_container.rb

@@ -0,0 +1,8 @@
+
+def root_container_create
+  return if(ENV['CI'] && !ENV['RSPEC_RUNNING'])
+
+  Triannon::RootAnnotationCreator.create if File.exists? Triannon.triannon_file
+end
+
+# root_container_create

data/config/triannon.yml

@@ -0,0 +1,6 @@
+development:
+  ldp_url: yer_ldp_url_here
+test: &test
+  ldp_url: yer_ldp_url_here
+production:
+  ldp_url: yer_ldp_url_here

data/lib/generators/triannon/install_generator.rb

@@ -5,5 +5,20 @@ module Triannon
     def inject_Triannon_routes
       route "mount Triannon::Engine, at: 'annotations'"
     end
+
+    def create_triannon_yml_file
+      default_yml =<<-YML
+development:
+  ldp_url: http://localhost:8983/fedora/rest/anno
+  triannon_base_url: http://your.triannon-server.com
+test: &test
+  ldp_url: http://localhost:8983/fedora/rest/anno
+  triannon_base_url: http://your.triannon-server.com
+production:
+  ldp_url:
+  triannon_base_url:
+      YML
+      create_file 'config/triannon.yml', default_yml
+    end
   end
 end

data/lib/rdf/triannon_vocab.rb

@@ -0,0 +1,14 @@
+require 'rdf'
+module RDF
+  # contains RDF predefined terms and properties for Triannon 
+  class Triannon < RDF::StrictVocabulary("http://triannon.stanford.edu/ns/")
+
+    # Property definitions
+    property :externalReference,
+      comment: %(A reference to a resource external to Triannon storage.).freeze,
+      label: "externalReference".freeze,
+      "rdfs:isDefinedBy" => %(triannon:).freeze,
+      range: "xsd:anyURI".freeze,  # rdf:URI?  rdfs:Resource?
+      type: "rdf:Property".freeze
+  end
+end

data/lib/triannon.rb

@@ -1,7 +1,51 @@
 require 'linkeddata'
 require 'rdf/open_annotation'
+require 'rdf/ldp'
+require 'rdf/fcrepo4'
+require 'rdf/triannon_vocab'
 require 'bootstrap-sass'
+require 'faraday'
 
 module Triannon
-  require "triannon/engine"    
+  require "triannon/engine"
+
+  class << self
+    attr_accessor :config
+  end
+
+  def self.triannon_file
+    "#{::Rails.root.to_s}/config/triannon.yml"
+  end
+
+  def self.config
+    @triannon_config ||= begin
+        raise "The #{::Rails.env} environment settings were not found in the triannon.yml config" unless config_yml[::Rails.env]
+        config_yml[::Rails.env].symbolize_keys
+      end
+  end
+
+  def self.config_yml
+    require 'erb'
+    require 'yaml'
+
+    return @triannon_yml if @triannon_yml
+    unless File.exists?(triannon_file)
+      raise "You are missing the triannon configuration file: #{triannon_file}."
+    end
+
+    begin
+      @triannon_yml = YAML::load_file(triannon_file)
+    rescue => e
+      raise("triannon.yml was found, but could not be parsed.\n")
+    end
+
+    if @triannon_yml.nil? || !@triannon_yml.is_a?(Hash)
+      raise("triannon.yml was found, but was blank or malformed.\n")
+    end
+
+    return @triannon_yml
+  end
+
+
+
 end

data/lib/triannon/oa_context_20130208.json

@@ -0,0 +1,53 @@
+{
+	"oa": "http://www.w3.org/ns/oa#",
+	"cnt": "http://www.w3.org/2011/content#",
+	"dc": "http://purl.org/dc/elements/1.1/",
+	"dcterms": "http://purl.org/dc/terms/",
+	"dctypes": "http://purl.org/dc/dcmitype/",
+	"foaf": "http://xmlns.com/foaf/0.1/",
+	"rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+	"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
+	"skos": "http://www.w3.org/2004/02/skos/core#",
+	"owl": "http://www.w3.org/2002/07/owl#",
+	"prov": "http://www.w3.org/ns/prov#",
+	"trig": "http://www.w3.org/2004/03/trix/rdfg-1/",
+	"xsd": "http://www.w3.org/2001/XMLSchema#",
+	"triannon": " http://triannon.stanford.edu/ns/",
+
+	"hasBody" :         {"@type":"@id", "@id" : "oa:hasBody"},
+	"hasTarget" :       {"@type":"@id", "@id" : "oa:hasTarget"},
+	"hasSource" :       {"@type":"@id", "@id" : "oa:hasSource"},
+	"hasSelector" :     {"@type":"@id", "@id" : "oa:hasSelector"},
+	"hasState" :        {"@type":"@id", "@id" : "oa:hasState"},
+	"hasScope" :        {"@type":"@id", "@id" : "oa:hasScope"},
+	"annotatedBy" :  {"@type":"@id", "@id" : "oa:annotatedBy"},
+	"serializedBy" : {"@type":"@id", "@id" : "oa:serializedBy"},
+	"motivatedBy" :  {"@type":"@id", "@id" : "oa:motivatedBy"},
+	"equivalentTo" : {"@type":"@id", "@id" : "oa:equivalentTo"},
+	"styledBy" :     {"@type":"@id", "@id" : "oa:styledBy"},
+	"cachedSource" : {"@type":"@id", "@id" : "oa:cachedSource"},
+	"conformsTo" :   {"@type":"@id", "@id" : "dcterms:conformsTo"},
+	"default" :      {"@type":"@id", "@id" : "oa:default"},
+	"item" :         {"@type":"@id", "@id" : "oa:item"},
+	"first":         {"@type":"@id", "@id" : "rdf:first"},
+	"rest":          {"@type":"@id", "@id" : "rdf:rest", "@container" : "@list"},
+
+	"annotatedAt" :  { "@type": "xsd:dateTimeStamp", "@id": "oa:annotatedAt" },
+	"end" :          { "@type": "xsd:nonNegativeInteger", "@id": "oa:end" },
+	"exact" :        "oa:exact",
+	"prefix" :       "oa:prefix",
+	"serializedAt" : { "@type": "xsd:dateTimeStamp", "@id": "oa:serializedAt" },
+	"start" :        { "@type": "xsd:nonNegativeInteger", "@id": "oa:start" },
+	"styleClass" :   "oa:styleClass",
+	"suffix" :       "oa:suffix",
+	"when" :         { "@type": "xsd:dateTimeStamp", "@id": "oa:when" },
+
+	"chars" :        "cnt:chars",
+	"bytes" :        "cnt:bytes",
+	"format" :       "dc:format",
+	"language" :     "dc:language",
+	"value" :        "rdf:value",
+	"label" :        "rdfs:label",
+	"name" :         "foaf:name",
+	"mbox" :         "foaf:mbox"
+}

data/lib/triannon/version.rb

@@ -1,3 +1,3 @@
 module Triannon
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,6 +53,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdf-ldp
+  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: rdf-fcrepo4
+  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: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -82,13 +110,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0.beta1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -165,6 +193,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - cabeer@stanford.edu
@@ -184,19 +240,28 @@ files:
 - app/helpers/triannon/annotations_helper.rb
 - app/helpers/triannon/application_helper.rb
 - app/models/triannon/annotation.rb
-- app/models/triannon/graph_validator.rb
+- app/models/triannon/annotation_ldp.rb
+- app/services/triannon/ldp_creator.rb
+- app/services/triannon/ldp_destroyer.rb
+- app/services/triannon/ldp_loader.rb
+- app/services/triannon/ldp_to_oa_mapper.rb
+- app/services/triannon/root_annotation_creator.rb
 - app/views/layouts/triannon/application.html.erb
 - app/views/triannon/annotations/_form.html.erb
 - app/views/triannon/annotations/edit.html.erb
 - app/views/triannon/annotations/index.html.erb
 - app/views/triannon/annotations/new.html.erb
 - app/views/triannon/annotations/show.html.erb
+- config/initializers/mime_types.rb
+- config/initializers/root_annotation_container.rb
 - config/routes.rb
-- db/migrate/20140912173046_create_triannon_annotations.rb
+- config/triannon.yml
 - lib/generators/triannon/install_generator.rb
+- lib/rdf/triannon_vocab.rb
 - lib/tasks/triannon_tasks.rake
 - lib/triannon.rb
 - lib/triannon/engine.rb
+- lib/triannon/oa_context_20130208.json
 - lib/triannon/version.rb
 homepage: 
 licenses:
@@ -218,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails engine for working with storage of OpenAnnotations stored in Fedora4

data/app/models/triannon/graph_validator.rb

@@ -1,33 +0,0 @@
-module Triannon
-  class GraphValidator < ActiveModel::Validator
-    
-    def validate(anno)
-      graph_exists? anno
-      graph = anno.graph
-      basic_solution = graph.query(self.basic_query)
-      unless basic_solution && basic_solution.size == 1
-        anno.errors[:data] << 'The oa:Annotation class MUST be associated with each Annotation.'
-        anno.errors[:data] << 'each Annotation MUST have at least one target'
-      end      
-    end
-    
-    def graph_exists?(anno)
-      graph = anno.graph
-      unless graph && graph.size > 0
-        anno.errors[:data] << 'Unable to create non-null graph'
-      end
-    end
-    
-    # query for a subject with 
-    #  predicate  RDF::OpenAnnotation.hasTarget  
-    #  type of RDF::OpenAnnotation.Annotation
-    def self.basic_query
-      @@basic_query ||= begin
-        RDF::Query.new
-        basic_query << [:s, RDF.type, RDF::URI("http://www.w3.org/ns/oa#Annotation")]
-        basic_query << [:s, RDF::OpenAnnotation.hasTarget, nil]
-      end
-    end
-    
-  end
-end

data/db/migrate/20140912173046_create_triannon_annotations.rb

@@ -1,9 +0,0 @@
-class CreateTriannonAnnotations < ActiveRecord::Migration
-  def change
-    create_table :triannon_annotations do |t|
-      t.text :data
-
-      t.timestamps null: false
-    end
-  end
-end