annotot 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acb7f756f361431eb365f9c7fe77febc9a5cc306
-  data.tar.gz: 69bf28e6148de3a0bfb2cb90c446df5662d18052
+  metadata.gz: ac87d8c015fd3899dbc19d4c0fa12a86903c0344
+  data.tar.gz: e2afe1764a6066501ce6188da467347a1616bb91
 SHA512:
-  metadata.gz: b49b9693b0354745d0ff550281c7980ce53a45d7c530a5f5a86998a28a4e48796c97311412275b432d11f788d350217d3729b22db5df9b209cd4e4d98c61546d
-  data.tar.gz: f7d3ed313d39d68a90bdea0231872de99ea5535701240ea2528676e12b61874839d675515384a12db1e6756739449bb1f1313388bd1614712c5e1c2d972de572
+  metadata.gz: 1768923be84227b0a0e3ddf14f030700bc087912522ea8a5228ad4ac3839061a8e5521c8ce75ae62b931ffdfc4d7f21ff6519fff567a47314702823c509926fa
+  data.tar.gz: adee2f5434e7df3ca0f4aa68ce7cdb0850909aa6fa0b4256dd572d3e661ddcc0ce25cad88357712cafad374196383be7e05806d992750a6bd81529c3a250953f

data/app/assets/javascripts/annotot/annotot_endpoint.js

@@ -31,7 +31,7 @@
     search: function(options, successCallback, errorCallback) {
       var _this = this;
       _this.annotationsList = [];
-      options.format = 'json'
+      options.format = 'json';
 
       jQuery.ajax({
         url: _this.endpoint,
@@ -89,8 +89,8 @@
     update: function(oaAnnotation, successCallback, errorCallback) {
       var _this = this;
       var annotation = _this.getAnnotationInEndpoint(oaAnnotation);
-      
-      var annotationID = annotation.annotation['uuid'];
+
+      var annotationID = annotation.annotation.uuid;
 
       jQuery.ajax({
         url: _this.endpoint + '/' + encodeURIComponent(annotationID),
@@ -158,13 +158,15 @@
     // Converts OA Annotation to endpoint format
     getAnnotationInEndpoint: function(oaAnnotation) {
       // Generate a new uuid if one is not present
-      if (oaAnnotation['@id'] == null) {
+      // condition needs to be set to check for "falsy" values
+      // !oaAnnotation['@id'] should match null and undefined
+      if (!oaAnnotation['@id']) {
         oaAnnotation["@id"] = Mirador.genUUID();
       }
-      
+
       canvas = oaAnnotation.on[0].full;
       var newAnno = jQuery.extend({}, oaAnnotation);
-      delete newAnno.endpoint
+      delete newAnno.endpoint;
       return {
         annotation: {
           uuid: oaAnnotation["@id"],

data/app/controllers/annotot/annotations_controller.rb

@@ -50,7 +50,9 @@ module Annotot
     private
 
     def set_annotation
-      @annotation = Annotation.find_by(id: CGI.unescape(params[:id])) || Annotation.find_by(uuid: CGI.unescape(params[:id]))
+      @annotation = Annotot::Annotation.retrieve_by_id_or_uuid(
+        CGI.unescape(params[:id])
+      )
       raise ActiveRecord::RecordNotFound unless @annotation.present?
     end
 

data/app/controllers/annotot/application_controller.rb

@@ -1,5 +1,5 @@
 module Annotot
   class ApplicationController < ActionController::Base
-    protect_from_forgery
+    protect_from_forgery with: :exception, unless: -> { request.format.json? }
   end
 end

data/app/models/annotot/annotation.rb

@@ -4,5 +4,17 @@ module Annotot
     validates :canvas, presence: true
 
     serialize :data, JSON
+
+    ##
+    # Used to differentiate between a numeric id and a uuid. Rails will trim a
+    # uuid with leading numbers eg '123a'.to_i => 123
+    # @param [String] identifier
+    def self.retrieve_by_id_or_uuid(identifier)
+      if identifier =~ /\A\d+\z/
+        find_by(id: identifier)
+      else
+        find_by(uuid: identifier)
+      end
+    end
   end
 end

data/lib/annotot/version.rb

@@ -1,3 +1,3 @@
 module Annotot
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: annotot
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jack Reed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails