mountable_image_server 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c63a9eab25e840d81dffc313e19a280367674550cb7e985b6d5a5c1947e060
-  data.tar.gz: ff7b2820a0a88aebd46245e0089271c527ae7823ca274ad74625ae5db88ad3fd
+  metadata.gz: ffaf3db5f2b33f4e7e71c150f641da2dfd8c725e67c9349c802f6c4953eb309e
+  data.tar.gz: 680db514860ff0f6f6678be05e8e98705d1dff5462ca86361b464b4bf863d43b
 SHA512:
-  metadata.gz: 8c7d3c782dd5f6d86781be932683afa8be1a58ff83f9ff9c9d54865c74853f143f905c4390d6ae20e797401b1aecf9d42cbadaf85689dc08942abcd4c3e620dc
-  data.tar.gz: 4acd2cd370f9e7f085fd19d9caa87dfcea39b5443ba89d05f641ccbb77b923c28366dc728bbe6d1359ad8b20b9e29de029df3bb2179360523061fb09d46463a5
+  metadata.gz: 0e03f3c2f614b91fffc53903941277f44454a486d65178f1f3f59194d4867aaf765906564e52372203e43aaa0f1c48fb8ad7c00c58374883b16cbd6e9ae3fe8e
+  data.tar.gz: 34d25e94e1fea7bfed0238a3a3c5d5348205547cbf7a211378755b79ed422bf85d70e6f73a74e17bef90089367136c68047d8bc6bd5b560c0d7763dcee3f3ec9

data/lib/mountable_image_server/image_processor.rb

@@ -15,14 +15,19 @@ module MountableImageServer
     # `fm`     - Format of image, use 'jpg', 'png', 'gif', ...
     VALID_PARAMETERS = [:fit, :w, :h, :q, :darken, :fm]
 
+    PARAMETER_VALUE_PATTERNS = {
+      fit: /^(clip|crop)$/,
+      h: /^\d+$/,
+      w: /^\d+$/,
+      q: /^([0-9]|[1-9][0-9]|100)$/,
+      darken: /^([0-9]|[1-9][0-9]|100)$/,
+      fm: /^(jpg|png|gif)$/,
+    }
+
     def initialize(path, parameters)
       @path = path
       @file_format = path.extname.downcase.scan(/[^\.]+/).last
-      @parameters = parameters.select do |key, value|
-        VALID_PARAMETERS.include?(key.to_sym) && value =~ /\S+/
-      end.map do |key, value|
-        [key.to_sym, value.strip.downcase]
-      end.to_h
+      @parameters = sanitize_parameters(parameters)
     end
 
     def run(&block)
@@ -70,6 +75,14 @@ module MountableImageServer
     private
     attr_reader :parameters, :path, :file_format
 
+    def sanitize_parameters(raw_parameters)
+      raw_parameters.select do |key, value|
+        VALID_PARAMETERS.include?(key.to_sym) && value =~ PARAMETER_VALUE_PATTERNS.fetch(key.to_sym)
+      end.map do |key, value|
+        [key.to_sym, value.strip.downcase]
+      end.to_h
+    end
+
     def darken_operations
       return [] unless parameters[:darken]
 

data/lib/mountable_image_server/version.rb

@@ -1,3 +1,3 @@
 module MountableImageServer
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/shell.nix

@@ -17,6 +17,7 @@ pkgs.mkShell {
     phantomjs
     rubyPackages_2_5.nokogiri
     libiconv
+    imagemagick
   ];
 
   shellHook = ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mountable_image_server
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - David Strauß