./bin/cli/routes.rb in lux-fw-0.5.36 vs ./bin/cli/routes.rb in lux-fw-0.5.37
- old
+ new
@@ -41,17 +41,18 @@
route = route.to_s
route = [@prefix, route].join('/') if @prefix
route = '/%s' % route unless route.include?('/')
route += '/*' unless target.include?('#')
route = "#{@prefix}/*" if route .include?('#')
+
print "#{indent}#{route}".ljust(50)
print target.ljust(50)
if controller && !target.include?('#')
puts
for el in controller.instance_methods(false)
- print " #{route.to_s.sub('/*', '/')}#{el}".ljust(50)
+ print " #{route.to_s.sub('/*', '/').gsub('//', '/')}#{el}".ljust(50)
puts [target, el].join(' # ')
end
else
puts
end
@@ -59,9 +60,11 @@
def map obj, &block
if @target
target = @target.is_a?(String) && !@target.include?('#') ? @target + "##{obj}" : @target
show_route obj, target
+ elsif obj.is_a?(Array)
+ show_route obj[0], obj[1]
elsif obj.is_a?(Hash)
show_route obj.keys.first, obj.values.first
elsif block_given?
@target = obj
yield