desert 0.5.0 → 0.5.2

data/Rakefile

@@ -20,6 +20,7 @@ def run_suite
 end
 
 begin
+  gem "pivotal-jeweler"
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "desert"
@@ -27,7 +28,7 @@ begin
     s.email = "opensource@pivotallabs.com"
     s.homepage = "http://pivotallabs.com"
     s.description = "Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps."
-    s.authors = ["Pivotal Labs", "Brian Takita", "Parker Thompson", "Adam Milligan"]
+    s.authors = ["Pivotal Labs", "Brian Takita", "Parker Thompson", "Adam Milligan, Joe Moore"]
     s.files =  FileList[
       '[A-Z]*',
       '*.rb',
@@ -49,7 +50,7 @@ end
 desc "Install dependencies to run the build. This task uses Git."
 task :install_dependencies do
   require "lib/desert/supported_rails_versions"
-  system("git clone git://github.com/rails/rails.git spec/rails_root/vendor/rails_versions/edge")
+  system("git clone git://github.com/rails/rails.git /Users/pivotal/workspace/desert/spec/rails_root/vendor/rails_versions/edge")
   Dir.chdir("spec/rails_root/vendor/rails_versions/edge") do
     begin
       Desert::SUPPORTED_RAILS_VERSIONS.each do |version, data|

data/VERSION.yml

@@ -1,4 +1,2 @@
 --- 
-:minor: 5
-:patch: 0
-:major: 0
+:version: 0.5.2

data/lib/desert/manager.rb

@@ -30,6 +30,7 @@ module Desert
         paths << File.join(component_root, 'app','models')
         paths << File.join(component_root, 'app','controllers')
         paths << File.join(component_root, 'app','helpers')
+        paths << File.join(component_root, 'app','sweepers')        
         paths << File.join(component_root, 'lib')
       end
       dependencies.load_paths.reverse.each do |path|

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

@@ -3,7 +3,10 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
     initialize_schema_migrations_table_without_plugins
 
     begin
-      execute "CREATE TABLE #{Desert::PluginMigrations::Migrator.schema_migrations_table_name} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:string)})"
+      smt = Desert::PluginMigrations::Migrator.schema_migrations_table_name
+      unless ActiveRecord::Base.connection.tables.include?(smt)
+        execute "CREATE TABLE #{smt} (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:string)})"
+      end
       plugins_and_versions = select_all("SELECT plugin_name, version from #{Desert::PluginMigrations::Migrator.schema_info_table_name}")
       plugins_and_versions.each do |plugin_data|
         plugin_name, version = plugin_data["plugin_name"], plugin_data["version"]
@@ -30,4 +33,4 @@ ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
     end
   end
   alias_method_chain :initialize_schema_migrations_table, :plugins
-end
+end

data/lib/desert/plugin_templates.rb

@@ -4,7 +4,10 @@ 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
+elsif Desert::VersionChecker.rails_version_is_below_220?
   require "#{dir}/plugin_templates/2.0.0/action_mailer"
+else
+  require "#{dir}/plugin_templates/2.2.0/action_mailer"
 end
+
 require "#{dir}/plugin_templates/action_view"

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

@@ -20,4 +20,4 @@ module ActionMailer #:nodoc
         end
       end
   end
-end
+end

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

@@ -1,8 +1,11 @@
 module ActionView #:nodoc:
   class TemplateFinder #:nodoc:
     def initialize_with_desert_plugins(*args)
-      initialize_without_desert_plugins *args
-
+      begin
+        initialize_without_desert_plugins *args
+      rescue ActionView::TemplateFinder::InvalidViewPath
+        # Desert will add the missing paths next
+      end
       Desert::Manager.plugins.reverse.each do |plugin|
         append_view_path plugin.templates_path
       end

data/lib/desert/plugin_templates/2.2.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)
+        self.view_paths = Dir[template_path].collect do |path|
+          File.dirname(path)
+        end if self.view_paths.empty?
+        returning(template = ActionView::Base.new(view_paths, assigns, self)) do
+          template.extend ApplicationHelper
+          template.extend self.class.master_helper_module
+        end
+      end
+  end
+end

data/lib/desert/plugin_templates/action_view.rb

@@ -10,7 +10,7 @@ else
       require "#{dir}/2.0.2/action_view"
     end
   elsif ActionView.const_defined?(:PathSet)
-    require "#{dir}/edge/action_view"
+    require "#{dir}/2.2.0/action_view"
   else
     require "#{dir}/1.2.0/action_view"
   end

data/lib/desert/version_checker.rb

@@ -21,6 +21,14 @@ module Desert
       def rails_version_is_1991?
         current_rails_version_matches?('=1.99.1')
       end
+
+      def rails_version_is_below_220?
+        current_rails_version_matches?('<2.2.0')
+      end
+      
+      def rails_version_is_below_230?
+        current_rails_version_matches?('<2.3.0')
+      end
     end
   end
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification 
 name: desert
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - Pivotal Labs
 - Brian Takita
 - Parker Thompson
-- Adam Milligan
+- Adam Milligan, Joe Moore
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,9 +55,10 @@ files:
 - 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/2.2.0/action_mailer.rb
+- lib/desert/plugin_templates/2.2.0/action_view.rb
 - lib/desert/plugin_templates/action_controller.rb
 - lib/desert/plugin_templates/action_view.rb
-- lib/desert/plugin_templates/edge/action_view.rb
 - lib/desert/rails.rb
 - lib/desert/rails/1.2.0/initializer.rb
 - lib/desert/rails/2.0.0/plugin.rb
@@ -71,6 +72,8 @@ files:
 - lib/desert/version_checker.rb
 has_rdoc: true
 homepage: http://pivotallabs.com
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -94,9 +97,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: desert
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.
 test_files: []