triannon 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c07f371ee48e9009a0939488713930cf86ceb374
-  data.tar.gz: 8c8fcd9dd0f6df80a1c254894cd34090a4f96bcc
+  metadata.gz: feb01d17b07570a2f93644aa4f630272df6281f8
+  data.tar.gz: 707da73463f69cc9f28b0f6fafe8b6e0d94d1756
 SHA512:
-  metadata.gz: d8a3a250a33f946a1c9704af4fcd554bacb7154fb804457de64df9d948a0210365c0072261bede0ac3c6904e732881a0a71811fdaaa05d3bede2f6144a497aa5
-  data.tar.gz: c86be08cdcab1acfc2a2ce32ffe6374ac0bac1813c715862f2d33c18d2e07b9400c84b311bfb22ca8e65701d3c5f1dd6f7360e323d4ba246c4bd1915f8f18e7e
+  metadata.gz: a89db206c12919c93630d4377ac6204583c042bfae99379ad73c3ff0da2a3e61bbace6306f4c47853da3fd018893a0d487eeabbf02c2ff7ef4599b770754795c
+  data.tar.gz: c29ddde43c40c2e536140c41f67019957632da471b1449d5dbe3a5c6d5904f3a0b9d5e97520146d07e76f38fadf0c6e2b193396953effe05a3cf1d4a00817d8d

data/app/controllers/triannon/annotations_controller.rb

@@ -14,7 +14,7 @@ module Triannon
     # GET /annotations/annotations/1
     def show
       respond_to do |format|
-        format.jsonld { render :json => @annotation.graph.to_jsonld }
+        format.jsonld { render_jsonld_per_context (params[:jsonld_context]) }
         format.ttl {
           accept_return_type = mime_type_from_accept(["application/x-turtle", "text/turtle"])
           render :body => @annotation.graph.to_ttl, content_type: accept_return_type if accept_return_type }
@@ -23,7 +23,7 @@ module Triannon
           render :body => @annotation.graph.to_rdfxml, content_type: accept_return_type if accept_return_type }
         format.json {
           accept_return_type = mime_type_from_accept(["application/json", "text/x-json", "application/jsonrequest"])
-          render :json => @annotation.graph.to_jsonld, content_type: accept_return_type if accept_return_type }
+          render_jsonld_per_context(params[:jsonld_context], accept_return_type) }
         format.xml {
           accept_return_type = mime_type_from_accept(["application/xml", "text/xml", "application/x-xml"])
           render :xml => @annotation.graph.to_rdfxml, content_type: accept_return_type if accept_return_type }
@@ -36,9 +36,10 @@ module Triannon
       @annotation = Annotation.new
     end
 
-    # GET /annotations/annotations/1/edit
-    def edit
-    end
+    # NOT YET IMPLEMENTED
+    # GET /annotations/annotations/1/edit    
+#    def edit
+#    end
 
     # POST /annotations/annotations
     def create
@@ -61,14 +62,15 @@ module Triannon
       end
     end
 
+    # NOT YET IMPLEMENTED
     # PATCH/PUT /annotations/annotations/1
-    def update
-      if @annotation.update(params)
-        redirect_to @annotation, notice: 'Annotation was successfully updated.'
-      else
-        render :edit
-      end
-    end
+#    def update
+#      if @annotation.update(params)
+#        redirect_to @annotation, notice: 'Annotation was successfully updated.'
+#      else
+#        render :edit
+#      end
+#    end
 
     # DELETE /annotations/annotations/1
     def destroy
@@ -106,5 +108,31 @@ module Triannon
       def ext_ref_error(exception)
         render plain: exception.message, status: 403
       end
+      
+      # render json_ld respecting requested context
+      # @param [String] req_context set to "iiif" or "oa".  Default is OA
+      # @param [String] mime_type the mime type to be set in the Content-Type header of the HTTP response
+      def render_jsonld_per_context (req_context, mime_type=nil)
+        case req_context
+          when "iiif", "IIIF"
+            if mime_type
+              render :json => @annotation.jsonld_iiif, content_type: mime_type
+            else
+              render :json => @annotation.jsonld_iiif
+            end
+          when "oa", "OA"
+            if mime_type
+              render :json => @annotation.jsonld_oa, content_type: mime_type
+            else
+              render :json => @annotation.jsonld_oa
+            end
+          else
+            if mime_type
+              render :json => @annotation.jsonld_oa, content_type: mime_type
+            else
+              render :json => @annotation.jsonld_oa
+            end
+        end 
+      end
   end
 end

data/app/models/triannon/annotation.rb

@@ -70,13 +70,17 @@ module Triannon
     # @return json-ld representation of graph with OpenAnnotation context as a url
     def jsonld_oa
       inline_context = graph.dump(:jsonld, :context => "http://www.w3.org/ns/oa.jsonld")
-      inline_context.sub(/@context.*@graph/m, "@context\": \"http://www.w3.org/ns/oa.jsonld\",\n  \"@graph")
+      hash_from_json = JSON.parse(inline_context)
+      hash_from_json["@context"] = "http://www.w3.org/ns/oa.jsonld"
+      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 => "http://iiif.io/api/presentation/2/context.json")
-      inline_context.sub(/@context.*@graph/m, "@context\": \"http://iiif.io/api/presentation/2/context.json\",\n  \"@graph")
+      hash_from_json = JSON.parse(inline_context)
+      hash_from_json["@context"] = "http://iiif.io/api/presentation/2/context.json"
+      hash_from_json.to_json
     end
 
     # query for a subject with type of RDF::OpenAnnotation.Annotation
@@ -122,7 +126,7 @@ private
       if data
         data.strip!
         case data
-          when /\A\{.+\}\Z/m
+          when /\A\{.+\}\Z/m  # (Note:  \A and \Z and m are needed instead of ^$ due to \n in data)
             g ||= RDF::Graph.new << JSON::LD::API.toRdf(json_ld) if json_ld
             self.data = g.dump(:ttl) if g
           when /\A<.+>\Z/m # (Note:  \A and \Z and m are needed instead of ^$ due to \n in data)
@@ -138,7 +142,7 @@ private
       end
       g
     end
-
+    
     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\"", json_oa_context)

data/config/routes.rb

@@ -1,5 +1,18 @@
 Triannon::Engine.routes.draw do
   root to: 'annotations#index'
 
-  resources :annotations
+  # show action must explicitly forbid "iiif" or "oa" as id values;  couldn't
+  #  figure out how to do it with regexp constraint since beginning and end 
+  #  matchers aren't allowed when enforcing formats for segment (e.g. :id)
+  get '/annotations/:id(.:format)', to: 'annotations#show', 
+    constraints: lambda { |request| 
+                            id = request.env["action_dispatch.request.path_parameters"][:id]
+                            id !~ /^iiif$/ && id !~ /^oa$/ 
+                        }
+
+  resources :annotations, :except => [:update, :edit, :show]
+
+  # allow jsonld context in path
+  get '/annotations/:jsonld_context/:id(.:format)', to: 'annotations#show', jsonld_context: /iiif|oa/
+  
 end

data/lib/triannon/version.rb

@@ -1,3 +1,3 @@
 module Triannon
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Chris Beer
 - Naomi Dushay
+- Willy Mene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0.rc1
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -109,20 +110,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -253,6 +240,7 @@ description:
 email:
 - cabeer@stanford.edu
 - ndushay@stanford.edu
+- wmene@stanford.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -315,5 +303,5 @@ rubyforge_project:
 rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: Rails engine for working with storage of OpenAnnotations stored in Fedora4
+summary: Rails engine for working with OpenAnnotations stored in Fedora4
 test_files: []