imogen 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjdlYmVmMjIwZmFhMzNmYTdmMjNiOTFiYjM2ZjNmZTllMjYyZTRmMw==
+    YTc3NzAyOGZkYmNhYWIzYjNmM2VhNGQ1NzQ5M2E5M2I4ZTNiNWQ2OQ==
   data.tar.gz: !binary |-
-    YjU0NmU3NDdkZTE3YWI0NTdlMDUyMzhhYjk0OTI0ODI1YjIyYzAyYg==
+    NjJkMDQ4YTU1NmJlNTllMWZkNWI4ZDMwZjZkNmY4OGE1MDU2YzA0Mg==
 SHA512:
   metadata.gz: !binary |-
-    MWQ1ODU2NTE3OWRlN2MwZTNlOWYzYjQ0NmI0ZDhmNTBjZmMzMDdmZWYwNmMy
-    NDAwNzU4Y2RhMTE0MjBlYWIxMzg3ZGQxZWU0Yjc2MjU3ZjBhYzY5NjE2NGY4
-    YTAxNjAzZTBkZGNlZTYwYzZiM2Y0NzFlOWIxNTliOTYzZmEzN2Y=
+    YzZmODU5YzA2ODA5YmMyNzFkMTRkNWM2NjBlZmQ5NGY1OGFlMTZmMzEyZjU1
+    YTljZjY0M2EyNjJkYWI5ODYxYmMzY2FlNmNiZTBkY2JiYTYwOTNkNDQyNmM5
+    ZWVhOWM1YWE3ZTczYjc2YmFjZjlmZGVhMmZmMDViMDE1NDUzZWY=
   data.tar.gz: !binary |-
-    ZWE1ZjZiOGNjYzE3OWJlZjA5YWRlMWRlMDQzOWE2NTAxMzVmYjAzYmQ3M2Nm
-    NjVlZjY2NmY2YmE3NWU3MzE2NmQ2ZjhkNjYwMzY2ODA3MWQ3MzRkNTY5Mjg4
-    MDJjZDIxMzcyZjVmZTgwNDZiMTJiZjJhOTMzYjQ1MmU5YmRiNzY=
+    NTNkMTJiZmI0NGE4ZWY1YmYwOWI5OGEzYzQzODcyYmI1YjQ5ZDdiMGM2MTlk
+    MWM2YWE4YTRiOTc4ZmIxMzY3YzIyNzYxZDQ1NGI5YTE1YWFmZGJhOWU4MDVi
+    YmIwNzFkZDQ2ZGU3MDc1ZDE0YjRlOGY3YzU4OTRjZjhkOWEwZTY=

data/lib/imogen/iiif/size.rb

@@ -5,7 +5,7 @@ class Size < Transform
     if scale.nil? or scale.eql? "full"
       return nil
     end
-    if md = /^(\d+)?,(\d+)?$/.match(scale)
+    if md = /^[!]?(\d+)?,(\d+)?$/.match(scale)
       w = md[1] ? min(Integer(md[1]), @width) : nil
       h = md[2] ? min(Integer(md[2]), @height) : nil
       raise BadRequest.new("bad scale #{scale}") unless w or h
@@ -21,6 +21,15 @@ class Size < Transform
       raise BadRequest.new("bad size #{scale}")
     end
     raise BadRequest.new("bad size #{scale}") if e[0] <= 0 or e[1] <= 0
+    if scale.start_with? '!'
+      w_ratio = e[0].to_f / @width
+      h_ratio = e[1].to_f / @height
+      if w_ratio > h_ratio
+        e[0] = (@width * h_ratio).round
+      elsif h_ratio > w_ratio
+        e[1] = (@height * w_ratio).round
+      end
+    end
     return e
   end
   def self.convert(img, size)

data/spec/unit/imogen_iiif_size_spec.rb

@@ -34,6 +34,7 @@ describe Imogen::Iiif::Size, type: :unit do
     describe "with scaling width and height" do
       it "should calculate for a good value" do
         expect(subject.get("105,79")).to eql([105, 79])
+        expect(subject.get("105,105")).to eql([105, 105])
       end
       it "should not upscale" do
         expect(subject.get("350,262")).to eql([175, 131])
@@ -44,6 +45,9 @@ describe Imogen::Iiif::Size, type: :unit do
         expect{subject.get("0,262")}.to raise_error Imogen::Iiif::BadRequest
         expect{subject.get("0,262")}.to raise_error Imogen::Iiif::BadRequest
       end
+      it "should caculate for 'contained' Wh" do
+        expect(subject.get("!105,105")).to eql([105, 79])
+      end
     end
     describe "with a percentage scale" do
       it "should calculate for a good value" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imogen
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ben Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-opencv