riddl 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9151bbe616252bba8dcaa453d7a80c8ee302709ead1a491cf5d6b271674f6068
-  data.tar.gz: b5cc9a75e847d2177dcc8fe1b3f5a293dc4194a659801dcbe87d117d452fd42f
+  metadata.gz: 28692624877cae67118d788e232ffad0707e98f685257ae38661a50235cc2e19
+  data.tar.gz: 773269607873f5d8153cb92accdb3bbcd058109c3ea00f1704807d5b5496d8af
 SHA512:
-  metadata.gz: d730da18c9408ce79d10d2836e51f4ac961e95bb4ba6fa8d26025cb7b6840fe2a307312bac4e6129073e06d3532ce9a24ac27bfd4a1ed613fa9a7977e766d7a5
-  data.tar.gz: 965872cb5818403abb37f070115f2bd9e0d3c5632e4a6f639097f879f219f9d725a88ad912318d6decba8d333016ec3814409bd10ea6efa23013c5ca8e55ba26
+  metadata.gz: d4ac230888df9ae43b840f407764ee293d6d1ddfe9c242ea9fa5e850c8b455a1722a9a1da6ba675710b310e9fa10804d67b037424799e671b4ef6b2cd299bd93
+  data.tar.gz: 5bb88e50380fcc18206f5d0c021cbeac4c7c473e97e94c221af6880baa9aac20b8f39057e042127fd2cce4e8157710eadbf630174f8a3caa426d7c1f5f083c31

data/README.md

@@ -1,5 +1,5 @@
 All code in this package is provided under the LGPL license.
-Please read the file COPYING.
+Please read the file LICENSE.
 
 For all running services (unless they are started in production mode):
 

data/examples/propnew/server.properties.schema

@@ -2,15 +2,15 @@
   This file is part of CPEE.
 
   CPEE is free software: you can redistribute it and/or modify it under the terms
-  of the GNU General Public License as published by the Free Software Foundation,
+  of the GNU Lesser General Public License as published by the Free Software Foundation,
   either version 3 of the License, or (at your option) any later version.
 
   CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
   WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along with
-  CPEE (file COPYING in the main directory).  If not, see
+  You should have received a copy of the GNU Lesser General Public License along with
+  CPEE (file LICENSE in the main directory).  If not, see
   <http://www.gnu.org/licenses/>.
 -->
 

data/lib/ruby/riddl/client.rb

@@ -291,10 +291,11 @@ unless Module.constants.include?('CLIENT_INCLUDED')
           qparams = extract_qparams(parameters,riddl_method.downcase)
 
           response = nil
+          ignore = @options[:ignore_response] ? true : false # status and headers only, the body is discarded while receiving
           if @wrapper.nil? || @wrapper.description? || (@wrapper.declaration? && !@base.nil?)
-            status, response, response_headers = make_request(@base + @rpath,riddl_method,parameters,headers,qparams,simulate,riddl_message && riddl_message.out ? true : false)
+            status, response, response_headers = make_request(@base + @rpath,riddl_method,parameters,headers,qparams,simulate,riddl_message && riddl_message.out ? true : false,ignore)
             return response if simulate
-            if !@wrapper.nil? && status >= 200 && status < 300
+            if !@wrapper.nil? && !ignore && status >= 200 && status < 300
               unless @wrapper.check_message(response,response_headers,riddl_message.out)
                 raise OutputError, "Not a valid output from service."
               end
@@ -302,9 +303,9 @@ unless Module.constants.include?('CLIENT_INCLUDED')
           elsif !@wrapper.nil? && @base.nil? && @wrapper.declaration?
             headers['RIDDL-DECLARATION-PATH'] = @rpath
             if !riddl_message.route?
-              status, response, response_headers = make_request(riddl_message.interface.real_url(@rpath,@base),riddl_method,parameters,headers,qparams,simulate,riddl_message && riddl_message.out ? true : false)
+              status, response, response_headers = make_request(riddl_message.interface.real_url(@rpath,@base),riddl_method,parameters,headers,qparams,simulate,riddl_message && riddl_message.out ? true : false,ignore)
               return response if simulate
-              if status >= 200 && status < 300
+              if !ignore && status >= 200 && status < 300
                 unless @wrapper.check_message(response,response_headers,riddl_message.out)
                   raise OutputError, "Not a valid output from service."
                 end
@@ -314,13 +315,14 @@ unless Module.constants.include?('CLIENT_INCLUDED')
               th = headers
               tq = qparams
               riddl_message.route.each do |m|
