riddl 0.127 → 0.129

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0695959f6c714b4aca4c11debdcd59d22fefbbe6c11f69400c2b0ebd252d43fc'
-  data.tar.gz: cabfaef2d61eb9cd5010af81f891684dce71f761255e65531ef146362b6b884a
+  metadata.gz: 6316fd15d163902d1742764b42bc4886aaeb270a4957f540c2f617b099c5b15a
+  data.tar.gz: 35713bac9ab94975e7aa396966443d54c11b45085ad640280faa9fd6e63225e7
 SHA512:
-  metadata.gz: 5d53d1d0a1aba73908811c361dfeed70e79dcec182b5c6c20863e9c1d9e7c5886c022d78dc4f97277c7519cf155a7abbb136a2b79852e64830151b73b53bf6ff
-  data.tar.gz: 442afaa166e57b02f1d29a262e693c3a5f7843e56fdbe98fe8c77f4087b94c31f58876a5a53eb83565a385e473b1b0263bc4e4a8f936896c1435fa6e0a788cee
+  metadata.gz: 268485523d1c71d829e7f9576244d438fd914f89dba9e1c039adf90155e2d0eb2f5bfb784344780f8fd97bc5627579f6ae7174f74629c5632396c438c3bb3137
+  data.tar.gz: f80e80903d09ae3c4b756ab3dd75897fb3d4586e02e4c04e0c4ffc852b5b694cd7fc79b76d82d03a4e79a512331d5140ab45a2f5d8394f0482ca0edc306bc882

data/examples/declaration-server-distributed/main.rb

@@ -5,7 +5,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/f
 
 class Info < Riddl::Implementation
   def response
-    unless File.exists?("instances/#{@r[0]}")
+    unless File.exist?("instances/#{@r[0]}")
       @status = 400
       return
     end

data/examples/declaration-server-hybrid/declaration.rb

@@ -6,7 +6,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../lib/ruby/riddl/utils/p
 
 class Info < Riddl::Implementation
   def response
-    unless File.exists?("instances/#{@r[0]}")
+    unless File.exist?("instances/#{@r[0]}")
       @status = 400
       return
     end

data/examples/flickr/Flickr/authenticate.rb

@@ -12,9 +12,9 @@ key = File.read('flickr.key').strip
 secret = File.read('flickr.secret').strip
 
 ### get frob
-if File.exists?('flickr.frob')
+if File.exist?('flickr.frob')
   frob = File.read('flickr.frob').strip
