kanoko 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3e0d030893084af61384d4d8b6348a42ccc9a80
-  data.tar.gz: 826a04fc42395cf02695038c8af3be399fa2de09
+  metadata.gz: 1c8ae72b9c1732baa61ae18d0454a30d2a246fcd
+  data.tar.gz: 2e1122b7b11dce472368b5e252a25a44aeef57b5
 SHA512:
-  metadata.gz: f4c817ced22e73cc3f6bfbaea398a27e7aaf2ae3c09bedb3f972e642340adaf7ab5a61bbd68b38ff26149f766904dc14603697e1bde79f2b3ef839a582e95c97
-  data.tar.gz: b39a548d60bac3f6abd22af3ab7a987c067245679c7f90ebd84c4c6a62e27d36f866e0b8b8073c17cb6d0f8eb2361bb8933abf911289b2c8c15d65307549db74
+  metadata.gz: e8ecc2d16be738fa47c45e2c55c544a5aca200d2184b023bea55ef17441df0eafcf817e701759189c3a27f0b9dcf1f07523ed8a4cc6e5b1e9d1ddda864e8dae1
+  data.tar.gz: 3e56068dc8148d8b230bf768b08549561b0da67328a1065d1ed2c011d1dc99cc4f4272bd0be280d9b27f8011b4b70c5281c8cc8c55b95bd6b3a9bbc15bd2e9dc

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 2.1.6
-  - 2.2.2
+  - 2.1.10
+  - 2.2.4
+  - 2.3.0

data/kanoko.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sinatra"
+  spec.add_development_dependency "sinatra"
+  spec.add_development_dependency "mime-types"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"

data/lib/kanoko.rb

@@ -24,7 +24,7 @@ module Kanoko
 
   def path_for(*function, src)
     hash = make_hash(*function, src)
-    "/#{hash}/#{function.map{ |i| URI.encode_www_form_component(i) }.join('/')}/#{src}"
+    "/#{hash}/#{function.map { |i| URI.encode_www_form_component(i) }.join('/')}/#{src}"
   end
   module_function :path_for
 

data/lib/kanoko/application/convert.rb

@@ -2,6 +2,7 @@ require 'sinatra'
 require 'net/http'
 require 'tempfile'
 require 'kanoko'
+require 'mime/types'
 
 # This is an experimental implementation.
 # You can set configure and other.
@@ -33,6 +34,18 @@ module Kanoko
     class Convert < Sinatra::Application
       require 'kanoko/application/convert/function'
 
+      IMAGE_TYPES = MIME::Types.select do |m|
+        m.media_type == 'image'
+      end
+      TYPE_MAP = IMAGE_TYPES.map { |i|
+        [i.to_s, i.preferred_extension]
+      }.to_h
+      EXT_MAP = IMAGE_TYPES.each_with_object({}) do |i, h|
+        i.extensions.each do |ext|
+          h[ext] = i.to_s
+        end
+      end
+
       # /123abc456def=/resize/200x200/crop/100x100/path/to/src
       get '/:hash/*' do
         # REQUEST_URI dependent on unicorn.
@@ -48,13 +61,16 @@ module Kanoko
         list = Kanoko::Application::Convert::Function.list
         convert_options = []
         arguments = []
-
+        to_ext = File.extname(request_params.last)[1..-1]
         while id = request_params.shift.to_sym
-          if list.include?(id)
+          if id == :to
+            to_ext = request_params.shift
+            arguments << id << to_ext
+          elsif list.include?(id)
             arguments << id
             method = Function.new.method(id)
             arg = request_params.shift(method.arity)
-            arg.map!{|i| URI.decode_www_form_component i}
+            arg.map! { |i| URI.decode_www_form_component i }
             arguments.concat arg if 0 < arg.length
             convert_options.concat method.call(*arg)
           else
@@ -63,7 +79,7 @@ module Kanoko
           end
         end
 
-        check_path = request_params.map{ |i| URI.decode_www_form_component(i) }.join('/')
+        check_path = request_params.map { |i| URI.decode_www_form_component(i) }.join('/')
         unless hash == Kanoko.make_hash(*arguments, check_path)
           logger.error "hash check failed #{[*arguments, check_path]}"
           return 400
@@ -80,22 +96,35 @@ module Kanoko
           src_file.write res.body
           src_file.fdatasync
 
-          Tempfile.create("dst") do |dst_file|
+          t = TYPE_MAP[res.content_type]
+          src_type = if t
+            "#{t}:"
+          else
+            ""
+                     end
+
+          dst_name = if to_ext.nil?
+            "dst"
+          else
+            ["dst", ".#{to_ext}"]
+                     end
+          Tempfile.create(dst_name) do |dst_file|
             system_command = [
-              {"OMP_NUM_THREADS" => "1"},
+              { "OMP_NUM_THREADS" => "1" },
               'convert',
               '-depth', '8',
               convert_options,
-              src_file.path,
-              dst_file.path
+              "#{src_type}#{src_file.path}",
+              dst_file.path,
             ].flatten
             result = system *system_command
 
             unless result
-              logger.error "command fail $?=#{$?.inspect}"
+              logger.error "command fail $?=#{$CHILD_STATUS.inspect}"
               return 500
             end
 
+            content_type EXT_MAP[to_ext]
             dst_file.read
           end
         end

data/lib/kanoko/application/convert/function.rb

@@ -42,7 +42,13 @@ module Kanoko
 
         def auto_orient
           [
-            '-auto-orient'
+            '-auto-orient',
+          ]
+        end
+
+        def strip
+          [
+            '-strip',
           ]
         end
       end

data/lib/kanoko/configure.rb

@@ -19,16 +19,18 @@ module Kanoko
     def initialize
       @digest_func = ENV['KANOKO_DIGEST_FUNC']
       @secret_key = ENV['KANOKO_SECRET_KEY']
-      @hash_proc = ->(*args){
+      @hash_proc = lambda do |*args|
         if @digest_func.nil? || @secret_key.nil?
           fail ConfigureError, "`digest_func' and `secret_key' must be set"
         end
         Base64.urlsafe_encode64(
-          OpenSSL::HMAC.digest @digest_func,
-          @secret_key,
-          args.map(&:to_s).join(',')
+          OpenSSL::HMAC.digest(
+            @digest_func,
+            @secret_key,
+            args.map(&:to_s).join(','),
+          ),
         )
-      }
+      end
     end
   end
 end

data/lib/kanoko/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanoko
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-11 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -17,7 +17,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -135,7 +149,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: kanoko is a active image generater library.