riddl 0.99.125 → 0.99.129

data/Rakefile

@@ -19,3 +19,7 @@ end
 task :push => :gem do |r|
   `gem push pkg/riddl.gem`
 end  
+
+task :install => :gem do |r|
+  `sudo gem install pkg/riddl.gem`
+end  

data/lib/{riddl → ruby/riddl}/handlers/relaxng.rb

@@ -7,7 +7,9 @@ module Riddl
         else  
           XML::Smart.string(what)
         end  
-        w.validate_against(XML::Smart.string(hinfo)) rescue false
+        rng = XML::Smart.string("<payload>" + hinfo + "</payload>")
+        rng.register_namespace 'r', 'http://relaxng.org/ns/structure/1.0'
+        w.validate_against(rng.find("//r:grammar|//r:element").first.to_doc) rescue false
       end
     end
   end  

data/lib/{riddl → ruby/riddl}/ns/common-patterns/riddl-description/resource-show.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <description xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <message name="riddl-description-response">
+    <header name="RIDDL_DESCRIPTION" fixed="oh my, a riddl description"/>  
     <parameter name="riddl-description" mimetype="text/xml"/>
   </message>
   <message name="riddl-resource-description-request">

data/lib/{riddl → ruby/riddl}/ns/common-patterns/riddl-description/show.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <description xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <message name="riddl-description-response">
+    <header name="RIDDL_DESCRIPTION" fixed="oh my, a riddl description"/>  
     <parameter name="riddl-description" mimetype="text/xml"/>
   </message>
   <message name="riddl-description-request">

data/lib/{riddl → ruby/riddl}/server.rb

@@ -253,9 +253,9 @@ module Riddl
           @riddl_status = 501 # not implemented?!
         end  
       else
-        if !@riddl_message.nil? && @riddl_message.in.name == 'riddl-description-request' && @riddl_method == 'get' &&  '/' + @riddl_info[:s].join('/') == '/'
+        if !@riddl_message.nil? && @accessible_description && @riddl_message.in.name == 'riddl-description-request' && @riddl_method == 'get' &&  '/' + @riddl_info[:s].join('/') == '/'
           run Riddl::Utils::Description::RDR, @riddl_description_string 
-        elsif !@riddl_message.nil? && @riddl_message.in.name == 'riddl-resource-description-request' && @riddl_method == 'get'
+        elsif !@riddl_message.nil? && @accessible_description && @riddl_message.in.name == 'riddl-resource-description-request' && @riddl_method == 'get'
           @riddl_path = File.dirname('/' + @riddl_info[:s].join('/')).gsub(/\/+/,'/')
           on resource File.basename('/' + @riddl_info[:s].join('/')).gsub(/\/+/,'/') do
             run Riddl::Utils::Description::RDR, @riddl.resource_description(@riddl_matching_path[0])

data/lib/{riddl → ruby/riddl}/utils/description.rb

@@ -6,6 +6,7 @@ module Riddl
 
       class RDR < Riddl::Implementation
         def response
+          @headers << Riddl::Header.new("RIDDL_DESCRIPTION", 'oh my, a riddl description')
           return Riddl::Parameter::Complex.new("riddl-description","text/xml",@a[0])
         end
       end
@@ -15,11 +16,14 @@ module Riddl
           client = Riddl::Client.new(@a[3],@a[4])
 
           path = client.resource "/" + @a[5]
-          @status, result = if @a[0].nil?
+          @status, result, headers = if @a[0].nil?
             path.request @m => [ Riddl::Header.new("RIDDL_DECLARATION_RESOURCE", @a[2]), Riddl::Header.new("RIDDL-DECLARATION-PATH", @a[1]) ] + @h.map{|a,b| Riddl::Header.new(a,b)} + @p
           else 
             path.request @m => [ Riddl::Header.new("RIDDL_DECLARATION_RESOURCE", @a[2]), Riddl::Header.new("RIDDL-DECLARATION-PATH", @a[1]) ] + @a[0].headers.map{|a,b| Riddl::Header.new(a,b)} + @a[0].response
-          end  
+          end
+          headers.each do |k,v|
+            @headers << Riddl::Header.new(k,v) unless ["CONTENT_TYPE", "CONTENT_DISPOSITION", "RIDDL_TYPE", "CONTENT_ID", "CONTENT_LENGTH", "CONNECTION", "SERVER"].include?(k)
+          end
           result
         end
       end

data/lib/{riddl → ruby/riddl}/wrapper.rb

@@ -129,7 +129,7 @@ module Riddl
       @declaration
       #}}}
     end
