triannon 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54a4a66f7d3970f51d9378924c414dc14ac866fe
-  data.tar.gz: d1454821e3b02177c5f3c81e72c06ddd556c460a
+  metadata.gz: 56a7669bd9da9a9b2606b8e69581aefa06ba3758
+  data.tar.gz: 647d6a29caedcec5c4050d6fa2fcb52024e07248
 SHA512:
-  metadata.gz: 5dade8b77d9d3f4aa003ec5f327d9d8cc6ac6707999392d2f5d8eb7defc434cc5fdf30dede163d74611aa113265c8546cc3d3724c12d055c4a47094ce1633339
-  data.tar.gz: 34f4a938d2ab43fd3a2c410c2fa7d4c9fd922bce5675bcab518f42f84eb81ee8f592e402b92a57ae53311c9fc05aac41a772bbe3f5f17c7935b7e05f4c9a7d7f
+  metadata.gz: d1a31dcf5fd7f41d9cd07a5b516c6fda3f3c90c8ae9eeffbbdd4ee50dba79d0cedc9bc27e6af741ac7834186d8a7bc930824e508ab4cad8eafae635abd0a8f29
+  data.tar.gz: 646d9abc0b152ab17e852295f3e0e7c8a58d0343572f5be6de8b596be10540fb1664e27eed4881be2af19b2c9ab20306edf2c5e48c9c42baf8c4357e9ab4bcd1

data/README.md

