riddl 0.99.255 → 0.99.256

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7efd3c192b59759fc3904bfc114c582fd0779419
-  data.tar.gz: 81df50479b20de911d2359f3b6341866946a4e48
+  metadata.gz: 234355d07a1365d8c3edad0985f8fbed5c1020b1
+  data.tar.gz: eeedfe05639e119ff574ecaef299e4fe792786aa
 SHA512:
-  metadata.gz: 28a20fdcf4e8dac7197e6a5c0db2893066cefe24ce7f1fe192efe89e7097e28588ae148854343c07874506248e2a03298532b04897226025e568ea1e38e77750
-  data.tar.gz: f425f6c7ca302bd9972e2fffd67483063674a6b00f328fc85dc84df470e08bc08c89a423aed4d571ce9f524653c7c237b2fd564ff4ed04485a750fce1255df45
+  metadata.gz: 8746dda65d1ecfb226db477340b060ca803392ddf40d1228299c39a670afdd6fb004bb579ed1cfeab379c9d7dbfc2af06a4688405de26132d713eb4e149095fa
+  data.tar.gz: fccc19fdd4ca57f9673ece1c9a071c85d1188fc52a3b9c76461424232b3d08fe06590e5738d88fcf30c4bbc640ec7217d5241bb10874ed4b6fce1fb274bb552f

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

@@ -1,11 +1,7 @@
-gem 'blather'
-
 require File.expand_path(File.dirname(__FILE__) + '/wrapper')
 require File.expand_path(File.dirname(__FILE__) + '/error')
 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')
@@ -13,7 +9,6 @@ require File.expand_path(File.dirname(__FILE__) + '/option')
 require 'net/https'
 require 'eventmachine'
 require 'em-websocket-client'
-require 'blather/client/client'
 require 'uri'
 require 'openssl'
 require 'digest/md5'
@@ -47,7 +42,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
       \A
 
       # protocol identifier
-      (?:(?:https?|xmpp)://)
+      (?:(?:https?|[a-z]{4})://)
 
       # user:pass authentication
       (?:\S+(?::\S*)?@)?
@@ -93,26 +88,8 @@ unless Module.constants.include?('CLIENT_INCLUDED')
         if @base !~ RIDDL_URL_PATTERN
           raise ConnectionError, 'An RFC 3986 URI as target is required. Pro tip: (http|https|xmpp)://...'
         end
-        if URI.parse(@base).scheme == 'xmpp' && !((@options[:jid] && @options[:pass]) || @options[:xmpp].is_a?(Blather::Client))
-          raise ConnectionError, 'XMPP connections need jid/pass or Blather::client object passed as options to be successful.'
-        end
-        if URI.parse(@base).scheme == 'xmpp' && @options[:jid] && @options[:pass]
-          sig = SignalWait.new
-          Thread::abort_on_exception = true
-          Thread.new do
-            begin
-              EM.send EM.reactor_running? ? :defer : :run do
-                client = Blather::Client.setup @options[:jid], @options[:pass]
-                client.register_handler(:ready) { sig.continue }
-                client.connect
-                @options[:xmpp] = client
-                sig.continue
-              end
-            rescue
-              raise ConnectionError, 'XMPP connection not successful.'
-            end
-          end
-          sig.wait 2
+        if @options[:custom_protocol]
+          @options[:custom_protocol] = @options[:custom_protocol].new(@base,@options)
         end
         unless riddl.nil?
           @wrapper = (riddl.class == Riddl::Wrapper ? riddl : Riddl::Wrapper::new(riddl))
@@ -127,10 +104,6 @@ unless Module.constants.include?('CLIENT_INCLUDED')
       end
       attr_reader :base
 
-      def close_xmpp
-        @options[:xmpp].close if @options[:xmpp]
-      end
-
       def self::location(base,options={})
         new(base,nil,options)
       end
@@ -409,56 +382,12 @@ unless Module.constants.include?('CLIENT_INCLUDED')
             end
             return res.code.to_i, response, response_headers
             #}}}
-          elsif url.class == URI::Generic && url.scheme.downcase == 'xmpp'
-            #{{{
-            req = Riddl::Client::XMPPRequest.new(riddl_method,url.user + "@" + url.host,url.path,parameters,headers,qs,ack)
-            return req.simulate if simulate
-
-            sig = SignalWait.new
-            stanza = req.stanza
-
-            @options[:debug].puts(stanza) if @options[:debug]
-
-            status = 404
-            response = []
-            response_headers = {}
-            if ack
-              @options[:xmpp].write_with_handler(stanza) do |raw|
-                res = XML::Smart::Dom::Element.new(raw).parent
-                @options[:debug].puts(res.to_s) if @options[:debug]
-                res.register_namespace 'xr', Riddl::Protocols::XMPP::XR_NS
-                if res.find('/message/error').empty?
-                  status = 200
-                  response_headers = {}
-                  res.find('/message/xr:header').each do |e|
-                    response_headers[e.attributes['name']] = e.text
-                  end
-                  response = Protocols::XMPP::Parser.new('', res).params
-                else
-                  res.register_namespace 'se', Blather::StanzaError::STANZA_ERR_NS
-                  err = res.find('string(/message/error/se:text)')
-                  status = (err.match(/\d+/)[0] || 209).to_i
-                end
-                sig.continue
-              end
-              sig.wait
-            else
-              status = 200
-              @options[:xmpp].write stanza
-
-              # xmpp writes in next_tick so we have to fucking wait also a tick
-              # to ensure that all shit has been written. fuck. not the best
-              # solution, but scripts may preemtively quit if we dont do it. if
-              # anybody knows a better solution, please tell me.
-
-              ### UPDATE todo, we produce deadlocks here, rethink this mess
-              # EM.next_tick { sig.continue }
-              # sig.wait
+          else
+            if @options[:custom_protocol]
+              return @options[:custom_protocol].handle(url,riddl_method,parameters,headers,qs,simulate,ack)
             end
-            return status, response, response_headers
-            #}}}
           end
-          raise URIError, "not a valid URI (http, https, xmpp are accepted)"
+          raise URIError, "not a valid URI (http, https, ... are accepted)"
         end #}}}
         private :make_request
 
@@ -489,25 +418,6 @@ unless Module.constants.include?('CLIENT_INCLUDED')
         end
       end # }}}
 
-      class XMPPRequest #{{{
-        attr_reader :stanza
-
-        def initialize(method, to, path, parameters, headers, qs, ack)
-          path = (path.strip == '' ? '' : path)
-          path += "/?#{qs}" unless qs == ''
-          path.gsub!(/\/+/,'/')
-          @stanza = Protocols::XMPP::Generator.new(method,parameters,headers,ack).generate
-          @stanza.to = to + path
-        end
-
-        def simulate
-          sock = StringIO.new('')
-          sock.write @stanza.to_s
-          sock.rewind
-          [nil, sock, []]
-        end
-      end #}}}
-
     end
 
   end

data/lib/ruby/riddl/server.rb

@@ -1,11 +1,7 @@
-gem 'blather'
-
 require File.expand_path(File.dirname(__FILE__) + '/constants')
 require File.expand_path(File.dirname(__FILE__) + '/implementation')
 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')
@@ -20,7 +16,7 @@ require 'rack/content_length'
 require 'rack/chunked'
 require 'securerandom'
 require 'psych.rb'
-require 'blather/client/client'
+
 
 module Riddl
 
@@ -133,7 +129,10 @@ module Riddl
       )
 
       puts "Server (#{@riddl_opts[:url]}) started as PID:#{Process.pid}"
-      puts "XMPP support (#{@riddl_xmpp_jid}) active" if @riddl_xmpp_jid && @riddl_xmpp_pass && !@riddl_opts[:http_only]
+      if @riddl_opts[:custom_protocol] && !@riddl_opts[:http_only]
+        @riddl_opts[:custom_protocol] = @riddl_opts[:custom_protocol].new(@riddl_opts)
+        puts @riddl_opts[:custom_protocol].support if @riddl_opts[:custom_protocol].support
+      end
       Process.daemon(@riddl_opts[:basepath]) unless @riddl_opts[:verbose]
       Dir.chdir(@riddl_opts[:basepath])
       ::Kernel::at_exit do
@@ -150,29 +149,8 @@ module Riddl
             server.start
           end
 
-          @riddl_opts[:xmpp] = nil
-          if @riddl_xmpp_jid && @riddl_xmpp_pass && !@riddl_opts[:http_only]
-            xmpp = Blather::Client.setup @riddl_xmpp_jid, @riddl_xmpp_pass
-            @riddl_opts[:xmpp] = xmpp
-            xmpp.register_handler(:message, '/message/ns:operation', :ns => 'http://riddl.org/ns/xmpp-rest') do |m|
-              began_at = Time.now
-              instance = dup
-              instance.__xmpp_call(xmpp,m)
-              now = Time.now
-              instance.riddl_log.write Rack::CommonLogger::FORMAT % [
-                @riddl_xmpp_jid || "-",
-                m.from || "-",
-                now.strftime("%d/%b/%Y %H:%M:%S"),
-                instance.riddl_method.upcase,
-                instance.riddl_pinfo,
-                '',
-                'XMPP',
-                instance.riddl_status,
-                '?',
-                now - began_at
-              ]
-            end
-            xmpp.connect
+          if @riddl_opts[:custom_protocol] && !@riddl_opts[:http_only]
+            @riddl_opts[:custom_protocol].start
           end
 
           [:INT, :TERM].each do |signal|
@@ -184,11 +162,10 @@ module Riddl
         end
 
       rescue => e
-        if e.is_a?(Blather::Stream::ConnectionFailed)
-          puts "Server (#{@riddl_xmpp_jid}) stopped due to connection error (PID:#{Process.pid})"
-        else
-          puts "Server (#{@riddl_opts[:url]}) stopped due to connection error (PID:#{Process.pid})"
+        if @riddl_opts[:custom_protocol] && !@riddl_opts[:http_only]
+          @riddl_opts[:custom_protocol].error_handling(e)
         end
+        puts "Server (#{@riddl_opts[:url]}) stopped due to connection error (PID:#{Process.pid})"
       end
     end #}}}
 
@@ -327,62 +304,6 @@ module Riddl
       end
     end #}}}
 
-    def __xmpp_call(env,raw) #{{{
-      @riddl_log = @riddl_logger || STDOUT
-
-      @riddl_env = XML::Smart::Dom::Element.new(raw).parent
-      @riddl_env.register_namespace 'xr', Riddl::Protocols::XMPP::XR_NS
-      @riddl_res = env
-      @riddl_status = 404
-
-      @riddl_pinfo = ('/' + @riddl_env.root.attributes['to'].sub(/^[^\/]+/,'')).gsub(/\/+/,'/')
-      @riddl_pinfo.gsub!(/\?(.*)/).each do
-        @riddl_query_string = $1; ''
-      end
-      @riddl_matching_path = @riddl_paths.find{ |e| @riddl_pinfo.match(e[1]).to_s.length == @riddl_pinfo.length }
-
-      if @riddl_matching_path
-        @riddl_method = @riddl_env.find('string(/message/xr:operation)').downcase
-
-        @riddl_headers = {}
-        @riddl_env.find('/message/xr:header').each do |e|
-          @riddl_headers[e.attributes['name']] = e.text
-        end
-        @riddl_parameters = Protocols::XMPP::Parser.new(
-          @riddl_query_string,
-          @riddl_env
-        ).params
-
-        @riddl_path = '/'
-        @riddl_info = {
-          :h => @riddl_headers,
-          :p => @riddl_parameters,
-          :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 }),
-          :match => []
-        }
-
-        __call
-      else
-        @riddl_log.write "404: this resource for sure does not exist.\n"
-        @riddl_status = 404 # client requests wrong path
-      end
-
-      stanza = if @riddl_exe && @riddl_status >= 200 && @riddl_status < 300
-        return if @riddl_message.out.nil?
-        Protocols::XMPP::Generator.new(@riddl_status,@riddl_exe.response,@riddl_exe.headers).generate
-      else
-        Protocols::XMPP::Error.new(@riddl_status).generate
-      end
-
-      stanza.from = raw.to
-      stanza.to = raw.from
-      stanza.id = raw.id
-      @riddl_res.write stanza
-    end #}}}
-
     def __http_call(env) #{{{
       @riddl_env = env
       @riddl_env['rack.logger'] =  @riddl_logger if @riddl_logger
@@ -419,7 +340,7 @@ module Riddl
           :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]}),
+          :env => @riddl_env.reject{|k,v| k =~ /^rack\./}.merge({'riddl.transport' => 'http', 'custom_protocol' => @riddl_opts[:custom_protocol]}),
           :match => []
         }
 
@@ -464,11 +385,6 @@ module Riddl
     def process_out(pout)# {{{
       @riddl_process_out = pout
     end# }}}
-    def xmpp(jid,pass)# {{{
-      @riddl_xmpp_jid = jid
-      @riddl_xmpp_pass = pass
-      @riddl_opts[:jid] = jid
-    end# }}}
     def cross_site_xhr(csxhr)# {{{
       @riddl_cross_site_xhr = csxhr
     end# }}}

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.255"
+  s.version          = "0.99.256"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'em-websocket-client', '>= 0.1', '~>0'
   s.add_runtime_dependency 'mime-types', '>= 2.4', '~>2'
   s.add_runtime_dependency 'minitest', '>= 5.0.0', '~>5'
-  s.add_runtime_dependency 'blather', '~>1.2'
   s.add_runtime_dependency 'charlock_holmes', '>= 0.7', '~>0'
   s.add_runtime_dependency 'redis', '>= 3.3.0', '~>3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.255
+  version: 0.99.256
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
@@ -180,20 +180,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
-- !ruby/object:Gem::Dependency
-  name: blather
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: charlock_holmes
   requirement: !ruby/object:Gem::Requirement
@@ -441,8 +427,6 @@ files:
 - lib/ruby/riddl/protocols/http/parser.rb
 - lib/ruby/riddl/protocols/utils.rb
 - lib/ruby/riddl/protocols/websocket.rb
-- lib/ruby/riddl/protocols/xmpp/generator.rb
-- lib/ruby/riddl/protocols/xmpp/parser.rb
 - lib/ruby/riddl/roles.rb
 - lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Faccess_token.rb
 - lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Fon_behalf.rb

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

@@ -1,169 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../constants')
-require File.expand_path(File.dirname(__FILE__) + '/../utils')
-require 'blather/client/client'
-require 'securerandom'
-
-module Riddl
-  module Protocols
-    module XMPP
-      XR_NS = 'http://riddl.org/ns/xmpp-rest'.freeze
-
-      class Stanza < Blather::Stanza
-        def self.new
-          node = super :message
-          node.type = :normal
-          node.id = SecureRandom.uuid
-          node
-        end
-      end
-
-      class Error
-        MAPPING = {
-          302 => ['redirect'                , 'modify' , '302 Redirect'              ],
-          400 => ['bad-request'             , 'modify' , '400 Bad Request'           ],
-          401 => ['not-authorized'          , 'auth'   , '401 Not Authorized '       ],
-          402 => ['payment-required'        , 'auth'   , '402 Payment Required'      ],
-          403 => ['forbidden'               , 'auth'   , '403 Forbidden'             ],
-          404 => ['item-not-found'          , 'cancel' , '404 Not Found'             ],
-          405 => ['not-allowed'             , 'cancel' , '405 Not Allowed'           ],
-          406 => ['not-acceptable'          , 'modify' , '406 Not Acceptable'        ],
-          407 => ['registration-required'   , 'auth'   , '407 Registration Required' ],
-          408 => ['remote-server-timeout'   , 'wait'   , '408 Request Timeout'       ],
-          409 => ['conflict'                , 'cancel' , '409 Conflict'              ],
-          500 => ['internal-server-error'   , 'wait'   , '500 Internal Server Error' ],
-          501 => ['feature-not-implemented' , 'cancel' , '501 Not Implemented'       ],
-          502 => ['service-unavailable'     , 'wait'   , '502 Remote Server Error'   ],
-          503 => ['service-unavailable'     , 'cancel' , '503 Service Unavailable'   ],
-          504 => ['remote-server-timeout'   , 'wait'   , '504 Remote Server Timeout' ],
-          510 => ['service-unavailable'     , 'cancel' , '510 Disconnected'          ]
-        }.freeze
-        UNDEFINED = [
-          'undefined-condition', 'modify'
-        ].freeze
-
-        def initialize(err)
-          m = Stanza.new
-          @stanza = if MAPPING[err]
-            Blather::StanzaError.new(m,*MAPPING[err]).to_node
-          else
-            Blather::StanzaError.new(m,*UNDEFINED,'#{err} see http://www.iana.org/assignments/http-status-codes/http-status-codes.xml').to_node
-          end
-        end
-
-        def generate
-          @stanza
-        end
-      end
-
-      class Generator
-        def initialize(what,params,headers,ack=false)
-          @params = params
-          @stanza = Stanza.new
-          @node = XML::Smart::Dom::Element.new(@stanza)
-          if what.is_a?(Fixnum)
-            @node.add('ok').namespaces.add(nil,XR_NS)
-          else
-            @node.add('operation',what,:ack=>ack).namespaces.add(nil,XR_NS)
-          end
-          headers.each do |k,v|
-            @node.add('header',v,:name => k).namespaces.add(nil,XR_NS)
-          end
-        end
-
-        def generate(mode=:output)
-          if @params.is_a?(Array) && @params.length == 1
-            body(@params[0],mode)
-          elsif @params.class == Riddl::Parameter::Simple || @params.class == Riddl::Parameter::Complex
-            body(@params,mode)
-          elsif @params.is_a?(Array) && @params.length > 1
-            multipart(mode)
-          else
-            @stanza
-          end  
-        end
-
-        def body(r,mode)
-          case r
-            when Riddl::Parameter::Simple
-              if mode == :output
-                n = @node.add('part',r.value)
-                n.namespaces.add(nil,XR_NS)
-                n.attributes['content-type'] = 'text/plain'
-                n.attributes['content-id'] = r.name
-                n.attributes['RIDDL-TYPE'] = 'simple'
-              end
-              if mode == :input
-                n = @node.add('part')
-                n.namespaces.add(nil,XR_NS)
-                n.attributes['content-type'] = 'application/x-www-form-urlencoded'
-                n.text = Riddl::Protocols::Utils::escape(r.name) + '=' + Riddl::Protocols::Utils::escape(r.value)
-              end
-            when Riddl::Parameter::Complex
-              n = @node.add('part')
-              n.namespaces.add(nil,XR_NS)
-              n.text = (r.value.respond_to?(:read) ? r.value.read : r.value)
-              n.attributes['content-type'] = r.mimetype + r.mimextra
-              n.attributes['RIDDL-TYPE'] = 'complex'
-              if r.filename.nil?
-                n.attributes['content-id'] = r.name
-              else
-                n.attributes['content-disposition'] = "riddl-data; name=\"#{r.name}\"; filename=\"#{r.filename}\""
-              end  
-          end
-          @stanza
-        end
-        private :body
-
-        def multipart(mode)
-          scount = ccount = 0
-          @params.each do |r|
-            case r
-              when Riddl::Parameter::Simple
-                scount += 1
-              when Riddl::Parameter::Complex
-                ccount += 1
-            end   
-          end
-          if scount > 0 && ccount == 0
-            n = @node.add('part')
-            n.namespaces.add(nil,XR_NS)
-            n.attributes['content-type'] = 'application/x-www-form-urlencoded'
-            res = []
-            @params.each do |r|
-              case r
-                when Riddl::Parameter::Simple
-                  res << Riddl::Protocols::Utils::escape(r.name) + '=' + Riddl::Protocols::Utils::escape(r.value)
-              end   
-            end
-            n.text = res.join('&')
-          else
-            if scount + ccount > 0
-              @params.each do |r|
-                case r
-                  when Riddl::Parameter::Simple
-                    n = @node.add('part')
-                    n.namespaces.add(nil,XR_NS)
-                    n.attributes['RIDDL-TYPE'] = 'simple'
-                    n.attributes['content-type'] = 'text/plain'
-                    n.attributes['content-disposition'] = "#{mode == :input ? 'form-data' : 'riddl-data'}; name=\"#{r.name}\""
-                    n.text = r.value
-                  when Riddl::Parameter::Complex
-                    n = @node.add('part')
-                    n.namespaces.add(nil,XR_NS)
-                    n.attributes['RIDDL-TYPE'] = 'complex'
-                    n.attributes['content-disposition'] = "#{mode == :input ? 'form-data' : 'riddl-data'}; name=\"#{r.name}\"#{r.filename.nil? ? '' : "; filename=\"#{r.filename}\""}"
-                    n.attributes['content-transfer-encoding'] = 'binary'
-                    n.attributes['content-type'] = r.mimetype + r.mimextra
-                    n.text = (r.value.respond_to?(:read) ? r.value.read : r.value)
-                end   
-              end
-            end
-          end
-          @stanza
-        end
-        private :multipart
-      
-      end
-    end
-  end
-end  

data/lib/ruby/riddl/protocols/xmpp/parser.rb

@@ -1,110 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../constants')
-require File.expand_path(File.dirname(__FILE__) + '/../../parameter')
-require File.expand_path(File.dirname(__FILE__) + '/../utils')
-
-module Riddl
-  module Protocols
-    module XMPP
-      class Parser
-        FORM_CONTENT_TYPES = [
-          #{{{
-          'application/x-www-form-urlencoded'
-          #}}}
-        ].freeze
-
-        STD_ATTRIBUTES = [
-          #{{{
-          'content-type',
-          'content-disposition',
-          'content-id',
-          'content-transfer-type',
-          'RIDDL-TYPE',
-          #}}}
-        ].freeze
-
-        def parse_part(input,head,ctype,content_disposition,content_id,riddl_type)
- #{{{
-          head = Hash[
-            head.map do |h|
-              STD_ATTRIBUTES.include?(h.qname.name) ? nil : [h.qname.name, h.value]
-            end.compact
-          ]
-          ctype = nil if riddl_type == 'simple'
-          filename = content_disposition[/ filename="?([^\";]*)"?/ni, 1]
-          name = content_disposition[/ name="?([^\";]*)"?/ni, 1] || content_id
-
-          if ctype || filename
-            body = Parameter::Tempfile.new("RiddlMultipart")
-            body.binmode if body.respond_to?(:binmode)
-          else
-            body = ''
-          end
-
-          input.each { |i| body << i.dump }
-          body.rewind if body.respond_to?(:binmode)
-
-          add_to_params(name,body,filename,ctype,head)
- #}}}
-        end
-
-        def add_to_params(name,body,filename,ctype,head)
-          #{{{
-          if filename == ""
-            # filename is blank which means no file has been selected
-          elsif filename && ctype
-            body.rewind
-
-            # Take the basename of the upload's original filename.
-            # This handles the full Windows paths given by Internet Explorer
-            # (and perhaps other broken user agents) without affecting
-            # those which give the lone filename.
-            filename =~ /^(?:.*[:\\\/])?(.*)/m
-            filename = $1
-
-            @params << Parameter::Complex.new(name, ctype, body, filename, head)
-          elsif !filename && ctype
-            body.rewind
-            
-            # Generic multipart cases, not coming from a form
-            @params << Parameter::Complex.new(name, ctype, body, nil, head)
-          else
-            @params << Parameter::Simple.new(name, body, :body)
-          end
-          #}}}
-        end
-        private :add_to_params
-
-        def parse_nested_query(qs, type)
-          #{{{
-          (qs || '').split(/[#{D}] */n).each do |p|
-            k, v = Riddl::Protocols::Utils::unescape(p).split('=', 2)
-            @params << Parameter::Simple.new(k,v,type)
-          end
-          #}}}
-        end
-        private :parse_nested_query
-
-        def initialize(query_string,input)
-          #{{{
-          @params = Riddl::Parameter::Array.new
-
-          parse_nested_query(query_string,:query)
-
-          input.find('/message/xr:part').each do |p|
-            content_type = p.attributes['content-type'] || nil
-            media_type = content_type && content_type.split(/\s*[;,]\s*/, 2).first.downcase
-            if FORM_CONTENT_TYPES.include?(media_type)
-              # sub is a fix for Safari Ajax postings that always append \0
-              parse_nested_query(p.text.sub(/\0\z/, ''),:body)
-            else  
-              parse_part(p.children,p.attributes,content_type,p.attributes['content-disposition']||'',p.attributes['content-id']||'',p.attributes['RIDDL-TYPE']||'')
-            end
-          end
-          #}}}
-        end
-
-        attr_reader :params
-      end
-    end
-  end
-end