Merge branch 'support_rails_three_oh'

draper.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activesupport', '>= 3.2'
-  s.add_dependency 'actionpack', '>= 3.2'
+  s.add_dependency 'activesupport', '>= 3.0'
+  s.add_dependency 'actionpack', '>= 3.0'
 
   s.add_development_dependency 'ammeter'
   s.add_development_dependency 'rake', '~> 0.9.2'

lib/draper/railtie.rb

@@ -3,6 +3,8 @@
 module ActiveModel
   class Railtie < Rails::Railtie
     generators do |app|
+      app ||= Rails.application # Rails 3.0.x does not yield `app`
+
       Rails::Generators.configure! app.config.generators
       require 'generators/resource_override'
     end

lib/draper/test/test_unit_integration.rb

@@ -1,8 +1,17 @@
 require "rake/testtask"
-require "rails/test_unit/sub_test_task"
+
+klass = nil
+
+if Rails.version[0,3] == "3.0"
+  require 'rails/test_unit/railtie'
+  klass = Rake::TestTask
+else 
+  require "rails/test_unit/sub_test_task"
+  klass = Rails::SubTestTask
+end
 
 namespace :test do
-  Rails::SubTestTask.new(:decorators => "test:prepare") do |t|
+  klass.new(:decorators => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = "test/decorators/**/*_test.rb"
   end

lib/generators/decorator/decorator_generator.rb

@@ -23,6 +23,14 @@ def parent_class_name
           "Draper::Decorator"
         end
       end
-   end
+
+
+      # Rails 3.0.X compatibility, stolen from https://github.com/jnunemaker/mongomapper/pull/385/files#L1R32
+      unless methods.include?(:module_namespacing)
+        def module_namespacing(&block)
+          yield if block
+        end
+      end
+    end
   end
 end

lib/generators/decorator/templates/decorator.rb

@@ -1,5 +1,9 @@
-<% module_namespacing do -%>
+<%- module_namespacing do -%>
+  <%- if parent_class_name.present? -%>
 class <%= class_name %>Decorator < <%= parent_class_name %>
+  <%- else -%>
+class <%= class_name %>
+  <%- end -%>
 
   # Accessing Helpers
   #   You can access any helper via a proxy