kanoko 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2549a6bdda23d33eb4cded2c73a8a4404a5fd017
-  data.tar.gz: 36ecc1c7d224edbf0c3b82ecd3d8967da52ef741
+  metadata.gz: e42bf64558cec67348c3f8b2793079179c5012c1
+  data.tar.gz: 6148e4976c50a71236ffe7c1ab8b5b2860f438e1
 SHA512:
-  metadata.gz: ba78d7bd762e23ad896a6b0559d5c98dc86e13ca8d82508b19341d6c00712fcc176a7b5c4acc9a9217687782199fab70af08d8be3e0c83f2af8f5205393bb61c
-  data.tar.gz: 500b00d0fcda53eba841fd2903bd9038d294c1ba21d8e420470c8f3c0bd80adb72b83a166086a8c42fe949902f88c7392657045fa42b6d811ac6b231a511430e
+  metadata.gz: 3246a4f831cb4355b0f200e52ef608f5c04a79228a7498c225fbb66efb1aed28dac8a74d5de6fe7ba13bb305848935cfe79c94c4637f8cff994223af2d77d25d
+  data.tar.gz: ab2dc0dc148d7a1637b5d6d3ca581b067f68c98778c466d2bb94148a99e7290ae2167ae10e3116887a44d3b0a0db8502a77120ec3daac46bf18dd24b9b1661b2

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.1.6
+  - 2.2.2

data/README.md

@@ -0,0 +1,4 @@
+kanoko
+===
+
+[![Build Status](https://travis-ci.org/spice-life/kanoko.svg?branch=master)](https://travis-ci.org/spice-life/kanoko)

data/kanoko.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "sinatra"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"

data/lib/kanoko.rb

@@ -7,6 +7,11 @@ module Kanoko
   #   p Kanoko.configure #=> #<Kanoko::Configure ...>
   def configure
     @configure ||= Configure.new
+    if block_given?
+      yield @configure
+    else
+      @configure
+    end
   end
   module_function :configure
 
@@ -31,7 +36,7 @@ module Kanoko
 
   def make_path(func, args, src)
     hash = make_hash(func, args, src)
-    "/#{hash}/#{[func, args, src].map{|i| URI.encode_www_form_component(i)}.join('/')}"
+    "/#{hash}/#{[func, args].map{|i| URI.encode_www_form_component(i)}.join('/')}/#{src}"
   end
   module_function :make_path
 end

data/lib/kanoko/application/convert.rb

@@ -0,0 +1,121 @@
+require 'sinatra'
+require 'net/http'
+require 'tempfile'
+require 'kanoko'
+
+# This is a experimental implementation.
+# You can set configure and other.
+# This application receve url make by Kanoko.url_for().
+# You can choice function that image processing.
+# Image resource can get by url,
+# And that write once to file,
+# And image processing by imagemagick,
+# And that read file binary.
+#
+# example:
+#   require 'kanoko/application/convert'
+#
+#   ENV['KANOKO_DIGEST_FUNC'] = "sha1"
+#   ENV['KANOKO_SECRET_KEY'] = "secret"
+#
+#   class MyApp < Kanoko::Application::Convert
+#     before do
+#       content_type 'image/png'
+#     end
+#     configure :production do
+#       require 'newrelic_rpm'
+#     end
+#   end
+#
+#   run MyApp
+module Kanoko
+  module Application
+    class Convert < Sinatra::Application
+      get '/:hash/:func/:args/*' do
+        hash = params[:hash]
+        func = params[:func]
+        args = params[:args]
+        src_path = env["REQUEST_URI"].sub(%r{/.*?/.*?/.*?/(.*)}, '\1')
+
+        unless hash == Kanoko.make_hash(func, args, src_path)
+          logger.error "hash check failed #{[func, args, src_path]}"
+          return 400
+        end
+
+        res = http_get(URI.parse("#{(request.secure? ? 'https' : 'http')}://#{src_path}"))
+        if res.nil?
+          return 404
+        end
+        after_response res
+
+        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
+            end
+
+            unless result
+              logger.error "command fail $?=#{$?.inspect}"
+              return 500
+            end
+            dst_file.read
+          end
+        end
+      end
+
+      private
+
+      def http_get(uri)
+        retries = 2
+        req = Net::HTTP::Get.new(uri.request_uri)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.read_timeout = 1
+        http.use_ssl = true if uri.scheme == 'https'
+        begin
+          res = http.start do |http|
+            http.request(req)
+          end
+          res.value
+          res
+        rescue => e
+          if 1 < retries
+            retries -= 1
+            sleep rand(0..0.3)
+            retry
+          end
+          logger.error "Can not get image from '#{uri}' with #{e.message}"
+          nil
+        end
+      end
+
+      def after_response(res)
+        res.each do |key, value|
+          headers[key] ||= value
+        end
+      end
+    end
+  end
+end

data/lib/kanoko/configure.rb

@@ -12,7 +12,7 @@ module Kanoko
     # hash_proc expect Proc
     #
     # example:
-    #   Kanoko.configure.tap do |c|
+    #   Kanoko.configure do |c|
     #     c.kanoko_host = "http://example.com"
     #     c.digest_func = "sha1"
     #     c.secret_key = "secret"
@@ -20,8 +20,8 @@ module Kanoko
     #   Kanoko.url_for(:resize, "100x100") #=> "http://example.com/.../.../..."
     def initialize
       @kanoko_host = nil
-      @digest_func = nil
-      @secret_key = nil
+      @digest_func = ENV['KANOKO_DIGEST_FUNC']
+      @secret_key = ENV['KANOKO_SECRET_KEY']
       @hash_proc = ->(*args){
         if @digest_func.nil? || @secret_key.nil?
           fail ConfigureError, "`digest_func' and `secret_key' must be set"

data/lib/kanoko/version.rb

@@ -1,3 +1,3 @@
 module Kanoko
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/test_kanoko.rb

@@ -28,7 +28,7 @@ class TestKanoko < Minitest::Test
   def test_url_for_with_default_hash_proc
     change_hash_proc(proc{ "aaa" }) do
       assert_equal "http://example.com/aaa/test_func/test_args/test_path", Kanoko.url_for(:test_func, "test_args", "test_path")
-      assert_equal "http://example.com/aaa/test_func/%2F%3F-_%3D%21%40%23%3C%3E%5C/%2F%3F-_%3D%21%40%23%3C%3E%5C", Kanoko.url_for(:test_func, "/?-_=!@#<>\\", "/?-_=!@#<>\\")
+      assert_equal "http://example.com/aaa/test_func/%2F%3F-_%3D%21%40%23%3C%3E%5C//?-_=!@#<>\\", Kanoko.url_for(:test_func, "/?-_=!@#<>\\", "/?-_=!@#<>\\")
     end
   end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: kanoko
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -60,11 +74,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- README.md
 - Rakefile
 - kanoko.gemspec
 - lib/kanoko.rb
+- lib/kanoko/application/convert.rb
 - lib/kanoko/configure.rb
 - lib/kanoko/errors.rb
 - lib/kanoko/version.rb