riddl 0.101.2 → 0.101.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2cea9a80ededd022823efc922dc84709485cb2421d338ea70be4c0eb21886d6
-  data.tar.gz: 4525add42fed586dab3d1d14bdca501eb6bd35cd2bbc472dbbb356fdc3a166b3
+  metadata.gz: 8463c8e66af82fe3e3253f557b3efba7cdf0a0a04af91a862c40ac880c863b0d
+  data.tar.gz: 1cb38101d36c8e71a89a60287d46bfd230da7bc47ae595f4050ebf4eacd8eed3
 SHA512:
-  metadata.gz: a2d242c4fdb927e4edec1b3defd8f8c158c3c441a787c45061d338fc9239c40e07abc2581f936308d117443f7c24b53f4fce18b15950dd0616bfa1c8afc6b462
-  data.tar.gz: 87be88f6201c3884f1214393b63940af7141fe7f9fa505b4fe1bf773936b7ad1bba90d97275f2de2f5834de3ba3c216c6e2707984aa7da6e5217c6e0cf976b3e
+  metadata.gz: d39cf79dfc0a202c8fba8c328b67020a9645813ce3f2e846b1a18bb93126ebe3967428639387e65c499afbbc4eaa476b74c8d232215130c1068ad802d7fcc2f6
+  data.tar.gz: 95e428d2dd351b12f46307a443e624a2f0d6d6fc7e37c3519a30effdc06f452bb05e20c1d8fda88142fba0e9854a0816913a553ac96b6a751cc6e26a4a5d50f6

data/lib/ruby/riddl/wrapper/messageparser.rb

@@ -9,9 +9,9 @@ module Riddl
         headers.each do |k,v|
           if v.nil?
             @headp[k.name.upcase.gsub(/\-/,'_')] = k.value
-          else  
+          else
             @headp[k.upcase.gsub(/\-/,'_')] = v
-          end  
+          end
         end
 
         @numparams = 0
@@ -37,7 +37,7 @@ module Riddl
         if ignore_name
           # if only one parameter, ignore the name
           @numparams = m.find("count(//des:parameter)").to_i
-        end  
+        end
 
         m.find("des:*[not(name()='header')]").each do |p|
           return false unless send p.qname.to_s, p
@@ -69,22 +69,22 @@ module Riddl
                 if success
                   @mistp += 1
                   return true
-                end  
+                end
               else
                 # handler not found leads to an error
                 return false
-              end  
+              end
             else
               @mistp += 1
               return true
-            end  
+            end
           end
-        end  
+        end
         false
         #}}}
       end
       private :parameter
-      
+
       def oneOrMore(a)
         #{{{
         tistp = @mistp
@@ -93,12 +93,12 @@ module Riddl
           counter,length = traverse_simple(a,true)
           ncounter += 1 if counter == length
         end while counter == length && @mistp < @mist.length
-        if ncounter > 0 
+        if ncounter > 0
           true
-        else  
+        else
           @mistp = tistp
           false
-        end  
+        end
         #}}}
       end
 
@@ -106,7 +106,7 @@ module Riddl
         #{{{
         begin
           counter,length = traverse_simple(a,true)
-        end while counter == length && @mistp < @mist.length 
+        end while counter == length && @mistp < @mist.length
         true
         #}}}
       end
@@ -118,8 +118,8 @@ module Riddl
         end
         false
         #}}}
-      end  
-      
+      end
+
       def group(a)
         #{{{
         tistp = @mistp
@@ -132,12 +132,12 @@ module Riddl
         end
         if success
           true
-        else  
+        else
           @mistp = tistp
           false
-        end  
+        end
         #}}}
-      end  
+      end
 
       def optional(a)
         #{{{
@@ -148,7 +148,7 @@ module Riddl
 
         if counter == 0 || counter == length
           true
-        else  
+        else
           @mistp = tistp
           false
         end
@@ -173,30 +173,33 @@ module Riddl
         counter = 0
         lastname = ''
         nodes.each do |p|
-          lastname = p.qname.to_s 
+          lastname = p.qname.to_s
           counter += 1 if send lastname, p
         end
         if single_optional_protection && lastname == 'optional' && tistp == @mistp
           [0,-1]
-        else  
+        else
           [counter,nodes.length]
-        end 
+        end
         #}}}
       end
-      
+
       def match_simple(a,b)
         #{{{
         if a.attributes['fixed']
           a.attributes['fixed'] == b
-        else  
+        else
           value = XML::Smart::string("<check/>")
           value.root.text = b
           type = XML::Smart::string(CHECK)
           data = type.root.children[0]
           data.attributes['type'] = a.attributes['type']
-          data.add a.children
+          a.children.each do |e|
+            e.namespaces.delete_all!
+            data.add e
+          end
           value.validate_against type
-        end  
+        end
         #}}}
       end
       private :match_simple
@@ -211,11 +214,11 @@ module Riddl
             true
           else
             false
-          end  
+          end
         end
       end
       private :match_mimetype
 
-    end  
-  end    
+    end
+  end
 end

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.101.2"
+  s.version          = "0.101.3"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'typhoeus', '~>1.3'
   s.add_runtime_dependency 'xml-smart', '>=0.3.6', '~>0'
   s.add_runtime_dependency 'rdf-smart', '>=0.0.160', '~>0'
-  s.add_runtime_dependency 'rack', '~>1.6'
+  s.add_runtime_dependency 'rack', '~>2.2'
   s.add_runtime_dependency 'thin', '~>1.6'
   s.add_runtime_dependency 'eventmachine', '>= 1.0.0', '~>1.0'
   s.add_runtime_dependency 'em-websocket', '>= 0.4.0', '~>0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.101.2
+  version: 0.101.3
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2020-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement