triannon 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe781b6ecd92bc4a8862c0be6d1d16964be6a197
-  data.tar.gz: afde4024d9b2fb317f359c99a3cc2828de69bca7
+  metadata.gz: ec5c63fec8ee04d1f247c4804a3227b6b3171bac
+  data.tar.gz: b56c06505be1f81eba22e490c139f526bface06a
 SHA512:
-  metadata.gz: 9f56d27f5281ab3fe37705bc0314a612c2f4c81f4c8556018e21cf78234417b555049cd75ef3448d50367be654eee261d6892bbaef9d60decfce657627495742
-  data.tar.gz: b1e61108016b1c7e348e27aad4e85f799f02fc91a1a056c754eca8ecbd996944cf21321cb898f21729fa817f6efd439fc435fc5715c5a0dc0a8699230742b540
+  metadata.gz: a25814d29d28ed25b89b87f994afb2fb61ad308ad2079758d5e25c4ce4cf7c0378c0b53c89b9c60e04045c4febe9a362b1ab7d3a1a2b55b3b527ef3fa5c2c398
+  data.tar.gz: dd50677466ed2e149ef98db1d2591bf98fac050b9e6ac323763ff6e5a8d0385057b705e4fa63cec128d9b497c6570335c189246b92bface4d1497a59bd0c400b

data/app/models/triannon/annotation.rb

@@ -69,17 +69,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 = graph.dump(:jsonld, :context => Triannon::JsonldContext::OA_CONTEXT_URL)
       hash_from_json = JSON.parse(inline_context)
-      hash_from_json["@context"] = "http://www.w3.org/ns/oa.jsonld"
+      hash_from_json["@context"] = Triannon::JsonldContext::OA_CONTEXT_URL
       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 = graph.dump(:jsonld, :context => Triannon::JsonldContext::IIIF_CONTEXT_URL)
       hash_from_json = JSON.parse(inline_context)
-      hash_from_json["@context"] = "http://iiif.io/api/presentation/2/context.json"
+      hash_from_json["@context"] = Triannon::JsonldContext::IIIF_CONTEXT_URL
       hash_from_json.to_json
     end
 
@@ -145,33 +145,15 @@ private
     
     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.sub!("\"http://www.w3.org/ns/oa-context-20130208.json\"", Triannon::JsonldContext.oa_context)
       elsif data.match(/"@context"\s*\:\s*"http\:\/\/www\.w3\.org\/ns\/oa\.jsonld"/)
-        data.sub!("\"http://www.w3.org/ns/oa.jsonld\"", json_oa_context)
+        data.sub!("\"http://www.w3.org/ns/oa.jsonld\"", Triannon::JsonldContext.oa_context)
       elsif data.match(/"@context"\s*\:\s*"http\:\/\/iiif\.io\/api\/presentation\/2\/context\.json"/)
-        data.sub!("\"http://iiif.io/api/presentation/2/context.json\"", json_iiif_context)
+        data.sub!("\"http://iiif.io/api/presentation/2/context.json\"", Triannon::JsonldContext.iiif_context)
       end
       @json_ld ||= JSON.parse(data) rescue nil
     end
 
-    def json_oa_context
-      # 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
-        @json_oa_context ||= File.read(Rails.root.join("lib", "triannon", "oa_context_20130208.json"))
-      end
-    end
-
-    def json_iiif_context
-      # 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
-        @json_oa_context ||= File.read(Rails.root.join("lib", "triannon", "iiif_presentation_2_context.json"))
-      end
-    end
-
     def graph_exists?
       graph && graph.size > 0
     end

data/lib/triannon.rb

@@ -10,6 +10,7 @@ require 'faraday'
 module Triannon
   require "triannon/engine"
   require "triannon/error"
+  require "triannon/jsonld_context"
 
   class << self
     attr_accessor :config

data/lib/triannon/jsonld_context.rb

@@ -0,0 +1,21 @@
+module Triannon
+  class JsonldContext
+    
+    OA_CONTEXT_URL = "http://www.w3.org/ns/oa.jsonld"
+
+    OA_DATED_CONTEXT_URL = "http://www.w3.org/ns/oa-context-20130208.json"
+    
+    IIIF_CONTEXT_URL = "http://iiif.io/api/presentation/2/context.json"
+
+    # a crude way of locally caching context so we don't hammer w3c server for every jsonld parse
+    def self.oa_context
+      @@oa_context ||= File.read(File.dirname(__FILE__) + "/oa_context_20130208.json")
+    end
+
+    # a crude way of locally caching context so we don't hammer server for every jsonld parse
+    def self.iiif_context
+      @@iiif_context ||= File.read(File.dirname(__FILE__) + "/iiif_presentation_2_context.json")
+    end
+     
+  end
+end

data/lib/triannon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: triannon
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Chris Beer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -278,6 +278,7 @@ files:
 - lib/triannon/engine.rb
 - lib/triannon/error.rb
 - lib/triannon/iiif_presentation_2_context.json
+- lib/triannon/jsonld_context.rb
 - lib/triannon/oa_context_20130208.json
 - lib/triannon/version.rb
 homepage: