imogen 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTc3NzAyOGZkYmNhYWIzYjNmM2VhNGQ1NzQ5M2E5M2I4ZTNiNWQ2OQ==
+    YmIyN2FkZGFmNTc2MTdhMDljZDMxOWRjMDgxMmFkOGVhZDBkYmVhNQ==
   data.tar.gz: !binary |-
-    NjJkMDQ4YTU1NmJlNTllMWZkNWI4ZDMwZjZkNmY4OGE1MDU2YzA0Mg==
+    ODIyZmQ0NWM5ZGRjY2Y2MDY4NzY3NmQ4ZDEwMDVlNDM3OGQxNTY4Zg==
 SHA512:
   metadata.gz: !binary |-
-    YzZmODU5YzA2ODA5YmMyNzFkMTRkNWM2NjBlZmQ5NGY1OGFlMTZmMzEyZjU1
-    YTljZjY0M2EyNjJkYWI5ODYxYmMzY2FlNmNiZTBkY2JiYTYwOTNkNDQyNmM5
-    ZWVhOWM1YWE3ZTczYjc2YmFjZjlmZGVhMmZmMDViMDE1NDUzZWY=
+    MmVhYjFmYmUwNmJkMGZhZjM3MjU4ZTkyNDNhOWI5N2U1ZGI5ZDA3ZTJhNTFm
+    MjZlYWU4YjI3MjdlNjRlYjIyZmM3YzhlYTk4M2RkMDYyY2NlYTVkMmQyOTAz
+    NzA5YzQwZjgwMTFmOWFlM2MwNDRiZWJjMzQwNTgxMjk5YzI2MjM=
   data.tar.gz: !binary |-
-    NTNkMTJiZmI0NGE4ZWY1YmYwOWI5OGEzYzQzODcyYmI1YjQ5ZDdiMGM2MTlk
-    MWM2YWE4YTRiOTc4ZmIxMzY3YzIyNzYxZDQ1NGI5YTE1YWFmZGJhOWU4MDVi
-    YmIwNzFkZDQ2ZGU3MDc1ZDE0YjRlOGY3YzU4OTRjZjhkOWEwZTY=
+    ZjRmNzUwZGZmM2RmOGI1ZmExNWIwZTk4MmNlNTE4YjNiN2UwZWZkYzBhNDc4
+    N2EwNmQyYTg1MDNlNDE1M2YyNzRjZjBlOTY4ZDA1MjUwMDljNjJmYzVmNTEw
+    MDhmYmU2ODM0OGIwYzRhNjliMzQ2YjVjNjQ5NjUyNGUxYzMzYjY=

data/lib/imogen/iiif.rb

@@ -21,11 +21,11 @@ module Imogen
       end
     end
     module Quality
-      VALUES = [:native, :color, :grey, :bitonal]
+      VALUES = {native: nil, default: nil, color: nil, bitonal: :bitonal, grey: :grey, gray: :grey}
       def self.get(quality=:native)
         q = (quality || :native).to_sym
         raise BadRequest.new("bad quality #{quality}") unless VALUES.include? q
-        return (q == :native or q == :color) ? nil : q
+        return VALUES[q]
       end
       def self.convert(img, quality)
         q = get(quality)

data/lib/imogen/iiif/region.rb

@@ -5,8 +5,10 @@ module Iiif
 class Region < Transform
   # returns leftX, topY, rightX, bottomY
   def get(region=nil)
-    if region.nil? || region == 'full'
+    if region.nil? || region.to_s == 'full'
       return nil
+    elsif region.to_s == 'featured'
+      return :featured
     elsif md = /^pct:(\d+(\.\d+)?),(\d+(\.\d+)?),(\d+(\.\d+)?),(\d+(\.\d+)?)$/.match(region)
       p = [Float(md[1]),Float(md[3]),Float(md[5]),Float(md[7])]
       if p[0] == p[2] or p[1] == p[3]
@@ -42,10 +44,18 @@ class Region < Transform
   end
   def self.convert(img, region)
     edges = Region.new(img).get(region)
-    if edges
-      img.copy(*edges) {|crop| yield crop}
-    else
+    if edges.nil?
       yield img
+    else
+      if edges == :featured
+        frame = Imogen::AutoCrop::Edges.new(img)
+        begin
+          edges = frame.get([img.width, img.height,768].min)
+        ensure
+          frame.unlink
+        end
+      end
+      img.copy(*edges) {|crop| yield crop}
     end
   end
 end

data/spec/unit/imogen_iiif_quality_spec.rb

@@ -0,0 +1,20 @@
+require 'imogen/iiif'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+describe Imogen::Iiif::Quality, type: :unit do
+  before(:all) do
+    @test_image = ImageStub.new(175,131)
+  end
+  describe "#get" do
+    it "should nil for all the supported no-op values" do
+      expect(subject.get('native')).to be_nil
+      expect(subject.get('color')).to be_nil
+      expect(subject.get('default')).to be_nil
+      expect(subject.get(nil)).to be_nil
+    end
+    it "should return appropriate symbols for the transform values" do
+      expect(subject.get('grey')).to eql(:grey)
+      expect(subject.get('gray')).to eql(:grey)
+      expect(subject.get('bitonal')).to eql(:bitonal)
+    end
+  end
+end

data/spec/unit/imogen_iiif_region_spec.rb

@@ -6,11 +6,14 @@ describe Imogen::Iiif::Region, type: :unit do
   end
   subject {Imogen::Iiif::Region.new(@test_image)}
   describe "#get" do
-    describe "with default or full region" do
-      it "should return nil" do
+    describe "with named regions" do
+      it "should return nil for full or default" do
         expect(subject.get(nil)).to be_nil
         expect(subject.get("full")).to be_nil
       end
+      it "should return symbol for featured" do
+        expect(subject.get("featured")).to eql(:featured)
+      end
     end
     describe "with an absolute region" do
       it "should calculate a contained region" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imogen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ben Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-opencv
@@ -56,6 +56,7 @@ files:
 - lib/imogen/iiif/tiles.rb
 - lib/imogen/zoomable.rb
 - spec/spec_helper.rb
+- spec/unit/imogen_iiif_quality_spec.rb
 - spec/unit/imogen_iiif_region_spec.rb
 - spec/unit/imogen_iiif_rotate_spec.rb
 - spec/unit/imogen_iiif_size_spec.rb