riddl 0.99.162 → 0.99.163

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ae68d222d023f4e61265f9d75e4bb1c79a737d
-  data.tar.gz: d640c1f61bc732d1a1fc3f84d2dc4456af1c436f
+  metadata.gz: 18b85503beb0c20754c0c07bd158b5ded0760fb1
+  data.tar.gz: afcd7fd93113b1f6a5ca754dd5c34720aea2c2a9
 SHA512:
-  metadata.gz: a0e5062e30588c3030ea4a7ff58a703714bde72e28db8594977e9b8913ba44b8ee38050ebf8f9ab718ecbe7fcedde29109186fb0add397d0fddcf89ab60b6e77
-  data.tar.gz: 2a7f4501b1bf520adb00c74cfb8a7882b6558b0f9eb46b28b67cae14bc067ee0e57a65a9a2ccb7a06d155498c11e67a55f280d5f9f222aed8d3c517cbb77d22c
+  metadata.gz: 09180e1e9b517e1019e87ccfe2a2ea9e26d5fc04f9ce84abcbbed33e2281eab568ca7a7badebedfcb0a795b1f3a4c8bae951eddfcc4cfdf80a9ada8ace914298
+  data.tar.gz: 5474fc3977e917b6585a9149b7dc728103b6db5a26fb2db2600e4668ddc74ec5d0b079f215495c224050d3cec5fef36522e24707596cd16919520be41b4db698

data/examples/properties/server.properties.xml

@@ -11,6 +11,6 @@
   </endpoints>
   <handlerwrapper>Test</handlerwrapper>
   <description>lala</description>
-  <state>running</state>
+  <state>stopped</state>
   <transformation>xxx</transformation>
 </properties>

data/lib/ruby/riddl/client.rb

@@ -12,6 +12,7 @@ require File.expand_path(File.dirname(__FILE__) + '/protocols/http/generator')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/http/parser')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/xmpp/generator')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/xmpp/parser')
+require File.expand_path(File.dirname(__FILE__) + '/protocols/utils')
 require File.expand_path(File.dirname(__FILE__) + '/header')
 require File.expand_path(File.dirname(__FILE__) + '/option')
 
@@ -268,7 +269,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
                p.type = :query
             end
             if p.class == Riddl::Parameter::Simple && p.type == :query
-              qparams << Protocols::HTTP::Generator::escape(p.name) + (p.value.nil? ? '' : '=' + Protocols::HTTP::Generator::escape(p.value))
+              qparams << Protocols::Utils::escape(p.name) + (p.value.nil? ? '' : '=' + Protocols::Utils::escape(p.value))
               true
             else
               starting = false

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

@@ -7,7 +7,7 @@ module Riddl
         provided = []
         qs = what.read
         (qs || '').split(/[&] */n).each do |p|
-          k, v = Protocols::HTTP::Parser::unescape(p).split('=', 2)
+          k, v = Protocols::Utils::unescape(p).split('=', 2)
           provided << k.to_sym
         end
         WANTED.all?{ |e| provided.include?(e) }

data/lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0/base.rb

@@ -21,42 +21,42 @@ module Riddl
         def initialize(qs)
           @provided = {}
           (qs || '').split(/[&] */n).each do |p|
-            k, v = Protocols::HTTP::Parser::unescape(p).split('=', 2)
+            k, v = Protocols::Utils::unescape(p).split('=', 2)
             @provided[k.to_sym] = v
           end
         end
       end
 
       def self::sign(fullpath,method,parameters,headers,options)
-        signature_string = method.upcase + "&" + Protocols::HTTP::Generator::escape(fullpath) + "&"
+        signature_string = method.upcase + "&" + Protocols::Utils::escape(fullpath) + "&"
 
         sparams = []
         if parameters.class == Array
           parameters.each do |p|
             if p.class == Riddl::Parameter::Simple
-              sparams << [Protocols::HTTP::Generator::escape(p.name),Protocols::HTTP::Generator::escape(p.value)]
+              sparams << [Protocols::Utils::escape(p.name),Protocols::Utils::escape(p.value)]
             end
           end
         end
 
         oparams = []
-        oparams << ["oauth_consumer_key",Protocols::HTTP::Generator::escape(options[:consumer_key])]
+        oparams << ["oauth_consumer_key",Protocols::Utils::escape(options[:consumer_key])]
         oparams << ["oauth_signature_method","HMAC-SHA1"]
         oparams << ["oauth_timestamp",Time.new.to_i.to_s]
         oparams << ["oauth_version","1.0"]
-        oparams << ["oauth_nonce",Protocols::HTTP::Generator::escape(OpenSSL::Digest::SHA1.hexdigest(rand(10000).to_s)[0...32])]
-        oparams << ["oauth_token",Protocols::HTTP::Generator::escape(options[:token])] if options[:token]
-        oparams << ["oauth_verifier",Protocols::HTTP::Generator::escape(options[:verifier])] if options[:verifier]
+        oparams << ["oauth_nonce",Protocols::Utils::escape(OpenSSL::Digest::SHA1.hexdigest(rand(10000).to_s)[0...32])]
+        oparams << ["oauth_token",Protocols::Utils::escape(options[:token])] if options[:token]
+        oparams << ["oauth_verifier",Protocols::Utils::escape(options[:verifier])] if options[:verifier]
 
         params = (sparams + oparams).sort{|a,b|a[0]<=>b[0]}.map{ |e| e[0] + '=' + e[1] }.join('&')
-        signature_string += Protocols::HTTP::Generator::escape(params)
+        signature_string += Protocols::Utils::escape(params)
 
-        signature = OpenSSL::HMAC.digest(DIGEST,"#{Protocols::HTTP::Generator::escape(options[:consumer_secret])}&#{Protocols::HTTP::Generator::escape(options[:token_secret])}",signature_string)
+        signature = OpenSSL::HMAC.digest(DIGEST,"#{Protocols::Utils::escape(options[:consumer_secret])}&#{Protocols::Utils::escape(options[:token_secret])}",signature_string)
         signature = [signature].pack("m").gsub(/\n/, '')
 
-        oparams << ["oauth_signature", Protocols::HTTP::Generator::escape(signature)]
+        oparams << ["oauth_signature", Protocols::Utils::escape(signature)]
 
-        oparams.unshift(["realm", Protocols::HTTP::Generator::escape(options[:realm])]) if options[:realm]
+        oparams.unshift(["realm", Protocols::Utils::escape(options[:realm])]) if options[:realm]
 
         headers['Authorization'] = 'OAuth ' + oparams.map{|e|e[0]+'='+"\"#{e[1]}\""}.join(', ')
       end

data/lib/ruby/riddl/server.rb

@@ -5,6 +5,7 @@ require File.expand_path(File.dirname(__FILE__) + '/protocols/http/parser')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/http/generator')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/xmpp/parser')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/xmpp/generator')
+require File.expand_path(File.dirname(__FILE__) + '/protocols/utils')
 require File.expand_path(File.dirname(__FILE__) + '/protocols/websocket')
 require File.expand_path(File.dirname(__FILE__) + '/header')
 require File.expand_path(File.dirname(__FILE__) + '/parameter')
@@ -341,7 +342,7 @@ module Riddl
         @riddl_info = { 
           :h => @riddl_headers,
           :p => @riddl_parameters,
-          :r => @riddl_pinfo.sub(/\//,'').split('/').map{|e|Protocols::HTTP::Parser::unescape(e)}, 
+          :r => @riddl_pinfo.sub(/\//,'').split('/').map{|e|Protocols::Utils::unescape(e)}, 
           :s => @riddl_matching_path[0].sub(/\//,'').split('/'),
           :m => @riddl_method, 
           :env =>  Hash[@riddl_env.root.attributes.map{|a| [a.qname.name, a.value] }].merge({ 'riddl.transport' => 'xmpp', 'xmpp' => @riddl_res }),
@@ -402,7 +403,7 @@ module Riddl
         @riddl_info = { 
           :h => @riddl_headers,
           :p => @riddl_parameters,
-          :r => @riddl_pinfo.sub(/\//,'').split('/').map{|e|Protocols::HTTP::Parser::unescape(e)}, 
+          :r => @riddl_pinfo.sub(/\//,'').split('/').map{|e|Protocols::Utils::unescape(e)}, 
           :s => @riddl_matching_path[0].sub(/\//,'').split('/'),
           :m => @riddl_method, 
           :env => @riddl_env.reject{|k,v| k =~ /^rack\./}.merge({'riddl.transport' => 'http', 'xmpp' => @riddl_opts[:xmpp]}),

data/lib/ruby/riddl/utils/properties.rb

@@ -209,7 +209,7 @@ module Riddl
 
           EM.defer{handler.property(@r[1]).read} unless handler.nil?
 
-          if ret = extract_values(backend,@r[1],Riddl::Protocols::HTTP::Parser::unescape(@r[2..-1].join('/')))
+            if ret = extract_values(backend,@r[1],Riddl::Protocols::Utils::unescape(@r[2..-1].join('/')))
             ret
           else
             @status = 404
@@ -393,7 +393,7 @@ module Riddl
           handler = @a[1]
 
           property = @r[1]
-          minor    = Riddl::Protocols::HTTP::Parser::unescape(@r[2])
+          minor    = Riddl::Protocols::Utils::unescape(@r[2])
 
           unless backend.modifiable?(property)
             @status = 500

data/lib/ruby/riddl/wrapper.rb

@@ -250,7 +250,7 @@ module Riddl
     def load_necessary_roles!
       #{{{
       @doc.find("//des:resource/@role").map{|h|h.to_s}.uniq.each do |h|
-        h = Protocols::HTTP::Generator::escape(h)
+        h = Protocols::Utils::escape(h)
         if File.exists?(File.dirname(__FILE__) + '/roles/' + h + '.rb')
           require File.expand_path(File.dirname(__FILE__) + '/roles/' + h)
         end

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.162"
+  s.version          = "0.99.163"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   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.99.162
+  version: 0.99.163
 platform: ruby
 authors:
 - Juergen eTM Mangler