Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fallback to apipie views when application override isn't present #552

Merged
merged 1 commit into from
Aug 20, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions lib/tasks/apipie.rake
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,14 @@ namespace :apipie do
# Attempt to use the Rails application views, otherwise default to built in views
def renderer
return @apipie_renderer if @apipie_renderer
base_path = if File.directory?("#{Rails.root}/app/views/apipie/apipies")
"#{Rails.root}/app/views/apipie/apipies"
else
File.expand_path("../../../app/views/apipie/apipies", __FILE__)
end
layouts_path = if File.directory?("#{Rails.root}/app/views/layouts/apipie")
"#{Rails.root}/app/views/layouts"
else
File.expand_path("../../../app/views/layouts", __FILE__)
end
@apipie_renderer = ActionView::Base.new([base_path, layouts_path])

base_paths = [File.expand_path("../../../app/views/apipie/apipies", __FILE__)]
base_paths.unshift("#{Rails.root}/app/views/apipie/apipies") if File.directory?("#{Rails.root}/app/views/apipie/apipies")

layouts_paths = [File.expand_path("../../../app/views/layouts", __FILE__)]
layouts_paths.unshift("#{Rails.root}/app/views/layouts") if File.directory?("#{Rails.root}/app/views/layouts/apipie")

@apipie_renderer = ActionView::Base.new(base_paths + layouts_paths)
@apipie_renderer.singleton_class.send(:include, ApipieHelper)
return @apipie_renderer
end
Expand Down