optimacms 0.1.57 → 0.1.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3d4e52c4c4f6ee80e2e2cc715fe5942ee76800f
-  data.tar.gz: ab6c741215c43f9a2ab6da485b835a7c4bfdd765
+  metadata.gz: b97da65940e9e195a6724bef2dbacd66e3b748f1
+  data.tar.gz: 750087e73c213267611d745337edb7c337e473cf
 SHA512:
-  metadata.gz: 14df3169bf11dab1293192bae129fb27a2fb7e581f22b355038f3f68c9a03ab134ea80a22da4dcca5f50b99aa9ddcf2882c4fc7920e6ecc0edf85aff2d2d938c
-  data.tar.gz: 512efcbef77513ee9d20b0281842a0d71280171dfed7265470f12925435c059ef48ec5b5a72c8954d5b59ee75e7e0f1347ecb8d1b58fbe609e48407eb2ed59a8
+  metadata.gz: ee8de12d7ad50837f34f3617719d1f360b481f721bb72e784571ce71edd6d1a513c3c16ce54e326936116bda964645a70244cc36400e17623141840a74e64ddd
+  data.tar.gz: c8600d0d2effef8000d7eada7f6123aac76a111ddb2dfbcf2bf4df68935e0c1175639c751f92faf6e57548e9eedb945034ba251a20cd6e2cfe5a4715cd578709

data/lib/optimacms/page_services/page_route_service.rb

@@ -64,8 +64,12 @@ module Optimacms
         url_parts = url.split '/'
         a = []
         i_part = 0
+        n_parts = url_parts.count
+        is_last_optional = false
+
         url_parts.each do |part|
           i_part+=1
+          is_last_optional = false
 
 
           # check for brackets inside brackets
@@ -77,30 +81,47 @@ module Optimacms
           p = part
 
 
-          # variables inside (.) - optional
+          # variables inside (...) - optional
+
+          # last optional varible
+          if i_part==n_parts
+            # /^(:name)..$
+            # include last / as optional
+            p_before = p.clone
+            p.gsub! /^(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '\/?([^/]+)*\2'
+            is_last_optional = true if p!=p_before
+          end
 
-          if i_part>1
+          p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '([^/]+)*\2'
+
+          #if i_part>1
             # add / to the beginning - / is optional too
-            p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '(\/[^/]+)*\2'
-          else
+            #p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '([^/]+)*\2'
+          #else
             # the first param
-            p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '([^/]+)*\2'
-          end
+            #p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '([^/]+)*\2'
+          #end
 
           # variables
           #p.gsub! /\{\$[^}]+\}/, '([^/]+)'
-          p.gsub! /(\:#{REGEX_VARIABLE})([-\.]|$)/, '\/([^/]+)\2'
+          p.gsub! /(\:#{REGEX_VARIABLE})([-\.]|$)/, '([^/]+)\2'
 
 
           # escape system symbols
           # replace '.'
           p.sub! '.', '[.]'
 
+          #
+          if i_part>1 && !is_last_optional
+            p = '/'+p
+          end
+
+
 
           a << p
         end
 
-        return '^'+url_parts.join('')+'$'
+        return '^'+a.join('')+'$'
       end
 
       def self.count_url_parts(url)

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.57"
+  VERSION = "0.1.58"
 end