riddl 0.117 → 0.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6338f9c8066488b4ae5e361f2d39ac514c8b7e2a81daa9a723cf0c7ebdc899a8
-  data.tar.gz: a1c803128b7695ed590970c53534542f39ffaf948750f64c5f4d5faa8c84023c
+  metadata.gz: f3dedc8b0cb28306e10d9bf69403c7a8e4c1e0101060070b5847b66d58e2b722
+  data.tar.gz: 4ecde45979b650bd571d79fb05a539370c6019cf2db50761f9a251a5d96f83e2
 SHA512:
-  metadata.gz: 997620d70200a2952bf334899c83f8436749ec765873fc0fa774e7268bf9b2aba4c451f4f1ec86f959e9bc5b5269b025a73a9bc8e06cbc7a6274b9b32e8cb487
-  data.tar.gz: 87f8887a0baf08ac5074f6abcc3530e06853a87dab472dee998e4d4621c4732a2be183b66f0bc013828dd37eeb13055b02ef74fdda342071ab9009cdd7d2787e
+  metadata.gz: 57c4af96b9857b1196f1abb9ccbee5e1b56fbfe58753554c47df13ba1e42594a8c58038fc92280365667a1b2ef12f460ac09eb9712a700036eab53c2d370d03c
+  data.tar.gz: 3275e26d5d59fb90c2ad1088e8d3ec79508a31ce141a117bf6a38992ad8c2bc8d9754fa640d62db118857bc0dc00e6c5bba97c5d054940d5def71320d0fd9e02

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

@@ -19,9 +19,13 @@ module Riddl
           elsif @params.is_a?(Array) && @params.length > 1
             multipart(mode)
           else
-            @headers['Content-Type'] = 'text/plain'
-            StringIO.new('','r+b')
-          end  
+            if mode == :output
+              @headers['Content-Type'] = 'text/plain'
+              StringIO.new('','r+b')
+            else
+              StringIO.new('','r+b')
+            end
+          end
         end
 
         def body(r,mode)
@@ -46,7 +50,7 @@ module Riddl
                 @headers['Content-ID'] = r.name
               else
                 @headers['Content-Disposition'] = "riddl-data; name=\"#{r.name}\"; filename=\"#{r.filename}\""
-              end  
+              end
           end
           tmp.flush
           tmp.rewind
@@ -63,7 +67,7 @@ module Riddl
                 scount += 1
               when Riddl::Parameter::Complex
                 ccount += 1
-            end   
+            end
           end
           if scount > 0 && ccount == 0
             @headers['Content-Type'] = 'application/x-www-form-urlencoded'
@@ -72,7 +76,7 @@ module Riddl
               case r
                 when Riddl::Parameter::Simple
                   res << Riddl::Protocols::Utils::escape(r.name) + '=' + Riddl::Protocols::Utils::escape(r.value)
-              end   
+              end
             end
             tmp.write res.join('&')
           else
@@ -97,7 +101,7 @@ module Riddl
                     tmp.write EOL
                     tmp.write(r.value.respond_to?(:read) ? r.value.read : r.value)
                     tmp.write EOL
-                end   
+                end
               end
               tmp.write "--" + BOUNDARY + EOL
             end
@@ -107,8 +111,8 @@ module Riddl
           tmp
         end
         private :multipart
-      
+
       end
     end
   end
-end  
+end

data/lib/ruby/riddl/wrapper/declaration/tile.rb

@@ -57,7 +57,7 @@ module Riddl
           block.each do |bl|
             bpath = bl.to_s.gsub(/\/+/,'/').gsub(/\/$/,'')
             bpath = (bpath == "" ? "/" : bpath)
-            if path == bpath
+            if interface.sub == bpath
               res.remove_access_methods(des,bl.attributes,index)
             end
           end
@@ -67,6 +67,11 @@ module Riddl
 
         def compose!(res=@base_path)
           #{{{
+          # delete empty resources
+          res.resources.delete_if do |k,r|
+            r.access_methods.length == 0
+          end
+          # compose
           res.compose!
           res.resources.each do |k,r|
             compose!(r)

data/lib/ruby/riddl/wrapper/description/resource.rb

@@ -75,6 +75,8 @@ module Riddl
             [RequestTransformation,Riddl::Wrapper::Description::Transformation.new(des,filter['transformation'])]
           elsif filter['pass'] && filter['pass'] == '*'
             [RequestPass]
+          elsif filter['method'] == 'sse'
+            [SSE]
           end
           raise BlockError, "blocking #{filter.inspect} not possible" if freq.nil?
 
@@ -95,10 +97,19 @@ module Riddl
                   true if freq[1] && freq[1].hash == req.trans.hash
                 elsif req.class == RequestPass
                   true
+                elsif req.class == SSE
+                  true
                 end
               end
             end
           end
+          if @access_methods[filter['method']][index].empty?
+            @access_methods[filter['method']].delete_at(index)
+          end
+          @access_methods[filter['method']].compact!
+          if @access_methods[filter['method']].length == 0
+            @access_methods.delete(filter['method'])
+          end
           #}}}
         end
 

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.117"
+  s.version          = "0.119"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   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: '0.117'
+  version: '0.119'
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -548,7 +548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: 'restful interface description and declaration language: tools and client/server