riddl 0.101.6 → 0.101.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ac699f285362fb3002c4635b8ffdf28a92404631d217e0ae0d80bfc7a28b8c
-  data.tar.gz: bf30ebb19e885a24d133fada81fe7f8c6bb52f7761b060af10372f934ebad8d8
+  metadata.gz: 109e837b2ce174314da92efbd082962a6e3fb73e7a165bf5067808986d220b41
+  data.tar.gz: c04560d8388c750139cc45e972e5fb8da06ffe04db6eee5d6416a0e776231712
 SHA512:
-  metadata.gz: 02aa2d45d6f6191e9b0460e22fa4c555e6a85bd674276ac355b29ab052242fbc23675d273dd29a98cf54039bedaadc7d5ed0c7128fa7040ec73c729ed9fe96fc
-  data.tar.gz: a3fb8861f04553eaacc6edf3dbc8438f0b5e0f821acebb43fc4f8fcb13732552ac2da374e9a3b917b5671bc4f8d6ed58c3983c6501be454206ffadd7a19aa4b3
+  metadata.gz: 99bad479ea3a0286e7a23987c2d7ba9c3dd7e539f6291754ff60e171192cda653e79010da8e8b4c6f6cc46f36dd145c6840617961d62964e94659e0c35e11068
+  data.tar.gz: 4386b196c4521963f2224b4cb95e94bc1b77a9b8388f33534e9805cca69b53d74dfa280322fae7e668d19e73511acb12f7bbefe33156ea1175ca9d0acac8d14f

data/lib/ruby/riddl/handlers/relaxng.rb

@@ -2,17 +2,22 @@ module Riddl
   module Handlers
     class RelaxNG < Riddl::Handlers::Implementation
       def self::handle(what,hinfo)
-        w = if what.class == Riddl::Parameter::Tempfile || what.class == File
-          XML::Smart.open_unprotected(what)
-        else  
-          XML::Smart.string(what)
-        end  
-        rng = XML::Smart.string("<payload>" + hinfo + "</payload>")
-        rng.register_namespace 'r', 'http://relaxng.org/ns/structure/1.0'
-        w.validate_against(rng.find("//r:grammar|//r:element").first.to_doc) rescue false
+        begin
+          w = if what.class == Riddl::Parameter::Tempfile || what.class == File
+            XML::Smart.open_unprotected(what)
+          else
+            XML::Smart.string(what)
+          end
+          rng = XML::Smart.string("<payload>" + hinfo + "</payload>")
+          rng.register_namespace 'r', 'http://relaxng.org/ns/structure/1.0'
+          w.validate_against(rng.find("//r:grammar|//r:element").first.to_doc) rescue false
+        rescue
+          puts 'The XML sent to the server is b0rked/>'
+          false
+        end
       end
     end
-  end  
-end  
+  end
+end
 
 Riddl::Handlers::add("http://riddl.org/ns/handlers/relaxng",Riddl::Handlers::RelaxNG)

data/lib/ruby/riddl/wrapper.rb

@@ -63,7 +63,8 @@ module Riddl
     RIDDL_DESCRIPTION_SHOW = "#{File.dirname(__FILE__)}/ns/common-patterns/riddl-description/show.xml"
     RIDDL_DESCRIPTION_RESOURCE_SHOW = "#{File.dirname(__FILE__)}/ns/common-patterns/riddl-description/resource-show.xml"
     COMMON = "datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"#{DESCRIPTION}\" xmlns:xi=\"http://www.w3.org/2001/XInclude\""
-    CHECK = "<element name=\"check\" datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"http://relaxng.org/ns/structure/1.0\"><data/></element>"
+    CHECK_DATA = "<element name=\"check\" datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"http://relaxng.org/ns/structure/1.0\"><data/></element>"
+    CHECK_CHOICE = "<element name=\"check\" datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"http://relaxng.org/ns/structure/1.0\"></element>"
     #}}}
 
     def initialize(name,get_description=false)

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

@@ -195,14 +195,14 @@ module Riddl
             type = XML::Smart::string(CHECK_CHOICE)
             data = type.root
           else
-            type = XML::Smart::string(CHECK)
+            type = XML::Smart::string(CHECK_DATA)
             data = type.root.children[0]
             data.attributes['type'] = a.attributes['type']
           end
           a.children.each do |e|
             unless e.class == XML::Smart::Dom::Text
-              e.namespaces.delete_all!
-              e.find('.//*').each{ |x| x.namespaces.delete_all! }
+              e = e.to_doc.root
+              e.namespaces[nil] = 'http://relaxng.org/ns/structure/1.0'
               data.add e
             end
           end

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.101.6"
+  s.version          = "0.101.12"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'daemonite', '~>0.2'
   s.add_runtime_dependency 'typhoeus', '~>1.3'
-  s.add_runtime_dependency 'xml-smart', '>=0.3.6', '~>0'
+  s.add_runtime_dependency 'xml-smart', '>=0.4.3', '~>0'
   s.add_runtime_dependency 'rdf-smart', '>=0.0.160', '~>0'
   s.add_runtime_dependency 'rack', '~>2.2'
   s.add_runtime_dependency 'thin', '~>1.6'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.101.6
+  version: 0.101.12
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.3
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
@@ -56,7 +56,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.3
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'