rails-rfc6570 1.1.0 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/README.md +1 -1
- data/lib/rails/rfc6570/version.rb +1 -1
- data/lib/rails/rfc6570.rb +17 -18
- data/spec/dummy/config/routes.rb +1 -1
- data/spec/dummy/log/test.log +503 -2206
- data/spec/rfc6570_spec.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ce4faf89b39d74647128aad91ec3233979cbd752
|
4
|
+
data.tar.gz: d9d52f9c09e13853b7bc16cddb652f2fb4e05cbb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 34bed45b1b3f614ba054418fcedcb35d8bc08f79daa381702703a692ec2c4bdbc4f932c0f5de322eb15ff341420e97daed3e1a081d9c88019450fc4ec62fe58b
|
7
|
+
data.tar.gz: c7afddd77cabf3d33174bcd827abdbb92b3f2193066f1c285fec21890834134905ebe466e4a2710af98042b29c34db311c1b6069067217e0eae7cc297ddb0742
|
data/CHANGELOG.md
CHANGED
data/README.md
CHANGED
data/lib/rails/rfc6570.rb
CHANGED
@@ -222,15 +222,7 @@ module Rails
|
|
222
222
|
|
223
223
|
mod.module_eval do
|
224
224
|
define_method(rfc6570_name) do |opts = {}|
|
225
|
-
|
226
|
-
|
227
|
-
if opts.fetch(:path_only, false)
|
228
|
-
template
|
229
|
-
else
|
230
|
-
root_uri = Addressable::URI.parse(root_url)
|
231
|
-
|
232
|
-
Addressable::Template.new root_uri.join(template.pattern).to_s
|
233
|
-
end
|
225
|
+
::Rails::RFC6570::build_url_template(self, route, opts)
|
234
226
|
end
|
235
227
|
|
236
228
|
define_method(rfc6570_url_name) do |opts = {}|
|
@@ -304,15 +296,7 @@ module Rails
|
|
304
296
|
raise KeyError.new "No named routed for `#{name}'."
|
305
297
|
end
|
306
298
|
|
307
|
-
|
308
|
-
|
309
|
-
if opts.fetch(:path_only, false)
|
310
|
-
template
|
311
|
-
else
|
312
|
-
root_uri = Addressable::URI.parse(root_url)
|
313
|
-
|
314
|
-
Addressable::Template.new root_uri.join(template.pattern).to_s
|
315
|
-
end
|
299
|
+
::Rails::RFC6570::build_url_template(self, route, opts)
|
316
300
|
end
|
317
301
|
end
|
318
302
|
|
@@ -330,6 +314,21 @@ module Rails
|
|
330
314
|
end
|
331
315
|
end
|
332
316
|
|
317
|
+
def build_url_template(t, route, options)
|
318
|
+
template = route.to_rfc6570(options)
|
319
|
+
|
320
|
+
if options.fetch(:path_only, false)
|
321
|
+
template
|
322
|
+
else
|
323
|
+
options = t.url_options.merge(options)
|
324
|
+
options[:path] = template.pattern
|
325
|
+
|
326
|
+
url = ActionDispatch::Http::URL.url_for options
|
327
|
+
|
328
|
+
::Addressable::Template.new url
|
329
|
+
end
|
330
|
+
end
|
331
|
+
|
333
332
|
def params_for(controller, action)
|
334
333
|
ctr = "#{controller.camelize}Controller".constantize
|
335
334
|
ctr.rfc6570_defs[action.to_sym] if ctr.respond_to?(:rfc6570_defs)
|
data/spec/dummy/config/routes.rb
CHANGED