desert 0.2.2 → 0.3.0

data/CHANGES

@@ -1,11 +1,12 @@
-0.2.2
+0.3.0
+- Fixed bug "Desert can't override an ERB template in a plugin with another template in your app"
+- Fixed multipart duplication issue
 - Fixed script/destroy not removing the routes [From Jeff Dean]
 - gem includes the Rails generator files [From Jeff Dean]
 - Fixed readding the route to config/routes.rb in the script/destroy task [From Jeff Dean]
 - Github now properly formats readme [From Jeff Dean]
 - Updated the gemspec so rdoc includes it and updated it to add installation and setup instructions [From Jeff Dean]
 - Removed sample route from generator [From Jeff Dean]
-- Fix migration issue with Rails 2.1.0 using timestamps.
 
 0.2.1
 - Fixed ActionMailer rendering in Rails 1.99.0

data/README.rdoc

@@ -150,29 +150,6 @@ All standard routing methods are available in your plugin's routes file, such as
       admin.resources :posts
     end
 
-Desert uses a separate table to manage migration version to maintain backwards compatibility with Rails 1.x.
-Your plugin app's migration live in your_plugin/db/migrate.  To run migrations, follow these steps:
-
-* Create a new migration in your main app
-
-    script/generate migration migrate_my_plugin_to_045
-  
-* Add the custom `migrate_plugin` method
-
-    class MigrateMyPluginTo045 < ActiveRecord::Migration
-      def self.up
-        migrate_plugin(:my_plugin, 20080530223548)
-      end
-
-      def self.down
-        migrate_plugin(:my_plugin, 0)
-      end
-    end
-
-* Run your migrations normally
-
-    rake db:migrate
-
     connect "/signup", :controller => "users", :action => "signup"
 
 == Share Migrations

data/Rakefile

@@ -26,7 +26,7 @@ task(:tag_release) do
 end
 
 PKG_NAME = "desert"
-PKG_VERSION = "0.2.2"
+PKG_VERSION = "0.3.0"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/lib/desert/plugin_migrations/migrator.rb

@@ -43,12 +43,6 @@ module Desert #:nodoc:
         end
       end
       alias_method :record_version_state_after_migrating, :set_schema_version
-
-
-      def migrated
-        current_plugin_version = self.class.current_version
-        (1..current_plugin_version).to_a
-      end
     end
   end
 end

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

@@ -2,15 +2,11 @@ module ActionMailer #:nodoc
   class Base #:nodoc:
     private
       def template_path_with_plugin_routing
-        result = nil
-        Desert::Manager.plugins_and_app.reverse.each do |plugin|
-          relative_path = "#{plugin.templates_path}/#{mailer_name}"
-          unless Dir["#{relative_path}/#{@template}.*"].empty?
-            result = relative_path
-            break
-          end
+        template_paths = [template_path_without_plugin_routing]
+        Desert::Manager.plugins.reverse.each do |plugin|
+          template_paths << "#{plugin.templates_path}/#{mailer_name}"
         end
-        result || template_path_without_plugin_routing
+        "{#{template_paths * ','}}"
       end
       alias_method_chain :template_path, :plugin_routing
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-20 00:00:00 -07:00
+date: 2008-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -25,41 +25,41 @@ extra_rdoc_files:
 files: 
 - CHANGES
 - MIT-LICENSE
-- README.rdoc
 - Rakefile
+- README.rdoc
 - init.rb
 - lib/desert/rails/2.0.0/plugin.rb
-- lib/desert/rails/1.2.0/initializer.rb
 - lib/desert/rails/route_set.rb
 - lib/desert/rails/migration.rb
+- lib/desert/rails/1.2.0/initializer.rb
 - lib/desert/rails/dependencies.rb
-- lib/desert/rails.rb
-- lib/desert/plugin_templates/action_view.rb
-- lib/desert/plugin_templates/1.99.0/action_mailer.rb
-- lib/desert/plugin_templates/2.0.0/action_mailer.rb
-- lib/desert/plugin_templates/1.2.0/action_mailer.rb
-- lib/desert/plugin_templates/action_controller.rb
-- lib/desert/plugin_templates.rb
-- lib/desert/supported_rails_versions.rb
 - lib/desert/manager.rb
 - lib/desert/plugin_migrations/migrator.rb
 - lib/desert/plugin_migrations/extensions/1.0/schema_statements.rb
 - lib/desert/plugin_migrations/extensions/schema_statements.rb
 - lib/desert/plugin_migrations/extensions/2.1/schema_statements.rb
+- lib/desert/plugin_templates.rb
+- lib/desert/supported_rails_versions.rb
 - lib/desert/ruby.rb
 - lib/desert/version_checker.rb
-- lib/desert/plugin_migrations.rb
+- lib/desert/plugin_templates/2.0.0/action_mailer.rb
+- lib/desert/plugin_templates/action_controller.rb
+- lib/desert/plugin_templates/action_view.rb
+- lib/desert/plugin_templates/1.2.0/action_mailer.rb
+- lib/desert/plugin_templates/1.99.0/action_mailer.rb
 - lib/desert/ruby/object.rb
+- lib/desert/plugin_migrations.rb
+- lib/desert/rails.rb
 - lib/desert/plugin.rb
 - lib/desert.rb
 - generators/desert_plugin
 - generators/desert_plugin/USAGE
-- generators/desert_plugin/desert_plugin_generator.rb
 - generators/desert_plugin/templates
+- generators/desert_plugin/templates/spec_helper.rb
 - generators/desert_plugin/templates/plugin_migration.rb
 - generators/desert_plugin/templates/empty_file
-- generators/desert_plugin/templates/spec_helper.rb
 - generators/desert_plugin/templates/routes.rb
+- generators/desert_plugin/desert_plugin_generator.rb
 has_rdoc: true
 homepage: http://pivotallabs.com
 post_install_message: