desert 0.2.1 → 0.2.2

data/CHANGES

@@ -1,3 +1,12 @@
+0.2.2
+- 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

@@ -0,0 +1,295 @@
+= Desert - It doesn't get any DRYer than this
+
+Desert is a Rails plugin framework that makes it easy to share models, views, 
+controllers, helpers, routes, and migrations across your applications.
+
+With Desert, reusability doesn't come at the cost of extensibility: it's trivial to extend 
+the functionality of a plugin - both in your application _and_ in other plugins.
+
+Classes are automatically mixed in with your own or other plugins' classes.
+This allows you to make full featured composable components.
+
+Desert is a replacement for Appable Plugins (http://wiki.pluginaweek.org/Appable_plugins).
+
+== Anatomy of a desert plugin
+
+  |-- app
+  |   |-- controllers
+  |   |   |-- application.rb
+  |   |   `-- blogs_controller.rb
+  |   |-- helpers
+  |   |   |-- application_helper.rb
+  |   |   `-- blogs_helper.rb
+  |   |-- models
+  |   |   `-- user.rb
+  |   `-- views
+  |       |-- blogs
+  |       |-- layouts
+  |       |   `-- users.html.erb
+  |       `-- users
+  |           |-- index.html.erb
+  |           `-- show.html.erb
+  |-- db
+  |   `-- migrate
+  |       `-- 001_migrate_users_to_001.rb
+  |-- lib
+  |   `-- current_user.rb
+  |-- spec
+  |   |-- controllers
+  |   |   `-- blogs_controller_spec.rb
+  |   |-- fixtures
+  |   |-- models
+  |   |-- spec_helper.rb
+  |   `-- views
+  |       `-- blogs
+  `-- vendor
+      `-- plugins
+          `-- user
+              |-- app
+              |   |-- controllers
+              |   |   `-- users_controller.rb
+              |   |-- helpers
+              |   |   `-- users_helper.rb
+              |   |-- models
+              |   |   `-- user.rb
+              |   `-- views
+              |       `-- users
+              |           |-- edit.html.erb
+              |           |-- index.html.erb
+              |           |-- new.html.erb
+              |           `-- show.html.erb
+              |-- config
+              |   `-- routes.rb
+              |-- db
+              |   `-- migrate
+              |       `-- 001_create_users.rb
+              |-- init.rb
+              |-- lib
+              |   `-- current_user.rb
+              |-- spec
+              |   |-- controllers
+              |   |   `-- user_controller_spec.rb
+              |   |-- fixtures
+              |   |   `-- users.yml
+              |   |-- models
+              |   |   `-- user.rb
+              |   |-- spec_helper.rb
+              |   `-- views
+              |       `-- users
+              `-- tasks
+
+== Installation and Usage
+
+* Install the gem
+
+    sudo gem install desert
+
+* Require 'desert' between 'boot' and Rails::Initializer.run in environment.rb
+
+    # File: config/environment.rb
+
+    require File.join(File.dirname(__FILE__), 'boot')
+
+    require 'desert'
+
+    Rails::Initializer.run do |config|
+    end
+  
+NOTE: you may have to require rubygems before requiring desert.
+
+* Generate your desert plugin
+
+    script/generate desert_plugin my_plugin_app
+
+== Manage Plugin Dependencies
+
+By default, Rails loads plugins in alphabetical order, making it tedious to manage dependencies.
+Desert will automatically load plugins in the proper order when you declare their dependencies like this:
+
+    # File: vendor/plugins/blogs/init.rb
+
+    require_plugin 'user'
+    require_plugin 'will_paginate'
+
+Here <tt>user</tt> and <tt>will_paginate</tt> will always be loaded before <tt>blogs<tt>. Note that any plugin can be declared as a dependency.
+
+== Share Routes
+
+When you share controllers, you'll want to share their routes too.  
+If you look in your RAILS_ROOT/config/routes.rb file you will notice that the generator added a new line to the top:
+
+    map.routes_from_plugin(:my_plugin_app)
+
+In the <tt>user</tt> plugin: 
+
+    # File: vendor/plugins/user/config/routes.rb
+
+    resource :users
+
+In the <tt>blogs</tt> plugin:
+
+    File: vendor/plugins/blogs/config/routes.rb
+
+    resource :blogs
+
+In the application:
+  
+    # File: config/routes.rb
+
+    ActionController::Routing::Routes.draw do |map|
+      map.routes_from_plugin :blogs
+      map.routes_from_plugin :user
+    end
+
+Here the application adds the <tt>users</tt> resource from the <tt>user</tt> plugin and the <tt>blogs</tt> resource from the <tt>blogs</tt> plugin.
+Notice that there is no need to call methods on map in the plugin route files, because they are instance eval'd in the map object.
+
+All standard routing methods are available in your plugin's routes file, such as:
+
+    namespace :admin do |admin|
+      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
+
+Sharing models means sharing schema fragments, and that means sharing migrations:
+
+In the <tt>user</tt> plugin:
+
+  vendor/plugins/user/db/migrate/
+    001_create_user_table.rb
+
+In the <tt>blogs</tt> plugin:
+
+    vendor/plugins/blogs/db/migrate/
+      001_create_user_table.rb
+      002_add_became_a_blogger_at_to_user.rb
+
+Here the <tt>blogs</tt> plugin needs to add a column to the <tt>users</tt> table. No problem!
+It just includes a migration in its <tt>db/migrate</tt> directory, just like a regular Rails application.
+When the application developer installs the plugin, he migrates the plugin in his own migration:
+
+<tt>application_root/db/migrate/009_install_user_and_blogs_plugins.rb</tt>
+
+    class InstallUserAndBlogsPlugins < ActiveRecord::Migration
+      def self.up
+        migrate_plugin 'user', 1
+        migrate_plugin :blogs, 2
+      end
+
+      def self.down
+        migrate_plugin 'user', 0
+        migrate_plugin :blogs, 0
+      end
+    end
+
+Here the application migrates the <tt>user</tt> plugin to version 1 and the <tt>blogs</tt> plugin to version 2.
+If a subsequent version of the plugin introduces new migrations, the application developer has full control over when to apply them to his schema.
+
+== Share Views
+
+To share views, just create templates and partials in the plugin's <tt>app/views</tt> directory, just as you would with a Rails application.
+
+<tt>application_root/app/views/blogs/index.html.erb</tt>
+
+    <%= @blog.posts.each do |post| %>
+      ...
+    <% end %>
+
+== Customize / extend behavior in each installation
+
+Say you want to create a plugin named acts_as_spiffy.
+Desert allows Spiffy to have a set of features that can be reused and extended in several projects.
+
+The Spiffy project has a:
+
+* SpiffyController
+* Spiffy model
+* SpiffyHelper
+* spiffy.html.erb
+* SpiffyLib library class
+
+The Spiffy plugin acts as its own mini Rails application.  Here is the directory structure:
+
+  RAILS_ROOT/vendor/plugins/spiffy/app/controllers/spiffy_controller.rb
+  RAILS_ROOT/vendor/plugins/spiffy/app/models/spiffy.rb
+  RAILS_ROOT/vendor/plugins/spiffy/app/helpers/spiffy_helper.rb
+  RAILS_ROOT/vendor/plugins/spiffy/app/views/spiffy/spiffy.rhtml
+  RAILS_ROOT/vendor/plugins/spiffy/lib/spiffy_lib.rb
+
+Now, say there is a Spiffy Store rails application that uses acts_as_spiffy.  The Rails app can open up any of the Spiffy classes and override any of the methods.
+
+Say spiffy.rb in the Spiffy plugin is defined as:
+
+  class Spiffy < ActiveRecord::Base
+    def why?
+      "I just am Spiffy"
+    end
+  end
+
+The Spiffy#why method can be overridden in RAILS_ROOT/app/models/spiffy.rb
+
+  class Spiffy < ActiveRecord::Base
+    def why?
+      "I sell Spiffy stuff"
+    end
+  end
+
+== Running plugin tests
+
+You can run your plugin tests/specs like so:
+
+  rake desert:testspec:plugins PLUGIN=spiffy
+
+Leaving off the PLUGIN environment variable will cause it to run all the
+test/specs for all installed plugins, which may not be what you want.
+
+== Running Desert Specs
+
+To run specs, you need to:
+
+* Make sure you have the necessary gems installed (rr, rspec)
+* Install git http://git.or.cz/
+* Create a database named desert_test
+* Update the database.yml file in <tt>spec/rails_root/config/database.yml</tt>
+* Install the dependencies
+* Run the specs
+
+Desert is a library that heavily monkey patches Rails. To ensure that Desert works with
+multiple versions of Rails, its tests are run against the supported versions of Rails.
+
+To set up the different supported versions of Rails, run
+
+  rake install_dependencies
+
+This will clone the Rails git repo and export the supported versions of rails into the
+respective directories.
+
+  rake update_dependencies
+
+will update the clones repo on your machine.

data/Rakefile

@@ -26,13 +26,13 @@ task(:tag_release) do
 end
 
 PKG_NAME = "desert"
-PKG_VERSION = "0.2.1"
+PKG_VERSION = "0.2.2"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',
   'lib/**/*.rb',
-  'lib/generators/**/*',
-  'lib/generators/**/templates/*',
+  'generators/**/*',
+  'generators/**/templates/*',
   'examples/**/*.rb'
 ]
 
@@ -47,8 +47,8 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.has_rdoc = true
-  s.extra_rdoc_files = [ "README", "CHANGES" ]
-  s.rdoc_options = ["--main", "README", "--inline-source", "--line-numbers"]
+  s.extra_rdoc_files = [ "README.rdoc", "CHANGES" ]
+  s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"]
 
   s.test_files = Dir.glob('spec/*_spec.rb')
   s.require_path = 'lib'

data/generators/desert_plugin/USAGE

@@ -0,0 +1,14 @@
+NAME
+     desert_plugin - creates a directory structure and starter files for a new desert plugin
+
+SYNOPSIS
+     desert_plugin [plugin name]
+
+DESCRIPTION
+     |-- vendor
+        `-- plugins
+           `-- [plugin name]
+
+EXAMPLE
+      ./script/generate desert_plugin spiffy
+

data/generators/desert_plugin/desert_plugin_generator.rb

@@ -0,0 +1,73 @@
+require 'rails_generator'
+require 'rails_generator/commands'
+
+class DesertPluginGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      m.directory "vendor/plugins/#{file_name}"
+
+      m.directory "vendor/plugins/#{file_name}/app"
+      m.directory "vendor/plugins/#{file_name}/app/controllers"
+      m.directory "vendor/plugins/#{file_name}/app/helpers"
+      m.directory "vendor/plugins/#{file_name}/app/models"
+      m.directory "vendor/plugins/#{file_name}/app/views"
+
+      m.directory "vendor/plugins/#{file_name}/config"
+      m.template "routes.rb", "vendor/plugins/#{file_name}/config/routes.rb"
+      m.map_route_from_plugin
+
+      m.directory "vendor/plugins/#{file_name}/db"
+      m.directory "vendor/plugins/#{file_name}/db/migrate"
+      # m.template "plugin_migration.rb", "vendor/plugins/#{file_name}/db/migrate/001_init_#{file_name}_plugin.rb" 
+
+      m.directory "vendor/plugins/#{file_name}/lib"
+
+      m.directory "vendor/plugins/#{file_name}/spec"
+      m.directory "vendor/plugins/#{file_name}/spec/controllers"
+      m.directory "vendor/plugins/#{file_name}/spec/fixtures"
+      m.directory "vendor/plugins/#{file_name}/spec/models"
+      m.directory "vendor/plugins/#{file_name}/spec/views"
+      m.file "spec_helper.rb", "vendor/plugins/#{file_name}/spec/spec_helper.rb" 
+
+      m.directory "vendor/plugins/#{file_name}/tasks"
+
+      m.file "empty_file", "vendor/plugins/#{file_name}/init.rb"
+    end
+  end
+
+end
+
+module Desert #:nodoc:
+  module Generator #:nodoc:
+    module Commands #:nodoc:
+
+      module Create
+        def map_route_from_plugin
+          logger.route "adding map.routes_from_plugin(:#{file_name}) to top of routes.rb"
+          sentinel = 'ActionController::Routing::Routes.draw do |map|'
+          gsub_file('config/routes.rb', /(#{Regexp.escape(sentinel)})/mi) do |match|
+            "#{match}\n  map.routes_from_plugin(:#{file_name})\n"
+          end
+        end
+      end
+
+      module Destroy
+        def map_route_from_plugin
+          look_for = "\n  map.routes_from_plugin(:#{file_name})\n"
+          logger.route "removing map.routes_from_plugin(:#{file_name}) from routes.rb"
+          gsub_file 'config/routes.rb', /(#{Regexp.escape(look_for)})/mi, ''
+        end
+      end
+
+      module List
+        def map_route_from_plugin
+          logger.route "adding map.routes_from_plugin(:#{file_name}) to top of routes.rb"
+        end
+      end
+    end
+  end
+end
+
+Rails::Generator::Commands::Create.send   :include,  Desert::Generator::Commands::Create
+Rails::Generator::Commands::Destroy.send  :include,  Desert::Generator::Commands::Destroy
+Rails::Generator::Commands::List.send     :include,  Desert::Generator::Commands::List

data/generators/desert_plugin/templates/plugin_migration.rb

@@ -0,0 +1,11 @@
+class Init<%= class_name %>Plugin < ActiveRecord::Migration
+  def self.up
+    create_table "<%= plural_name %>", :force => true do |t|
+      t.column "some_<%= file_name %>_column", :string
+    end
+  end
+
+  def self.down
+    drop_table :<%= plural_name %>
+  end
+end

data/generators/desert_plugin/templates/routes.rb

@@ -0,0 +1,4 @@
+# Add your custom routes here.  If in config/routes.rb you would 
+# add <tt>map.resources</tt>, here you would add just <tt>resources</tt>
+
+# resources :<%= plural_name %>

data/generators/desert_plugin/templates/spec_helper.rb

@@ -0,0 +1,8 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
+require 'spec'
+require 'spec/rails'
+
+Spec::Runner.configure do |config|
+  config.fixture_path = "#{File.dirname(__FILE__)}/../spec/fixtures"
+end

data/lib/desert/manager.rb

@@ -32,7 +32,7 @@ module Desert
         paths << File.join(component_root, 'app','helpers')
         paths << File.join(component_root, 'lib')
       end
-      Dependencies.load_paths.reverse.each do |path|
+      dependencies.load_paths.reverse.each do |path|
         paths << File.expand_path(path) unless paths.include?(File.expand_path(path))
       end
       paths
@@ -44,9 +44,9 @@ module Desert
 
       yield if block_given?
 
-      Dependencies.load_paths << plugin.models_path
-      Dependencies.load_paths << plugin.controllers_path
-      Dependencies.load_paths << plugin.helpers_path
+      dependencies.load_paths << plugin.models_path
+      dependencies.load_paths << plugin.controllers_path
+      dependencies.load_paths << plugin.helpers_path
 
       @plugins_in_registration.pop
 
@@ -101,6 +101,10 @@ module Desert
     end
 
     protected
+    def dependencies
+      @dependencies ||= ActiveSupport.const_defined?(:Dependencies) ? ActiveSupport::Dependencies : Dependencies
+    end
+
     def plugin_paths
       plugins_and_app.collect { |plugin| plugin.path }
     end

data/lib/desert/plugin.rb

@@ -58,16 +58,16 @@ module Desert
     end
 
     def migration
-      @migration ||= PluginAWeek::PluginMigrations::Migrator.new(:up, migration_path)
+      @migration ||= PluginMigrations::Migrator.new(:up, migration_path)
     end
 
     def with_current_plugin
-      old_plugin = PluginAWeek::PluginMigrations::Migrator.current_plugin
+      old_plugin = PluginMigrations::Migrator.current_plugin
       begin
-        PluginAWeek::PluginMigrations::Migrator.current_plugin = self
+        PluginMigrations::Migrator.current_plugin = self
         yield
       ensure
-        PluginAWeek::PluginMigrations::Migrator.current_plugin = old_plugin
+        PluginMigrations::Migrator.current_plugin = old_plugin
       end
     end
   end

data/lib/desert/plugin_migrations/extensions/1.0/schema_statements.rb

@@ -3,7 +3,7 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
     initialize_schema_information_without_plugins
 
     begin
-      execute "CREATE TABLE #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
+      execute "CREATE TABLE #{Desert::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
     rescue ActiveRecord::StatementInvalid
       # Schema has been initialized
     end
@@ -17,11 +17,11 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
     schema_information << dump if dump
 
     begin
-      plugins = ActiveRecord::Base.connection.select_all("SELECT * FROM #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name}")
+      plugins = ActiveRecord::Base.connection.select_all("SELECT * FROM #{Desert::PluginMigrations::Migrator.schema_info_table_name}")
       plugins.each do |plugin|
         if (version = plugin['version'].to_i) > 0
           plugin_name = ActiveRecord::Base.quote_value(plugin['plugin_name'])
-          schema_information << "INSERT INTO #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name} (plugin_name, version) VALUES (#{plugin_name}, #{version})"
+          schema_information << "INSERT INTO #{Desert::PluginMigrations::Migrator.schema_info_table_name} (plugin_name, version) VALUES (#{plugin_name}, #{version})"
         end
       end
     rescue ActiveRecord::StatementInvalid

data/lib/desert/plugin_migrations/extensions/2.1/schema_statements.rb

@@ -3,7 +3,7 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
     initialize_schema_migrations_table_without_plugins
 
     begin
-      execute "CREATE TABLE #{PluginAWeek::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
+      execute "CREATE TABLE #{Desert::PluginMigrations::Migrator.schema_info_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})"
     rescue ActiveRecord::StatementInvalid
       # Schema has been initialized
     end

data/lib/desert/plugin_migrations/migrator.rb

@@ -1,6 +1,6 @@
-module PluginAWeek #:nodoc:
+module Desert #:nodoc:
   module PluginMigrations
-    # Responsible for migrating plugins.  PluginAWeek::PluginMigrations.Migrator.current_plugin
+    # Responsible for migrating plugins.  PluginMigrations.Migrator.current_plugin
     # indicates which plugin is currently being migrated
     class Migrator < ActiveRecord::Migrator
       # We need to be able to set the current plugin being migrated.
@@ -43,6 +43,12 @@ module PluginAWeek #: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.2.0/action_mailer.rb

@@ -1,21 +1,21 @@
 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}"
+      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
-      "{#{template_paths * ','}}"
-    end
-    alias_method_chain :template_path, :plugin_routing
+      alias_method_chain :template_path, :plugin_routing
 
-    def initialize_template_class(assigns)
-      base_path = Dir["#{template_path}/#{@template}.*"].first
-      returning(template = ActionView::Base.new(File.dirname(base_path), assigns, self)) do
-        template.extend ApplicationHelper
-        template.extend self.class.master_helper_module
+      def initialize_template_class(assigns)
+        view_path = File.dirname(Dir["#{template_path}/#{@template}.*"].first)
+        returning(template = ActionView::Base.new(view_path, assigns, self)) do
+          template.extend ApplicationHelper
+          template.extend self.class.master_helper_module
+        end
       end
-    end
   end
 end

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

@@ -2,19 +2,21 @@ 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}"
+        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
         end
-        "{#{template_paths * ','}}"
+        result || template_path_without_plugin_routing
       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
+        view_path = File.dirname(Dir["#{template_path}/#{@template}.*"].first)
+        returning(template = ActionView::Base.new([view_path], assigns, self)) do
           template.extend ApplicationHelper
           template.extend self.class.master_helper_module
         end

data/lib/desert/plugin_templates/action_view.rb

@@ -14,10 +14,98 @@ if ActionView.const_defined?(:TemplateFinder)
 else
   module ActionView #:nodoc:
     class Base #:nodoc:
-      private
+      if private_instance_methods.include?('find_template_extension_from_handler')
+        if instance_methods.include?('template_handler_preferences')
+          # Rails 1.99.0
+          def find_template_extension_from_handler(template_path, formatted = nil)
+            checked_template_path = formatted ? "#{template_path}.#{template_format}" : template_path
+
+            view_paths.each do |view_path|
+              template_handler_preferences.each do |template_type|
+                extensions =
+                  case template_type
+                  when :javascript
+                    [:rjs]
+                  when :delegate
+                    @@template_handlers.keys
+                  else
+                    [template_type]
+                  end
+
+                extensions.each do |extension|
+                  file_path = File.join(view_path, "#{checked_template_path}.#{extension}")
+                  if File.exist?(file_path)
+                    return formatted ? "#{template_format}.#{extension}" : extension.to_s
+                  end
+                end
+              end
+            end
+            nil
+          end
+        else
+          # Rails 2.0.2
+          def find_template_extension_from_handler(template_path, formatted = nil)
+            checked_template_path = formatted ? "#{template_path}.#{template_format}" : template_path
+
+            view_paths.each do |view_path|
+              self.class.template_handler_extensions.each do |extension|
+                file_path = File.join(view_path, "#{checked_template_path}.#{extension}")
+                if File.exist?(file_path)
+                  return formatted ? "#{template_format}.#{extension}" : extension.to_s
+                end
+              end
+            end
+            nil
+          end
+        end
+      end
+
+      if instance_methods.include?('view_paths')
+        def initialize_with_desert_plugins(*args)
+          initialize_without_desert_plugins *args
+
+          Desert::Manager.plugins.reverse.each do |plugin|
+            view_paths << plugin.templates_path
+          end
+        end
+        alias_method_chain :initialize, :desert_plugins
+      else
+        attr_reader :view_paths
+        def initialize_with_desert(base_path = nil, assigns_for_first_render = {}, controller = nil)
+          initialize_without_desert(base_path, assigns_for_first_render, controller)
+
+          @view_paths = [base_path]
+          Desert::Manager.plugins_and_app.reverse.each do |plugin|
+            @view_paths << plugin.templates_path
+          end
+        end
+        alias_method_chain :initialize, :desert
+
+        private
+        def full_path_template_exists?(path, extension)
+          file_path = "#{path}.#{extension}"
+          @@method_names.has_key?(file_path) || FileTest.exists?(file_path)
+        end
+
+        def find_template_extension_for(template_path)
+          view_paths.each do |view_path|
+            full_path = "#{view_path}/#{template_path}"
+            if match = @@template_handlers.find { |k,| full_path_template_exists?(template_path, k) }
+              return match.first.to_sym
+            elsif full_path_template_exists?(full_path, :rhtml)
+              return :rhtml
+            elsif full_path_template_exists?(full_path, :rxml)
+              return :rxml
+            elsif full_path_template_exists?(full_path, :rjs)
+              return :rjs
+            end
+          end
+          raise ActionViewError, "No rhtml, rxml, rjs or delegate template found for #{template_path} in #{@base_path}"
+        end
+
         def full_template_path_with_plugin_routing(template_path, extension)
           full_template_path = full_template_path_without_plugin_routing(template_path, extension)
-        
+
           unless File.exist?(full_template_path)
             # Look through the plugins for the template
             Desert::Manager.plugins.reverse.each do |plugin|
@@ -27,10 +115,11 @@ else
               end
             end
           end
-        
+
           full_template_path
         end
         alias_method_chain :full_template_path, :plugin_routing
+      end
     end
   end
 end

data/lib/desert/rails/dependencies.rb

@@ -1,4 +1,5 @@
-module Dependencies
+dependencies = ActiveSupport.const_defined?(:Dependencies) ? ActiveSupport::Dependencies : Dependencies
+dependencies.module_eval do
   def load_missing_constant_with_desert(from_mod, const_name)
     from_mod = guard_against_anonymous_module(from_mod)
     qualified_name = qualified_name_for from_mod, const_name
@@ -63,9 +64,7 @@ module Dependencies
   def define_constant_from_file(from_mod, const_name, qualified_name, path_suffix)
     files = Desert::Manager.files_on_load_path(path_suffix)
     files.each do |file|
-      # TODO: JLM/BT -- figure out why require_or_load does not work on Windows.
-      #      require_or_load file
-      load file
+      require_or_load file
       loaded << file.gsub(/\.rb$/, '')
       next if autoloaded_constants.include?(qualified_name)
       next if load_once_path?(file)

data/lib/desert/rails/migration.rb

@@ -2,7 +2,7 @@ class ActiveRecord::Migration
   module DesertMigration
     def migrate_plugin(plugin_name, version)
       plugin = find_plugin(plugin_name)
-      PluginAWeek::PluginMigrations::Migrator.migrate_plugin(
+      Desert::PluginMigrations::Migrator.migrate_plugin(
         plugin,
         version
       )
@@ -10,13 +10,13 @@ class ActiveRecord::Migration
 
     def schema_version_equivalent_to(plugin_name, version)
       plugin = find_plugin(plugin_name)
-      PluginAWeek::PluginMigrations::Migrator.current_plugin = plugin
-      PluginAWeek::PluginMigrations::Migrator.allocate.set_schema_version(version)
+      Desert::PluginMigrations::Migrator.current_plugin = plugin
+      Desert::PluginMigrations::Migrator.allocate.set_schema_version(version)
     end
 
     protected
     def find_plugin(plugin_name)
-      plugin = Desert::Manager.find_plugin(plugin_name)
+      plugin = Desert::Manager.find_plugin(plugin_name.to_s)
       return plugin if plugin
       raise ArgumentError, "No plugin found named #{plugin_name}"
     end

data/lib/desert/supported_rails_versions.rb

@@ -3,6 +3,7 @@ module Desert
     "1.2.5" => {'version' => '1.2.5', 'git_tag' => 'v1.2.5'},
     "1.99.0" => {'version' => '1.99.0', 'git_tag' => 'v2.0.0_RC1'},
     "2.0.2" => {'version' => '2.0.2', 'git_tag' => 'v2.0.2'},
+    "2.1.0" => {'version' => '2.1.0', 'git_tag' => 'v2.1.0'},
     "edge" => {'version' => 'edge', 'git_tag' => 'master'},
   }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-02 00:00:00 -07:00
+date: 2008-06-20 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -20,45 +20,52 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 - CHANGES
 files: 
-- Rakefile
 - CHANGES
 - MIT-LICENSE
-- README
-- scratch.rb
+- README.rdoc
+- Rakefile
 - init.rb
-- lib/desert/manager.rb
-- lib/desert/version_checker.rb
-- lib/desert/plugin.rb
-- lib/desert/plugin_templates/1.2.0/action_mailer.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/dependencies.rb
+- lib/desert/rails.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/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/rails.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/2.1/schema_statements.rb
 - lib/desert/plugin_migrations/extensions/1.0/schema_statements.rb
 - lib/desert/plugin_migrations/extensions/schema_statements.rb
-- lib/desert/rails/1.2.0/initializer.rb
-- lib/desert/rails/2.0.0/plugin.rb
-- lib/desert/rails/route_set.rb
-- lib/desert/rails/migration.rb
-- lib/desert/rails/dependencies.rb
-- lib/desert/plugin_templates.rb
-- lib/desert/plugin_migrations.rb
+- lib/desert/plugin_migrations/extensions/2.1/schema_statements.rb
 - lib/desert/ruby.rb
+- lib/desert/version_checker.rb
+- lib/desert/plugin_migrations.rb
 - lib/desert/ruby/object.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/plugin_migration.rb
+- generators/desert_plugin/templates/empty_file
+- generators/desert_plugin/templates/spec_helper.rb
+- generators/desert_plugin/templates/routes.rb
 has_rdoc: true
 homepage: http://pivotallabs.com
 post_install_message: 
 rdoc_options: 
 - --main
-- README
+- README.rdoc
 - --inline-source
 - --line-numbers
 require_paths: 
@@ -78,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pivotalrb
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.

data/README

@@ -1,89 +0,0 @@
-= Desert
-
-Desert is a component framework for Rails that allows you to seamlessly define in your plugins:
-* Models
-* Controllers
-* Views
-* Helpers
-* Routes
-* Migrations
-* Plugin Dependencies
-
-Classes are automatically mixed in with your own or other plugins' classes.
-This allows you to make full featured composable components.
-Desert is a replacement for Appable Plugins (http://wiki.pluginaweek.org/Appable_plugins).
-
-
-== Using desert
-
-To use Desert, you need to do only a few things:
-
-* require 'desert' before Rails::Initializer.run in environment.rb
-
-  environment.rb
-    require 'desert'
-    Rails::Initializer.run do
-    end
-
-* Install your desert plugin routes in routes.rb
-
-  map.routes_from_plugin(:spiffy)
-
-
-== Example
-Say you want to create a plugin named acts_as_spiffy.
-Desert allows Spiffy to have a set of features that can be reused and extended in several projects.
-
-The Spiffy project has a:
-* SpiffyController
-* Spiffy model
-* SpiffyHelper
-* spiffy.rhtml
-* SpiffyLib library class
-
-The Spiffy plugin acts as its own mini Rails application.
-Here is the directory structure:
-  RAILS_ROOT/vendor/plugins/spiffy/app/controllers/spiffy_controller.rb
-  RAILS_ROOT/vendor/plugins/spiffy/app/models/spiffy.rb
-  RAILS_ROOT/vendor/plugins/spiffy/app/helpers/spiffy_helper.rb
-  RAILS_ROOT/vendor/plugins/spiffy/app/views/spiffy/spiffy.rhtml
-  RAILS_ROOT/vendor/plugins/spiffy/lib/spiffy_lib.rb
-
-Now, say there is a Spiffy Store rails application that uses acts_as_spiffy.
-The Rails app can open up any of the Spiffy classes and override any of the methods.
-
-Say spiffy.rb in the Spiffy plugin is defined as:
-  class Spiffy < ActiveRecord::Base
-    def why?
-      "I just am Spiffy"
-    end
-  end
-
-The Spiffy#why method can be overridden in RAILS_ROOT/app/models/spiffy.rb
-  class Spiffy < ActiveRecord::Base
-    def why?
-      "I sell Spiffy stuff"
-    end
-  end
-
-
-== Running plugin tests
-
-You can run your plugin tests/specs like so:
-
-  rake desert:testspec:plugins PLUGIN=spiffy
-
-Leaving off the PLUGIN environment variable will cause it to run all the test/specs for
-all installed plugins, which may not be what you want.
-
-== Running Desert tests
-
-Desert is a library that heavily monkey patches Rails. To ensure that Desert works with
-multiple versions of Rails, its tests are run against the supported versions of Rails.
-
-To set up the different supported versions of Rails, run `rake install_dependencies`.
-
-This will clone the Rails git repo and export the supported versions of rails into the
-respective directories.
-
-`rake update_dependencies` will update the clones repo on your machine.

data/scratch.rb

@@ -1,2 +0,0 @@
-require "rubygems"
-require "rr"