-else  
+else
   method = 'flickr.auth.getFrob'
   sig = Digest::MD5.hexdigest("#{secret}api_key#{key}method#{method}")
   status, res = rest.get [
@@ -25,7 +25,7 @@ else
   raise "no valid frob" unless status == 200
   frob = XML::Smart::string(res[0].value.read).find('string(/rsp/frob)')
   File.open('flickr.frob','w'){|f|f.write(frob)}
-end  
+end
 
 ### prepare auth link
 method = 'flickr.auth.getFrob'

data/examples/flickr/Flickr/find.rb

@@ -4,7 +4,7 @@ require '../../../lib/ruby/riddl/client'
 require 'pp'
 
 # no ready for use
-unless File.exists?('.flickr.frob')
+unless File.exist?('.flickr.frob')
   puts "Check the README file and use authenticate.rb."
   exit
 end
@@ -24,11 +24,11 @@ key = File.read('.flickr.key').strip
 secret = File.read('.flickr.secret').strip
 frob = File.read('.flickr.frob').strip
 
-### get 
-if File.exists?('.flickr.token')
+### get
+if File.exist?('.flickr.token')
   token = File.read('.flickr.token').strip
-else 
-  puts "hmm, there is no token...." 
+else
+  puts "hmm, there is no token...."
   method = 'flickr.auth.getToken'
   sig = Digest::MD5.hexdigest("#{secret}api_key#{key}frob#{frob}method#{method}")
   status, res = rest.request :get => [
@@ -66,4 +66,4 @@ status, res, headers = rest.get [
 ]
 raise "token no longer valid, delete .flickr.token, .flickr.frob then retry authenticate.rb, flickr.rb" unless status == 200
 
-puts "STATUS: #{status} RES:" + res[0].value.read + " HEADERS: #{headers}" 
+puts "STATUS: #{status} RES:" + res[0].value.read + " HEADERS: #{headers}"

data/examples/flickr/Flickr/flickr.rb

@@ -4,7 +4,7 @@ require '../../../lib/ruby/riddl/client'
 require 'pp'
 
 # no ready for use
-unless File.exists?('.flickr.frob')
+unless File.exist?('.flickr.frob')
   puts "Check the README file and use authenticate.rb."
   exit
 end
@@ -29,11 +29,11 @@ key = File.read('.flickr.key').strip
 secret = File.read('.flickr.secret').strip
 frob = File.read('.flickr.frob').strip
 
-### get 
-if File.exists?('.flickr.token')
+### get
+if File.exist?('.flickr.token')
   token = File.read('.flickr.token').strip
-else 
-  puts "hmm, there is no token...." 
+else
+  puts "hmm, there is no token...."
   method = 'flickr.auth.getToken'
   sig = Digest::MD5.hexdigest("#{secret}api_key#{key}frob#{frob}method#{method}")
   status, res = rest.get [
@@ -76,7 +76,7 @@ status, res = upload.post [
   Riddl::Parameter::Simple.new("tags", tags),
   Riddl::Parameter::Simple.new("is_public", is_public),
   Riddl::Parameter::Simple.new("api_sig", sig)
-]  
+]
 
 rsp = XML::Smart::string(res[0].value.read)
 stat = rsp.find('string(/rsp/@stat)')

data/examples/flickr/Flickr/public.rb

@@ -4,7 +4,7 @@ require '../../../lib/ruby/riddl/client'
 require 'pp'
 
 # no ready for use
-unless File.exists?('.flickr.frob')
+unless File.exist?('.flickr.frob')
   puts "Check the README file and use authenticate.rb."
   exit
 end
@@ -29,11 +29,11 @@ key = File.read('.flickr.key').strip
 secret = File.read('.flickr.secret').strip
 frob = File.read('.flickr.frob').strip
 
-### get 
-if File.exists?('.flickr.token')
+### get
+if File.exist?('.flickr.token')
   token = File.read('.flickr.token').strip
-else 
-  puts "hmm, there is no token...." 
+else
+  puts "hmm, there is no token...."
   method = 'flickr.auth.getToken'
   sig = Digest::MD5.hexdigest("#{secret}api_key#{key}frob#{frob}method#{method}")
   status, res = rest.get [
@@ -90,7 +90,7 @@ puts "RES:" + res[0].value.read
 #  Riddl::Parameter::Simple.new("tags", tags),
 #  Riddl::Parameter::Simple.new("is_public", is_public),
 #  Riddl::Parameter::Simple.new("api_sig", sig)
-#]  
+#]
 
 #rsp = XML::Smart::string(res[0].value.read)
 #stat = rsp.find('string(/rsp/@stat)')

data/examples/flickr/Helpers/flickr.rb

@@ -4,9 +4,9 @@ class FlickrHelper
   def initialize(dir)
     @api_key = File.read(dir + '/flickr.key').strip
     @api_secret = File.read(dir + '/flickr.secret').strip
-    if File.exists?(dir + 'flickr.token')
+    if File.exist?(dir + 'flickr.token')
       @auth_token = File.read(dir + 'flickr.token').strip
-    else  
+    else
       @auth_token = "simulated"
     end
   end
@@ -19,10 +19,10 @@ class FlickrHelper
       if e.class == Riddl::Parameter::Simple
         if names.empty?
           sig += "#{e.name}#{e.value}"
-        else  
+        else
           sig += "#{e.name}#{e.value}" if names.include?(e.name)
-        end  
-      end  
+        end
+      end
     end
     Digest::MD5.hexdigest(sig)
   end

data/examples/twitter/client.rb

@@ -12,7 +12,7 @@ file_token        = File.expand_path(File.dirname(__FILE__) + '/.twitter.token')
 file_token_secret = File.expand_path(File.dirname(__FILE__) + '/.twitter.token_secret')
 
 ### When token and secret already saved, skip this part
-if !File.exists?(file_token) && !File.exists?(file_token_secret)
+if !File.exist?(file_token) && !File.exist?(file_token_secret)
   ### go to request token resource and set necessary role options
   resource = twitter.resource("/oauth/request_token")
   params = [

data/examples/twitter/timeline.rb

@@ -12,7 +12,7 @@ file_token        = File.expand_path(File.dirname(__FILE__) + '/.twitter.token')
 file_token_secret = File.expand_path(File.dirname(__FILE__) + '/.twitter.token_secret')
 
 ### When token and secret already saved, skip this part
-if !File.exists?(file_token) && !File.exists?(file_token_secret)
+if !File.exist?(file_token) && !File.exist?(file_token_secret)
   ### go to request token resource and set necessary role options
   resource = twitter.resource("/oauth/request_token")
   params = [

data/examples/zotero/client.rb

@@ -11,7 +11,7 @@ file_token        = File.expand_path(File.dirname(__FILE__) + '/.zotero.token')
 file_token_secret = File.expand_path(File.dirname(__FILE__) + '/.zotero.token_secret') #}}}
 
 ### When token and secret already saved, skip this part #{{{
-if !File.exists?(file_token) && !File.exists?(file_token_secret)
+if !File.exist?(file_token) && !File.exist?(file_token_secret)
   zotero = Riddl::Client.interface("https://www.zotero.org/","zotero.xml")
 
   ### go to request token resource and set necessary role options

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

@@ -95,7 +95,8 @@ module Riddl
                     tmp.write '--' +  BOUNDARY + EOL
                     tmp.write 'RIDDL-TYPE: complex' + EOL
                     tmp.write "Content-Disposition: #{mode == :input ? 'form-data' : 'riddl-data'}; name=\"#{r.name}\""
-                    tmp.write r.filename.nil? ? '; filename=""' + EOL : "; filename=\"#{r.filename}\"" + EOL
+                    #tmp.write r.filename.nil? ? '; filename=""' + EOL : "; filename=\"#{r.filename}\"" + EOL
+                    tmp.write r.filename.nil? ? EOL : "; filename=\"#{r.filename}\"" + EOL
                     tmp.write 'Content-Transfer-Encoding: binary' + EOL
                     tmp.write 'Content-Type: ' + r.mimetype + r.mimextra + EOL
                     tmp.write EOL

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

@@ -11,14 +11,14 @@ module Riddl
           @status = 404
           return []
         end
-        if File.exists?(path)
+        if File.exist?(path)
           __ERB_FILE__ = path
           rval = ERB.new(File.read(path), 0, "%<>")
           return Riddl::Parameter::Complex.new("data",MIME::Types.type_for(path)[0].to_s,rval.result(binding))
         end
         @status = 404
         []
-      end  
+      end
     end
-  end  
+  end
 end

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

@@ -12,7 +12,7 @@ module Riddl
           @status = 404
           return []
         end
-        if File.exists?(path)
+        if File.exist?(path)
           mtime = File.mtime(path)
           @headers << Riddl::Header.new("Last-Modified",mtime.httpdate)
           @headers << Riddl::Header.new("ETag",Digest::MD5.hexdigest(mtime.httpdate))

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

@@ -87,18 +87,18 @@ module Riddl
             def each(&block)
               keys.each do |key|
                 f = @target + '/' + key + '/subscription.xml'
-                block.call Sub.new(f), key if File.exists? f
+                block.call Sub.new(f), key if File.exist? f
               end
             end
 
             def include?(key)
               f = @target + '/' + key + '/subscription.xml'
-              File.exists?(f)
+              File.exist?(f)
             end
 
             def [](key)
               f = @target + '/' + key + '/subscription.xml'
-              File.exists?(f) ? Sub.new(f) : nil
+              File.exist?(f) ? Sub.new(f) : nil
             end
 
             def create(&block)
@@ -133,7 +133,7 @@ module Riddl
           def initialize(topics,target,init=nil)
             @target = target.gsub(/^\/+/,'/')
 
-            unless File.exists?(@target)
+            unless File.exist?(@target)
               if init
                 FileUtils::cp_r init, @target
               else
@@ -141,7 +141,7 @@ module Riddl
               end
             end
 
-            raise "topics file not found" unless File.exists?(topics)
+            raise "topics file not found" unless File.exist?(topics)
             @topics = XML::Smart.open_unprotected(topics.gsub(/^\/+/,'/'))
             @topics.register_namespace 'n', 'http://riddl.org/ns/common-patterns/notifications-producer/1.0'
 

data/lib/ruby/riddl/utils/oauth2-helper.rb

@@ -18,7 +18,7 @@ module Riddl
 
             def [](key)
               get(key)
-            end  
+            end
 
             def get(key)
               @redis.get key
@@ -30,7 +30,7 @@ module Riddl
 
             def each
               if block_given?
-                @redis.keys.each do |e| 
+                @redis.keys.each do |e|
                   yield e, get(e)
                 end
               else
@@ -63,7 +63,7 @@ module Riddl
 
             def [](key)
               get(key)
-            end  
+            end
 
             def get(key)
               read if changed != @changed
@@ -72,7 +72,7 @@ module Riddl
 
             def each
               if block_given?
-                @tokens.each do |k,v| 
+                @tokens.each do |k,v|
                   yield k,v
                 end
               else
@@ -91,7 +91,7 @@ module Riddl
             end
 
             def changed
-              if ::File.exists?(@tfile)
+              if ::File.exist?(@tfile)
                 ::File.stat(@tfile).mtime
               else
                 @tokens = {}
@@ -119,7 +119,7 @@ module Riddl
               deleted
             end
           end #}}}
-        
+
         end #}}}
 
         def self::header #{{{

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

@@ -75,10 +75,10 @@ module Riddl
           @schema = @schemas.first[1]
           @rng = @rngs.first[1]
 
-          FileUtils::mkdir_p(File::dirname(@target)) unless File.exists?(@target)
-          FileUtils::cp init, @target                if init and not File.exists?(@target)
+          FileUtils::mkdir_p(File::dirname(@target)) unless File.exist?(@target)
+          FileUtils::cp init, @target                if init and not File.exist?(@target)
 
-          raise "properties file not found" unless File.exists?(@target)
+          raise "properties file not found" unless File.exist?(@target)
           @data = XML::Smart.open_unprotected(@target)
           @data.register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
           @mutex = Mutex.new
@@ -95,10 +95,10 @@ module Riddl
         end
 
         def add_schema(key,name)
-          raise "schema file not found" unless File.exists?(name)
+          raise "schema file not found" unless File.exist?(name)
           @schemas[key] = XML::Smart.open_unprotected(name.gsub(/^\/+/,'/'))
           @schemas[key].register_namespace 'p', 'http://riddl.org/ns/common-patterns/properties/1.0'
-          if !File::exists?(Riddl::Utils::Properties::PROPERTIES_SCHEMA_XSL_RNG)
+          if !File::exist?(Riddl::Utils::Properties::PROPERTIES_SCHEMA_XSL_RNG)
             raise "properties schema transformation file not found"
           end
           @rngs[key] = @schemas[key].transform_with(XML::Smart.open_unprotected(Riddl::Utils::Properties::PROPERTIES_SCHEMA_XSL_RNG))

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

@@ -14,7 +14,7 @@ module Riddl
           @status = 404
           return []
         end
-        if File.exists?(path)
+        if File.exist?(path)
           mtime = File.mtime(path)
           @headers << Riddl::Header.new("Last-Modified",mtime.httpdate)
           @headers << Riddl::Header.new("Cache-Control","max-age=15552000, public")
@@ -24,17 +24,17 @@ module Riddl
             @headers << Riddl::Header.new("Connection","close")
             @status = 304 # Not modified
             return []
-          else 
-            if xpath 
+          else
+            if xpath
               res = XML::Smart.open(path).find(xpath)
               return Riddl::Parameter::Complex.new('file','text/xml',res.any? ? res.first.dump : '<empty/>')
             else
               return Riddl::Parameter::Complex.new('file','text/xml',File.open(path,'r'))
             end
-          end  
+          end
         end
         @status = 404
-      end  
+      end
     end
-  end  
-end  
+  end
+end

data/lib/ruby/riddl/wrapper.rb

@@ -103,7 +103,7 @@ module Riddl
       @doc.find('//x:include/@href').each do |i|
         if i.value =~ /^http:\/\/(www\.)?riddl\.org(\/ns\/common-patterns\/.*)/
           t = File.expand_path(File.dirname(__FILE__)) + $2
-          i.value = t if File.exists?(t)
+          i.value = t if File.exist?(t)
         end
       end
       fpath.nil? ? @doc.xinclude! : @doc.xinclude!(fpath)
@@ -275,7 +275,7 @@ module Riddl
       #{{{
       @doc.find("//des:resource/@role").map{|h|h.to_s}.uniq.each do |h|
         h = Protocols::Utils::escape(h)
-        if File.exists?(File.dirname(__FILE__) + '/roles/' + h + '.rb')
+        if File.exist?(File.dirname(__FILE__) + '/roles/' + h + '.rb')
           require File.expand_path(File.dirname(__FILE__) + '/roles/' + h)
         end
       end

data/riddl.gemspec

@@ -1,24 +1,24 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.127"
+  s.version          = "0.129"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
-  s.summary          = "restful interface description and declaration language: tools and client/server libs"
+  s.summary          = "Restful Interface Description and Declaration Language: tools and client/server libs"
 
-  s.description      = "rest service interface definition, mixing, and evolution. supports mixed http and xmpp servers."
+  s.description      = "REST service interface definition, mixing, and evolution. Supports mixed http and xmpp servers."
 
-  s.files            = Dir['{lib/ruby/riddl/ns/**/*,tools/**/*,ns/**/*,contrib/**/*,lib/ruby/riddl/**/*,examples/**/*}'] + %w(COPYING Rakefile riddl.gemspec README.rdoc TODO AUTHORS INSTALL)
+  s.files            = Dir['{lib/ruby/riddl/ns/**/*,tools/**/*,ns/**/*,contrib/**/*,lib/ruby/riddl/**/*,examples/**/*}'] + %w(COPYING Rakefile riddl.gemspec README.md TODO AUTHORS INSTALL)
 
   s.require_path     = 'lib/ruby'
-  s.extra_rdoc_files = ['README.rdoc']
+  s.extra_rdoc_files = ['README.md']
   s.bindir           = 'tools'
   s.executables      = ['riddlcheck','riddlprocess']
   s.test_files       = Dir['test/tc_*.rb','test/smartrunner.rb']
 
   s.email            = 'juergen.mangler@gmail.com'
-  s.authors          = ['Juergen \'eTM\' Mangler','Florian \'Solo\' Stertz','Sonja Biedermann']
+  s.authors          = ['Juergen \'eTM\' Mangler','Florian \'Solo\' Stertz','Sonja Biedermann','Matthias Ehrendorfer']
   s.email            = 'juergen.mangler@gmail.com'
-  s.homepage         = 'http://www.wst.univie.ac.at/communities/riddl/'
+  s.homepage         = 'http://github.com/etm/riddl/'
 
   s.required_ruby_version = '>=2.2.0'
 

data/tools/riddlcheck

@@ -1,8 +1,8 @@
-#!/usr/bin/ruby 
+#!/usr/bin/ruby
 curpath = __FILE__
 while ::File::symlink?(curpath)
   curpath = ::File::dirname(curpath) + '/' + ::File::readlink(curpath)
-end  
+end
 require 'rubygems'
 require ::File::dirname(curpath) + "/../lib/ruby/riddl/wrapper"
 require 'optparse'
@@ -15,7 +15,7 @@ ARGV.options { |opt|
   opt.on("Filename is either a description or a declaration.")
   opt.parse!
 }
-if ARGV.length == 0 || !File.exists?(ARGV[0])
+if ARGV.length == 0 || !File.exist?(ARGV[0])
   puts ARGV.options
   exit
 end
@@ -27,7 +27,7 @@ if riddl.description?
   puts 'RIDDL description found.'
 elsif riddl.declaration?
   puts 'RIDDL declaration found.'
-else  
+else
   puts 'Neither a RIDDL description, nor a RIDDL declaration.'
   exit
 end

data/tools/riddlprocess

@@ -1,8 +1,8 @@
-#!/usr/bin/ruby 
+#!/usr/bin/ruby
 curpath = __FILE__
 while ::File::symlink?(curpath)
   curpath = ::File::dirname(curpath) + '/' + ::File::readlink(curpath)
-end  
+end
 require 'rubygems'
 require ::File::dirname(curpath) + "/../lib/ruby/riddl/wrapper"
 require 'optparse'
@@ -21,7 +21,7 @@ ARGV.options { |opt|
   opt.on("Filename has to be a declaration.")
   opt.parse!
 }
-if ARGV.length == 0 || !File.exists?(ARGV[0]) || dowhat.nil?
+if ARGV.length == 0 || !File.exist?(ARGV[0]) || dowhat.nil?
   puts ARGV.options
   exit
 end
@@ -30,7 +30,7 @@ fname = ARGV[0]
 riddl = Riddl::Wrapper.new(fname)
 
 unless riddl.declaration?
-  puts 'Not a RIDDL declaration.' 
+  puts 'Not a RIDDL declaration.'
   exit
 end
 unless riddl.validate!
@@ -48,4 +48,4 @@ case dowhat
     d.visualize_facade
   when 'description'
     puts d.description_xml
-end 
+end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: '0.127'
+  version: '0.129'
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
 - Florian 'Solo' Stertz
 - Sonja Biedermann
+- Matthias Ehrendorfer
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemonite
@@ -248,7 +249,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: rest service interface definition, mixing, and evolution. supports mixed
+description: REST service interface definition, mixing, and evolution. Supports mixed
   http and xmpp servers.
 email: juergen.mangler@gmail.com
 executables:
@@ -256,12 +257,12 @@ executables:
 - riddlprocess
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
 - AUTHORS
 - COPYING
 - INSTALL
-- README.rdoc
+- README.md
 - Rakefile
 - TODO
 - contrib/riddl.jpg
@@ -459,10 +460,8 @@ files:
 - lib/ruby/riddl/ns/description/1.0/description.rng
 - lib/ruby/riddl/option.rb
 - lib/ruby/riddl/parameter.rb
-- lib/ruby/riddl/protocols/generator.rb
 - lib/ruby/riddl/protocols/http/generator.rb
 - lib/ruby/riddl/protocols/http/parser.rb
-- lib/ruby/riddl/protocols/parser.rb
 - lib/ruby/riddl/protocols/sse.rb
 - lib/ruby/riddl/protocols/utils.rb
 - lib/ruby/riddl/protocols/websocket.rb
@@ -533,7 +532,7 @@ files:
 - tools/flash-policy-server.rb
 - tools/riddlcheck
 - tools/riddlprocess
-homepage: http://www.wst.univie.ac.at/communities/riddl/
+homepage: http://github.com/etm/riddl/
 licenses:
 - LGPL-3.0
 metadata: {}
@@ -552,10 +551,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
-summary: 'restful interface description and declaration language: tools and client/server
+summary: 'Restful Interface Description and Declaration Language: tools and client/server
   libs'
 test_files:
 - test/tc_declaration-distributed.rb

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

@@ -1,118 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../constants')
-require File.expand_path(File.dirname(__FILE__) + '/../utils')
-require 'stringio'
-
-module Riddl
-  module Protocols
-    module HTTP
-      class Generator
-        def initialize(params,headers)
-          @params = params
-          @headers = headers
-        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
-            if mode == :output
-              @headers['Content-Type'] = 'text/plain'
-              StringIO.new('','r+b')
-            else
-              StringIO.new('','r+b')
-            end
-          end
-        end
-
-        def body(r,mode)
-          tmp = StringIO.new('','r+b')
-          case r
-            when Riddl::Parameter::Simple
-              if mode == :output
-                tmp.write r.value
-                @headers['Content-Type'] = 'text/plain'
-                @headers['Content-ID'] = r.name
-                @headers['RIDDL-TYPE'] = 'simple'
-              end
-              if mode == :input
-                @headers['Content-Type'] = 'application/x-www-form-urlencoded'
-                tmp.write Riddl::Protocols::Utils::escape(r.name) + '=' + Riddl::Protocols::Utils::escape(r.value)
-              end
-            when Riddl::Parameter::Complex
-              tmp.write(r.value.respond_to?(:read) ? r.value.read : r.value)
-              @headers['Content-Type'] = r.mimetype + r.mimextra
-              @headers['RIDDL-TYPE'] = 'complex'
-              if r.filename.nil?
-                @headers['Content-ID'] = r.name
-              else
-                @headers['Content-Disposition'] = "riddl-data; name=\"#{r.name}\"; filename=\"#{r.filename}\""
-              end
-          end
-          tmp.flush
-          tmp.rewind
-          tmp
-        end
-        private :body
-
-        def multipart(mode)
-          tmp = StringIO.new('','r+b')
-          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
-            @headers['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
-            tmp.write res.join('&')
-          else
-            if scount + ccount > 0
-              @headers['Content-Type'] = "multipart/#{mode == :input ? 'form-data' : 'mixed'}; boundary=\"#{BOUNDARY}\""
-              @params.each do |r|
-                case r
-                  when Riddl::Parameter::Simple
-                    tmp.write '--' + BOUNDARY + EOL
-                    tmp.write 'RIDDL-TYPE: simple' + EOL
-                    tmp.write "Content-Disposition: #{mode == :input ? 'form-data' : 'riddl-data'}; name=\"#{r.name}\"" + EOL
-                    tmp.write EOL
-                    tmp.write r.value
-                    tmp.write EOL
-                  when Riddl::Parameter::Complex
-                    tmp.write '--' +  BOUNDARY + EOL
-                    tmp.write 'RIDDL-TYPE: complex' + EOL
-                    tmp.write "Content-Disposition: #{mode == :input ? 'form-data' : 'riddl-data'}; name=\"#{r.name}\""
-                    tmp.write r.filename.nil? ? '; filename=""' + EOL : "; filename=\"#{r.filename}\"" + EOL
-                    tmp.write 'Content-Transfer-Encoding: binary' + EOL
-                    tmp.write 'Content-Type: ' + r.mimetype + r.mimextra + EOL
-                    tmp.write EOL
-                    tmp.write(r.value.respond_to?(:read) ? r.value.read : r.value)
-                    tmp.write EOL
-                end
-              end
-              tmp.write '--' + BOUNDARY + EOL
-            end
-          end
-          tmp.flush
-          tmp.rewind
-          tmp
-        end
-        private :multipart
-
-      end
-    end
-  end
-end

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

@@ -1,205 +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 HTTP
-      class Parser
-        MULTIPART_CONTENT_TYPES = [
-          #{{{
-          'multipart/form-data',
-          'multipart/related',
-          'multipart/mixed'
-          #}}}
-        ].freeze
-        FORM_CONTENT_TYPES = [
-          #{{{
-          'application/x-www-form-urlencoded'
-          #}}}
-        ].freeze
-
-        def parse_content(input,ctype,content_length,content_disposition,content_id,riddl_type)
-          #{{{
-          # fixing for chunked?
-
-          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
-
-          if content_length == 0
-            bufsize = 16384
-            until input.eof?
-              c = input.read(bufsize)
-              raise EOFError, "bad content body"  if c.nil? || c.empty?
-              body << c
-              content_length -= c.size
-            end
-            body << input.read
-          else
-            bufsize = 16384
-            until content_length <= 0
-              c = input.read(bufsize < content_length ? bufsize : content_length)
-              raise EOFError, "bad content body"  if c.nil? || c.empty?
-              body << c
-              content_length -= c.size
-            end
-          end
-          body.rewind if body.respond_to?(:binmode)
-
-          add_to_params(name,body,filename,ctype,nil) if body.length > 0
-          #}}}
-        end
-        private :parse_content
-
-        def parse_multipart(input,content_type,content_length)
-          #{{{
-          content_type =~ %r|\Amultipart/.*boundary=\"?([^\";,]+)\"?|n
-          boundary = "--#{$1}"
-
-          boundary_size = boundary.size + EOL.size
-          content_length -= boundary_size
-          status = input.read(boundary_size)
-          raise EOFError, "bad content body" unless status == boundary + EOL
-
-          rx = /(?:#{EOL})?#{Regexp.quote boundary}(#{EOL}|--)/n
-
-          buf = ""
-          bufsize = 16384
-          loop do
-            head = nil
-            body = ''
-            filename = ctype = name = nil
-
-            until head && buf =~ rx
-              if !head && i = buf.index(EOL+EOL)
-                head = buf.slice!(0, i+2) # First \r\n
-                buf.slice!(0, 2)          # Second \r\n
-
-                filename = head[/Content-Disposition:.* filename="?([^\";]*)"?/ni, 1]
-                ctype = head[/Content-Type: (.*)#{EOL}/ni, 1]
-                name = head[/Content-Disposition:.*\s+name="?([^\";]*)"?/ni, 1] || head[/Content-ID:\s*([^#{EOL}]*)/ni, 1]
-
-                if ctype || filename
-                  body = Parameter::Tempfile.new("RiddlMultipart")
-                  body.binmode  if body.respond_to?(:binmode)
-                end
-
-                next
-              end
-
-              # Save the read body part.
-              if head && (boundary_size+4 < buf.size)
-                body << buf.slice!(0, buf.size - (boundary_size+4))
-              end
-
-              c = input.read(bufsize < content_length ? bufsize : content_length)
-              raise EOFError, "bad content body"  if c.nil? || c.empty?
-              content_length -= c.size
-
-              buf << c
-            end
-
-            # Save the rest.
-            if i = buf.index(rx)
-              body << buf.slice!(0, i)
-              buf.slice!(0, boundary_size+2)
-              content_length = -1  if $1 == "--"
-            end
-
-            p name
-            p body
-            p filename
-            p ctype
-            p head
-            p '----'
-
-            add_to_params(name,body,filename == '' ? nil : filename,ctype,head)
-
-            break if buf.empty? || content_length == -1
-          end
-          #}}}
-        end
-        private :parse_multipart
-
-        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,content_type,content_length,content_disposition,content_id,riddl_type)
-          #{{{
-          # rewind because in some cases it is not at start (when multipart without length)
-
-          begin
-            input.rewind if input.respond_to?(:rewind)
-          rescue Errno::ESPIPE
-            # Handles exceptions raised by input streams that cannot be rewound
-            # such as when using plain CGI under Apache
-          end
-
-          media_type = content_type && content_type.split(/\s*[;,]\s*/, 2).first.downcase
-          @params = Riddl::Parameter::Array.new
-          parse_nested_query(query_string,:query)
-          if MULTIPART_CONTENT_TYPES.include?(media_type)
-            parse_multipart(input,content_type,content_length.to_i)
-          elsif FORM_CONTENT_TYPES.include?(media_type)
-            # sub is a fix for Safari Ajax postings that always append \0
-            parse_nested_query(input.read.sub(/\0\z/, ''),:body)
-          else
-            parse_content(input,content_type,content_length.to_i,content_disposition||'',content_id||'',riddl_type||'')
-          end
-
-          begin
-            input.rewind if input.respond_to?(:rewind)
-          rescue Errno::ESPIPE
-            # Handles exceptions raised by input streams that cannot be rewound
-            # such as when using plain CGI under Apache
-          end
-          #}}}
-        end
-
-        attr_reader :params
-      end
-    end
-  end
-end