rails-rfc6570 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe0a2171639cd02d609193683e4537b8c13a0af9
-  data.tar.gz: d407c343aa810e9d88ed85e40a5c842b55d3ba49
+  metadata.gz: ce4faf89b39d74647128aad91ec3233979cbd752
+  data.tar.gz: d9d52f9c09e13853b7bc16cddb652f2fb4e05cbb
 SHA512:
-  metadata.gz: 651b5ca68c7b084d95f5af70fd0534558e16bfb565e473d06f5ca831b6be3c28caf7dc391d79fe470c016791f34d6b9f638bd1e791e738ea08be56d002398904
-  data.tar.gz: 5dc1887c8c6845f3096804f0d2df102f574b51c2e3f2a697ee6db8ed8cb34937dc5c9acaaf1a3c0cc4e6d4ce611040a77ef19c185c8e6f475ea76067879b3bda
+  metadata.gz: 34bed45b1b3f614ba054418fcedcb35d8bc08f79daa381702703a692ec2c4bdbc4f932c0f5de322eb15ff341420e97daed3e1a081d9c88019450fc4ec62fe58b
+  data.tar.gz: c7afddd77cabf3d33174bcd827abdbb92b3f2193066f1c285fec21890834134905ebe466e4a2710af98042b29c34db311c1b6069067217e0eae7cc297ddb0742

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.1
+
+* Fix full URL generation to not use `root_url` helper to avoid depending on that and to improve compatibility with e.g. rails engines.
+
 ## 1.1.0
 
 * Added support for Rails 5.0

data/README.md

@@ -8,7 +8,7 @@ Pragmatical access to your Rails 4.0 or 4.1 or 4.2 or 5.0 routes as RFC6570 URI
 
 Add this line to your application's Gemfile:
 
-    gem 'rails-rfc6570', '~> 0.3'
+    gem 'rails-rfc6570', '~> 1.1'
 
 And then execute:
 

data/lib/rails/rfc6570/version.rb

@@ -3,7 +3,7 @@ module Rails
     module VERSION
       MAJOR = 1
       MINOR = 1
-      PATCH = 0
+      PATCH = 1
       STAGE = nil
 
       STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze

data/lib/rails/rfc6570.rb

@@ -222,15 +222,7 @@ module Rails
 
           mod.module_eval do
             define_method(rfc6570_name) do |opts = {}|
-              template = route.to_rfc6570(opts)
-
-              if opts.fetch(:path_only, false)
-                template
-              else
-                root_uri = Addressable::URI.parse(root_url)
-
-                Addressable::Template.new root_uri.join(template.pattern).to_s
-              end
+              ::Rails::RFC6570::build_url_template(self, route, opts)
             end
 
             define_method(rfc6570_url_name) do |opts = {}|
@@ -304,15 +296,7 @@ module Rails
           raise KeyError.new "No named routed for `#{name}'."
         end
 
-        template = route.to_rfc6570(opts)
-
-        if opts.fetch(:path_only, false)
-          template
-        else
-          root_uri = Addressable::URI.parse(root_url)
-
-          Addressable::Template.new root_uri.join(template.pattern).to_s
-        end
+        ::Rails::RFC6570::build_url_template(self, route, opts)
       end
     end
 
@@ -330,6 +314,21 @@ module Rails
       end
     end
 
+    def build_url_template(t, route, options)
+      template = route.to_rfc6570(options)
+
+      if options.fetch(:path_only, false)
+        template
+      else
+        options = t.url_options.merge(options)
+        options[:path] = template.pattern
+
+        url     = ActionDispatch::Http::URL.url_for options
+
+        ::Addressable::Template.new url
+      end
+    end
+
     def params_for(controller, action)
       ctr = "#{controller.camelize}Controller".constantize
       ctr.rfc6570_defs[action.to_sym] if ctr.respond_to?(:rfc6570_defs)

data/spec/dummy/config/routes.rb

@@ -1,3 +1,3 @@
 Dummy::Application.routes.draw do
-  root to: 'application#index'
+  get '/' => 'application#index'
 end