riddl 0.99.226 → 0.99.227

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d6eca195cbeec3544fb4e192b66cf20f6c995de
-  data.tar.gz: 6d7b88a519dffa4019c7d9ceff69cbc44ed54c42
+  metadata.gz: 531b59a0576b4c3c80c0982cc2cb3daa0a5c1937
+  data.tar.gz: 9f9333e701a95a927c151861fa9f067adbd0a1f7
 SHA512:
-  metadata.gz: 73dd2bc985411195b256aeea27f7f66df3e7cb5aa45fc8a10a1ba661dc53528b67eddcd2c98c3466b5398504625051d47f59d84d692da291957bb8851a62578e
-  data.tar.gz: 2be0a3d91d2c5ff68183c54aa9d854b15b0940c6c458cdb66c999b2a3cba46cef7a4a7b322b8bd68aa0f32e8f63142598e9079170fae27f90a6049b97c01267f
+  metadata.gz: 71ae7b32aefc5e9c9f8a934d8c070fc4754c9cc0697f7e4ea54ac6f1e8cf0227a071e0f7ad2640b55b28ff821ae3568a0fa2ac005fc391813158506adb91fe88
+  data.tar.gz: e80850aeef8cdd327af9aeaf3c0ded941a34eeb9f5a94386306459fc93bd71bbf2b15c92b26e5f7105ed7446befab36f561f69e273a99b62d09dc70cb6583157

data/lib/ruby/riddl/server.rb

@@ -298,7 +298,7 @@ module Riddl
               @riddl_path = '/'
               if m.interface.base.nil?
                 if @riddl_interfaces.key? m.interface.name
-                  @riddl_info[:r] = m.interface.real_path(@riddl_pinfo).sub(/\/*/,'').split('/')
+                  @riddl_info[:r] = m.interface.real_path(@riddl_pinfo).sub(/\//,'').split('/')
                   @riddl_info[:h]['RIDDL_DECLARATION_PATH'] = @riddl_pinfo
                   @riddl_info[:h]['RIDDL_DECLARATION_RESOURCE'] = m.interface.top
                   @riddl_info[:s] = m.interface.sub.sub(/\//,'').split('/')
@@ -414,7 +414,7 @@ module Riddl
         @riddl_info = {
           :h => @riddl_headers,
           :p => @riddl_parameters,
-          :r => @riddl_pinfo.sub(/\/*/,'').split('/').map{|e|Protocols::Utils::unescape(e)},
+          :r => @riddl_pinfo.sub(/\//,'').split('/').map{|e|Protocols::Utils::unescape(e)},
           :s => @riddl_matching_path[0].sub(/\//,'').split('/'),
           :m => @riddl_method,
           :env => @riddl_env.reject{|k,v| k =~ /^rack\./}.merge({'riddl.transport' => 'http', 'xmpp' => @riddl_opts[:xmpp]}),

data/lib/ruby/riddl/wrapper/declaration/facade.rb

@@ -3,6 +3,8 @@ module Riddl
     class Declaration < WrapperUtils
 
       class Facade
+        attr_reader :resource
+
         def initialize
           @resource = Riddl::Wrapper::Description::Resource.new("/")
         end
@@ -56,7 +58,7 @@ module Riddl
           res.composition.each do |method,s|
             fac.composition[method] ||= []
             fac.composition[method] += s
-          end  
+          end
           res.resources.each do |path,r|
             if !fac.resources.has_key?(path)
               fac.resources[path] = Riddl::Wrapper::Description::Resource.new(path,r.recursive)
@@ -65,28 +67,6 @@ module Riddl
           end
           #}}}
         end
-
-        # recurse to all resources that currently exist in facade beneath the
-        # current resource path, and merge the tile contents
-        def merge_tiles_to_all(r,fac) 
-
-          fac.resources.keys.each do |fkey|
-            merge_tiles(r,fac.resources[fkey])
-            merge_tiles_to_all(r,fac.resources[fkey])
-          end
-        end
-        private :merge_tiles_to_all
-
-        # move to children in the facade (directly beneath the current resource
-        # path), and merge the tile contents
-        def merge_tiles_to_layer(r,fac)
-          fac.resources.keys.each do |fkey|
-            merge_tiles(r,fac.resources[fkey])
-          end
-        end
-        private :merge_tiles_to_all
-
-        attr_reader :resource
       end
 
     end

data/lib/ruby/riddl/wrapper/declaration/interface.rb

@@ -19,7 +19,7 @@ module Riddl
           t = @top.split('/')
           real = real.split('/')
           real = real[t.length..-1]
-          '/' + real.join('/')
+          real.join('/')
         end
 
         def real_url(real,base)

data/lib/ruby/riddl/wrapper/description/resource.rb

@@ -137,24 +137,34 @@ module Riddl
           routes.map do |r|
             ret = nil
             teh_last = r.last
+            teh_first = r.first
+            lcount = r.size
+            fcount = 0
             begin
               success = true
-              if r.first.respond_to?(:in) && teh_last.respond_to?(:out)
+              if teh_first.respond_to?(:in) && teh_last.respond_to?(:out)
                 #1: responds first in + last out -> new InOut
-                ret = RequestInOut.new_from_message(r.first.in,teh_last.out)
-              elsif r.first.class == RequestTransformation && teh_last.class == RequestTransformation && teh_last.out.nil?
+                ret = RequestInOut.new_from_message(teh_first.in,teh_last.out)
+              elsif teh_first.class == RequestTransformation && teh_last.class == RequestTransformation && teh_last.out.nil?
                 #2: first transform + last transform -> merge transformations
-                ret = RequestTransformation.new_from_transformation(r.first.trans,teh_last.trans)
+                ret = RequestTransformation.new_from_transformation(teh_first.trans,teh_last.trans)
+              elsif teh_first.class == RequestPass  
+                if r.size > (fcount + 1)
+                  teh_first = r[fcount+=1]
+                  success = false
+                else
+                  ret = teh_last
+                end
               elsif teh_last.respond_to?(:out)
                 #3: responds last out only -> new StarOut
                 ret = RequestStarOut.new_from_message(teh_last.out)
               elsif teh_last.class == RequestPass
                 #4: last pass -> remove last until #1 or #2 or #3 or size == 1
-                if r.size > 1
-                  teh_last = r[-2]
+                if lcount - 1 > 0
+                  teh_last = r[lcount -= 1]
                   success = false
                 else
-                  ret = teh_last
+                  ret = teh_first
                 end
               end
             end while !success

data/riddl.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.226
+  version: 0.99.227
 platform: ruby
 authors:
 - Juergen 'eTM' Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart