kanoko 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bb14e5d991054049e19110d50de0645f8e5e4e2
-  data.tar.gz: 9d937dbe7cb9d93183130f7f4dc1b5e30f5c9054
+  metadata.gz: c3e0d030893084af61384d4d8b6348a42ccc9a80
+  data.tar.gz: 826a04fc42395cf02695038c8af3be399fa2de09
 SHA512:
-  metadata.gz: 744b4e38f86f5d12ea30a82d169ce0c7808acb2afb7cf515ab638fd3265caebb0594cac9fe6e32fb92a32933e60a2e66d8606db5146c5606162b8c59a7d7a6f6
-  data.tar.gz: 9d19cfeca0bdef8ded0195ba00bdccc7abc297f148c00db1ad00295f253a8bba00bff6665be96d4e3b7e4084c38efe4d043197ba215e58f43b1ab0f2c832b3a1
+  metadata.gz: f4c817ced22e73cc3f6bfbaea398a27e7aaf2ae3c09bedb3f972e642340adaf7ab5a61bbd68b38ff26149f766904dc14603697e1bde79f2b3ef839a582e95c97
+  data.tar.gz: b39a548d60bac3f6abd22af3ab7a987c067245679c7f90ebd84c4c6a62e27d36f866e0b8b8073c17cb6d0f8eb2361bb8933abf911289b2c8c15d65307549db74

data/kanoko.gemspec

@@ -12,9 +12,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/spice-life/kanoko"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sinatra"

data/lib/kanoko/application/convert.rb

@@ -31,32 +31,45 @@ require 'kanoko'
 module Kanoko
   module Application
     class Convert < Sinatra::Application
+      require 'kanoko/application/convert/function'
 
       # /123abc456def=/resize/200x200/crop/100x100/path/to/src
       get '/:hash/*' do
-        request_uri = URI.parse(env["REQUEST_URI"] || "/#{params[:captures].join('/')}")
-        hash = params[:hash]
-        unless params[:splat]
+        # REQUEST_URI dependent on unicorn.
+        # request.path should be use only testing
+        raw_request_uri = env["REQUEST_URI"] || request.path
+        request_params = raw_request_uri.split('/').tap(&:shift)
+        hash = request_params.shift
+        unless 0 < request_params.length
           logger.error "invalid url #{request_uri}"
           return 400
         end
 
-        splat = params[:splat][0]
-        argument = ArgumentParser.new splat
+        list = Kanoko::Application::Convert::Function.list
+        convert_options = []
+        arguments = []
 
-        hint_src = splat[argument.path.length..-1]
-        unless hint_src
-          logger.error "invalid url #{request_uri}"
-          return 400
+        while id = request_params.shift.to_sym
+          if 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}
+            arguments.concat arg if 0 < arg.length
+            convert_options.concat method.call(*arg)
+          else
+            request_params.unshift(id.to_s)
+            break
+          end
         end
-        hint_index = request_uri.to_s.index(argument.path) + argument.path.length + 1
-        src_path = request_uri.to_s[hint_index..-1]
-        src_path_unescaped = URI.decode_www_form_component(src_path).force_encoding('UTF-8')
-        unless hash == Kanoko.make_hash(*(argument.to_a.flatten), src_path_unescaped)
-          logger.error "hash check failed #{[*(argument.to_a.flatten), src_path]}"
+
+        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
         end
 
+        src_path = request_params.join('/')
         res = http_get(URI.parse("#{(request.secure? ? 'https' : 'http')}://#{src_path}"))
         if res.nil?
           return 404
@@ -72,7 +85,7 @@ module Kanoko
               {"OMP_NUM_THREADS" => "1"},
               'convert',
               '-depth', '8',
-              argument.options,
+              convert_options,
               src_file.path,
               dst_file.path
             ].flatten
@@ -130,5 +143,3 @@ module Kanoko
     end
   end
 end
-
-require 'kanoko/application/convert/argument_parser'

data/lib/kanoko/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kanoko
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - ksss
@@ -110,20 +110,11 @@ files:
 - kanoko.gemspec
 - lib/kanoko.rb
 - lib/kanoko/application/convert.rb
-- lib/kanoko/application/convert/argument_parser.rb
 - lib/kanoko/application/convert/function.rb
 - lib/kanoko/configure.rb
 - lib/kanoko/errors.rb
 - lib/kanoko/version.rb
 - logo.png
-- test/helper.rb
-- test/resize.jpg
-- test/resize_and_crop.jpg
-- test/src.jpg
-- test/test_application_convert.rb
-- test/test_application_convert_argumentparser.rb
-- test/test_configure.rb
-- test/test_kanoko.rb
 homepage: https://github.com/spice-life/kanoko
 licenses:
 - MIT
@@ -148,12 +139,4 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: kanoko is a active image generater library.
-test_files:
-- test/helper.rb
-- test/resize.jpg
-- test/resize_and_crop.jpg
-- test/src.jpg
-- test/test_application_convert.rb
-- test/test_application_convert_argumentparser.rb
-- test/test_configure.rb
-- test/test_kanoko.rb
+test_files: []

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

@@ -1,45 +0,0 @@
-require 'kanoko/application/convert/function'
-
-module Kanoko
-  module Application
-    class Convert
-      class ArgumentParser
-        include Enumerable
-        extend Forwardable
-        def_delegators :@args, :each, :to_a
-
-        attr_reader :options
-
-        def initialize(args)
-          @args, @options = ArgumentParser.parse args
-        end
-
-        def to_path
-          map { |i| "/#{i.join('/')}" }.join
-        end
-        alias path to_path
-
-        private
-
-        class << self
-          def parse(path)
-            args = []
-            options = []
-            items = path.split('/')
-            while item = items.shift
-              id = item.to_sym
-              if Function.list.include?(id)
-                function = Function.new
-                method = function.method(id)
-                arg = items.shift(method.arity)
-                options.concat method.call(*arg)
-                args.push [id, *arg]
-              end
-            end
-            [args, options]
-          end
-        end
-      end
-    end
-  end
-end

data/test/helper.rb

@@ -1,7 +0,0 @@
-ENV['RACK_ENV'] = 'test'
-
-require 'minitest/autorun'
-require 'stringio'
-require "rack/test"
-require "exifr"
-require "kanoko/application/convert"

data/test/test_application_convert.rb

@@ -1,99 +0,0 @@
-require 'helper'
-
-class TestKanokoApplicationConvert < Minitest::Test
-  include Rack::Test::Methods
-
-  class TestApp < Kanoko::Application::Convert
-    class ResponseMock < Struct.new(:body)
-    end
-    def http_get(uri)
-      ResponseMock.new(File.read "test/src.jpg")
-    end
-    def after_response(res)
-    end
-  end
-
-  def app
-    TestApp.new
-  end
-
-  def setup
-    Kanoko.configure.digest_func = "sha1"
-    Kanoko.configure.secret_key = "test"
-  end
-
-  def assert_jpeg(expected, actual)
-    expected_exif = EXIFR::JPEG.new(StringIO.new(expected))
-    actual_exif = EXIFR::JPEG.new(StringIO.new(actual))
-    assert_equal expected_exif.to_hash, actual_exif.to_hash
-  end
-
-  def test_resize
-    path = Kanoko.path_for(:resize, "10x10", "src.jpg")
-    get path
-    assert last_response.ok?
-    assert 0 < last_response.body.length
-    assert_jpeg File.read("test/resize.jpg"), last_response.body
-  end
-
-  def test_resize_and_crop
-    path = Kanoko.path_for(:resize, "10x10", :crop, "5x5+1+1", "src.jpg")
-    get path
-    assert last_response.ok?
-    assert 0 < last_response.body.length
-    assert_jpeg File.read("test/resize_and_crop.jpg"), last_response.body
-  end
-
-  def test_auto_orient
-    path = Kanoko.path_for(:auto_orient, "src.jpg")
-    get path
-    assert last_response.ok?
-    assert 0 < last_response.body.length
-    assert_jpeg File.read("test/src.jpg"), last_response.body
-  end
-
-  def test_resize_and_auto_orient
-    path = Kanoko.path_for(:resize, "10x10", :auto_orient, "src.jpg")
-    get path
-    assert last_response.ok?
-    assert 0 < last_response.body.length
-    assert_jpeg File.read("test/resize.jpg"), last_response.body
-  end
-
-  def test_undefined_func
-    path = Kanoko.path_for(:undefined, "10x10", "src.jpg")
-    get path
-    assert_equal 400, last_response.status
-    assert_equal "", last_response.body
-  end
-
-  def test_root_not_found
-    path = "/"
-    get path
-    assert_equal 404, last_response.status
-    assert_equal "", last_response.body
-  end
-
-  def test_invalid_path
-    path = "/invalid/path/to/src"
-    get path
-    assert_equal 400, last_response.status
-    assert_equal "", last_response.body
-  end
-
-  class Kanoko::Application::Convert::Function
-    def method_for_500
-      ['-undefined-imagemagick-option']
-    end
-  end
-
-  def test_500
-    path = Kanoko.path_for(:method_for_500, "src.jpg")
-    out, err = capture_subprocess_io do
-      get path
-    end
-    assert_equal 500, last_response.status
-    assert_equal "", last_response.body
-    assert_match /convert: unrecognized option `-undefined-imagemagick-option'/, err
-  end
-end

data/test/test_application_convert_argumentparser.rb

@@ -1,58 +0,0 @@
-require 'helper'
-
-class TestKanokoApplicationConvertArgumentParser < Minitest::Test
-  include Kanoko::Application
-  class Kanoko::Application::Convert::Function
-    def empty_option
-      []
-    end
-    def one_option
-      ['func1']
-    end
-    def one_arg_and_one_option(arg)
-      ['func2', arg]
-    end
-  end
-
-  def test_empty
-    a = Convert::ArgumentParser.new("")
-    assert_equal [], a.to_a
-    assert_equal [], a.options
-    assert_equal "", a.path
-  end
-
-  def test_empty_option
-    a = Convert::ArgumentParser.new("empty_option/10x10")
-    assert_equal [[:empty_option]], a.to_a
-    assert_equal [], a.options
-    assert_equal "/empty_option", a.path
-  end
-
-  def test_one_option
-    a = Convert::ArgumentParser.new("one_option/10x10")
-    assert_equal [[:one_option]], a.to_a
-    assert_equal "/one_option", a.path
-    assert_equal ['func1'], a.options
-  end
-
-  def test_one_arg_and_one_option
-    a = Convert::ArgumentParser.new("one_arg_and_one_option/10x10")
-    assert_equal [[:one_arg_and_one_option, '10x10']], a.to_a
-    assert_equal "/one_arg_and_one_option/10x10", a.path
-    assert_equal ['func2', '10x10'], a.options
-  end
-
-  def test_one_option_and_one_arg_and_one_option
-    a = Convert::ArgumentParser.new("one_option/one_arg_and_one_option/10x10")
-    assert_equal [[:one_option], [:one_arg_and_one_option, '10x10']], a.to_a
-    assert_equal "/one_option/one_arg_and_one_option/10x10", a.path
-    assert_equal ['func1', 'func2', '10x10'], a.options
-  end
-
-  def test_nothing
-    a = Convert::ArgumentParser.new("nothing/10x10")
-    assert_equal [], a.to_a
-    assert_equal "", a.path
-    assert_equal [], a.options
-  end
-end

data/test/test_configure.rb

@@ -1,27 +0,0 @@
-require 'helper'
-
-class TestKanokoConfigure < Minitest::Test
-  def setup
-    @config = Kanoko::Configure.new
-  end
-
-  def test_hash_proc_by_default_error
-    @config.digest_func = nil
-    @config.secret_key = nil
-    assert_raises(Kanoko::ConfigureError){ @config.hash_proc.call }
-
-    @config.digest_func = "sha1"
-    @config.secret_key = nil
-    assert_raises(Kanoko::ConfigureError){ @config.hash_proc.call }
-
-    @config.digest_func = nil
-    @config.secret_key = "test"
-    assert_raises(Kanoko::ConfigureError){ @config.hash_proc.call }
-  end
-
-  def test_hash_proc_by_default
-    @config.digest_func = "sha1"
-    @config.secret_key = "test"
-    assert_equal "yrYrwA2D_XJwEyaWOr3S8GPWtd8=", @config.hash_proc.call("aaa")
-  end
-end

data/test/test_kanoko.rb

@@ -1,50 +0,0 @@
-require 'helper'
-
-class TestKanoko < Minitest::Test
-  def setup
-    Kanoko.configure.digest_func = "sha1"
-    Kanoko.configure.secret_key = "test"
-  end
-
-  def change_hash_proc(hash_proc)
-    before = Kanoko.configure.hash_proc
-    Kanoko.configure.hash_proc = hash_proc
-    yield
-    Kanoko.configure.hash_proc = before
-  end
-
-  def test_configure
-    assert_kind_of Kanoko::Configure, Kanoko.configure
-  end
-
-  def test_configure_with_block
-    assert_equal "sha1", Kanoko.configure.digest_func
-    Kanoko.configure.digest_func = "ok"
-    assert_equal "ok", Kanoko.configure.digest_func
-  end
-
-  def test_path_for_with_default_hash_proc
-    change_hash_proc(proc{ "aaa" }) do
-      path = Kanoko.path_for(:test_func, "test_args", "test_path")
-      assert_equal "/aaa/test_func/test_args/test_path", path
-
-      path = Kanoko.path_for(:test_func, "/?-_=!@#<>\\", "/?-_=!@#<>\\")
-      assert_equal "/aaa/test_func/%2F%3F-_%3D%21%40%23%3C%3E%5C//?-_=!@#<>\\", path
-
-      path = Kanoko.path_for(:test_func, "test_args", :test_func2, "test_args2", "test_path")
-      assert_equal "/aaa/test_func/test_args/test_func2/test_args2/test_path", path
-    end
-  end
-
-  def test_make_hash
-    change_hash_proc(proc{ "bbb" }) do
-      assert_equal "bbb", Kanoko.make_hash(:test_func, "test_args", "test_path")
-    end
-  end
-
-  def test_make_hash_custom_hash_proc
-    change_hash_proc(proc{ "ccc" }) do
-      assert_equal "ccc", Kanoko.make_hash(:test_func, "test_args", "test_path")
-    end
-  end
-end