riddl 0.99.259 → 0.99.260

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c1b1de9fbd47a1665ad047a232d807495494c98
-  data.tar.gz: 81b689137e2261461a548368b16bac9bbb97cc27
+  metadata.gz: a3826c3cbdc75fe88d6d8d1635127c693a6f61e4
+  data.tar.gz: 8651dcd9448e6ca7d2bb0e49124271ec05785cbc
 SHA512:
-  metadata.gz: ee00e0900b1d2a13fe3014060ee28fbf34296b2dacf3386fa2cf805b98af65543ec9107f2dbfc5e3659cbd98dc07636fc92df77f989b9282ac48382bbbc7880d
-  data.tar.gz: '080f54624dd6fcb6cf80ef0a8a8de957185b40638f4c85a9d5cd0b4c931a21a01b9e55a709bc87c601be7e3029bfe00990f38d2420dc276af63f3d4ca22f918f'
+  metadata.gz: 0730b16245a088f76fdd2e28a3be7b23212e3ed542f22e036c2389d3bcb62b71e33f7202906eca78666089c0782840d7cd8224ff053e8c3a635469da4cbc160a
+  data.tar.gz: 79b3c5132e86b5f584e2766e98b4a8e67ba6b38bbe38ef4f0a64d474945b46f5a7f4edee28370b91457c6afb0eb638754da50468f14aca5075f74264c7a70ac5

data/examples/client/{client.rb → test1.rb}

@@ -2,7 +2,7 @@
 require '../../lib/ruby/riddl/client'
 require 'pp'
 
-library = Riddl::Client.new("http://sumatra.wst.univie.ac.at/services/delay.php")
+library = Riddl::Client.new("http://demo.wst.univie.ac.at/services/delay.php")
 status, res = library.post [
   Riddl::Parameter::Simple.new("delay","10"),
 ]
@@ -14,4 +14,4 @@ p id
   pp status
   pp res[0]
   sleep 1
-end  
+end

data/examples/client/test2.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/ruby
+require '../../lib/ruby/riddl/client'
+require 'pp'
+
+uri = 'https://mangler:test@httpbin.org/digest-auth/auth/mangler/test/MD5/never'
+
+library = Riddl::Client.new(uri)
+status, res = library.get
+
+p status

data/examples/client/test3.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/ruby
+require '../../lib/ruby/riddl/client'
+#require 'riddl/client'
+require 'pp'
+
+uri = 'http://gruppe.wst.univie.ac.at/~mangler/services/oebb.php?_taetigkeiten=taetigkeiten.txt&strategie=IS1&_schaedigungen=schaedigungen.txt'
+
+s = Time.now
+library = Riddl::Client.new(uri)
+status, res = library.post [
+  Riddl::Parameter::Simple.new("delay","10")
+]
+p status
+puts res[0].value.read
+puts Time.now-s
+

data/lib/ruby/riddl/client.rb

@@ -6,7 +6,7 @@ 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')
 
-require 'net/https'
+require 'typhoeus'
 require 'eventmachine'
 require 'em-websocket-client'
 require 'uri'
@@ -241,7 +241,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
           starting = true
           parameters.delete_if do |p|
             if starting && p.class == Riddl::Parameter::Simple && method == 'get'
-               p.type = :query
+              p.type = :query
             end
             if p.class == Riddl::Parameter::Simple && p.type == :query
               qparams << Protocols::Utils::escape(p.name) + (p.value.nil? ? '' : '=' + Protocols::Utils::escape(p.value))
@@ -336,54 +336,55 @@ unless Module.constants.include?('CLIENT_INCLUDED')
           qs = qparams.join('&')
           if url.class == URI::HTTP || url.class == URI::HTTPS
             #{{{
-            req = Riddl::Client::HTTPRequest.new(riddl_method,url.path,parameters,headers,qs)
-            return req.simulate if simulate
-
-            res = response = nil
-
-            http = Net::HTTP.new(url.host, url.port)
-            if url.class == URI::HTTPS
-              http.use_ssl = true
-              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            return Riddl::Client::HTTPRequest.new(riddl_method,url.path,parameters,headers,qs).simulate if simulate
+
+            path = (url.path.strip == '' ? '/' : url.path)
+            path += "?#{qs}" unless qs == ''
+            uri = url.scheme + '://' + url.host + ':' + url.port.to_s + path
+
+            tmp = Protocols::HTTP::Generator.new(parameters,headers).generate(:input)
+
+            opts = {
+              :method         => riddl_method,
+              :headers        => headers,
+              :body           => tmp.read,
+              :ssl_verifypeer => false
+            }
+            if url.user && url.password
+              opts[:username] = url.user
+              opts[:password] = url.password
+              opts[:httpauth] = :auto
             end
             if @options[:debug]
-              http.set_debug_output @options[:debug]
-            end
-            http.start do
-              retrycount = 0
-              begin
-                http.request(req) do |resp|
-                  res = resp
-                  bs = Parameter::Tempfile.new("RiddlBody")
-                  res.read_body(bs)
-                  bs.rewind
-                  response = Riddl::Protocols::HTTP::Parser.new(
-                    "",
-                    bs,
-                    res['CONTENT-TYPE'],
-                    res['CONTENT-LENGTH'].to_i != bs.length ? 0 : res['CONTENT-LENGTH'], # because when gzip content length differs from bs length
-                    res['CONTENT-DISPOSITION'],
-                    res['CONTENT-ID'],
-                    res['RIDDL-TYPE']
-                  ).params
-                end
-              rescue => e
-                retrycount += 1
-                if retrycount < 4
-                  retry
-                else
-                  raise Riddl::ConnectionError, "#{url.host}:#{url.port}/#{url.path} not reachable - #{e.message}."
-                end
-              end
+              opts[:verbose] = true ### sadly only to console, does not respect @options[:debug]
             end
+
+            req = Typhoeus::Request.new(uri,opts)
+            res = req.run
+
+            bs = Parameter::Tempfile.new("RiddlBody")
+            bs.write res.body
+            bs.rewind
+
             response_headers = {}
-            res.each do |k,v|
+            res.headers.each do |k,v|
               if v.nil?
                 response_headers[k.name.upcase.gsub(/\-/,'_')] = v
               else
                 response_headers[k.upcase.gsub(/\-/,'_')] = v
               end
             end
+
+            response = Riddl::Protocols::HTTP::Parser.new(
+              "",
+              bs,
+              response_headers['CONTENT_TYPE'],
+              response_headers['CONTENT_LENGTH'].to_i != bs.length ? 0 : response_headers['CONTENT_LENGTH'], # because when gzip content length differs from bs length
+              response_headers['CONTENT_DISPOSITION'],
+              response_headers['CONTENT_ID'],
+              response_headers['RIDDL_TYPE']
+            ).params
+
             return res.code.to_i, response, response_headers
             #}}}
           else
@@ -397,7 +398,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
 
       end #}}}
 
-      class HTTPRequest < Net::HTTPGenericRequest #{{{
+      class HTTPRequest #{{{
         def initialize(method, path, parameters, headers, qs)
           path = (path.strip == '' ? '/' : path)
           path += "?#{qs}" unless qs == ''
@@ -407,10 +408,6 @@ unless Module.constants.include?('CLIENT_INCLUDED')
           self.body_stream = tmp
         end
 
-        def supply_default_content_type
-          ### none, Protocols::HTTP::Generator handles this
-        end
-
         def simulate
           sock = StringIO.new('')
           sock.define_singleton_method(:io) do

data/riddl.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.259
+  version: 0.99.260
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: xml-smart
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +253,11 @@ files:
 - contrib/riddl.jpg
 - contrib/riddl.png
 - contrib/riddl.svg
-- examples/client/client.rb
+- examples/client/password,
+- examples/client/test1.rb
+- examples/client/test2.rb
+- examples/client/test3.rb
+- examples/client/username,
 - examples/declaration-server-distributed/README
 - examples/declaration-server-distributed/declaration.rb
 - examples/declaration-server-distributed/declaration.xml