kanoko 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174aaa5dc844a02ce0fe1bc7d99aabddffbc8db5
-  data.tar.gz: b78fe145753b4104900984eccc76d7259da3922e
+  metadata.gz: c507e252c2624f4482ad7e29ac990c0a698300f5
+  data.tar.gz: 416bc6b1987141e93dcb646e83e571434e6bea71
 SHA512:
-  metadata.gz: 3d980fb390493a82e79718a41054486272b9e0390bf6a963e877c4fbe92aada2fd197d3f74045cd80d5a6352383f94109db67d328c53a8f15f49ffdc5dbbbdc8
-  data.tar.gz: ae4bc45b643ae3f19233377b242c497bfa7bd27366f2fcb2ecf3b4319809a20ff24aa21605336271404b2f1b399ef1bfb468a0748258e9b5b720ac4b2800489d
+  metadata.gz: fc89740eacc7b58c509b2cf8d84405945eb1fb1e3e2dc1eb6cd5a158c5f7f43d7b4719ab1d20de31cb231feb7c18a842f360fc6dad40159fa67c0c7215f92e18
+  data.tar.gz: 0f05b0052f0784639d6a42564bf04ee06b709860cbf6ace572fff11cb145cffaedd692b3eeca3c4096d1ca8a5d013454dec952b1db9a6c11c9a54c53b814dfcf

data/kanoko.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rack-test"
+  spec.add_development_dependency "exifr"
 end

data/lib/kanoko.rb

@@ -1,5 +1,7 @@
 require 'uri'
 require 'kanoko/configure'
+require 'kanoko/errors'
+require 'kanoko/version'
 
 module Kanoko
   # example:
@@ -19,9 +21,9 @@ module Kanoko
     @configure = value
   end
 
-  def path_for(func, args, src)
-    hash = make_hash(func, args, src)
-    "/#{hash}/#{[func, args].map{|i| URI.encode_www_form_component(i)}.join('/')}/#{src}"
+  def path_for(*function, src)
+    hash = make_hash(*function, src)
+    "/#{hash}/#{function.map{ |i| URI.encode_www_form_component(i) }.join('/')}/#{src}"
   end
   module_function :path_for
 

data/lib/kanoko/application/convert.rb

@@ -31,14 +31,22 @@ require 'kanoko'
 module Kanoko
   module Application
     class Convert < Sinatra::Application
-      get '/:hash/:func/:args/*' do
+      # /123abc456def=/resize/200x200/crop/100x100/path/to/src
+      get '/:hash/*' do
+        request_uri = URI.parse env["REQUEST_URI"]
         hash = params[:hash]
-        func = params[:func]
-        args = params[:args]
-        src_path = env["REQUEST_URI"].sub(%r{/.*?/.*?/.*?/(.*)}, '\1')
+        unless params[:splat]
+          logger.error "invalid url #{request_uri}"
+          return 400
+        end
+        splat = params[:splat][0]
+        function = Function.new splat
+        hint_src = splat[function.to_path.length..-1]
+        hint_index = request_uri.to_s.index(hint_src)
+        src_path = request_uri.to_s[hint_index..-1]
 
-        unless hash == Kanoko.make_hash(func, args, src_path)
-          logger.error "hash check failed #{[func, args, src_path]}"
+        unless hash == Kanoko.make_hash(*(function.to_a.flatten), src_path)
+          logger.error "hash check failed #{[*(function.to_a.flatten), src_path]}"
           return 400
         end
 
@@ -51,36 +59,59 @@ module Kanoko
         Tempfile.open("src") do |src_file|
           src_file.write res.body
           src_file.fdatasync
+
           Tempfile.open("dst") do |dst_file|
             default_env = {"OMP_NUM_THREADS" => "1"}
-            result = case func.to_sym
-
-            when :crop
-              system(default_env,
-                'convert',
-                '-thumbnail', "#{args}^",
-                '-gravity', 'north',
-                '-extent', args,
-                '-background', 'transparent',
-                '-depth', '8',
-                src_file.path, dst_file.path)
-
-            when :resize
-              system(default_env,
-                'convert',
-                '-thumbnail', args,
-                '-depth', '8',
-                src_file.path, dst_file.path)
-
-            else
-              logger.error "undefined func #{func}"
-              return 400
+            command = 'convert'
+            default_options = [
+              '-depth', '8'
+            ]
+            options = []
+
+            function.each do |name, arg|
+              func_options = case name.to_sym
+                when :crop
+                  [
+                    '-crop', arg
+                  ]
+
+                when :fill
+                  [
+                    '-gravity', 'north',
+                    '-extent', arg,
+                    '-background', 'transparent',
+                  ]
+
+                when :resize
+                  [
+                    '-define', "jpeg:size=#{arg}",
+                    '-thumbnail', arg,
+                  ]
+
+                else
+                  logger.error "undefined func #{name}"
+                  return 400
+                end
+
+              options.concat func_options
             end
 
+            system_command = [
+              default_env,
+              command,
+              default_options,
+              options,
+              src_file.path,
+              dst_file.path
+            ].flatten
+
+            result = system *system_command
+
             unless result
               logger.error "command fail $?=#{$?.inspect}"
               return 500
             end
+
             dst_file.read
           end
         end
@@ -113,9 +144,16 @@ module Kanoko
 
       def after_response(res)
         res.each do |key, value|
-          headers[key] ||= value
+          case key.downcase
+          when "status"
+            next
+          else
+            headers[key] ||= value
+          end
         end
       end
     end
   end
 end
+
+require 'kanoko/application/convert/function'

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

@@ -0,0 +1,38 @@
+module Kanoko
+  module Application
+    class Convert
+      class Function
+        include Enumerable
+        extend Forwardable
+        def_delegators :@args, :each, :to_a, :to_h
+
+        def initialize(args)
+          @args = parse args
+        end
+
+        def to_path
+          paths = []
+          @args.each do |func, arg|
+            paths << "/#{func}/#{arg}"
+          end
+          paths.join
+        end
+
+        private
+
+        def parse(args)
+          hash = {}
+          items = args.split('/')
+          items.each_slice(2) do |funcname, arg|
+            if funcname.match(/\./)
+              break
+            else
+              hash[funcname.to_sym] = arg.to_s
+            end
+          end
+          hash
+        end
+      end
+    end
+  end
+end

data/lib/kanoko/version.rb

@@ -1,3 +1,3 @@
 module Kanoko
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/test/test_application_convert.rb

@@ -0,0 +1,63 @@
+require 'digest/sha1'
+require 'stringio'
+require 'minitest/autorun'
+require "rack/test"
+require "exifr"
+require "kanoko/application/convert"
+
+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
+    ENV['RACK_ENV'] = 'test'
+    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
+    url = Kanoko.path_for(:resize, "10x10", "src.jpg")
+    get url, {}, {"REQUEST_URI" => url}
+    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
+    url = Kanoko.path_for(:resize, "10x10", :crop, "5x5+1+1", "src.jpg")
+    get url, {}, {"REQUEST_URI" => url}
+    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_not_found
+    get "/nothing"
+    assert_equal 404, last_response.status
+
+    post "/nothing"
+    assert_equal 404, last_response.status
+
+    delete "/nothing"
+    assert_equal 404, last_response.status
+  end
+end

data/test/test_kanoko.rb

@@ -26,8 +26,14 @@ class TestKanoko < Minitest::Test
 
   def test_path_for_with_default_hash_proc
     change_hash_proc(proc{ "aaa" }) do
-      assert_equal "/aaa/test_func/test_args/test_path", Kanoko.path_for(:test_func, "test_args", "test_path")
-      assert_equal "/aaa/test_func/%2F%3F-_%3D%21%40%23%3C%3E%5C//?-_=!@#<>\\", Kanoko.path_for(:test_func, "/?-_=!@#<>\\", "/?-_=!@#<>\\")
+      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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanoko
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: exifr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: kanoko is a active image generater library.
 email:
 - co000ri@gmail.com
@@ -82,9 +110,14 @@ files:
 - kanoko.gemspec
 - lib/kanoko.rb
 - lib/kanoko/application/convert.rb
+- lib/kanoko/application/convert/function.rb
 - lib/kanoko/configure.rb
 - lib/kanoko/errors.rb
 - lib/kanoko/version.rb
+- test/resize.jpg
+- test/resize_and_crop.jpg
+- test/src.jpg
+- test/test_application_convert.rb
 - test/test_configure.rb
 - test/test_kanoko.rb
 homepage: https://github.com/spice-life/kanoko
@@ -112,5 +145,9 @@ signing_key:
 specification_version: 4
 summary: kanoko is a active image generater library.
 test_files:
+- test/resize.jpg
+- test/resize_and_crop.jpg
+- test/src.jpg
+- test/test_application_convert.rb
 - test/test_configure.rb
 - test/test_kanoko.rb