imogen 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NTI4Y2ZkMGUzMGQ5Mjg4NmI3NmRmZTQxMTkyM2VlMDJlY2FiMzhmYg==
-  data.tar.gz: !binary |-
-    ZmQ3M2I5NDc5ZDg5MjNiNGUyYTAxZDNmNDFiZjg5NmI0ZmExMzYzNg==
+SHA1:
+  metadata.gz: 72d6fdb5d3ff30a5b88603de22b081704f0cd525
+  data.tar.gz: f4bbe60079ba2216d8e7f58f50a355e3a553f45c
 SHA512:
-  metadata.gz: !binary |-
-    NzE0NDE0N2U1Y2M5NTA5OTNkZjJhOTdjN2FjM2Y2ZTUzMmZlZGU4MTZhMGY1
-    NjkwN2E3NmFiNTNlZjRlYzUwOWYzYTk5MDIwNTFhZTZiZDgxMjIzNmFkNGJl
-    YmRkMWUzMWQwM2YyZDUwMjFjOTE3ZGY5NzE0NzNkMDJiYTMzZTg=
-  data.tar.gz: !binary |-
-    ODRkMDgwMmRkMmE2YjY1ZGU5NWRlNmMxZDJhNmM5NTU2ZTQ0YWQwNDU5MzVl
-    YWIxZDNiM2NlYjQ5ZjBlYTUwZDRiZWE2NGU2YWJhNWYxZWY4NTQxMGVkMjcx
-    NWI0ODZiNjQ2NmMzMzZhOGEwOTY5ZTY3MDk2NWVkZGIzMzJiNDM=
+  metadata.gz: 19e7f16d7f1e6cc363baf6000988c81de25429420fdd7d8282f8796a9d6e99304796ad50835ad7d63fcfad012c6bce3ac47f502db535da32e7b63bdab2b1939d
+  data.tar.gz: f3c05ae821d2a6ab630c3bfe5753473a5c3070949bc0c1bf202f75aa368111642b84e87c0c5e7ad05d28c4c04d274d18bbe37e4ac0900535ea8aa7b9a0b25693

data/lib/imogen/iiif/region.rb

@@ -11,7 +11,7 @@ class Region < Transform
       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]
+      if p[2] == 0 or p[3] == 0
         raise BadRequest.new("Invalid region: #{region}")
       end
       e = [
@@ -32,12 +32,12 @@ class Region < Transform
         min(@height,(p[1] + p[3]))
       ]
     else
-      raise BadRequest.new("Invalid region: #{region}")
-    end
-    if e[0] > e[2] or e[1] > e[3]
-      raise BadRequest.new("Invalid region: #{region}")
+      raise BadRequest.new("Invalid region (syntax): #{region}")
     end
-    if (e[2] - e[0]) * (e[3] - e[1]) < 100
+    if (e[0] > @width or e[1] > @height)
+      raise BadRequest.new("Invalid region (disjoint): #{region}")
+    end      
+    if (e[2]) * (e[3]) < 100
       raise BadRequest.new("Region too small: #{region}")
     end
     return e

data/spec/unit/imogen_iiif_region_spec.rb

@@ -37,7 +37,7 @@ describe Imogen::Iiif::Region, type: :unit do
         expect(subject.get("pct:80,15,10,75")).to eql([140,20,158,118])
       end
       it "should reject zero-dimension boxes" do
-        expect{subject.get("pct:10.2,15,10.21,15")}.to raise_error Imogen::Iiif::BadRequest
+        expect{subject.get("pct:10.2,15,0,15")}.to raise_error Imogen::Iiif::BadRequest
       end
       describe "that exceeds the bounds" do
         it "should calculate an overlapping region" do
@@ -52,6 +52,12 @@ describe Imogen::Iiif::Region, type: :unit do
       expect{subject.get("px:1,2,3,4")}.to raise_error Imogen::Iiif::BadRequest
       expect{subject.get("-1,2,3,4")}.to raise_error Imogen::Iiif::BadRequest
       expect{subject.get("pct:-1,2,3,4")}.to raise_error Imogen::Iiif::BadRequest
-    end 
+    end
+    it "should work for some other image" do
+      img = ImageStub.new(1706,1726)
+      test = Imogen::Iiif::Region.new(img)
+      expect(test.get("1536,1024,190,512")).to eql([1536,1024,1706,1536])
+      expect{subject.get("1536,1024,190,512")}.to raise_error Imogen::Iiif::BadRequest
+    end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: imogen
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ben Armintor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-opencv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -70,12 +70,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []