Merge pull request #30 from stbenjam/use-plugin-methods-for-apipie

Use plugin methods for apipie
theforeman · Mar 2, 2015 · c36ebf4 · c36ebf4
2 parents 3a49494 + 7701bfc
commit c36ebf4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/foreman_salt/engine.rb b/lib/foreman_salt/engine.rb
@@ -24,14 +24,15 @@ class Engine < ::Rails::Engine
     end
 
     initializer 'foreman_salt.apipie' do
-      Apipie.configuration.api_controllers_matcher << "#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"
       Apipie.configuration.checksum_path += ['/salt/api/']
     end
 
     initializer 'foreman_salt.register_plugin', :after => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_salt do
         requires_foreman '>= 1.8'
 
+        apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
+
         ## Menus
         menu :top_menu, :salt_environments,
              :url_hash => { :controller => :'foreman_salt/salt_environments', :action => :index },

diff --git a/lib/foreman_salt/version.rb b/lib/foreman_salt/version.rb
@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end