-      
+
     def description
       #{{{
       if @description.nil? && @is_description
@@ -148,8 +148,8 @@ module Riddl
     end #}}}
 
     def resource_description(path)
-      req = @description.get_resource(path).description_xml if @is_description
-      req = @declaration.get_resource(path).description_xml if @is_declaration
+      req = @description.get_resource(path).description_xml(@doc.namespaces) if @is_description
+      req = @declaration.get_resource(path).description_xml(@doc.namespaces) if @is_declaration
       req.to_s
     end
 

data/lib/{riddl → ruby/riddl}/wrapper/declaration.rb

@@ -15,11 +15,11 @@ module Riddl
       end
       
       def description_xml
-        @facade.description_xml
+        @facade.description_xml(@namespaces)
       end
 
       def description
-        Riddl::Wrapper.new(@facade.description_xml)
+        Riddl::Wrapper.new(@facade.description_xml(@namespaces))
       end
 
       def visualize_tiles_and_layers
@@ -59,6 +59,7 @@ module Riddl
 
       def initialize(riddl)
         @facade = Riddl::Wrapper::Declaration::Facade.new
+        @namespaces = riddl.namespaces
         #{{{
         ### create single tiles
         @tiles = []

data/lib/{riddl → ruby/riddl}/wrapper/declaration/facade.rb

@@ -7,8 +7,14 @@ module Riddl
           @resource = Riddl::Wrapper::Description::Resource.new("/")
         end
 
-        def description_xml
+        def description_xml(namespaces)
           #{{{
+          namespaces = namespaces.delete_if do |k,n|
+            k =~ /^xmlns\d+$/ || [Riddl::Wrapper::DESCRIPTION, Riddl::Wrapper::DECLARATION, Riddl::Wrapper::XINCLUDE].include?(n)
+          end.map do |k,n|
+            "xmlns:#{k}=\"#{n}\""
+          end.join(' ')
+
           result = ""
           messages = {}
           names = []
@@ -23,7 +29,7 @@ module Riddl
             t.root.attributes['name'] = name
             messages_result << t.root.dump + "\n"
           end
-          XML::Smart.string("<description #{Riddl::Wrapper::COMMON}>\n\n" + description_result + messages_result.gsub(/^/,'  ') + "\n" + result + "\n</description>").to_s
+          XML::Smart.string("<description #{Riddl::Wrapper::COMMON} #{namespaces}>\n\n" + description_result + messages_result.gsub(/^/,'  ') + "\n" + result + "\n</description>").to_s
           #}}}
         end
         def description_xml_priv(result,messages,level,res=@resource)
@@ -31,38 +37,7 @@ module Riddl
           s = "  " * (level + 1)
           t = "  " * (level + 2)
           result << s + "<resource#{res.path != '/' && res.path != '{}' ? " relative=\"#{res.path}\"" : ''}#{res.recursive ? " recursive=\"true\"" : ''}>\n"
-          res.composition.each do |k,v|
-            v.each do |m|
-              m = m.result
-              if %w{get post put delete websocket}.include?(k)
-                result << t + "<#{k} "
-              else
-                result << t + "<request method=\"#{k}\" "
-              end  
-              case m
-                when Riddl::Wrapper::Description::RequestInOut
-                  messages[m.in.hash] ||= m.in
-                  result << "in=\"#{messages[m.in.hash].name}\""
-                  unless m.out.nil?
-                    messages[m.out.hash] ||= m.out
-                    result << " out=\"#{messages[m.out.hash].name}\""
-                  end  
-                when Riddl::Wrapper::Description::RequestStarOut
-                  result << "in=\"*\""
-                  unless m.out.nil?
-                    messages[m.out.hash] ||= m.out
-                    result << " out=\"#{messages[m.out.hash].name}\""
-                  end  
-                when Riddl::Wrapper::Description::RequestPass
-                  messages[m.pass.hash] ||= m.pass
-                  result << "pass=\"#{messages[m.pass.hash].name}\""
-                when Riddl::Wrapper::Description::RequestTransformation
-                  messages[m.trans.hash] ||= m.trans
-                  result << "transformation=\"#{messages[m.trans.hash].name}\""
-              end  
-              result << "/>\n"
-            end  
-          end
+          result << res.description_xml_string(messages,t)
           res.resources.each do |k,v|
             description_xml_priv(result,messages,level+1,v)
           end
@@ -74,6 +49,7 @@ module Riddl
       
         def merge_tiles(res,fac=@resource)
           #{{{
+          fac.custom = fac.custom + res.custom
           res.composition.each do |method,s|
             fac.composition[method] ||= []
             fac.composition[method] += s

data/lib/{riddl → ruby/riddl}/wrapper/declaration/tile.rb

@@ -47,6 +47,7 @@ module Riddl
           #{{{
           res = add_path(path,res,rec)
           res.add_access_methods(des,desres,index,interface)
+          res.add_custom(desres)
           block.each do |bl|
             bpath = bl.to_s.gsub(/\/+/,'/').gsub(/\/$/,'')
             bpath = (bpath == "" ? "/" : bpath)
@@ -73,9 +74,8 @@ module Riddl
           #}}}
         end
 
-        def add_path(path,res,rec=nil)
+        def add_path(path,pres,rec=nil)
           #{{{
-          pres = res
           path.split('/').each do |pa|
             next if pa == ""
             unless pres.resources.has_key?(pa)

data/lib/{riddl → ruby/riddl}/wrapper/description.rb

@@ -44,6 +44,7 @@ module Riddl
           res = res.resources[path]
         end
         res.add_access_methods(des,desres,0,nil)
+        res.add_custom(desres)
         desres.find("des:resource").each do |desres|
           cpath = desres.attributes['relative'] || "{}"
           rec = desres.attributes['recursive']

data/lib/{riddl → ruby/riddl}/wrapper/description/access.rb

@@ -10,10 +10,12 @@ module Riddl
           @used || false
         end
         attr_reader :interface
+        attr_reader :custom
       end# }}}
 
       class RequestInOut < AccessBase# {{{
-        def initialize(des,min,mout,interface)
+        def initialize(des,min,mout,interface,custom=[])
+          @custom = custom
           @interface = interface
           if des.nil?
             @in = min
@@ -34,7 +36,8 @@ module Riddl
       end# }}}
 
       class RequestTransformation < AccessBase# {{{
-        def initialize(des,mtrans,interface)
+        def initialize(des,mtrans,interface,custom=[])
+          @custom = custom
           @interface = interface
           if des.nil?
             @trans = mtrans
@@ -65,7 +68,8 @@ module Riddl
       end# }}}
 
       class RequestStarOut < AccessBase# {{{
-        def initialize(des,mout,interface)
+        def initialize(des,mout,interface,custom=[])
+          @custom = custom
           @interface = interface
           if des.nil?
             @out = mout
@@ -84,7 +88,8 @@ module Riddl
       end# }}}
 
       class RequestPass < AccessBase# {{{
-        def initialize(interface)
+        def initialize(interface,custom=[])
+          @custom = custom
           @interface = interface
         end  
         def visualize; ""; end
@@ -94,10 +99,11 @@ module Riddl
       end# }}}
 
       class WebSocket < AccessBase# {{{
-        def visualize; ""; end
-        def initialize(interface)
+        def initialize(interface,custom=[])
+          @custom = custom
           @interface = interface
         end  
+        def visualize; ""; end
         def hash
           0
         end

data/lib/{riddl → ruby/riddl}/wrapper/description/message_and_transformation.rb

@@ -13,18 +13,41 @@ module Riddl
             @content = layer.find("des:#{type}[@name='#{name}']").first.to_doc
             @content.root.find("@name").delete_all!
             @content.register_namespace 'des', Riddl::Wrapper::DESCRIPTION
-            @content.register_namespace 'dec', Riddl::Wrapper::DECLARATION
           end  
           update_hash!
         end
         def update_hash!
           # TODO too simple
-          @hash = @content.to_s.hash
+          hb = @content.root.to_doc
+          hb.register_namespace 'des', Riddl::Wrapper::DESCRIPTION
+          hb.unformated = true
+          hb.find("//comment()").delete_all!
+          hb.find("//des:parameter/*").delete_all!
+          hb.find("//text()").delete_all!
+          hb.find("//des:header/*").delete_all!
+          hb.find("//des:parameter/@handler").delete_all!
+          hb.find("//des:parameter/@mimetype").each { |e| e.value = '' }
+          hb.root.namespaces.delete_all!
+          @hash_base = hb
+          @hash      = hb.serialize.hash
         end
         def traverse?(other)
-          other.name.nil? ? false : (self.hash == other.hash)
+          if other.name.nil? 
+            false 
+          else
+            paths = self.hash_base.find("//des:parameter").map{ |e| e.path + "/@name" }
+            hb2 = XML::Smart::string(other.hash_base.serialize)
+            hb2.register_namespace 'des', Riddl::Wrapper::DESCRIPTION
+            hb2.unformated = true
+
+            paths.each do |p|
+              (hb2.find(p).first.value = '*') rescue nil
+            end
+
+            self.hash_base.serialize.hash == hb2.serialize.hash
+          end 
         end