@@ -38,12 +38,36 @@ Edit the `config/triannon.yml` file:
 * `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 your LDP server
+Generate the root annotations container on your LDP server:
 
 ```console
 $ rake triannon:create_root_container
 ```
 
+Set up caching for jsonld context documents:
+
+* by using Rack::Cache for RestClient:
+** add to Gemfile:
+
+```ruby
+gem 'rest-client', '~> 1.7.2'
+gem 'rack-cache'
+gem 'rest-client-components'
+``` 
+*** bundle install
+** create a  config/initializers/rest_client.rb
+
+```ruby
+require 'restclient/components'
+require 'rack/cache'
+RestClient.enable Rack::Cache,
+  metastore: "file:#{Rails.root}/tmp/rack-cache/meta",
+  entitystore: "file:#{Rails.root}/tmp/rack-cache/body",
+  default_ttl:  86400, # when to recheck, in seconds (daily = 60 x 60 x 24)
+  verbose: false
+```
+
+
 ## Client Interactions with Triannon
 
 ### Get a list of annos

data/Rakefile

@@ -9,16 +9,6 @@ ZIP_URL = "https://github.com/sul-dlss/hydra-jetty/archive/fedora-4/edge.zip"
 require 'active_support/benchmarkable'
 require 'jettywrapper'
 
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Triannon'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 require 'engine_cart/rake_task'
 desc 'run the triannon specs'
 task :ci => ['engine_cart:generate', 'jetty:clean'] do
@@ -86,4 +76,44 @@ RSpec::Core::RakeTask.new(:spec)
 
 task :default => :ci
 
+
+desc "Generate RDoc with YARD"
+task :doc => ['doc:generate']
+
+namespace :doc do
+  begin
+    require 'yard'
+    require 'yard/rake/yardoc_task'
+
+    YARD::Rake::YardocTask.new(:generate) do |yt|
+      yt.files   =  Dir.glob(File.join('app', '**', '*.rb')) +
+                    Dir.glob(File.join('lib', '*.rb')) +
+                    Dir.glob(File.join('lib', '**', '*.rb'))
+
+      yt.options = ['--output-dir', 'rdoc', '--readme', 'README.md', '--files', 'LICENSE',
+                    '--protected', '--private', '--title', 'Triannon', '--exclude', 'triannon_vocab']
+    end
+  rescue LoadError
+    desc "Generate RDoc with YARD"
+    task :generate do
+      abort "Please install the YARD gem to generate rdoc."
+    end
+  end
+
+  desc "Remove generated documenation"
+  task :clean do
+    rm_r 'rdoc' if File.exists?('rdoc')
+  end
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Triannon'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
 Bundler::GemHelper.install_tasks

data/app/models/triannon/annotation.rb

@@ -69,7 +69,7 @@ module Triannon
       end
     end
 
-    # @param either a Triannon::Graph or RDF::Graph object
+    # @param g either a Triannon::Graph or RDF::Graph object
     def graph= g
       if g.is_a? Triannon::Graph
         @graph = g
@@ -102,8 +102,7 @@ protected
 
     # Add annotation to Solr as a Solr document
     def solr_save
-      solr_hash = graph.solr_hash if graph && graph.id_as_url
-      solr_writer.add(solr_hash) if solr_hash && solr_hash.size > 0
+      solr_writer.write(graph) if graph && graph.id_as_url && !graph.id_as_url.empty?
     end
 
     # Delete annotation from Solr
@@ -157,8 +156,7 @@ private
     # SIDE EFFECT: converts data to turtle for LdpWriter
     # @return [RDF::Graph] populated RDF::Graph object, or nil
     def jsonld_to_graph
-      # need to do this to avoid external lookup of jsonld context
-      g ||= RDF::Graph.new << JSON::LD::API.toRdf(json_ld) if json_ld
+      g ||= RDF::Graph.new.from_jsonld(data)
       g = nil if g && g.size == 0
       self.data = g.dump(:ttl) if g  # LdpWriter expects ttl
       g
@@ -174,19 +172,6 @@ private
       g
     end
 
-    # avoid external lookup of jsonld context by putting it inline
-    # @return [Hash] the parsed json after the context is put inline
-    def json_ld
-      if data.match(/"@context"\s*\:\s*"http\:\/\/www\.w3\.org\/ns\/oa-context-20130208\.json"/)
-        data.sub!("\"http://www.w3.org/ns/oa-context-20130208.json\"", Triannon::JsonldContext.oa_context)
-      elsif data.match(/"@context"\s*\:\s*"http\:\/\/www\.w3\.org\/ns\/oa\.jsonld"/)
-        data.sub!("\"http://www.w3.org/ns/oa.jsonld\"", Triannon::JsonldContext.oa_context)
-      elsif data.match(/"@context"\s*\:\s*"http\:\/\/iiif\.io\/api\/presentation\/2\/context\.json"/)
-        data.sub!("\"http://iiif.io/api/presentation/2/context.json\"", Triannon::JsonldContext.iiif_context)
-      end
-      @json_ld ||= JSON.parse(data) rescue nil
-    end
-
     def graph_exists?
       graph && graph.size > 0
     end

data/app/services/triannon/ldp_to_oa_mapper.rb

@@ -64,8 +64,8 @@ module Triannon
     # @param [RDF::URI] uri_obj the object that may have RDF::Triannon.externalReference
     # @param [RDF::URI] predicate the predicate for [subject_obj, predicate, (ext_url)] statement
     # to be added to @oa_graph, e.g. RDF::OpenAnnotation.hasTarget
-    # @param [RDF::URI] the subject object to get the predicate statement; defaults to @root_uri
-    # @returns [Boolean] true if it adds statements to @oa_graph, false otherwise
+    # @param [RDF::URI] subject_obj the subject object to get the predicate statement; defaults to @root_uri
+    # @return [Boolean] true if it adds statements to @oa_graph, false otherwise
     def map_external_ref uri_obj, predicate, subject_obj = @root_uri
       solns = @ldp_anno_graph.query [uri_obj, RDF::Triannon.externalReference, nil]
       if solns.count > 0
@@ -90,8 +90,8 @@ module Triannon
     # @param [RDF::URI] uri_obj the object that may type RDF::Content.ContentAsText
     # @param [RDF::URI] predicate the predicate for [subject_obj, predicate, (ext_url)] statement
     # to be added to @oa_graph, e.g. RDF::OpenAnnotation.hasTarget
-    # @param [RDF::URI] the subject object to get the predicate statement; defaults to @root_uri
-    # @returns [Boolean] true if it adds statements to @oa_graph, false otherwise
+    # @param [RDF::URI] subject_obj the subject object to get the predicate statement; defaults to @root_uri
+    # @return [Boolean] true if it adds statements to @oa_graph, false otherwise
     def map_content_as_text uri_obj, predicate, subject_obj = @root_uri
       solns = @ldp_anno_graph.query [uri_obj, RDF.type, RDF::Content.ContentAsText]
       if solns.count > 0
@@ -117,7 +117,7 @@ module Triannon
     # @param [RDF::URI] uri_obj the object that may have type RDF::OpenAnnotation.SpecificResource
     # @param [RDF::URI] predicate the predicate for [@root_uri, predicate, (sel_res)] statement
     # to be added to @oa_graph, e.g. RDF::OpenAnnotation.hasTarget
-    # @returns [Boolean] true if it adds statements to @oa_graph, false otherwise
+    # @return [Boolean] true if it adds statements to @oa_graph, false otherwise
     def map_specific_resource uri_obj, predicate
       solns = @ldp_anno_graph.query [uri_obj, RDF.type, RDF::OpenAnnotation.SpecificResource]
       if solns.count > 0
@@ -170,7 +170,7 @@ module Triannon
     # @param [RDF::URI] uri_obj the object that may have type RDF::OpenAnnotation.Choice
     # @param [RDF::URI] predicate the predicate for [@root_uri, predicate, (choice)] statement
     # to be added to @oa_graph, e.g. RDF::OpenAnnotation.hasTarget
-    # @returns [Boolean] true if it adds statements to @oa_graph, false otherwise
+    # @return [Boolean] true if it adds statements to @oa_graph, false otherwise
     def map_choice uri_obj, predicate
       solns = @ldp_anno_graph.query [uri_obj, RDF.type, RDF::OpenAnnotation.Choice]
       if solns.count > 0

data/app/services/triannon/solr_writer.rb

@@ -1,6 +1,53 @@
 module Triannon
   class SolrWriter
-    
+
+    # 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
+    #
+    # Convert a Triannon::Graph object into a Hash suitable for writing to Solr.
+    #
+    # @param [Triannon::Graph] triannon_graph a populated Triannon::Graph object for a *stored* anno
+    # @return [Hash] a hash to be written to Solr, populated appropriately
+    def self.solr_hash(triannon_graph)
+      doc_hash = {}
+      triannon_id = triannon_graph.id_as_url
+      if triannon_id
+        # 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
+        solr_id = triannon_id.sub(Triannon.config[:triannon_base_url], "")
+        doc_hash[:id] = solr_id.sub(/^\/*/, "") # remove first char slash(es) if present
+
+        # use short strings for motivation field
+        doc_hash[:motivation] = triannon_graph.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 triannon_graph.annotated_at
+          begin
+            dt = Time.parse(triannon_graph.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] = triannon_graph.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] = triannon_graph.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] = triannon_graph.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] = triannon_graph.jsonld_oa
+      end
+      doc_hash
+    end
+
+
     def initialize
       @rsolr_client = RSolr.connect :url => Triannon.config[:solr_url]
       @logger = Rails.logger
@@ -8,10 +55,18 @@ module Triannon
       @base_sleep_seconds = Triannon.config[:base_sleep_seconds] || 1
       @max_sleep_seconds = Triannon.config[:max_sleep_seconds] || 5
     end
-    
+
+    # Convert the Triannon::Graph to a Solr document hash, then call RSolr.add
+    #  with the doc hash
+    # @param [Triannon::Graph] tgraph anno represented as a Triannon::Graph
+    def write(tgraph)
+      doc_hash = self.class.solr_hash(tgraph) if tgraph && !tgraph.id_as_url.empty?
+      add(doc_hash) if doc_hash && !doc_hash.empty?
+    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
+    # @param [Hash] doc a Hash representation of the Solr document to be added
     def add(doc)
       id = doc[:id]
 
@@ -32,7 +87,7 @@ module Triannon
     
     # 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
+    # @param [String] id 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}"

data/lib/generators/triannon/install_generator.rb

@@ -2,6 +2,8 @@ require 'rails/generators'
 
 module Triannon
   class Install < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
     def inject_Triannon_routes
       route "mount Triannon::Engine, at: ''"
     end
@@ -26,5 +28,17 @@ production:
       YML
       create_file 'config/triannon.yml', default_yml
     end
+
+    def add_linked_data_caching
+      gem 'rest-client', '~> 1.7.2'
+      gem 'rack-cache'
+      gem 'rest-client-components'
+
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
+
+      copy_file 'rest_client.rb', 'config/initializers/rest_client.rb'
+    end
   end
 end

data/lib/generators/triannon/templates/rest_client.rb

@@ -0,0 +1,7 @@
+require 'restclient/components'
+require 'rack/cache'
+RestClient.enable Rack::Cache,
+  metastore: "file:#{Rails.root}/tmp/rack-cache/meta",
+  entitystore: "file:#{Rails.root}/tmp/rack-cache/body",
+  default_ttl:  86400, # when to recheck, in seconds (daily = 60 x 60 x 24)
+  verbose: false

data/lib/triannon/graph.rb

@@ -47,50 +47,7 @@ module Triannon
       hash_from_json = JSON.parse(inline_context)
       hash_from_json["@context"] = Triannon::JsonldContext::IIIF_CONTEXT_URL
       hash_from_json.to_json
-    end
-
-    # 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
-      doc_hash = {}
-      triannon_id = id_as_url
-      if triannon_id
-        # 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
-        solr_id = triannon_id.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, "") }
-
-        # 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
-      end
-      doc_hash
-    end
-    
+    end    
 
     # Canned Query methods ----------------------------------------------------------------
   

data/lib/triannon/jsonld_context.rb

@@ -1,21 +1,13 @@
 module Triannon
   class JsonldContext
     
+    # TODO: perhaps this should no longer be a class -- these could be Triannon constants ...
+    
     OA_CONTEXT_URL = "http://www.w3.org/ns/oa.jsonld"
 
     OA_DATED_CONTEXT_URL = "http://www.w3.org/ns/oa-context-20130208.json"
     
     IIIF_CONTEXT_URL = "http://iiif.io/api/presentation/2/context.json"
-
-    # a crude way of locally caching context so we don't hammer w3c server for every jsonld parse
-    def self.oa_context
-      @@oa_context ||= File.read(File.dirname(__FILE__) + "/oa_context_20130208.json")
-    end
-
-    # a crude way of locally caching context so we don't hammer server for every jsonld parse
-    def self.iiif_context
-      @@iiif_context ||= File.read(File.dirname(__FILE__) + "/iiif_presentation_2_context.json")
-    end
      
   end
 end

data/lib/triannon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -264,6 +264,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  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: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+- !ruby/object:Gem::Dependency
+  name: rest-client-components
+  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: rack-cache
+  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
@@ -281,7 +337,6 @@ files:
 - app/assets/stylesheets/triannon/application.css.scss
 - app/controllers/triannon/annotations_controller.rb
 - app/controllers/triannon/application_controller.rb
-- app/helpers/triannon/annotations_helper.rb
 - app/helpers/triannon/application_helper.rb
 - app/models/triannon/annotation.rb
 - app/models/triannon/annotation_ldp.rb
@@ -303,15 +358,14 @@ files:
 - config/solr/triannon-core/conf/solrconfig.xml
 - config/triannon.yml
 - lib/generators/triannon/install_generator.rb
+- lib/generators/triannon/templates/rest_client.rb
 - lib/rdf/triannon_vocab.rb
 - lib/tasks/triannon_tasks.rake
 - lib/triannon.rb
 - lib/triannon/engine.rb
 - lib/triannon/error.rb
 - lib/triannon/graph.rb
-- lib/triannon/iiif_presentation_2_context.json
 - lib/triannon/jsonld_context.rb
-- lib/triannon/oa_context_20130208.json
 - lib/triannon/version.rb
 homepage: 
 licenses:
@@ -338,3 +392,4 @@ signing_key:
 specification_version: 4
 summary: Rails engine for working with OpenAnnotations stored in Fedora4
 test_files: []
+has_rdoc: 

data/app/helpers/triannon/annotations_helper.rb

@@ -1,4 +0,0 @@
-module Triannon
-  module AnnotationsHelper
-  end
-end

data/lib/triannon/iiif_presentation_2_context.json

@@ -1,72 +0,0 @@
-{
-	"sc":      "http://iiif.io/api/presentation/2#",
-    "iiif":    "http://iiif.io/api/image/2#",
-    "exif":    "http://www.w3.org/2003/12/exif/ns#",
-    "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#",
-    "xsd":     "http://www.w3.org/2001/XMLSchema#",
-	"svcs":    "http://rdfs.org/sioc/services#",
-
-    "license":     {"@type":"@id", "@id":"dcterms:license"},
-    "service":     {"@type":"@id", "@id":"svcs:has_service"},
-    "seeAlso":    {"@type":"@id", "@id":"foaf:page"},
-    "within":      {"@type":"@id", "@id":"dcterms:isPartOf"},
-    "profile":     {"@type":"@id", "@id":"dcterms:conformsTo"},
-    "related":     {"@type":"@id", "@id":"dcterms:relation"},
-    "logo":        {"@type":"@id", "@id":"foaf:logo"},
-    "thumbnail":   {"@type":"@id", "@id":"foaf:thumbnail"},
-    "startCanvas": {"@type":"@id", "@id":"sc:hasStartCanvas"},
-
-    "manifests":   {"@type":"@id", "@id":"sc:hasManifests", "@container":"@list"},
-    "sequences":   {"@type":"@id", "@id":"sc:hasSequences", "@container":"@list"},
-    "canvases":    {"@type":"@id", "@id":"sc:hasCanvases", "@container":"@list"},
-    "resources":   {"@type":"@id", "@id":"sc:hasAnnotations", "@container":"@list"},
-    "images":      {"@type":"@id", "@id":"sc:hasImageAnnotations","@container":"@list"},
-    "otherContent": {"@type":"@id", "@id":"sc:hasLists", "@container":"@list"},
-    "structures":  {"@type":"@id", "@id":"sc:hasRanges", "@container":"@list"},
-    "ranges" :     {"@type": "@id", "@id": "sc:hasRanges", "@container":"@list"},
-
-    "metadata":    {"@type":"@id", "@id":"sc:metadataLabels", "@container":"@list"},
-
-    "description": {"@id": "dc:description"},
-    "attribution": {"@id": "sc:attributionLabel"},
-    "height":      {"@type":"xsd:integer", "@id":"exif:height"},
-    "width":       {"@type":"xsd:integer", "@id":"exif:width"},
-    "viewingDirection": {"@id": "sc:viewingDirection", "@type":"@id"},
-    "viewingHint": {"@id": "sc:viewingHint", "@type":"@id"},
-
-    "left-to-right": {"@id":"sc:leftToRightDirection", "@type":"sc:ViewingDirection"},
-    "right-to-left": {"@id":"sc:rightToLeftDirection", "@type":"sc:ViewingDirection"},
-    "top-to-bottom": {"@id":"sc:topToBottomDirection", "@type":"sc:ViewingDirection"},	        
-    "bottom-to-top": {"@id":"sc:bottomToTopDirection", "@type":"sc:ViewingDirection"},
-
-    "paged":         {"@id":"sc:pagedHint", "@type":"sc:ViewingHint"},
-    "non-paged":     {"@id":"sc:nonPagedHint", "@type":"sc:ViewingHint"},   
-    "continuous":    {"@id":"sc:continuousHint", "@type":"sc:ViewingHint"},
-    "individuals":   {"@id":"sc:individualsHint", "@type":"sc:ViewingHint"}, 
-    "top":           {"@id":"sc:topHint", "@type":"sc:ViewingHint"},
-
-    "motivation":  {"@type":"@id", "@id":"oa:motivatedBy"},
-    "resource":    {"@type":"@id", "@id":"oa:hasBody"},
-    "on":          {"@type":"@id", "@id":"oa:hasTarget"},
-    "full":        {"@type":"@id", "@id":"oa:hasSource"},
-    "selector":    {"@type":"@id", "@id":"oa:hasSelector"},
-    "stylesheet":  {"@type":"@id", "@id":"oa:styledBy"},
-    "style":       {"@id":"oa:styleClass"},
-
-    "default":     {"@type":"@id", "@id" : "oa:default"},
-    "item":        {"@type":"@id", "@id" : "oa:item"},
-    "chars":       {"@id": "cnt:chars"},
-    "encoding":    {"@id": "cnt:characterEncoding"},
-    "bytes":       {"@id": "cnt:bytes"},
-    "format":      {"@id": "dc:format"},
-    "language":    {"@id": "dc:language"},
-    "value":       {"@id": "rdf:value"},
-    "label":       {"@id": "rdfs:label"}
-}

data/lib/triannon/oa_context_20130208.json

@@ -1,53 +0,0 @@
-{
-	"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"
-}