oxymoron 1.2.5 → 1.2.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/oxymoron.rb +6 -1
- data/lib/oxymoron/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 97d209b7b2c2d8feec1d3c3cdcbdb3f72c7a211c
|
|
4
|
+
data.tar.gz: a2d131f408661d8cec417813fb2b697cf91ce8c5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 29ce9011dfc78743a883b758bcc253d9f400ed270eef2f938ddb2f67d0733d89c8af5dfe970b947d27e7f35fbfecd62a8e4fd626fa4849e8b5ffe8d85282b059
|
|
7
|
+
data.tar.gz: 279e6904afe33d85b145736ed28d536808522a298322fc49da14d566ab6e41f4403cb6cd8474c8d45d0d76b3b6a78a9c29051877f1d7ec1bf4aa66cd81e4a2be
|
data/lib/oxymoron.rb
CHANGED
|
@@ -37,6 +37,7 @@ module Oxymoron
|
|
|
37
37
|
ui_params = (route.defaults[:ui_params] || []).join("&")
|
|
38
38
|
ui_params = ui_params.present? ? "?#{ui_params}" : ""
|
|
39
39
|
url_matcher = "'#{path}#{ui_params}'"
|
|
40
|
+
url_matcher_factory = false
|
|
40
41
|
|
|
41
42
|
route.path.required_names.each do |required_name|
|
|
42
43
|
if requirement = route.requirements[required_name.to_sym]
|
|
@@ -44,9 +45,13 @@ module Oxymoron
|
|
|
44
45
|
requirement = requirement.to_s[7..-2]
|
|
45
46
|
end
|
|
46
47
|
url_matcher = path.gsub(':'+required_name, "{#{required_name}:(?:#{requirement})}")
|
|
48
|
+
url_matcher_factory = true
|
|
47
49
|
end
|
|
48
50
|
end
|
|
49
|
-
|
|
51
|
+
|
|
52
|
+
if url_matcher_factory
|
|
53
|
+
url_matcher = "$urlMatcherFactoryProvider.compile(\"#{url_matcher}#{ui_params}\")"
|
|
54
|
+
end
|
|
50
55
|
|
|
51
56
|
@states[route.name] = {
|
|
52
57
|
url: url_matcher,
|
data/lib/oxymoron/version.rb
CHANGED