riiif 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2267ef01c3a2abbf3991710ef5c4c9f6ac55500c
-  data.tar.gz: 13fc80e6e72c789bac048f66fc020d8a0cb2e314
+  metadata.gz: 905d7f9639fc63f7764759b985ea235a4e369645
+  data.tar.gz: e73244b575876cd67008082a497a5cc9d339777f
 SHA512:
-  metadata.gz: 0d45589ca6d5e13de6d7a40a61b09c48e9d062118c1845d9fd786e7d8f5066980d9e1adb8d1a4b1df7b419a6729248fec8bc8ea6338d0e9216324a94d9cec7eb
-  data.tar.gz: 64600eb8e05f1f613b7a039ed6c25b36f5f87d75f1993b9dad667ae3eea9e47e5fe9b66200ef4a03f3fc96862e307cdc2adf936e69609206e02cd4014562553b
+  metadata.gz: f4e8952000bb0374601d4b6d33e4d5428d721c69f30ef8bf5400e86021a4ce8214e764858401eb74779fe69380f51201ff968a3b678ae879caa7b066e2c7d77c
+  data.tar.gz: 4b46ed4fd0b9d004123b7fd181702a89f25019a9c891b6573b891ca0c6b0c1432a5814963b65d6cc4a25f63df8c84d7be2027d05e71c12efd6cd9db961237652

data/app/models/riiif/image.rb

@@ -1,3 +1,4 @@
+require 'digest/md5'
 module Riiif
   class Image
     
@@ -16,7 +17,10 @@ module Riiif
 
     def render(args)
       options = decode_options!(args)
-      Rails.cache.fetch(options.merge(id: id), compress: true, expires_in: 3.days) do
+      # Use a MD5 digest to ensure the keys aren't too long.
+      digest = Digest::MD5.hexdigest(options.merge(id: id).to_s)
+      puts digest
+      Rails.cache.fetch(digest, compress: true, expires_in: 3.days) do
         image.extract(options)
       end
     end

data/app/views/riiif/images/view.html.erb

@@ -6,9 +6,9 @@
             prefixUrl: "/assets/openseadragon/",
             tileSources:   [{
             "image_host":     "http://localhost:8080/image-service",
-            "identifier":   "irises",   
-            "width":        4264,   
-            "height":       3282,   
+            "identifier":   "<%= @image.id %>",   
+            "width":        <%= @image.info[:width] %>,   
+            "height":       <%= @image.info[:height] %>,   
             "scale_factors": [1, 2, 3, 4, 5],   
             "tile_width":   1024,   
             "tile_height":  1024,   

data/config/routes.rb

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

data/lib/riiif/file_system_file_resolver.rb

@@ -12,7 +12,7 @@ module Riiif
     end
 
     def self.pattern(id)
-      raise ArgumentException, "Invalid characters in id `#{id}`" unless /^\w+$/.match(id)
+      raise ArgumentException, "Invalid characters in id `#{id}`" unless /^[\w-]+$/.match(id)
       ::File.join(base_path, "#{id}.{#{input_types.join(',')}}")
     end
 

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/models/file_system_file_resolver_spec.rb

@@ -8,4 +8,8 @@ describe Riiif::FileSystemFileResolver do
   it "should get the jpeg2000 file" do
     expect(subject.find('world')).to eq Riiif::FileSystemFileResolver.root + '/spec/samples/world.jp2'
   end
+
+  it "should accept ids with dashes" do
+    subject.pattern('foo-bar-baz')
+  end
 end

data/spec/routing/resize_routes_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "routes" do
   routes { Riiif::Engine.routes }
 
-  describe 'for mogrification' do
+  describe 'for conversion' do
     it "routes GET /abcd1234/full/full/0/native.jpg" do
       expect(
         get: "/abcd1234/full/full/0/native.jpg"
@@ -12,13 +12,27 @@ describe "routes" do
                     quality: 'native', format: 'jpg')
     end
 
-    it "routes requests with dots" do
+    it "routes requests with floating point percent size" do
       expect(
         get: "/abcd1234/full/pct:12.5/22.5/native.jpg"
       ).to route_to(controller: "riiif/images", id: 'abcd1234', action: "show", 
                     region: 'full', size: 'pct:12.5', rotation: '22.5', 
                     quality: 'native', format: 'jpg')
     end
+    it "routes requests with pixel size" do
+      expect(
+        get: "/abcd1234/full/100,50/22.5/native.jpg"
+      ).to route_to(controller: "riiif/images", id: 'abcd1234', action: "show", 
+                    region: 'full', size: '100,50', rotation: '22.5', 
+                    quality: 'native', format: 'jpg')
+    end
+    it "routes requests with dashes in the id" do
+      expect(
+        get: "/abcd-1234-5678/full/full/0/native.jpg"
+      ).to route_to(controller: "riiif/images", id: 'abcd-1234-5678', action: "show", 
+                    region: 'full', size: 'full', rotation: '0', 
+                    quality: 'native', format: 'jpg')
+    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.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler