desert 0.2.0 → 0.2.1

data/CHANGES

@@ -1,3 +1,6 @@
+0.2.1
+- Fixed ActionMailer rendering in Rails 1.99.0
+
 0.2.0
 - Works with edge Rails
 - Removed Desert::Plugin#up_to_date?

data/Rakefile

@@ -26,7 +26,7 @@ task(:tag_release) do
 end
 
 PKG_NAME = "desert"
-PKG_VERSION = "0.2.0"
+PKG_VERSION = "0.2.1"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',
@@ -89,5 +89,5 @@ end
 
 desc "Updates the dependencies to run the build. This task uses Git."
 task(:update_dependencies) do
-  system "cd spec/rails_root/vendor/edge_rails; git pull origin"
+  system "cd spec/rails_root/vendor/rails_versions/edge; git pull origin"
 end

data/lib/desert/plugin_templates.rb

@@ -1,7 +1,9 @@
 dir = File.dirname(__FILE__)
 require "#{dir}/plugin_templates/action_controller"
-if Desert::VersionChecker.rails_version_is_below_rc2?
+if Desert::VersionChecker.rails_version_is_below_1990?
   require "#{dir}/plugin_templates/1.2.0/action_mailer"
+elsif Desert::VersionChecker.rails_version_is_below_rc2?
+  require "#{dir}/plugin_templates/1.99.0/action_mailer"
 else
   require "#{dir}/plugin_templates/2.0.0/action_mailer"
 end

data/lib/desert/plugin_templates/1.99.0/action_mailer.rb

@@ -0,0 +1,23 @@
+module ActionMailer #:nodoc
+  class Base #:nodoc:
+    private
+      def template_path_with_plugin_routing
+        template_paths = [template_path_without_plugin_routing]
+        Desert::Manager.plugins.reverse.each do |plugin|
+          template_paths << "#{plugin.templates_path}/#{mailer_name}"
+        end
+        "{#{template_paths * ','}}"
+      end
+      alias_method_chain :template_path, :plugin_routing
+
+      def initialize_template_class(assigns)
+        view_paths = Dir["#{template_path}/#{@template}.*"].collect do |path|
+          File.dirname(path)
+        end
+        returning(template = ActionView::Base.new(view_paths, assigns, self)) do
+          template.extend ApplicationHelper
+          template.extend self.class.master_helper_module
+        end
+      end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-26 00:00:00 -07:00
+date: 2008-05-02 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,7 @@ files:
 - lib/desert/plugin_templates/1.2.0/action_mailer.rb
 - lib/desert/plugin_templates/action_view.rb
 - lib/desert/plugin_templates/2.0.0/action_mailer.rb
+- lib/desert/plugin_templates/1.99.0/action_mailer.rb
 - lib/desert/plugin_templates/action_controller.rb
 - lib/desert/rails.rb
 - lib/desert/supported_rails_versions.rb