riiif 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea7c70b11b5f293a13b1518eaad32036f450189
-  data.tar.gz: 26af68981801093f8d7a0f0e7b4f4aaf4d1cb14f
+  metadata.gz: 5b43fe6591b40519b5eaf7678c4b732bcae87e79
+  data.tar.gz: 2c0d7e9b9e59f6e2886ab0830f3479bb09cabd29
 SHA512:
-  metadata.gz: 619d7dd008484a2cb62d18d0a21d9e015d7d3a2c3b04065f3859eb59bf9857007b7768e2e1898f53b9795eff11f98eadeb0aef4be694d533a8ec1d822f5f70cc
-  data.tar.gz: 31a0d174c238ad6177b887028370665cb9e61dcf02522843a71be121e97ac88b2069ddab733b6e87d414332cb57eb53cb40de32bc35bc1d5c5a62b178b4280ae
+  metadata.gz: aed34ce6c02744acc1cc74ea0d66ec2361aaca0578bfb9e6cc9742826088ac2edc7bef6f4755247f808d266b1eb659fcd08821797e548e0d4728a291d09f1c85
+  data.tar.gz: 173080fd02eab35a999c52fdddf229ff416509c03471e0cdb666dfc5f26045fe6e2289cbbdcdbd22bc7210b481e3c1788b380930a98da2959a47aedc86a62df6

data/app/models/riiif/image.rb

@@ -2,9 +2,20 @@ require 'digest/md5'
 module Riiif
   class Image
     
-    class_attribute :file_resolver
+    class_attribute :file_resolver, :info_service
     self.file_resolver = FileSystemFileResolver
 
+    # this is the default info service
+    # returns a hash with the original image dimensions.
+    # You can set your own lambda if you want different behavior
+    # 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
+        image.info
+      end
+    end
+
     OUTPUT_FORMATS = %W{jpg png}
 
     attr_reader :id, :image
@@ -23,7 +34,9 @@ module Riiif
       end
     end
 
-    delegate :info, to: :image
+    def info
+      info_service.call(id, image)
+    end
 
     def self.cache_key(id, options)
       str = options.merge(id: id).delete_if {|_, v| v.nil?}.to_s

data/config/routes.rb

@@ -1,8 +1,11 @@
 Riiif::Engine.routes.draw do
   ALLOW_DOTS ||= /[\w.]+/
   SIZES ||= /(pct:)?[\w.,]+/
-  get "/:id/:region/:size/:rotation/:quality(.:format)" => "images#show", 
-    constraints: { rotation: ALLOW_DOTS, size: SIZES}
+  get "/:id/:region/:size/:rotation/:quality.:format" => "images#show",
+    constraints: { rotation: ALLOW_DOTS, size: SIZES },
+    defaults: { format: 'jpg', rotation: '0', region: 'full', quality: 'native' },
+    as: 'image'
+
   get "/:id/info.json" => "images#info", defaults: { format: 'json' }, as: 'info'
   get "/:id/view(.:format)" => "images#view"
 end

data/lib/riiif/version.rb

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

data/spec/routing/resize_routes_spec.rb

@@ -33,6 +33,16 @@ describe "routes" do
                     region: 'full', size: 'full', rotation: '0', 
                     quality: 'native', format: 'jpg')
     end
+
+    describe "route helper" do
+      it "takes all the options" do
+        expect(image_path('abcd1234', region: 'full', size: '100,50', rotation: '22.5', quality: 'native',
+                          format: 'jpg')).to eq '/image-service/abcd1234/full/100,50/22.5/native.jpg'
+      end
+      it "has defaults" do
+        expect(image_path('abcd1234', size: '100,50')).to eq '/image-service/abcd1234/full/100,50/0/native.jpg'
+      end
+    end
   end
 
   describe "for info" do

metadata

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