mountable_image_server 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ad348f1212103893cc82cc3a60fa77e5ecdce3a
-  data.tar.gz: 2258abacb79c145cf2bd648b812696491d6f36e6
+  metadata.gz: 1895ff21aa0c200b38703ddc0d92159d9f4c636c
+  data.tar.gz: 9ecdb654c5066a1bba15684a669976a1c14f6149
 SHA512:
-  metadata.gz: 9f3fa96f6bd943a6a210b83c440c44e883c4481587a974798edea71e762194fa54da9a3b3c1a72939d66380f513b934d3b23756574d80c4d8e7f6bde72d27694
-  data.tar.gz: 126a9b49b548ab4fa815de5381a7d4b947de637aac46998da5f5b39a73d412b9c51745bdc3531a0065593cdcded98ab7c2aa8c6314e7683f3809f3936a1672a6
+  metadata.gz: 9ad5c4c99728c29a78c304c701c9896c51c738f642b488db48de7ddcb0914474dac7ed74d80c1473ebc19d67f09877a3002740bcaed77ff9e1201fc10110352a
+  data.tar.gz: 7972011c57cca2bb7ed892903b05eb1f46f69e9ce49f7c0fa7b3664517c66aab554ddd9ca70ea27135a7e782d93a8c4cd750d1d93d63caa0cf7a857ce84d3e04

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/config.ru

@@ -0,0 +1,9 @@
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+
+require './lib/mountable_image_server'
+
+MountableImageServer.configure do |config|
+  config.sources << './test/fixtures'
+end
+
+run MountableImageServer::Server.new

data/lib/mountable_image_server/image_processor.rb

@@ -6,18 +6,34 @@ module MountableImageServer
   class ImageProcessor
     include Skeptick
 
+    VALID_PARAMETERS = [:fit, :crop, :w, :h, :q, :darken]
+
     def initialize(path, parameters)
-      @parameters = parameters
       @path = path
+      @parameters = parameters.select do |key, value|
+        VALID_PARAMETERS.include?(key.to_sym)
+      end.map do |key, value|
+        [key.to_sym, value]
+      end.to_h
     end
 
     def run(&block)
-      yield(Pathname(path)) and return unless parameters[:h] || parameters[:w] || parameters[:q]
+      yield(Pathname(path)) and return unless parameters.any?
+
+      parameters[:fit] ||= 'clip'
+
+      operations_queue = [
+        resize_operations,
+        crop_operations,
+        quality_operations,
+        darken_operations
+      ].reduce([], :+)
 
       Tempfile.create(['processed-image', path.extname]) do |file|
         command = convert(path, to: file.path) do
-          set :resize, "#{parameters[:w]}x#{parameters[:h]}>" if parameters[:h] || parameters[:w]
-          set :quality, parameters[:q] if parameters[:q]
+          operations_queue.each do |operation|
+            set *operation
+          end
         end
 
         command.run
@@ -28,5 +44,40 @@ module MountableImageServer
 
     private
     attr_reader :parameters, :path
+
+    def darken_operations
+      return [] unless parameters[:darken]
+
+      [
+        [:fill, 'black'],
+        [:colorize, parameters[:darken]]
+      ]
+    end
+
+    def resize_operations
+      return [] unless (parameters[:fit] == 'clip') && (parameters[:h] || parameters[:w])
+
+      [
+        [:resize, "#{parameters[:w]}x#{parameters[:h]}>"]
+      ]
+    end
+
+    def crop_operations
+      return [] unless parameters[:fit] == 'crop' && parameters[:h] && parameters[:w]
+
+      [
+        [:resize, "#{parameters[:w]}x#{parameters[:h]}^"],
+        [:gravity, 'center'],
+        [:extent, "#{parameters[:w]}x#{parameters[:h]}"]
+      ]
+    end
+
+    def quality_operations
+      return [] unless parameters[:q]
+
+      [
+        [:quality, parameters[:q]]
+      ]
+    end
   end
 end

data/lib/mountable_image_server/server.rb

@@ -7,6 +7,19 @@ module MountableImageServer
     get '/:fid' do |fid|
       locator = ImageLocator.new(MountableImageServer.config.sources)
 
+      begin
+        respond_with_image(locator, fid, params)
+      rescue Skeptick::ImageMagickError => e
+        if e.message.include?('convert: unable to open image')
+          respond_with_image(locator, fid, params)
+        else
+          halt(404)
+        end
+      end
+    end
+
+    private
+    def respond_with_image(locator, fid, params)
       if path = locator.path_for(fid)
         image_processor = ImageProcessor.new(path, params)
 

data/lib/mountable_image_server/version.rb

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

data/mountable_image_server.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rack-test", "~> 0.6.3"
 
-  spec.add_runtime_dependency "sinatra", "~> 1.4.5"
+  spec.add_runtime_dependency "sinatra", "~> 2.0.0.rc1"
   spec.add_runtime_dependency "dry-configurable", "~> 0.1.6"
   spec.add_runtime_dependency "skeptick", "~> 0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mountable_image_server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - David Strauß
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -123,6 +124,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config.ru
 - lib/mountable_image_server.rb
 - lib/mountable_image_server/image_locator.rb
 - lib/mountable_image_server/image_processor.rb
@@ -149,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple mountable server for processing images on the fly.