From 1dad72bf13f5e28781a2b2b6654f72624d205576 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 22 Feb 2016 18:10:30 +0100 Subject: Fixes and general progress --- app/helpers/application_helper.rb | 6 +++--- app/helpers/routing_helper.rb | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 app/helpers/routing_helper.rb (limited to 'app/helpers') diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 29e444a32..ed7b59165 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,12 +1,12 @@ module ApplicationHelper - include GrapeRouteHelpers::NamedRouteMatcher + include RoutingHelper def unique_tag(date, id, type) "tag:#{LOCAL_DOMAIN},#{date.strftime('%Y-%m-%d')}:objectId=#{id}:objectType=#{type}" end def subscription_url(account) - add_base_url_prefix subscription_path(id: account.id, format: '') + add_base_url_prefix subscriptions_path(id: account.id, format: '') end def salmon_url(account) @@ -14,6 +14,6 @@ module ApplicationHelper end def add_base_url_prefix(suffix) - "#{root_url}api#{suffix}" + File.join(root_url, "api", suffix) end end diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb new file mode 100644 index 000000000..655e6bc26 --- /dev/null +++ b/app/helpers/routing_helper.rb @@ -0,0 +1,11 @@ +module RoutingHelper + extend ActiveSupport::Concern + include Rails.application.routes.url_helpers + include GrapeRouteHelpers::NamedRouteMatcher + + included do + def default_url_options + ActionMailer::Base.default_url_options + end + end +end -- cgit