-                if m == riddl_message.route.last
-                  status, response, response_headers = make_request(m.interface.real_url(@rpath,@base),riddl_method,tp,th,tq,simulate,riddl_message && riddl_message.out ? true : false)
+                last = (m == riddl_message.route.last) # intermediate responses are the input of the next hop, never ignore them
+                if last
+                  status, response, response_headers = make_request(m.interface.real_url(@rpath,@base),riddl_method,tp,th,tq,simulate,riddl_message && riddl_message.out ? true : false,ignore)
                 else
                   status, response, response_headers = make_request(m.interface.real_url(@rpath,@base),riddl_method,tp,th,tq,simulate,true)
                 end
                 return response if simulate
-                if status < 200 || status >= 300 || !@wrapper.check_message(response,response_headers,m.out)
+                if status < 200 || status >= 300 || (!(last && ignore) && !@wrapper.check_message(response,response_headers,m.out))
                   raise OutputError, "Not a valid output from service."
                 end
                 unless m == riddl_message.route.last
@@ -342,7 +344,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
         end #}}}
         private :exec_request
 
-        def make_request(url,riddl_method,parameters,headers,qparams,simulate,ack) #{{{
+        def make_request(url,riddl_method,parameters,headers,qparams,simulate,ack,ignore=false) #{{{
           url = URI.parse(url)
           qs = qparams.join('&')
           if url.class == URI::HTTP || url.class == URI::HTTPS
@@ -371,8 +373,21 @@ unless Module.constants.include?('CLIENT_INCLUDED')
               opts[:verbose] = true ### sadly only to console, does not respect @options[:debug]
             end
 
+            # stream the body into the tempfile while receiving, so that large responses
+            # are not held in memory (without on_body, ethon collects the whole body)
+            bs = nil
+            unless ignore
+              bs = Parameter::Tempfile.new("RiddlBody")
+              bs.binmode
+            end
             begin
               req = Typhoeus::Request.new(uri,opts)
+              if ignore
+                req.on_body { |chunk,_| nil } # discard
+              else
+                bs.rewind; bs.truncate(0) # a redirect body must not end up in the result
+                req.on_body { |chunk,_| bs.write chunk; nil } # anything but :abort continues
+              end
               res = req.run
 
               response_headers = {}
@@ -389,8 +404,8 @@ unless Module.constants.include?('CLIENT_INCLUDED')
               end
             end while res.code.to_i == 302 || res.code.to_i == 301
 
-            bs = Parameter::Tempfile.new("RiddlBody")
-            bs.write res.body
+            return res.code.to_i, Riddl::Parameter::Array.new, response_headers if ignore
+
             bs.rewind
 
             response = Riddl::Protocols::HTTP::Parser.new(

data/lib/ruby/riddl/parameter.rb

@@ -52,9 +52,14 @@ module Riddl
     end
     class Tempfile < ::Tempfile
       def _close
-        @tmpfile.close if @tmpfile
-        @data[1] = nil if @data
-        @tmpfile = nil
+        if @tmpfile # older rubies keep the file in @tmpfile (and @data for the finalizer)
+          @tmpfile.close
+          @data[1] = nil if @data
+          @tmpfile = nil
+        else # newer rubies (e.g. 3.4) only have the delegated file, @tmpfile is never set
+          f = __getobj__
+          f.close unless f.closed?
+        end
       end
     end
   end

data/riddl.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "1.0.20"
+  s.version          = "1.0.21"
   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"
 
   s.description      = "REST service interface definition, mixing, and evolution. Supports mixed http and xmpp servers."
 
-  s.files            = Dir['{lib/ruby/riddl/ns/**/*,tools/**/*,ns/**/*,contrib/**/*,lib/ruby/riddl/**/*,examples/**/*}'] + %w(COPYING Rakefile riddl.gemspec README.md TODO AUTHORS INSTALL.md)
+  s.files            = Dir['{lib/ruby/riddl/ns/**/*,tools/**/*,ns/**/*,contrib/**/*,lib/ruby/riddl/**/*,examples/**/*}'] + %w(LICENSE Rakefile riddl.gemspec README.md TODO AUTHORS INSTALL.md)
 
   s.require_path     = 'lib/ruby'
   s.extra_rdoc_files = ['README.md']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -253,8 +253,8 @@ extra_rdoc_files:
 - README.md
 files:
 - AUTHORS
-- COPYING
 - INSTALL.md
+- LICENSE
 - README.md
 - Rakefile
 - TODO
@@ -533,7 +533,7 @@ homepage: http://github.com/etm/riddl/
 licenses:
 - LGPL-3.0-or-later
 metadata:
-  documentation_uri: https://gemdocs.org/gems/riddl/1.0.20/
+  documentation_uri: https://gemdocs.org/gems/riddl/1.0.21/
 rdoc_options: []
 require_paths:
 - lib/ruby