riddl 0.99.183 → 0.99.184

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf3f893d98649855be8b00dad8b0bfe1d8f711c
-  data.tar.gz: 968e8e3293ef009c8b0a3bcff7f7bbcfb3890cac
+  metadata.gz: 34185cd539b33033e2da9a8a3de9adb7aebd52f0
+  data.tar.gz: a72f90e26bcb0d45fa6b467c40c6c51ca0e2211f
 SHA512:
-  metadata.gz: 573468d6020fcc9a8dc3e0866970aa44433df6bede641c0b06af79516f318718002f145ae84db6dbed5b8d27550aec785a7d043651227b3b0fc27e324f6fae6e
-  data.tar.gz: f4c0114f1d82c24f1989916b288777f3e3a27a41fb2566e7894311d392892d1ee07b97d4b2f57715800890618f0f80e7dc03d8949eb027b5170420fc921fd288
+  metadata.gz: 67e128c69893b0d367c69bba32a3af43f3f688f49be990c6779fb13e707e8c4b89c7375349bf4ed1422b3eecb7770aeed3779458714323272b86709e4070699b
+  data.tar.gz: 42ffb28d1beac0823471df53387d4d420173c3ab3172a080a8b16b596fe76449d80af7268aa4c2950749eeab0c182143ef05e836c5523d3c92a0433b243264f4

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

@@ -58,14 +58,40 @@ module Riddl
             fac.composition[method] += s
           end  
           res.resources.each do |path,r|
-            unless fac.resources.has_key?(path)
+            if !fac.resources.has_key?(path) && path != '**/*' && path != '*'
               fac.resources[path] = Riddl::Wrapper::Description::Resource.new(path,r.recursive)
-            end  
-            merge_tiles(r,fac.resources[path])
+            end
+            if path == '**/*'
+              merge_tiles_to_all(r,fac)
+            elsif path == '*'
+              merge_tiles_to_layer(r,fac)
+            else
+              merge_tiles(r,fac.resources[path])
+            end
           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
 

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

@@ -76,7 +76,7 @@ module Riddl
 
         def add_path(path,pres,rec=nil)
           #{{{
-          path.split('/').each do |pa|
+          path.split(/(?<!\/\*\*)\//).each do |pa| # match a slash not preceeded by **
             next if pa == ""
             unless pres.resources.has_key?(pa)
               pres.resources[pa] = Riddl::Wrapper::Description::Resource.new(pa,rec.nil? ? false : true)

data/riddl.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.183
+  version: 0.99.184
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart