Merge pull request #192 from nashby/fix-generators

use ApplicationDecorator if it's present

lib/generators/decorator/decorator_generator.rb

@@ -17,7 +17,7 @@ module Rails
       def parent_class_name
         if options[:parent]
           options[:parent]
-        elsif defined?(:ApplicationDecorator)
+        elsif defined?(ApplicationDecorator)
           "ApplicationDecorator"
         else
           "Draper::Base"

lib/generators/decorator/templates/decorator.rb

@@ -1,5 +1,5 @@
 <% module_namespacing  do -%>
-class <%= class_name %>Decorator < ApplicationDecorator
+class <%= class_name %>Decorator < <%= parent_class_name %>
   decorates :<%= singular_name %>
 
   # Accessing Helpers

spec/generators/decorator/decorator_generator_spec.rb

@@ -15,7 +15,7 @@ describe Rails::Generators::DecoratorGenerator do
     describe 'app/decorators/your_model_decorator.rb' do
       subject { file('app/decorators/your_model_decorator.rb') }
       it { should exist }
-      it { should contain "class YourModelDecorator < ApplicationDecorator" }
+      it { should contain "class YourModelDecorator < Draper::Base" }
       it { should contain "decorates :your_model" }
     end
   end
@@ -30,6 +30,27 @@ describe Rails::Generators::DecoratorGenerator do
     end
   end
 
+  context 'parent decorator' do
+    describe 'decorator inhereted from Draper::Base' do
+      before { run_generator ["YourModel"] }
+
+      subject { file('app/decorators/your_model_decorator.rb') }
+      it { should exist }
+      it { should contain "class YourModelDecorator < Draper::Base" }
+    end
+
+    describe "decorator inhereted from ApplicationDecorator if it's present" do
+      before do
+       class ApplicationDecorator; end
+       run_generator ["YourModel"]
+      end
+
+      subject { file('app/decorators/your_model_decorator.rb') }
+      it { should exist }
+      it { should contain "class YourModelDecorator < ApplicationDecorator" }
+    end
+  end
+
   context 'using rspec' do
     before { run_generator ["YourModel", "-t=rspec"]  }