riiif 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b43fe6591b40519b5eaf7678c4b732bcae87e79
-  data.tar.gz: 2c0d7e9b9e59f6e2886ab0830f3479bb09cabd29
+  metadata.gz: f5e8d0c868b034e0955aef6e76fe8e6b0944787a
+  data.tar.gz: 5e8e67c40d3804bd7d3852b10f1347493d110c5f
 SHA512:
-  metadata.gz: aed34ce6c02744acc1cc74ea0d66ec2361aaca0578bfb9e6cc9742826088ac2edc7bef6f4755247f808d266b1eb659fcd08821797e548e0d4728a291d09f1c85
-  data.tar.gz: 173080fd02eab35a999c52fdddf229ff416509c03471e0cdb666dfc5f26045fe6e2289cbbdcdbd22bc7210b481e3c1788b380930a98da2959a47aedc86a62df6
+  metadata.gz: b0f9f42f5a19abc877adba948c55b6e02ff5b03452d128df252823f65ac6c179e24e16885c9699550b4a86d09d5ddbed5463fc9b74ccccede4ea34d8adb49749
+  data.tar.gz: bb323cfe3324c38f2ebaffc0eec65044fd60c6fdd1cee9a0a3835f900ebec960f60402d770479ac716c8fdbfe254e556a3a2953d3cce6b4d3b94a342eee44ee1

data/README.md

@@ -87,6 +87,9 @@ ImageMagick must be installed with jasper support
 ```bash
 brew install imagemagick --with-jasper # if using Homebrew
 ```
+It appears that as of imagemagick 6.8.8 you have to use openjpeg2 instead of jasper:
+http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=25357#p109912
+This doesn't appear to be possible on homebrew until this ticket gets closed: https://github.com/Homebrew/homebrew/issues/28153
 
 Run the tests
 ```bash

data/app/models/riiif/image.rb

@@ -11,7 +11,7 @@ module Riiif
     # example:
     #   {:height=>390, :width=>600}
     self.info_service = lambda do |id, image|
-      Rails.cache.fetch(Image.cache_key(id, { info: true }), compress: true, expires_in: 3.days) do
+      Rails.cache.fetch(cache_key(id, { info: true }), compress: true, expires_in: expires_in) do
         image.info
       end
     end
@@ -29,7 +29,7 @@ module Riiif
 
     def render(args)
       options = decode_options!(args)
-      Rails.cache.fetch(Image.cache_key(id, options), compress: true, expires_in: 3.days) do
+      Rails.cache.fetch(Image.cache_key(id, options), compress: true, expires_in: Image.expires_in) do
         image.extract(options)
       end
     end
@@ -38,10 +38,17 @@ module Riiif
       info_service.call(id, image)
     end
 
-    def self.cache_key(id, options)
-      str = options.merge(id: id).delete_if {|_, v| v.nil?}.to_s
-      # Use a MD5 digest to ensure the keys aren't too long.
-      Digest::MD5.hexdigest(str)
+    class << self
+      def expires_in
+        Riiif::Engine.config.cache_duration_in_days.days
+      end
+
+
+      def cache_key(id, options)
+        str = options.merge(id: id).delete_if {|_, v| v.nil?}.to_s
+        # Use a MD5 digest to ensure the keys aren't too long.
+        Digest::MD5.hexdigest(str)
+      end
     end
 
     private

data/lib/riiif/engine.rb

@@ -1,5 +1,8 @@
 module Riiif
   class Engine < ::Rails::Engine
     isolate_namespace Riiif
+
+    # How long to cache the tiles for.
+    config.cache_duration_in_days = 3
   end
 end

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler