triannon 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: feb01d17b07570a2f93644aa4f630272df6281f8
-  data.tar.gz: 707da73463f69cc9f28b0f6fafe8b6e0d94d1756
+  metadata.gz: fe781b6ecd92bc4a8862c0be6d1d16964be6a197
+  data.tar.gz: afde4024d9b2fb317f359c99a3cc2828de69bca7
 SHA512:
-  metadata.gz: a89db206c12919c93630d4377ac6204583c042bfae99379ad73c3ff0da2a3e61bbace6306f4c47853da3fd018893a0d487eeabbf02c2ff7ef4599b770754795c
-  data.tar.gz: c29ddde43c40c2e536140c41f67019957632da471b1449d5dbe3a5c6d5904f3a0b9d5e97520146d07e76f38fadf0c6e2b193396953effe05a3cf1d4a00817d8d
+  metadata.gz: 9f56d27f5281ab3fe37705bc0314a612c2f4c81f4c8556018e21cf78234417b555049cd75ef3448d50367be654eee261d6892bbaef9d60decfce657627495742
+  data.tar.gz: b1e61108016b1c7e348e27aad4e85f799f02fc91a1a056c754eca8ecbd996944cf21321cb898f21729fa817f6efd439fc435fc5715c5a0dc0a8699230742b540

data/config/routes.rb

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

data/lib/triannon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Chris Beer