Merge branch 'support_rails_three_oh'
This commit is contained in:
commit
99a778d2b4
|
@ -16,8 +16,8 @@ Gem::Specification.new do |s|
|
||||||
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
|
||||||
s.require_paths = ["lib"]
|
s.require_paths = ["lib"]
|
||||||
|
|
||||||
s.add_dependency 'activesupport', '>= 3.2'
|
s.add_dependency 'activesupport', '>= 3.0'
|
||||||
s.add_dependency 'actionpack', '>= 3.2'
|
s.add_dependency 'actionpack', '>= 3.0'
|
||||||
|
|
||||||
s.add_development_dependency 'ammeter'
|
s.add_development_dependency 'ammeter'
|
||||||
s.add_development_dependency 'rake', '~> 0.9.2'
|
s.add_development_dependency 'rake', '~> 0.9.2'
|
||||||
|
|
|
@ -3,6 +3,8 @@ require 'rails/railtie'
|
||||||
module ActiveModel
|
module ActiveModel
|
||||||
class Railtie < Rails::Railtie
|
class Railtie < Rails::Railtie
|
||||||
generators do |app|
|
generators do |app|
|
||||||
|
app ||= Rails.application # Rails 3.0.x does not yield `app`
|
||||||
|
|
||||||
Rails::Generators.configure! app.config.generators
|
Rails::Generators.configure! app.config.generators
|
||||||
require 'generators/resource_override'
|
require 'generators/resource_override'
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,8 +1,17 @@
|
||||||
require "rake/testtask"
|
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
|
namespace :test do
|
||||||
Rails::SubTestTask.new(:decorators => "test:prepare") do |t|
|
klass.new(:decorators => "test:prepare") do |t|
|
||||||
t.libs << "test"
|
t.libs << "test"
|
||||||
t.pattern = "test/decorators/**/*_test.rb"
|
t.pattern = "test/decorators/**/*_test.rb"
|
||||||
end
|
end
|
||||||
|
|
|
@ -23,6 +23,14 @@ module Rails
|
||||||
"Draper::Decorator"
|
"Draper::Decorator"
|
||||||
end
|
end
|
||||||
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
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
<% module_namespacing do -%>
|
<%- module_namespacing do -%>
|
||||||
|
<%- if parent_class_name.present? -%>
|
||||||
class <%= class_name %>Decorator < <%= parent_class_name %>
|
class <%= class_name %>Decorator < <%= parent_class_name %>
|
||||||
|
<%- else -%>
|
||||||
|
class <%= class_name %>
|
||||||
|
<%- end -%>
|
||||||
|
|
||||||
# Accessing Helpers
|
# Accessing Helpers
|
||||||
# You can access any helper via a proxy
|
# You can access any helper via a proxy
|
||||||
|
|
Loading…
Reference in New Issue