triannon 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a7823282b8cd47ddb17f44857294cfad6766d9d
-  data.tar.gz: cd3260e1d1f0a2d34b037cd859ece24db463eefc
+  metadata.gz: c07f371ee48e9009a0939488713930cf86ceb374
+  data.tar.gz: 8c8fcd9dd0f6df80a1c254894cd34090a4f96bcc
 SHA512:
-  metadata.gz: 88a2eaa45c4eedf68f168b3077e767b6ec4a8e3278acba9a697e716ac05e7430e97b4608fc82e4d0a05c8cdb38908761a6cec8f16b6666d5ea1c89fa16753d03
-  data.tar.gz: c1ecd934d10e4dc3d8f2916aa74ebf0a46866597cbc07f5b715fe009524fce0cae1f5a4a318d1400e1b865b587c679c61e4c6d13575dfcb4de73a25b36c5fb1a
+  metadata.gz: d8a3a250a33f946a1c9704af4fcd554bacb7154fb804457de64df9d948a0210365c0072261bede0ac3c6904e732881a0a71811fdaaa05d3bede2f6144a497aa5
+  data.tar.gz: c86be08cdcab1acfc2a2ce32ffe6374ac0bac1813c715862f2d33c18d2e07b9400c84b311bfb22ca8e65701d3c5f1dd6f7360e323d4ba246c4bd1915f8f18e7e

data/app/controllers/triannon/annotations_controller.rb

@@ -42,8 +42,18 @@ module Triannon
 
     # POST /annotations/annotations
     def create
-      @annotation = Annotation.new(:data => request.body.read)
-
+      # FIXME: this is probably a bad way of allowing app form to be used as well as direct post requests
+      if params["annotation"]
+        # it's from app html form
+        params.require(:annotation).permit(:data)
+        if params["annotation"]["data"]
+          @annotation = Annotation.new({:data => params["annotation"]["data"]})
+        end
+      else
+        # it's a direct post request
+        @annotation = Annotation.new(:data => request.body.read)
+      end
+      
       if @annotation.save
         redirect_to @annotation, notice: 'Annotation was successfully created.'
       else
@@ -53,7 +63,7 @@ module Triannon
 
     # PATCH/PUT /annotations/annotations/1
     def update
-      if @annotation.update(annotation_params)
+      if @annotation.update(params)
         redirect_to @annotation, notice: 'Annotation was successfully updated.'
       else
         render :edit
@@ -71,7 +81,7 @@ module Triannon
       def set_annotation
         @annotation = Annotation.find(params[:id])
       end
-
+      
       def default_format_jsonld
         if ((!request.accept || request.accept.empty?) && (!params[:format] || params[:format].empty?))
           request.format = "jsonld"

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

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

data/lib/triannon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Chris Beer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails