riddl 1.0.12 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6755641198fcdf1ec742d707109514d224a582ad0d09e148a7d2b8bf98f2f292
-  data.tar.gz: 11b7c505a67f971b723c545b6c7e3a83b12c85b2b13b2e228fd891b4a077b571
+  metadata.gz: ad59966187ba048180bb734ff13f6cd32ec4afefe92301ce9215a70dd2a2d3e0
+  data.tar.gz: 3aa43b4e9af2ecb5f4eaffa703dd55f44383518ae157d720bad2c9db0a9b48c4
 SHA512:
-  metadata.gz: fc39f83807cd69c212578dc2520488ccd8b2336ebcc73fe5d42a5562028141f0c8ced512efa87e430e703ffdd54686c8d53957ba7bcc9a39d0366e5fc7a64cae
-  data.tar.gz: e817630e2ed9cfb4be792bae5951aa2c8ef0201a47a59389fd06ec37a02a2ca784e18cecfd0ae5e14c86059db51864ec9319a3cf879f9c8e2b6f549bf21ab21f
+  metadata.gz: 24dfe6af55d83570e06a0a76c8337cc3d6a32db4b8db7626c13a3d7c7d12c1a4d2a141b5595556c6cfe9a5c0d92e351f3e6e14cf8b842c4e9334ba826a395687
+  data.tar.gz: a3c9fc40d71d9e16e4386832880d2b10da7e0dc4ac54bc734b6683f1c14f7bfefa67f91a7d87571f9ec798c05fc60badb8eaec6e2b7cc05f83c2d3f1183273c2

data/lib/ruby/riddl/client.rb

@@ -353,12 +353,12 @@ unless Module.constants.include?('CLIENT_INCLUDED')
             path += "?#{qs}" unless qs == ''
             uri = url.scheme + '://' + url.host + ':' + url.port.to_s + path
 
-            tmp = Protocols::HTTP::Generator.new(parameters,headers).generate(:input)
+            parts = Protocols::HTTP::Generator.new(parameters,headers).generate(:input)
 
             opts = {
               :method         => riddl_method,
               :headers        => headers,
-              :body           => tmp.read,
+              :body           => Protocols::HTTP::Generator.merge(parts),
               :ssl_verifypeer => false
               # :followlocation => true
             }
@@ -428,9 +428,10 @@ unless Module.constants.include?('CLIENT_INCLUDED')
           path = (path.strip == '' ? '/' : path)
           path += "?#{qs}" unless qs == ''
           super method, true, true, path, headers
-          tmp = Protocols::HTTP::Generator.new(parameters,self).generate(:input)
-          self.content_length = tmp.size
-          self.body_stream = tmp
+          parts = Protocols::HTTP::Generator.new(parameters,self).generate(:input)
+          merged = Protocols::HTTP::Generator.merge(parts)
+          self.content_length = merged.bytesize
+          self.body_stream = StringIO.new(merged)
         end
 
         def supply_default_content_type

data/lib/ruby/riddl/protocols/http/generator.rb

@@ -5,12 +5,49 @@ require 'stringio'
 module Riddl
   module Protocols
     module HTTP
+
+      class StreamingBody
+        CHUNK_SIZE = 1 << 16  # 64 KiB
+
+        def initialize(parts)
+          @parts = parts
+        end
+
+        def each
+          @parts.each do |part|
+            if part.respond_to?(:read)
+              part.rewind if part.respond_to?(:rewind)
+              yield chunk while (chunk = part.read(CHUNK_SIZE))
+            else
+              yield part.to_s
+            end
+          end
+        end
+
+        def close
+          @parts.each do |part|
+            part.close if part.respond_to?(:close) && !part.is_a?(String)
+          end
+        end
+      end
+
       class Generator
         def initialize(params,headers)
           @params = params
           @headers = headers
         end
 
+        def self.merge(parts)
+          parts.map do |p|
+            if p.respond_to?(:read)
+              p.rewind if p.respond_to?(:rewind)
+              p.read
+            else
+              p.to_s
+            end
+          end.join
+        end
+
         def generate(mode=:output)
           if @params.is_a?(Array) && @params.length == 1
             body(@params[0],mode)
@@ -21,29 +58,26 @@ module Riddl
           else
             if mode == :output
               @headers['Content-Type'] = 'text/plain'
-              StringIO.new('','r+b')
-            else
-              StringIO.new('','r+b')
             end
+            []
           end
         end
 
         def body(r,mode)
-          tmp = StringIO.new('','r+b')
+          parts = []
           case r
             when Riddl::Parameter::Simple
               if mode == :output
-                tmp.write r.value
+                parts << r.value
                 @headers['Content-Type'] = 'text/plain'
                 @headers['Content-ID'] = r.name
                 @headers['RIDDL-TYPE'] = 'simple'
-              end
-              if mode == :input
+              else
                 @headers['Content-Type'] = 'application/x-www-form-urlencoded'
-                tmp.write Riddl::Protocols::Utils::escape(r.name) + '=' + Riddl::Protocols::Utils::escape(r.value)
+                parts << Riddl::Protocols::Utils::escape(r.name) + '=' + Riddl::Protocols::Utils::escape(r.value)
               end
             when Riddl::Parameter::Complex
-              tmp.write(r.value.respond_to?(:read) ? r.value.read : r.value)
+              parts << r.value
               @headers['Content-Type'] = r.mimetype + r.mimextra
               @headers['RIDDL-TYPE'] = 'complex'
               if r.filename.nil?
@@ -52,14 +86,12 @@ module Riddl
                 @headers['Content-Disposition'] = "riddl-data; name=\"#{r.name}\"; filename=\"#{r.filename}\""
               end
           end
