desert 0.3.0 → 0.3.2

data/CHANGES

@@ -1,6 +1,10 @@
+- Fixed exception in testspec.rake when rspec is not loaded
+- Fix template loading on Edge Rails and on Rails 2.1.0
+
+0.3.1
+- Fix migration issue with Rails 2.1.0 using timestamps.
+
 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]

data/README.rdoc

@@ -1,9 +1,9 @@
 = Desert - It doesn't get any DRYer than this
 
-Desert is a Rails plugin framework that makes it easy to share models, views, 
+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 
+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.
@@ -94,7 +94,7 @@ Desert is a replacement for Appable Plugins (http://wiki.pluginaweek.org/Appable
 
     Rails::Initializer.run do |config|
     end
-  
+
 NOTE: you may have to require rubygems before requiring desert.
 
 * Generate your desert plugin
@@ -115,12 +115,12 @@ Here <tt>user</tt> and <tt>will_paginate</tt> will always be loaded before <tt>b
 
 == Share Routes
 
-When you share controllers, you'll want to share their routes too.  
+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: 
+In the <tt>user</tt> plugin:
 
     # File: vendor/plugins/user/config/routes.rb
 
@@ -128,12 +128,12 @@ In the <tt>user</tt> plugin:
 
 In the <tt>blogs</tt> plugin:
 
-    File: vendor/plugins/blogs/config/routes.rb
+    # File: vendor/plugins/blogs/config/routes.rb
 
     resource :blogs
 
 In the application:
-  
+
     # File: config/routes.rb
 
     ActionController::Routing::Routes.draw do |map|
@@ -150,6 +150,29 @@ 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.3.0"
+PKG_VERSION = "0.3.2"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/lib/desert/plugin_migrations/migrator.rb

@@ -43,6 +43,12 @@ 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.rb

@@ -7,4 +7,4 @@ elsif Desert::VersionChecker.rails_version_is_below_rc2?
 else
   require "#{dir}/plugin_templates/2.0.0/action_mailer"
 end
-require "#{dir}/plugin_templates/action_view"
+require "#{dir}/plugin_templates/action_view"

data/lib/desert/plugin_templates/1.2.0/action_view.rb

@@ -0,0 +1,53 @@
+module ActionView
+  class Base
+    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|
+          if plugin_template_path = plugin.find_template("#{template_path}.#{extension}")
+            full_template_path = plugin_template_path
+            break
+          end
+        end
+      end
+
+      full_template_path
+    end
+    alias_method_chain :full_template_path, :plugin_routing
+  end
+end

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

@@ -2,11 +2,15 @@ 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
 

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

@@ -0,0 +1,38 @@
+module ActionView #:nodoc:
+  class Base #:nodoc:
+    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
+    
+    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
+  end
+end

data/lib/desert/plugin_templates/2.0.2/action_view.rb

@@ -0,0 +1,26 @@
+module ActionView #:nodoc:
+  class Base #:nodoc:
+    def initialize_with_desert_plugins(*args)
+      initialize_without_desert_plugins *args
+
+      Desert::Manager.plugins.reverse.each do |plugin|
+        append_view_path plugin.templates_path
+      end
+    end
+    alias_method_chain :initialize, :desert_plugins
+    
+    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

data/lib/desert/plugin_templates/2.1.0/action_view.rb

@@ -0,0 +1,12 @@
+module ActionView #:nodoc:
+  class TemplateFinder #:nodoc:
+    def initialize_with_desert_plugins(*args)
+      initialize_without_desert_plugins *args
+
+      Desert::Manager.plugins.reverse.each do |plugin|
+        append_view_path plugin.templates_path
+      end
+    end
+    alias_method_chain :initialize, :desert_plugins
+  end
+end

data/lib/desert/plugin_templates/action_view.rb

@@ -1,125 +1,17 @@
+dir = File.dirname(__FILE__)
+
 if ActionView.const_defined?(:TemplateFinder)
-  module ActionView #:nodoc:
-    class TemplateFinder #:nodoc:
-      def initialize_with_desert_plugins(*args)
-        initialize_without_desert_plugins *args
-        
-        Desert::Manager.plugins.reverse.each do |plugin|
-          append_view_path plugin.templates_path
-        end
-      end
-      alias_method_chain :initialize, :desert_plugins
-    end
-  end
+  require "#{dir}/2.1.0/action_view"
 else
-  module ActionView #:nodoc:
-    class Base #:nodoc:
-      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|
-              if plugin_template_path = plugin.find_template("#{template_path}.#{extension}")
-                full_template_path = plugin_template_path
-                break
-              end
-            end
-          end
-
-          full_template_path
-        end
-        alias_method_chain :full_template_path, :plugin_routing
-      end
+  if ActionView::Base.private_instance_methods.include?('find_template_extension_from_handler')
+    if ActionView::Base.instance_methods.include?('template_handler_preferences')
+      require "#{dir}/1.99.0/action_view"
+    else
+      require "#{dir}/2.0.2/action_view"
     end
+  elsif ActionView.const_defined?(:PathSet)
+    require "#{dir}/edge/action_view"
+  else
+    require "#{dir}/1.2.0/action_view"
   end
 end

data/lib/desert/plugin_templates/edge/action_view.rb

@@ -0,0 +1,10 @@
+ActionView::Base.class_eval do
+  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
+end

data/lib/desert/rails/migration.rb

@@ -8,12 +8,6 @@ class ActiveRecord::Migration
       )
     end
 
-    def schema_version_equivalent_to(plugin_name, version)
-      plugin = find_plugin(plugin_name)
-      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.to_s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors: 
 - Pivotal Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-10 00:00:00 -07:00
+date: 2008-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,38 +28,43 @@ files:
 - Rakefile
 - README.rdoc
 - init.rb
-- lib/desert/rails/2.0.0/plugin.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/manager.rb
-- lib/desert/plugin_migrations/migrator.rb
+- lib/desert/plugin.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/extensions/schema_statements.rb
+- lib/desert/plugin_migrations/migrator.rb
+- lib/desert/plugin_migrations.rb
+- lib/desert/plugin_templates/1.2.0/action_mailer.rb
+- lib/desert/plugin_templates/1.2.0/action_view.rb
+- lib/desert/plugin_templates/1.99.0/action_mailer.rb
+- lib/desert/plugin_templates/1.99.0/action_view.rb
 - lib/desert/plugin_templates/2.0.0/action_mailer.rb
+- lib/desert/plugin_templates/2.0.2/action_view.rb
+- lib/desert/plugin_templates/2.1.0/action_view.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/plugin_templates/edge/action_view.rb
+- lib/desert/plugin_templates.rb
+- lib/desert/rails/1.2.0/initializer.rb
+- lib/desert/rails/2.0.0/plugin.rb
+- lib/desert/rails/dependencies.rb
+- lib/desert/rails/migration.rb
+- lib/desert/rails/route_set.rb
 - lib/desert/rails.rb
-- lib/desert/plugin.rb
+- lib/desert/ruby/object.rb
+- lib/desert/ruby.rb
+- lib/desert/supported_rails_versions.rb
+- lib/desert/version_checker.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/plugin_migration.rb
 - generators/desert_plugin/templates/routes.rb
-- generators/desert_plugin/desert_plugin_generator.rb
+- generators/desert_plugin/templates/spec_helper.rb
+- generators/desert_plugin/USAGE
 has_rdoc: true
 homepage: http://pivotallabs.com
 post_install_message: 
@@ -85,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pivotalrb
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.