kanoko 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c507e252c2624f4482ad7e29ac990c0a698300f5
-  data.tar.gz: 416bc6b1987141e93dcb646e83e571434e6bea71
+  metadata.gz: 951798a023b45334f2180ac2a616bb1f66c90f7e
+  data.tar.gz: 5185345e9249e30edea76b5fad351b11fde1d48b
 SHA512:
-  metadata.gz: fc89740eacc7b58c509b2cf8d84405945eb1fb1e3e2dc1eb6cd5a158c5f7f43d7b4719ab1d20de31cb231feb7c18a842f360fc6dad40159fa67c0c7215f92e18
-  data.tar.gz: 0f05b0052f0784639d6a42564bf04ee06b709860cbf6ace572fff11cb145cffaedd692b3eeca3c4096d1ca8a5d013454dec952b1db9a6c11c9a54c53b814dfcf
+  metadata.gz: 59c18db72d747e198ee233e93d54a728283c2057ad36895b8cb51dbd16cb35e30d875842e37e877413a56fe0f93f5ee160b9de2775ea9277dfcae24710f4d861
+  data.tar.gz: db41f1f05a3ff41c872ca1d9ede236486cbff8ec0b5805f89b67ce0fea9cb7b0e73c152d4178dd4c9fa6f4ca80050f2a914b7fa4073fbcc2c179518ec4430b4f

data/README.md

@@ -3,6 +3,8 @@ kanoko
 
 [![Build Status](https://travis-ci.org/spice-life/kanoko.svg?branch=master)](https://travis-ci.org/spice-life/kanoko)
 
+![logo](https://raw.githubusercontent.com/spice-life/kanoko/master/logo.png)
+
 **kanoko** is an active image generate application.
 
 # Quick Start

data/lib/kanoko.rb

@@ -20,6 +20,7 @@ module Kanoko
   def configure=(value)
     @configure = value
   end
+  module_function :configure=
 
   def path_for(*function, src)
     hash = make_hash(*function, src)

data/lib/kanoko/application/convert.rb

@@ -31,22 +31,30 @@ require 'kanoko'
 module Kanoko
   module Application
     class Convert < Sinatra::Application
+
       # /123abc456def=/resize/200x200/crop/100x100/path/to/src
       get '/:hash/*' do
-        request_uri = URI.parse env["REQUEST_URI"]
+        request_uri = URI.parse(env["REQUEST_URI"] || "/#{params[:captures].join('/')}")
         hash = params[:hash]
         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]
+        argument = ArgumentParser.new splat
+
+        hint_src = splat[argument.path.length..-1]
+        unless hint_src
+          logger.error "invalid url #{request_uri}"
+          return 400
+        end
+
         hint_index = request_uri.to_s.index(hint_src)
         src_path = request_uri.to_s[hint_index..-1]
 
-        unless hash == Kanoko.make_hash(*(function.to_a.flatten), src_path)
-          logger.error "hash check failed #{[*(function.to_a.flatten), src_path]}"
+        unless hash == Kanoko.make_hash(*(argument.to_a.flatten), src_path)
+          logger.error "hash check failed #{[*(argument.to_a.flatten), src_path]}"
           return 400
         end
 
@@ -61,50 +69,14 @@ module Kanoko
           src_file.fdatasync
 
           Tempfile.open("dst") do |dst_file|
-            default_env = {"OMP_NUM_THREADS" => "1"}
-            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,
+              {"OMP_NUM_THREADS" => "1"},
+              'convert',
+              '-depth', '8',
+              argument.options,
               src_file.path,
               dst_file.path
             ].flatten
-
             result = system *system_command
 
             unless result
@@ -152,8 +124,12 @@ module Kanoko
           end
         end
       end
+
+      error 404 do
+        ""
+      end
     end
   end
 end
 
-require 'kanoko/application/convert/function'
+require 'kanoko/application/convert/argument_parser'

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

@@ -0,0 +1,45 @@
+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/lib/kanoko/application/convert/function.rb

@@ -1,36 +1,49 @@
 module Kanoko
   module Application
     class Convert
+      # You can make customize function.
+      # It just make or overwhrite instance method.
+      # example:
+      #   class Kanoko::Application::Convert::Function
+      #     # get "/new_func/new_value"
+      #     # => add imagemagick option
+      #     # -new-option new_value
+      #     def new_func(arg)
+      #       ['-new-option', arg]
+      #     end
+      #   end
       class Function
-        include Enumerable
-        extend Forwardable
-        def_delegators :@args, :each, :to_a, :to_h
+        class << self
+          def list
+            instance_methods(false)
+          end
+        end
 
-        def initialize(args)
-          @args = parse args
+        def crop(arg)
+          [
+            '-crop', arg
+          ]
         end
 
-        def to_path
-          paths = []
-          @args.each do |func, arg|
-            paths << "/#{func}/#{arg}"
-          end
-          paths.join
+        def fill(arg)
+          [
+            '-gravity', 'north',
+            '-extent', arg,
+            '-background', 'transparent',
+          ]
         end
 
-        private
+        def resize(arg)
+          [
+            '-define', "jpeg:size=#{arg}",
+            '-thumbnail', arg,
+          ]
+        end
 
-        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
+        def auto_orient
+          [
+            '-auto-orient'
+          ]
         end
       end
     end

data/lib/kanoko/version.rb

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

data/test/helper.rb

@@ -0,0 +1,7 @@
+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,9 +1,4 @@
-require 'digest/sha1'
-require 'stringio'
-require 'minitest/autorun'
-require "rack/test"
-require "exifr"
-require "kanoko/application/convert"
+require 'helper'
 
 class TestKanokoApplicationConvert < Minitest::Test
   include Rack::Test::Methods
@@ -23,7 +18,6 @@ class TestKanokoApplicationConvert < Minitest::Test
   end
 
   def setup
-    ENV['RACK_ENV'] = 'test'
     Kanoko.configure.digest_func = "sha1"
     Kanoko.configure.secret_key = "test"
   end
@@ -35,29 +29,71 @@ class TestKanokoApplicationConvert < Minitest::Test
   end
 
   def test_resize
-    url = Kanoko.path_for(:resize, "10x10", "src.jpg")
-    get url, {}, {"REQUEST_URI" => url}
+    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
-    url = Kanoko.path_for(:resize, "10x10", :crop, "5x5+1+1", "src.jpg")
-    get url, {}, {"REQUEST_URI" => url}
+    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_not_found
-    get "/nothing"
-    assert_equal 404, last_response.status
+  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
 
-    post "/nothing"
-    assert_equal 404, last_response.status
+  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
 
-    delete "/nothing"
+  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

@@ -0,0 +1,58 @@
+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,5 +1,4 @@
-require 'minitest/autorun'
-require 'kanoko/configure'
+require 'helper'
 
 class TestKanokoConfigure < Minitest::Test
   def setup

data/test/test_kanoko.rb

@@ -1,5 +1,4 @@
-require 'minitest/autorun'
-require 'kanoko'
+require 'helper'
 
 class TestKanoko < Minitest::Test
   def setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanoko
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -110,14 +110,18 @@ 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
@@ -145,9 +149,11 @@ 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