riddl 0.101.7 → 0.101.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d83aea0a8b18bb1bb5c91bc6df974cd87b857223a993d78be13ac24c08e72af
-  data.tar.gz: e465d44d7bf33ca6a67513aee86e4169057cd02be233b2949a2b0458f5dde0df
+  metadata.gz: 538f2fef1e82ea03b4b6902f9b3c944bfecb1325983f23595f19ef517533508b
+  data.tar.gz: dc72c26cc82dff1c2b28783bfe63ab23f96ac12d5b88c49bb37c84da8e1bddeb
 SHA512:
-  metadata.gz: d69bc13c09deadae2faf3802d96334191206d0e184e2f64c8fcac83054edbb050dd6ef2f59c95da69f1138309b5f946ae81ae817c540008d10b666d2e7dd10ea
-  data.tar.gz: 650985b7d38d7f3aa722273956c09194f1275581d07b855cb12589cef205da6d19405ec4f9bdd4afbfe566fc88b8471fd7cfebce465e4765720954241516d257
+  metadata.gz: 8bfaa4ab3c4ccb92b434b415a080c0c992180aa09b0d7d9b957add325a9b10b925924be2237b3dead8516a0fdb1639a6919657e32eac224f21f227f0aad6d2de
+  data.tar.gz: '0588e97d620d7ab2e080a40a86c8df65f75efc966952d851c338580018dbcc5d7e7c34118993abc5b96576b970d75fd3015cd11674acbe365cd426002714ad45'

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/utils/properties.rb

@@ -469,7 +469,7 @@ module Riddl
                   cpath = File.basename(child.path)
                   subele = ele.find("p:" + cpath).first
                   if subele
-                    subele.replace_by(child)
+                    subele.replace_by_copy(child)
                   else
                     ele.add(child)
                   end

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.7"
+  s.version          = "0.101.14"
   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.7
+  version: 0.101.14
 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-25 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'