-        attr_reader :name, :content, :hash
+        attr_reader :name, :content, :hash, :hash_base
         #}}}
       end
 

data/lib/{riddl → ruby/riddl}/wrapper/description/resource.rb

@@ -11,6 +11,7 @@ module Riddl
           @access_methods = {}
           @composition = {}
           @recursive = recursive
+          @custom = []
           #}}}
         end
 
@@ -18,36 +19,42 @@ module Riddl
           #{{{
           desres.find("des:*[not(name()='resource') and not(name()='websocket') and @in and not(@in='*')]").each do |m|
             method = m.attributes['method'] || m.qname.name
-            add_request_in_out(index,interface,des,method,m.attributes['in'],m.attributes['out'])
+            add_request_in_out(index,interface,des,method,m.attributes['in'],m.attributes['out'],m.find('*|text()'))
           end
           desres.find("des:*[not(name()='resource') and not(name()='websocket') and @pass and not(@pass='*')]").each do |m|
             method = m.attributes['method'] || m.qname.name
-            add_request_in_out(index,interface,des,method,m.attributes['pass'],m.attributes['pass'])
+            add_request_in_out(index,interface,des,method,m.attributes['pass'],m.attributes['pass'],m.find('*|text()'))
           end
           desres.find("des:*[not(name()='resource') and not(name()='websocket') and @transformation]").each do |m|
             method = m.attributes['method'] || m.qname.name
-            add_request_transform(index,interface,des,method,m.attributes['transformation'])
+            add_request_transform(index,interface,des,method,m.attributes['transformation'],m.find('*|text()'))
           end
           desres.find("des:*[not(name()='resource') and not(name()='websocket') and @in and @in='*']").each do |m|
             method = m.attributes['method'] || m.qname.name
-            add_request_star_out(index,interface,des,method,m.attributes['out'])
+            add_request_star_out(index,interface,des,method,m.attributes['out'],m.find('*|text()'))
           end
           desres.find("des:*[not(name()='resource') and not(name()='websocket') and not(@in)]").each do |m|
             method = m.attributes['method'] || m.qname.name
-            add_request_star_out(index,interface,des,method,m.attributes['out'])
+            add_request_star_out(index,interface,des,method,m.attributes['out'],m.find('*|text()'))
           end
           desres.find("des:*[not(name()='resource') and not(name()='websocket') and @pass and @pass='*']").each do |m|
             method = m.attributes['method'] || m.qname.name
-            add_request_pass(index,interface,method)
+            add_request_pass(index,interface,method,m.find('*|text()'))
           end
           desres.find("des:*[not(name()='resource') and name()='websocket']").each do |m|
-            add_websocket(index,interface)
+            add_websocket(index,interface,m.find('*|text()'))
           end
           @role = desres.find("string(@role)")
           @role = nil if @role.strip == ''
           #}}}
         end
 
+        def add_custom(desres)
+          #{{{
+          @custom = desres.find("*[not(self::des:*)]").to_a
+          #}}}
+        end
+
         # TODO add websockets
 
         def remove_access_methods(des,filter)
@@ -72,6 +79,7 @@ module Riddl
             reqs.delete_if do |req|
               if req.class == freq[0]
                 if req.class == RequestInOut
+                  # TODO These hash comparisons are maybe too trivial, as we want to catch name="*" parameters
                   if freq[1] && freq[1].hash == req.in.hash && freq[2] && req.out && freq[2].hash == req.out.hash
                     true
                   elsif freq[1] && freq[1].hash == req.in.hash && !freq[2]
@@ -224,33 +232,73 @@ module Riddl
         end
         private :add_to_path_and_split
 
-        def description_xml
-          collect = ''
-          messages = {}
-          messages_result = ''
-
+        def description_xml_string(messages,t)
+ #{{{
+          result = ''
+          @custom.each do |c|
+            result << c.dump
+          end
           if @composition.any?
             @composition.each do |k,v|
-              v.each do |e|
-                collect << if e.result.class==Riddl::Wrapper::Description::RequestInOut
-                  messages[e.result.in.hash] = e.result.in
-                  messages[e.result.out.hash] = e.result.out if e.result.out
-                  "    <#{k} in=\"#{e.result.in.name}\"#{e.result.out.nil? ? '' : " out=\"#{e.result.out.name}\""}/>\n"
-                elsif e.result.class==Riddl::Wrapper::Description::RequestTransformation
-                  '    '
-                elsif e.result.class==Riddl::Wrapper::Description::RequestStarOut
-                  messages[e.result.out.hash] = e.result.out if e.result.out
-                  "    <#{k} in=\"*\"#{e.result.out.nil? ? '' : " out=\"#{e.result.out.name}\""}/>\n"
-                elsif e.result.class==Riddl::Wrapper::Description::RequestPass
-                  '   '
-                elsif e.result.class==Riddl::Wrapper::Description::WebSocket
-                  "   <websocket/>\n"
+              v.each do |m|
+                m = m.result
+                if %w{get post put delete websocket}.include?(k)
+                  result << t + "<#{k} "
                 else
-                  ''
+                  result << t + "<request method=\"#{k}\" "
+                end  
+                case m
+                  when Riddl::Wrapper::Description::RequestInOut
+                    messages[m.in.hash] ||= m.in
+                    result << "in=\"#{messages[m.in.hash].name}\""
+                    unless m.out.nil?
+                      messages[m.out.hash] ||= m.out
+                      result << " out=\"#{messages[m.out.hash].name}\""
+                    end  
+                  when Riddl::Wrapper::Description::RequestStarOut
+                    result << "in=\"*\""
+                    unless m.out.nil?
+                      messages[m.out.hash] ||= m.out
+                      result << " out=\"#{messages[m.out.hash].name}\""
+                    end  
+                  when Riddl::Wrapper::Description::RequestPass
+                    messages[m.pass.hash] ||= m.pass
+                    result << "pass=\"#{messages[m.pass.hash].name}\""
+                  when Riddl::Wrapper::Description::RequestTransformation
+                    messages[m.trans.hash] ||= m.trans
+                    result << "transformation=\"#{messages[m.trans.hash].name}\""
                 end
-              end
+                if m.custom.length > 0
+                  result << ">\n"
+                  m.custom.each do |e|
+                    result << e.dump + "\n"
+                  end  
+                  if %w{get post put delete websocket}.include?(k)
+                    result << t + "</#{k}>"
+                  else
+                    result << t + "</request>\n"
+                  end  
+                else  
+                  result << "/>\n"
+                end
+              end  
             end
-          end  
+          end
+          result
+ #}}}
+        end  
+
+        def description_xml(namespaces)
+          #{{{
+          namespaces = namespaces.delete_if do |k,n|
+            k =~ /^xmlns\d+$/ || [Riddl::Wrapper::DESCRIPTION, Riddl::Wrapper::DECLARATION, Riddl::Wrapper::XINCLUDE].include?(n)
+          end.map do |k,n|
+            "xmlns:#{k}=\"#{n}\""
+          end.join(' ')
+
+          messages = {}
+          messages_result = ''
+          collect = description_xml_string(messages," " * 4)
 
           names = []
           messages.each do |hash,mess|
@@ -261,48 +309,50 @@ module Riddl
             t.root.attributes['name'] = name
             messages_result << t.root.dump + "\n"
           end
-          XML::Smart.string("<description #{Riddl::Wrapper::COMMON}>\n\n" + messages_result.gsub(/^/,'  ') + "\n  <resource>\n" + collect + "  </resource>\n</description>").to_s
+          XML::Smart.string("<description #{Riddl::Wrapper::COMMON} #{namespaces}>\n\n" + messages_result.gsub(/^/,'  ') + "\n  <resource>\n" + collect + "  </resource>\n</description>").to_s
+          #}}}
         end
 
-        # add requests helper methods
+        # private add requests helper methods
         #{{{
-        def add_request_in_out(index,interface,des,method,min,mout)
+        def add_request_in_out(index,interface,des,method,min,mout,custom)
           @access_methods[method] ||= []
           @access_methods[method][index] ||= []
-          @access_methods[method][index] << RequestInOut.new(des,min,mout,interface)
+          @access_methods[method][index] << RequestInOut.new(des,min,mout,interface,custom)
         end
         private :add_request_in_out
 
-        def add_request_transform(index,interface,des,method,mtrans)
+        def add_request_transform(index,interface,des,method,mtrans,custom)
           @access_methods[method] ||= []
           @access_methods[method][index] ||= []
-          @access_methods[method][index] << RequestTransformation.new(des,mtrans,interface)
+          @access_methods[method][index] << RequestTransformation.new(des,mtrans,interface,custom)
         end
         private :add_request_transform
 
-        def add_request_star_out(index,interface,des,method,mout)
+        def add_request_star_out(index,interface,des,method,mout,custom)
           @access_methods[method] ||= []
           @access_methods[method][index] ||= []
-          @access_methods[method][index] << RequestStarOut.new(des,mout,interface)
+          @access_methods[method][index] << RequestStarOut.new(des,mout,interface,custom)
         end
         private :add_request_star_out
 
-        def add_request_pass(index,interface,method)
+        def add_request_pass(index,interface,method,custom)
           @access_methods[method] ||= []
           @access_methods[method][index] ||= []
-          @access_methods[method][index] << RequestPass.new(interface)
+          @access_methods[method][index] << RequestPass.new(interface,custom)
         end
         private :add_request_pass
         
-        def add_websocket(index,interface)
+        def add_websocket(index,interface,custom)
           @access_methods['websocket'] ||= []
           @access_methods['websocket'][index] ||= []
-          @access_methods['websocket'][index] << WebSocket.new(interface)
+          @access_methods['websocket'][index] << WebSocket.new(interface,custom)
         end
         private :add_request_pass
         #}}}
 
         attr_reader :resources,:path,:access_methods,:composition,:recursive,:role
+        attr_accessor :custom
       end
 
       Composition = Struct.new(:route,:result)

data/ns/common-patterns/riddl-description/resource-show.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <description xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <message name="riddl-description-response">
+    <header name="RIDDL_DESCRIPTION" fixed="oh my, a riddl description"/>  
     <parameter name="riddl-description" mimetype="text/xml"/>
   </message>
   <message name="riddl-resource-description-request">

data/ns/common-patterns/riddl-description/show.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <description xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <message name="riddl-description-response">
+    <header name="RIDDL_DESCRIPTION" fixed="oh my, a riddl description"/>  
     <parameter name="riddl-description" mimetype="text/xml"/>
   </message>
   <message name="riddl-description-request">

data/riddl.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.125"
+  s.version          = "0.99.129"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"
 
   s.description      = "rest service interface definition, mixing, and evolution"
 
-  s.files            = Dir['{lib/riddl/ns/**/*,tools/**/*,ns/**/*,contrib/**/*,lib/riddl/**/*,example/**/*}'] + %w(COPYING Rakefile riddl.gemspec README.rdoc TODO AUTHORS INSTALL)
-  s.require_path     = 'lib'
+  s.files            = Dir['{lib/ruby/riddl/ns/**/*,tools/**/*,ns/**/*,contrib/**/*,lib/ruby/riddl/**/*,example/**/*}'] + %w(COPYING Rakefile riddl.gemspec README.rdoc TODO AUTHORS INSTALL)
+  s.require_path     = 'lib/ruby'
   s.extra_rdoc_files = ['README.rdoc']
   s.bindir           = 'tools'
   s.executables      = ['riddlcheck','riddlprocess']

data/test/tc_declaration-distributed.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/smartrunner.rb')
-require File.expand_path(File.dirname(__FILE__) + '/../lib/riddl/client')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ruby/riddl/client')
 require 'xml/smart'
 require 'pp'
 

data/test/tc_declaration-hybrid.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/smartrunner.rb')
-require File.expand_path(File.dirname(__FILE__) + '/../lib/riddl/client')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ruby/riddl/client')
 require 'xml/smart'
 require 'pp'
 

data/test/tc_declaration-local.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/smartrunner.rb')
-require File.expand_path(File.dirname(__FILE__) + '/../lib/riddl/client')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ruby/riddl/client')
 require 'xml/smart'
 require 'pp'
 

data/test/tc_helloworld.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/smartrunner.rb')
-require File.expand_path(File.dirname(__FILE__) + '/../lib/riddl/wrapper')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ruby/riddl/wrapper')
 
 class TestHelloWorld <  MiniTest::Unit::TestCase
 

data/test/tc_library.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/smartrunner.rb')
-require File.expand_path(File.dirname(__FILE__) + '/../lib/riddl/client')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ruby/riddl/client')
 require 'xml/smart'
 require 'pp'
 

data/test/tc_producer.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/smartrunner.rb')
-require File.expand_path(File.dirname(__FILE__) + '/../lib/riddl/client')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ruby/riddl/client')
 require 'xml/smart'
 
 class TestProd <  MiniTest::Unit::TestCase

data/test/tc_properties.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/smartrunner.rb')
-require File.expand_path(File.dirname(__FILE__) + '/../lib/riddl/client')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/ruby/riddl/client')
 require 'xml/smart'
 
 class TestProp <  MiniTest::Unit::TestCase

data/tools/riddlcheck

@@ -4,7 +4,7 @@ while ::File::symlink?(curpath)
   curpath = ::File::dirname(curpath) + '/' + ::File::readlink(curpath)
 end  
 require 'rubygems'
