rack_image_resizer 1.3.4 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7b0d56e8df36d87efd7a99b50b27d839aa924aceb93b3cefcff69c6a1c97cc9
-  data.tar.gz: 7e1e3beb0154980146b4528e52ee69104bf008d3f064593beda24dc0dcfb3493
+  metadata.gz: 9f36dba02c961baff412ab2cf297970602134af182f97291c2b3278349a545de
+  data.tar.gz: '023579e204e4bf5e7c830bab8a3e2228984c6ae83e9e4102e3a72aca9ece97d8'
 SHA512:
-  metadata.gz: e5ce0e392842ee04f3f50630a5c8e7c9dfadeb46f5e39726f6f69214b56d1e71a79c30b28612d17a8e3e76adade7e243fe2823a9df1c89d42c40d21020aaeac4
-  data.tar.gz: 2dfe4769f27d23a79842f98b9f1a5e90aa90b72341ed07ba7317ea3edaef2baa61dc3d8ce3770473d462eae24b704c7065a641a83c374c55ae36e7eb54143ca6
+  metadata.gz: 7de4972dce16c7d10b91258f2d516b09a5a61a07445f36ff6aa7cfc8cf8d32d7d4f9a0a09a09ed86aacc19106011088243f3dd18b1fe622cf22b4dc144d26570
+  data.tar.gz: c5a1d3b61b94b17ecfd6ed1a65131daa5a9b29e3929a4aa4bf2d662becfe082b8586ca889fd46bed5e0b937ced2f9d6b4a50c3fcf0ffd36fba273d93527cae80

data/lib/rack_image_resizer.rb

@@ -6,31 +6,29 @@ require_relative 'string'
 module ::RackImageResizer
   extend self
 
-  def resizer_secret
-    @secret || ENV.fetch('RESIZER_SECRET')
-  end
-
-  def resizer_url
-    @url    || ENV.fetch('RESIZER_URL')
-  end
-
   def set name, value
-    raise 'not allowed' unless [:secret, :url].include?(name)
+    raise 'not allowed' unless [:secret, :url, :host].include?(name)
     instance_variable_set '@%s' % name, value
   end
 
+  def get name
+    instance_variable_get('@%s' % name) || ENV.fetch('RESIZER_%s' % name.to_s.upcase)
+  end
+
   ###
 
-  # "http://foo.jpg".resize_image({ s: "222x222", q: 80 }
-  # "http://foo.jpg".resize_image("^200x200")
-  # "http://foo.jpg".resize_image - expcts size as param
-  def get opts
+  def build opts
     opts[:i] ||= opts.delete(:image)
     opts[:s] ||= opts.delete(:size) if opts[:size]
 
     # return empty pixel unless self
     return "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" if opts[:i].to_s == ''
 
+    # add host as prefix to image if relative
+    opts[:i] = get(:host) + opts[:i] if opts[:i][0,1] == '/'
+
+    raise ArgumentError.new('Invalid URL, no https?:// found') unless opts[:i] =~ %r{^https?://}
+
     opts[:i] = opts[:i].sub(%r{^(\w+)://}, '')
     prefix = $1 == 'https' ? 's' : 'p'
     opts[:i] = prefix + opts[:i]
@@ -41,7 +39,7 @@ module ::RackImageResizer
     data.push Base64.urlsafe_encode64(opts.to_json).gsub(/=*\s*$/, '')
 
     # add check
-    data.push Digest::SHA1.hexdigest(resizer_secret+data.first)[0,4]
+    data.push Digest::SHA1.hexdigest(get(:secret)+data.first)[0,4]
 
     # add extension
     ext = opts[:i].split('.').last.to_s.downcase
@@ -49,6 +47,6 @@ module ::RackImageResizer
     data.push '.%s' % ext
 
     # return full url
-    [resizer_url, data.join('')].join('/r/')
+    [get(:url), data.join('')].join('/r/')
   end
 end

data/lib/string.rb

@@ -1,10 +1,14 @@
 unless ''.respond_to?(:resized)
   class ::String
+    # "http://foo.jpg".resized({ s: "222x222", q: 80 }
+    # "http://foo.jpg".resized("^200x200")
+    # "http://foo.jpg".resized_image - expcts size as param
     def resized opts=nil
-      opts ||= {}
+      opts   ||= {}
+      opts     = { s: opts } if opts.is_a?(String)
       opts[:i] = self
 
-      RackImageResizer.get opts
+      RackImageResizer.build opts
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_image_resizer
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.1
 platform: ruby
 authors:
 - Dino Reic