riddl 0.99.105 → 0.99.106

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 12c031be92256e0af144457f4fcfcb02c4e0c7eb
+  data.tar.gz: d48a272fdef110c5d5ee3504da07869ad0a633fa
+SHA512:
+  metadata.gz: 4968eab363c56e10bf3be952018c6e9c4752126d316da12cf74ac631a56fdbf33b9592d09bc109da55be01c0281f42efd3bc6339dccbdd6d44523413ffcbbd54
+  data.tar.gz: f3d6fed2f30fda387954503ef037d9e36acb87dda23db77f735bf07869f2cdf8e1e653ef7487b1f41c79e1ed0b471a3edfa025a1ec17a857b9955710b3d8c47e

data/lib/riddl/client.rb

@@ -25,8 +25,8 @@ class SignalWait #{{{
     @q = Queue.new
   end
 
-  def wait
-    @q.deq
+  def wait(num=1)
+    num.times{ @q.deq }
   end
 
   def continue
@@ -46,19 +46,26 @@ unless Module.constants.include?('CLIENT_INCLUDED')
         @options = options
         @wrapper = nil
         @thread = nil
-        sig = SignalWait.new
-        if URI.parse(@base).scheme == 'xmpp' &&  @options[:jid] && @options[:pass]
+        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 = Thread.new do
-            EM.run do
-              client = Blather::Client.setup @options[:jid], @options[:pass]
-              client.register_handler(:ready) { sig.continue; }
-              client.connect
-              @options[:xmpp] = client
-              sig.continue
+            begin
+              EM.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
-          sig.wait
+          sig.wait 2
         end
         unless riddl.nil?
           @wrapper = (riddl.class == Riddl::Wrapper ? riddl : Riddl::Wrapper::new(riddl))
@@ -245,7 +252,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
 
           res = response = nil
           if @wrapper.nil? || @wrapper.description? || (@wrapper.declaration? && !@base.nil?)
-            status, response, response_headers = make_request(@base + @rpath,riddl_method,parameters,headers,qparams,simulate)
+            status, response, response_headers = make_request(@base + @rpath,riddl_method,parameters,headers,qparams,simulate,!riddl_message.out.nil?)
             return response if simulate
             if !@wrapper.nil? && status == 200
               unless @wrapper.check_message(response,response_headers,riddl_message.out)
@@ -255,7 +262,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
           elsif !@wrapper.nil? && @base.nil? && @wrapper.declaration?
             headers['RIDDL-DECLARATION-PATH'] = @rpath
             if !riddl_message.route?
-              status, response, response_headers = make_request(riddl_message.interface.real_url(@rpath,@base),riddl_method,parameters,headers,qparams,simulate)
+              status, response, response_headers = make_request(riddl_message.interface.real_url(@rpath,@base),riddl_method,parameters,headers,qparams,simulate,!riddl_message.out.nil?)
               return response if simulate
               if status == 200
                 unless @wrapper.check_message(response,response_headers,riddl_message.out)
@@ -267,7 +274,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
               th = headers
               tq = qparams
               riddl_message.route.each do |m|
-                status, response, response_headers = make_request(m.interface.real_url(@rpath,@base),riddl_method,tp,th,tq,simulate)
+                status, response, response_headers = make_request(m.interface.real_url(@rpath,@base),riddl_method,tp,th,tq,simulate,!riddl_message.out.nil?)
                 return response if simulate
                 if status != 200 || !@wrapper.check_message(response,response_headers,m.out)
                   raise OutputError, "Not a valid output from service."
@@ -291,7 +298,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
         end #}}}
         private :exec_request
 
-        def make_request(url,riddl_method,parameters,headers,qparams,simulate) #{{{
+        def make_request(url,riddl_method,parameters,headers,qparams,simulate,out) #{{{
           url = URI.parse(url)
           qs = qparams.join('&')
           if url.class == URI::HTTP || url.class == URI::HTTPS
@@ -338,6 +345,7 @@ unless Module.constants.include?('CLIENT_INCLUDED')
             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)
             return req.simulate if simulate
 
@@ -349,26 +357,32 @@ unless Module.constants.include?('CLIENT_INCLUDED')
             status = 404
             response = []
             response_headers = {}
-            @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
+            if out
+              @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)
             end
-            sig.wait
             return status, response, response_headers
+            #}}}
           end
           raise URIError, "not a valid URI (http, https, xmpp are accepted)"
         end #}}}

data/lib/riddl/error.rb

@@ -5,4 +5,5 @@ module Riddl
   class PathError < ::RuntimeError; end
   class BlockError < ::StandardError; end
   class SpecificationError < ::StandardError; end
+  class ConnectionError < ::StandardError; end
 end

data/lib/riddl/server.rb

@@ -160,32 +160,41 @@ module Riddl
         v.delete [Rack::Lint]
       end  
 
-      EM.run do
-        puts "Server (#{@riddl_opts[:url]}) started as #{Process.pid}"
-        puts "XMPP support (#{@riddl_xmpp_jid}) active" if @riddl_xmpp_jid && @riddl_xmpp_pass
-        server.start
-        if @riddl_xmpp_jid && @riddl_xmpp_pass
-          xmpp = Blather::Client.setup @riddl_xmpp_jid, @riddl_xmpp_pass
-          xmpp.register_handler(:message, :type => :normal) 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
-        end  
+      begin
+        EM.run do
+          puts "Server (#{@riddl_opts[:url]}) started as PID:#{Process.pid}"
+          puts "XMPP support (#{@riddl_xmpp_jid}) active" if @riddl_xmpp_jid && @riddl_xmpp_pass
+          server.start
+          if @riddl_xmpp_jid && @riddl_xmpp_pass
+            xmpp = Blather::Client.setup @riddl_xmpp_jid, @riddl_xmpp_pass
+            @riddl_opts[:xmpp] = xmpp
+            xmpp.register_handler(:message, :type => :normal) 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
+          end  
+        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})"
+        end
       end
     end #}}}
 
@@ -193,9 +202,7 @@ module Riddl
 
     def initialize(riddl,opts={},&blk)# {{{
       @riddl_opts = {}
-      OPTS.each do |k,v|
-        @riddl_opts[k] = opts.has_key?(k) ? opts[k] : v
-      end
+      @riddl_opts = OPTS.merge(opts) 
 
       if File.exists?(@riddl_opts[:basepath] + '/' + @riddl_opts[:conffile])
         @riddl_opts.merge!(YAML::load_file(@riddl_opts[:basepath] + '/' + @riddl_opts[:conffile]))
@@ -210,7 +217,7 @@ module Riddl
       @riddl_paths              = []  
 
       @riddl_interfaces = {}
-      instance_eval(&blk) if block_given?
+      instance_exec(@riddl_opts,&blk) if block_given?
 
       @riddl = Riddl::Wrapper.new(riddl,@accessible_description)
       if @riddl.description?
@@ -326,11 +333,14 @@ module Riddl
         @riddl_log.write "404: this resource for sure does not exist.\n"
         @riddl_status = 404 # client requests wrong path
       end
+     p  @riddl_message.out
+
       stanza = if @riddl_exe && @riddl_status == 200
         Protocols::XMPP::Generator.new(@riddl_status,@riddl_exe.response,@riddl_exe.headers).generate
       else
         Protocols::XMPP::Error.new(@riddl_status).generate
-      end  
+      end
+
       stanza.from = raw.to
       stanza.to = raw.from
       stanza.id = raw.id

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.105"
+  s.version          = "0.99.106"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,132 +1,116 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.105
-  prerelease: 
+  version: 0.99.106
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: em-websocket-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -142,17 +125,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: blather
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: rest service interface definition, mixing, and evolution
@@ -258,28 +239,27 @@ files:
 homepage: http://www.wst.univie.ac.at/communities/riddl/
 licenses:
 - LGPL-3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
-summary: ! 'restful interface description and declaration language: tools and client/server
+specification_version: 4
+summary: 'restful interface description and declaration language: tools and client/server
   libs'
 test_files:
 - test/tc_declaration-hybrid.rb