kanoko 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c8ae72b9c1732baa61ae18d0454a30d2a246fcd
-  data.tar.gz: 2e1122b7b11dce472368b5e252a25a44aeef57b5
+  metadata.gz: ffa8552fcdaf4c45ea00ce88b97dacb9f763c842
+  data.tar.gz: 372f96bb23aac7d9a2e81a00d7184606e3c76747
 SHA512:
-  metadata.gz: e8ecc2d16be738fa47c45e2c55c544a5aca200d2184b023bea55ef17441df0eafcf817e701759189c3a27f0b9dcf1f07523ed8a4cc6e5b1e9d1ddda864e8dae1
-  data.tar.gz: 3e56068dc8148d8b230bf768b08549561b0da67328a1065d1ed2c011d1dc99cc4f4272bd0be280d9b27f8011b4b70c5281c8cc8c55b95bd6b3a9bbc15bd2e9dc
+  metadata.gz: 732f5d80d8a18f124ccd63409b67897c36466766bbd060e8090d6ee8546c8bb1e21cddbaef07fb00f370edcfb51b7dc6a1d875b74cb3e57c979db2c0f25f125b
+  data.tar.gz: 94056f5166082d2303b88503eb09041ea6f8049a1bc710d1baca9b5a10d3b5635bafb08d8f1d9473cfd9923cc0267b4670a2a744387dc957f99017ba0f414b24

data/lib/kanoko/application/convert.rb

@@ -45,12 +45,17 @@ module Kanoko
           h[ext] = i.to_s
         end
       end
+      QUERY_REGEXP = /\?.*/
 
       # /123abc456def=/resize/200x200/crop/100x100/path/to/src
       get '/:hash/*' do
         # REQUEST_URI dependent on unicorn.
         # request.path should be use only testing
-        raw_request_uri = env["REQUEST_URI"] || request.path
+        raw_request_uri = if env["REQUEST_URI"]
+                            env["REQUEST_URI"]
+                          else
+                            "#{request.path}#{request.params.empty? ? "" : "?#{request.query_string}"}"
+                          end
         request_params = raw_request_uri.split('/').tap(&:shift)
         hash = request_params.shift
         unless 0 < request_params.length
@@ -61,7 +66,7 @@ module Kanoko
         list = Kanoko::Application::Convert::Function.list
         convert_options = []
         arguments = []
-        to_ext = File.extname(request_params.last)[1..-1]
+        to_ext = File.extname(request_params.last).sub(QUERY_REGEXP, '')[1..-1]
         while id = request_params.shift.to_sym
           if id == :to
             to_ext = request_params.shift
@@ -101,13 +106,14 @@ module Kanoko
             "#{t}:"
           else
             ""
-                     end
+          end
 
           dst_name = if to_ext.nil?
             "dst"
           else
             ["dst", ".#{to_ext}"]
-                     end
+          end
+
           Tempfile.create(dst_name) do |dst_file|
             system_command = [
               { "OMP_NUM_THREADS" => "1" },

data/lib/kanoko/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kanoko
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra