mountable_image_server 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1895ff21aa0c200b38703ddc0d92159d9f4c636c
-  data.tar.gz: 9ecdb654c5066a1bba15684a669976a1c14f6149
+SHA256:
+  metadata.gz: 63c63a9eab25e840d81dffc313e19a280367674550cb7e985b6d5a5c1947e060
+  data.tar.gz: ff7b2820a0a88aebd46245e0089271c527ae7823ca274ad74625ae5db88ad3fd
 SHA512:
-  metadata.gz: 9ad5c4c99728c29a78c304c701c9896c51c738f642b488db48de7ddcb0914474dac7ed74d80c1473ebc19d67f09877a3002740bcaed77ff9e1201fc10110352a
-  data.tar.gz: 7972011c57cca2bb7ed892903b05eb1f46f69e9ce49f7c0fa7b3664517c66aab554ddd9ca70ea27135a7e782d93a8c4cd750d1d93d63caa0cf7a857ce84d3e04
+  metadata.gz: 8c7d3c782dd5f6d86781be932683afa8be1a58ff83f9ff9c9d54865c74853f143f905c4390d6ae20e797401b1aecf9d42cbadaf85689dc08942abcd4c3e620dc
+  data.tar.gz: 4acd2cd370f9e7f085fd19d9caa87dfcea39b5443ba89d05f641ccbb77b923c28366dc728bbe6d1359ad8b20b9e29de029df3bb2179360523061fb09d46463a5

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.local-data/

data/README.md

@@ -1 +1,5 @@
-To be written.
+# Publish on RubyGems.org
+
+1. Increment `lib/mountable_image_server/version.rb` to your liking.
+2. Make a Git commit.
+3. Run `bundle exec rake release`.

data/lib/mountable_image_server/image_processor.rb

@@ -6,14 +6,22 @@ module MountableImageServer
   class ImageProcessor
     include Skeptick
 
-    VALID_PARAMETERS = [:fit, :crop, :w, :h, :q, :darken]
+    # Accepted parameters and values:
+    # `fit`    - Approach how to interpret width and height, use 'crop' (cropping) or 'clip' (resizing)
+    # `w`      - Width of image in pixels
+    # `h`      - Height of image in pixels
+    # `q`      - Quality of image, use value between 0 (worst) and 100 (best)
+    # `darken` - Blends image with black color, use value between 0 (no black) and 100 (completely black)
+    # `fm`     - Format of image, use 'jpg', 'png', 'gif', ...
+    VALID_PARAMETERS = [:fit, :w, :h, :q, :darken, :fm]
 
     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)
+        VALID_PARAMETERS.include?(key.to_sym) && value =~ /\S+/
       end.map do |key, value|
-        [key.to_sym, value]
+        [key.to_sym, value.strip.downcase]
       end.to_h
     end
 
@@ -22,15 +30,32 @@ module MountableImageServer
 
       parameters[:fit] ||= 'clip'
 
+      if parameters[:fm] && parameters[:fm] == file_format
+        parameters.delete(:fm)
+      end
+
+      if parameters[:fm]
+        extension = ".#{parameters[:fm]}"
+      else
+        extension = ".#{file_format}"
+      end
+
+      if parameters[:fm] && parameters[:fm] != file_format && file_format == 'gif'
+        input_path = "#{path}[0]"
+      else
+        input_path = path
+      end
+
       operations_queue = [
+        format_operations,
         resize_operations,
         crop_operations,
         quality_operations,
-        darken_operations
+        darken_operations,
       ].reduce([], :+)
 
-      Tempfile.create(['processed-image', path.extname]) do |file|
-        command = convert(path, to: file.path) do
+      Tempfile.create(['processed-image', extension]) do |file|
+        command = convert(input_path, to: file.path) do
           operations_queue.each do |operation|
             set *operation
           end
@@ -43,7 +68,7 @@ module MountableImageServer
     end
 
     private
-    attr_reader :parameters, :path
+    attr_reader :parameters, :path, :file_format
 
     def darken_operations
       return [] unless parameters[:darken]
@@ -79,5 +104,13 @@ module MountableImageServer
         [:quality, parameters[:q]]
       ]
     end
+
+    def format_operations
+      return [] unless parameters[:fm]
+
+      [
+        [:format, parameters[:fm]]
+      ]
+    end
   end
 end

data/lib/mountable_image_server/version.rb

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

data/mountable_image_server.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rack-test", "~> 0.6.3"
 
   spec.add_runtime_dependency "sinatra", "~> 2.0.0.rc1"
-  spec.add_runtime_dependency "dry-configurable", "~> 0.1.6"
+  spec.add_runtime_dependency "dry-configurable", ">= 0.1.6"
   spec.add_runtime_dependency "skeptick", "~> 0.2.1"
 end

data/shell.nix

@@ -0,0 +1,27 @@
+{
+  pkgs ? import (fetchGit {
+    url = https://github.com/NixOS/nixpkgs-channels;
+    ref = "nixos-20.03";
+  }) {},
+  ruby ? pkgs.ruby_2_5,
+  bundler ? pkgs.bundler.override { inherit ruby; }
+}:
+
+pkgs.mkShell {
+  buildInputs = with pkgs; [
+    ruby
+    bundler
+    git
+    sqlite
+    zlib
+    phantomjs
+    rubyPackages_2_5.nokogiri
+    libiconv
+  ];
+
+  shellHook = ''
+    mkdir -p .local-data/gems
+    export GEM_HOME=$PWD/.local-data/gems
+    export GEM_PATH=$GEM_HOME
+  '';
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mountable_image_server
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - David Strauß
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-10 00:00:00.000000000 Z
+date: 1970-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
@@ -131,6 +131,7 @@ files:
 - lib/mountable_image_server/server.rb
 - lib/mountable_image_server/version.rb
 - mountable_image_server.gemspec
+- shell.nix
 homepage: https://github.com/stravid/mountable_image_server
 licenses:
 - MIT
@@ -150,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple mountable server for processing images on the fly.