triannon 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df73d4970ac16fd6e16ceaca420806ffcd734213
-  data.tar.gz: d2596bcef0e1f2f26004a5f6f856cd43062a6915
+  metadata.gz: 9a7823282b8cd47ddb17f44857294cfad6766d9d
+  data.tar.gz: cd3260e1d1f0a2d34b037cd859ece24db463eefc
 SHA512:
-  metadata.gz: d1771d459b311f7c97ea77f07a1ce04d2f18ce2d92d5765ca752d59b77a6acc52dee668d59d7259f14013c8dad3470a005b1ac1e04e013fda19aac3aa3f201f7
-  data.tar.gz: 0f6e883baa0961f8675a71f822759e81ac41f85f9730e59b9ecbe44a3cf0e6902db5eaad47d26764716a3ef95659c1a79904dae0358565985841f91c664bbca4
+  metadata.gz: 88a2eaa45c4eedf68f168b3077e767b6ec4a8e3278acba9a697e716ac05e7430e97b4608fc82e4d0a05c8cdb38908761a6cec8f16b6666d5ea1c89fa16753d03
+  data.tar.gz: c1ecd934d10e4dc3d8f2916aa74ebf0a46866597cbc07f5b715fe009524fce0cae1f5a4a318d1400e1b865b587c679c61e4c6d13575dfcb4de73a25b36c5fb1a

data/app/models/triannon/annotation.rb

@@ -43,47 +43,6 @@ module Triannon
       end
     end
 
-    def has_target
-      # FIXME:  target might be more than a string (examples 14-17)
-      if graph_exists?
-        q = self.class.anno_query.dup
-        q << [:s, RDF::OpenAnnotation.hasTarget, :target]
-        solution = graph.query q
-        if solution && solution.size > 0
-          targets = []
-          solution.each {|res|
-            targets << res.target.to_s
-          }
-          targets
-        # TODO:  raise exception if none?
-        end
-      end
-    end
-
-    def has_body
-      # FIXME:  body can be other things besides blank node with chars
-      bodies = []
-      if graph_exists?
-        q = self.class.anno_query.dup
-        q << [:s, RDF::OpenAnnotation.hasBody, :body]
-        # for chars content
-        # the following two lines are equivalent in identifying inline chars content
-        # q << [:body, RDF.type, RDF::Content.ContentAsText]
-        q << [:body, RDF::Content.chars, :chars]
-        # for non-chars content
-        # // non-embedded Text resource
-        #?body a dctypes:Text ;
-        #  dc:format "application/msword .
-        solution = graph.query q
-        if solution && solution.size > 0
-          solution.each {|res|
-            bodies << res.chars.to_s
-          }
-        end
-      end
-      bodies
-    end
-
     def motivated_by
       if graph_exists?
         q = self.class.anno_query.dup
@@ -107,6 +66,18 @@ module Triannon
     def graph= g
       @graph = g
     end
+    
+    # @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")
+    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")
+    end
 
     # query for a subject with type of RDF::OpenAnnotation.Annotation
     def self.anno_query
@@ -180,7 +151,7 @@ private
     end
 
     def json_oa_context
-      # FIXME:  this is a terrible place to do this!!
+      # FIXME:  this is a terrible place/way to see if we are running in the testing app!!
       if Rails.root.to_s.match(/internal/) # testing via engine_cart
         @json_oa_context ||= File.read(Rails.root.join("..", "..", "lib", "triannon", "oa_context_20130208.json"))
       else
@@ -189,7 +160,7 @@ private
     end
 
     def json_iiif_context
-      # FIXME:  this is a terrible place to do this!!
+      # FIXME:  this is a terrible place/way to see if we are running in the testing app!!
       if Rails.root.to_s.match(/internal/) # testing via engine_cart
         @json_oa_context ||= File.read(Rails.root.join("..", "..", "lib", "triannon", "iiif_presentation_2_context.json"))
       else

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

@@ -4,29 +4,24 @@
 <%= @annotation.url %>
 </p>
 <p>
-<strong>Target:</strong>
-<%= @annotation.has_target.map{|t| link_to(t, t)}.join(", ").html_safe %>
-</p>
-<p>
-<strong>Body (blank node with text):</strong>
-<% if @annotation.has_body.size > 0 -%>
-<%= @annotation.has_body.map{|b| "<pre>" + b + "</pre>"}.join.html_safe %>
-<% else %>
-(no body for this annotation)
-<% end -%>
-</p>
-<p>
 <strong>Motivated By:</strong>
-<%= @annotation.motivated_by.map{|m| link_to(m, m)}.join(", ").html_safe %>
+<%= @annotation.motivated_by.map{|m| link_to(m, m)}.join(", ").html_safe if @annotation.motivated_by %>
 </p>
 <p>
-<strong>Type:</strong>
-<%= link_to @annotation.type, @annotation.type %>
-</p>
 
 <strong>Turtle:</strong>
 <pre>
 <%= @annotation.graph.dump(:ttl) %>
 </pre>
 
+<strong>JSON-LD (OpenAnnotation context):</strong>
+<pre>
+<%= @annotation.jsonld_oa %>
+</pre>
+
+<strong>JSON-LD (IIIF context):</strong>
+<pre>
+<%= @annotation.jsonld_iiif %>
+</pre>
+
 <%= link_to "Back to List", annotations_path %>

data/lib/triannon/version.rb

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

metadata

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