-require ::File::dirname(curpath) + "/../lib/riddl/wrapper"
+require ::File::dirname(curpath) + "/../lib/ruby/riddl/wrapper"
 require 'optparse'
 
 ARGV.options { |opt|

data/tools/riddlcheck-1_0

@@ -4,7 +4,7 @@ while ::File::symlink?(curpath)
   curpath = ::File::dirname(curpath) + '/' + ::File::readlink(curpath)
 end  
 require 'rubygems'
-require ::File::dirname(curpath) + "/../lib/riddl/wrapper"
+require ::File::dirname(curpath) + "/../lib/ruby/riddl/wrapper"
 require 'optparse'
 
 ARGV.options { |opt|

data/tools/riddlprocess

@@ -4,7 +4,7 @@ while ::File::symlink?(curpath)
   curpath = ::File::dirname(curpath) + '/' + ::File::readlink(curpath)
 end  
 require 'rubygems'
-require ::File::dirname(curpath) + "/../lib/riddl/wrapper"
+require ::File::dirname(curpath) + "/../lib/ruby/riddl/wrapper"
 require 'optparse'
 require 'pp'
 

data/tools/riddlprocess-1_0

@@ -4,7 +4,7 @@ while ::File::symlink?(curpath)
   curpath = ::File::dirname(curpath) + '/' + ::File::readlink(curpath)
 end  
 require 'rubygems'
-require ::File::dirname(curpath) + "/../lib/riddl/wrapper"
+require ::File::dirname(curpath) + "/../lib/ruby/riddl/wrapper"
 require 'optparse'
 require 'pp'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.125
+  version: 0.99.129
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
@@ -164,21 +164,21 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- lib/riddl/ns/declaration/1.0/declaration.rng
-- lib/riddl/ns/common/relaxng-modular.rng
-- lib/riddl/ns/common/relaxng.rng
-- lib/riddl/ns/common/datatypes-1_0.rng
-- lib/riddl/ns/description/1.0/description.rng
-- lib/riddl/ns/common-patterns/properties/1.0/properties.xml
-- lib/riddl/ns/common-patterns/properties/1.0/properties.schema.xsl
-- lib/riddl/ns/common-patterns/properties/1.0/properties.schema.schema
-- lib/riddl/ns/common-patterns/notifications-producer/1.0/producer.xml
-- lib/riddl/ns/common-patterns/addon-security/request.xml
-- lib/riddl/ns/common-patterns/addon-security/response.xml
-- lib/riddl/ns/common-patterns/downloadify/1.0/downloadify.xml
-- lib/riddl/ns/common-patterns/notifications-consumer/1.0/consumer.xml
-- lib/riddl/ns/common-patterns/riddl-description/resource-show.xml
-- lib/riddl/ns/common-patterns/riddl-description/show.xml
+- lib/ruby/riddl/ns/declaration/1.0/declaration.rng
+- lib/ruby/riddl/ns/common/relaxng-modular.rng
+- lib/ruby/riddl/ns/common/relaxng.rng
+- lib/ruby/riddl/ns/common/datatypes-1_0.rng
+- lib/ruby/riddl/ns/description/1.0/description.rng
+- lib/ruby/riddl/ns/common-patterns/properties/1.0/properties.xml
+- lib/ruby/riddl/ns/common-patterns/properties/1.0/properties.schema.xsl
+- lib/ruby/riddl/ns/common-patterns/properties/1.0/properties.schema.schema
+- lib/ruby/riddl/ns/common-patterns/notifications-producer/1.0/producer.xml
+- lib/ruby/riddl/ns/common-patterns/addon-security/request.xml
+- lib/ruby/riddl/ns/common-patterns/addon-security/response.xml
+- lib/ruby/riddl/ns/common-patterns/downloadify/1.0/downloadify.xml
+- lib/ruby/riddl/ns/common-patterns/notifications-consumer/1.0/consumer.xml
+- lib/ruby/riddl/ns/common-patterns/riddl-description/resource-show.xml
+- lib/ruby/riddl/ns/common-patterns/riddl-description/show.xml
 - tools/riddlprocess-1_0
 - tools/flash-policy-server.rb
 - tools/riddlprocess
@@ -202,49 +202,49 @@ files:
 - contrib/riddl.svg
 - contrib/riddl.jpg
 - contrib/riddl.png
-- lib/riddl/parameter.rb
-- lib/riddl/handlers/plain-type.rb
-- lib/riddl/handlers/oauth.rb
-- lib/riddl/handlers/relaxng.rb
-- lib/riddl/handlers/xmlschema.rb
-- lib/riddl/client.rb
-- lib/riddl/option.rb
-- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0/base.rb
-- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Fon_behalf.rb
-- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Faccess_token.rb
-- lib/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Frequest_token.rb
-- lib/riddl/roles.rb
-- lib/riddl/handlers.rb
-- lib/riddl/server.rb
-- lib/riddl/constants.rb
-- lib/riddl/wrapper.rb
-- lib/riddl/implementation.rb
-- lib/riddl/header.rb
-- lib/riddl/error.rb
-- lib/riddl/wrapper/declaration/tile.rb
-- lib/riddl/wrapper/declaration/facade.rb
-- lib/riddl/wrapper/declaration/interface.rb
-- lib/riddl/wrapper/layerchecker.rb
-- lib/riddl/wrapper/declaration.rb
-- lib/riddl/wrapper/description.rb
-- lib/riddl/wrapper/resourcechecker.rb
-- lib/riddl/wrapper/messageparser.rb
-- lib/riddl/wrapper/description/message_and_transformation.rb
-- lib/riddl/wrapper/description/access.rb
-- lib/riddl/wrapper/description/resource.rb
-- lib/riddl/utils/properties.rb
-- lib/riddl/utils/xsloverlay.rb
-- lib/riddl/utils/downloadify.rb
-- lib/riddl/utils/notifications_producer.rb
-- lib/riddl/utils/erbserve.rb
-- lib/riddl/utils/description.rb
-- lib/riddl/utils/fileserve.rb
-- lib/riddl/commonlogger.rb
-- lib/riddl/protocols/http/generator.rb
-- lib/riddl/protocols/http/parser.rb
-- lib/riddl/protocols/xmpp/generator.rb
-- lib/riddl/protocols/xmpp/parser.rb
-- lib/riddl/protocols/websocket.rb
+- lib/ruby/riddl/parameter.rb
+- lib/ruby/riddl/handlers/plain-type.rb
+- lib/ruby/riddl/handlers/oauth.rb
+- lib/ruby/riddl/handlers/relaxng.rb
+- lib/ruby/riddl/handlers/xmlschema.rb
+- lib/ruby/riddl/client.rb
+- lib/ruby/riddl/option.rb
+- lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0/base.rb
+- lib/ruby/riddl/roles/http%3A%2F%2Foauth.net%2F1.0%2Fon_behalf.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%2Frequest_token.rb
+- lib/ruby/riddl/roles.rb
+- lib/ruby/riddl/handlers.rb
+- lib/ruby/riddl/server.rb
+- lib/ruby/riddl/constants.rb
+- lib/ruby/riddl/wrapper.rb
+- lib/ruby/riddl/implementation.rb
+- lib/ruby/riddl/header.rb
+- lib/ruby/riddl/error.rb
+- lib/ruby/riddl/wrapper/declaration/tile.rb
+- lib/ruby/riddl/wrapper/declaration/facade.rb
+- lib/ruby/riddl/wrapper/declaration/interface.rb
+- lib/ruby/riddl/wrapper/layerchecker.rb
+- lib/ruby/riddl/wrapper/declaration.rb
+- lib/ruby/riddl/wrapper/description.rb
+- lib/ruby/riddl/wrapper/resourcechecker.rb
+- lib/ruby/riddl/wrapper/messageparser.rb
+- lib/ruby/riddl/wrapper/description/message_and_transformation.rb
+- lib/ruby/riddl/wrapper/description/access.rb
+- lib/ruby/riddl/wrapper/description/resource.rb
+- lib/ruby/riddl/utils/properties.rb
+- lib/ruby/riddl/utils/xsloverlay.rb
+- lib/ruby/riddl/utils/downloadify.rb
+- lib/ruby/riddl/utils/notifications_producer.rb
+- lib/ruby/riddl/utils/erbserve.rb
+- lib/ruby/riddl/utils/description.rb
+- lib/ruby/riddl/utils/fileserve.rb
+- lib/ruby/riddl/commonlogger.rb
+- lib/ruby/riddl/protocols/http/generator.rb
+- lib/ruby/riddl/protocols/http/parser.rb
+- lib/ruby/riddl/protocols/xmpp/generator.rb
+- lib/ruby/riddl/protocols/xmpp/parser.rb
+- lib/ruby/riddl/protocols/websocket.rb
 - COPYING
 - Rakefile
 - riddl.gemspec
@@ -266,7 +266,7 @@ licenses:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- lib/ruby
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements: