Merge fe02cab into 749984c

adhearsion · Jul 3, 2015 · c806adb · c806adb
2 parents 749984c + fe02cab
commit c806adb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/adhearsion/generators/app/templates/config/app.rb b/lib/adhearsion/generators/app/templates/config/app.rb
@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 class DemoApp < Adhearsion::Application
-  plugin_name :demo
+  app_name :demo
 
   # Actions to perform when initialising the application
   #

diff --git a/lib/adhearsion/plugin.rb b/lib/adhearsion/plugin.rb
@@ -140,10 +140,12 @@ def plugin_name(name = nil)
           self.plugin_name = name
         end
       end
+      alias :app_name :plugin_name
 
       def plugin_name=(name)
         @plugin_name = name
       end
+      alias :app_name= :plugin_name=
 
       # Class method that will be used by subclasses to configure the plugin
       # @param name Symbol plugin config name