-          tmp.flush
-          tmp.rewind
-          tmp
+          parts
         end
         private :body
 
         def multipart(mode)
-          tmp = StringIO.new('','r+b')
+          parts = []
           scount = ccount = 0
           @params.each do |r|
             case r
@@ -78,38 +110,35 @@ module Riddl
                   res << Riddl::Protocols::Utils::escape(r.name) + '=' + Riddl::Protocols::Utils::escape(r.value)
               end
             end
-            tmp.write res.join('&')
+            parts << res.join('&')
           else
             if scount + ccount > 0
               @headers['Content-Type'] = "multipart/#{mode == :input ? 'form-data' : 'mixed'}; boundary=\"#{BOUNDARY}\""
               @params.each do |r|
                 case r
                   when Riddl::Parameter::Simple
-                    tmp.write '--' + BOUNDARY + EOL
-                    tmp.write 'RIDDL-TYPE: simple' + EOL
-                    tmp.write "Content-Disposition: form-data; name=\"#{r.name}\"" + EOL
-                    tmp.write EOL
-                    tmp.write r.value
-                    tmp.write EOL
+                    parts << '--' + BOUNDARY + EOL +
+                             'RIDDL-TYPE: simple' + EOL +
+                             "Content-Disposition: form-data; name=\"#{r.name}\"" + EOL +
+                             EOL +
+                             r.value.to_s +
+                             EOL
                   when Riddl::Parameter::Complex
-                    tmp.write '--' +  BOUNDARY + EOL
-                    tmp.write 'RIDDL-TYPE: complex' + EOL
-                    tmp.write "Content-Disposition: form-data; name=\"#{r.name}\""
-                    #tmp.write r.filename.nil? ? '; filename=""' + EOL : "; filename=\"#{r.filename}\"" + EOL
-                    tmp.write r.filename.nil? ? EOL : "; filename=\"#{r.filename}\"" + EOL
-                    tmp.write 'Content-Transfer-Encoding: binary' + EOL
-                    tmp.write 'Content-Type: ' + r.mimetype + r.mimextra + EOL
-                    tmp.write EOL
-                    tmp.write(r.value.respond_to?(:read) ? r.value.read : r.value)
-                    tmp.write EOL
+                    parts << '--' +  BOUNDARY + EOL +
+                             'RIDDL-TYPE: complex' + EOL +
+                             "Content-Disposition: form-data; name=\"#{r.name}\"" +
+                                (r.filename.nil? ? EOL : "; filename=\"#{r.filename}\"" + EOL) +
+                             'Content-Transfer-Encoding: binary' + EOL +
+                             'Content-Type: ' + r.mimetype + r.mimextra + EOL +
+                             EOL
+                    parts << r.value
+                    parts << EOL
                 end
               end
-              tmp.write '--' + BOUNDARY + '--' + EOL
+              parts << '--' + BOUNDARY + '--' + EOL
             end
           end
-          tmp.flush
-          tmp.rewind
-          tmp
+          parts
         end
         private :multipart
 

data/lib/ruby/riddl/protocols/http/parser.rb

@@ -21,8 +21,6 @@ module Riddl
 
         def parse_content(input,ctype,content_length,content_disposition,content_id,riddl_type)
           #{{{
-          # fixing for chunked?
-
           ctype = nil if riddl_type == 'simple'
           filename = content_disposition[/ filename="?([^\";]*)"?/ni, 1]
           name = content_disposition[/ name="?([^\";]*)"?/ni, 1] || content_id
@@ -35,6 +33,8 @@ module Riddl
           end
 
           if content_length == 0
+            # should never happen normally, but leave it in, as sombody might
+            # decide to use parse_content independently
             bufsize = 16384
             until input.eof?
               c = input.read(bufsize)
@@ -177,6 +177,9 @@ module Riddl
             # such as when using plain CGI under Apache
           end
 
+          # fixing for chunked
+          content_length = content_length && content_length.to_i > 0 ? content_length.to_i : input.size
+
           media_type = content_type && content_type.split(/\s*[;,]\s*/, 2).first.downcase
           @params = Riddl::Parameter::Array.new
           parse_nested_query(query_string,:query)

data/lib/ruby/riddl/server.rb

@@ -322,13 +322,16 @@ module Riddl
         @riddl_status = 404 # client requests wrong path
       end
       if @riddl_exe
-        @riddl_res.write Protocols::HTTP::Generator.new(@riddl_exe.response,@riddl_res).generate.read
+        parts = Protocols::HTTP::Generator.new(@riddl_exe.response,@riddl_res).generate
         @riddl_exe.headers.each do |n,h|
           @riddl_res[n] = h
         end
+        @riddl_res.status = @riddl_status
+        [@riddl_status, @riddl_res.headers, Protocols::HTTP::StreamingBody.new(parts)]
+      else
+        @riddl_res.status = @riddl_status
+        @riddl_res.finish
       end
-      @riddl_res.status = @riddl_status
-      @riddl_res.finish
     end #}}}
 
     def process_out(pout)# {{{

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "1.0.12"
+  s.version          = "1.0.14"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Restful Interface Description and Declaration Language: tools and client/server libs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.14
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -539,7 +539,7 @@ homepage: http://github.com/etm/riddl/
 licenses:
 - LGPL-3.0-or-later
 metadata:
-  documentation_uri: https://gemdocs.org/gems/riddl/1.0.12/
+  documentation_uri: https://gemdocs.org/gems/riddl/1.0.14/
 rdoc_options: []
 require_paths:
 - lib/ruby