riiif 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a1934121b4a1108f275c5a0331519770bb408eb
-  data.tar.gz: eb9d3f833d1e77fe46421a754a2d8365eb081102
+  metadata.gz: 30f471dbabbb6d626cbc8477de2490b0ed732b8e
+  data.tar.gz: de3732ff0b0d71d96474e650fc1e72df8564e772
 SHA512:
-  metadata.gz: 848a8082a7768d0011f3e13dedebd36987aebbf5fef0c77103f0847539550066a84bac07f526689a80bd2b2d6fbd09b31c0eb9b19b732fec06dcfa3d4512a6d2
-  data.tar.gz: 58b1a338bf60c86fbba8b53fe7f340bab83d8a28bce65d7a84e2fab82bc2c79440340e498a1e52c248e7e5e5286dd3486a29638551298170a1d19d78e3958893
+  metadata.gz: b704b4e3a0c8fbda79a78b040f1d6dec12db688932ccdbfdaa8ce7b74419aa1a152930d6e2e7eeec2dfbaa51d52b77853651381a4709cb4f50164428f60f5092
+  data.tar.gz: 711c3a7639ac468462b88fbabe5840f0a6fe6c2bedd51a300bbd19404ff8dffca8a29d585a365a59cbe41db9fd4c453b4a91e84cf531a74172acab6fa11238c2

data/app/models/riiif/image.rb

@@ -99,6 +99,17 @@ module Riiif
           "#{md[3]}%x#{md[4]}+#{offset_x}+#{offset_y}"
         elsif md = /^(\d+),(\d+),(\d+),(\d+)$/.match(region)
           "#{md[3]}x#{md[4]}+#{md[1]}+#{md[2]}"
+        elsif region == 'square'
+          w = info[:width]
+          h = info[:height]
+          min, max = [w, h].minmax
+
+          offset = (max - min) / 2
+          if h >= w
+            "#{min}x#{min}+0+#{offset}"
+          else
+            "#{min}x#{min}+#{offset}+0"
+          end
         else
           raise InvalidAttributeError, "Invalid region: #{region}"
         end

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/spec/models/riiif/image_spec.rb

@@ -75,6 +75,11 @@ describe Riiif::Image do
         expect(subject.image).to receive(:execute).with("convert -crop 80%x70+18+13 #{filename} png:-")
         subject.render(region: 'pct:10,10,80,70', format: 'png')
       end
+      it 'handles square geometry' do
+        expect(subject.image).to receive(:execute).with("identify -format %hx%w #{filename}").and_return('131x175')
+        expect(subject.image).to receive(:execute).with("convert -crop 131x131+22+0 #{filename} png:-")
+        subject.render(region: 'square', format: 'png')
+      end
       it 'raises an error for invalid geometry' do
         expect { subject.render(region: '150x75', format: 'png') }.to raise_error Riiif::InvalidAttributeError
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails