iiif_url 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c81c70f9aca9c036e51b8f469c768fe7ee07a43
-  data.tar.gz: 048cf777800fed40f0ef8e78152b40ecae7b89c0
+  metadata.gz: cdc59d4c9f29f74fd43a2f582c1ed495637278c6
+  data.tar.gz: 29453c9dbd90f47db47236a651d878957198284c
 SHA512:
-  metadata.gz: fb3d08bef126d3203ce9a94431d3cc9f1dbdcd5497dde4d744e1c4840751787784d5a7469d6a5e654a8ade37ff33bc1fb4e2327ff252e443c03b601d79a34ea0
-  data.tar.gz: efc6eb6c4dec79f1514aed432841ca3349a9e20b65ea1dd4067fbe054d5641c283916531c4f52a3e0f9df85aff4a928642917f8f4fdf2eb0c2228f8c56289e0c
+  metadata.gz: 62f2420a77aee79a19eb338fc19859bae398b73d7a66bda8cc551578b2ade779c12e24aa656fa7adc342054dc89dbea0e958b1a19eed785e48a672590d4c6f67
+  data.tar.gz: 1bb3fdafe0095008ce4483754dccc3153523823e2123f49c4ddcdc38a9643bd9fad5e804d80d60150105a2942793a4fb37f630d379c8bf592fa78220202507f8

data/lib/iiif_url.rb

@@ -102,15 +102,26 @@ class IiifUrl
     quality, format = quality_format.split('.')
 
     rotation_string = url_parts.pop
-    rotation = if rotation_string.include?('!')
-      degrees = rotation_string.sub('!', '')
-      {degrees: degrees.to_i, mirror: true}
+    rotation = {}
+    rotation[:mirror] = if rotation_string.include?('!')
+      rotation_string.sub!('!', '')
+      true
     else
-      {degrees: rotation_string.to_i, mirror: false}
+      false
+    end
+    rotation[:degrees] = if is_number?(rotation_string)
+      rotation_string.to_i
+    else
+      rotation_string
     end
 
     size_string = url_parts.pop
-    size = if size_string.include?(',')
+    size = {}
+    if size_string =~ /^!\d+,\d+/
+      size[:confined] = true
+      size_string.gsub!('!', '')
+    end
+    if size_string.include?(',')
       w, h = size_string.split(',')
       w = if w.empty?
         nil
@@ -118,12 +129,13 @@ class IiifUrl
         w.to_i
       end
       h = h.to_i if !h.nil?
-      {w: w, h: h}
+      size[:w] = w
+      size[:h] = h
     elsif size_string.include?('pct')
-      pct, size = size_string.split(':')
-      {pct: size.to_f}
+      pct, pct_size = size_string.split(':')
+      size[:pct] = pct_size.to_f
     else
-      size_string
+      size = size_string
     end
 
     region_string = url_parts.pop
@@ -152,4 +164,10 @@ class IiifUrl
       format: format
     }
   end
+
+  private
+
+  def self.is_number?(string)
+    true if Float(string) rescue false
+  end
 end

data/lib/iiif_url/version.rb

@@ -1,3 +1,3 @@
 class IiifUrl
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iiif_url
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jason Ronallo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler