@@ -28,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', @@ -50,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| Rakefile @@ -1,2 +1,2 @@ ---- +--- :version: 0.5.1 VERSION.yml @@ -2,77 +2,76 @@ Gem::Specification.new do |s| s.name = %q{desert} - s.version = "0.5.0" + s.version = "0.5.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= - s.authors = ["Pivotal Labs", "Brian Takita Mockingbird", "Parker I'm-not-a-hippie! Thompson", "Adam 'That's Crap' Milligan"] - s.date = %q{2009-04-08} + s.authors = ["Pivotal Labs", "Brian Takita", "Parker Thompson", "Adam Milligan, Joe Moore"] + s.date = %q{2009-08-26} s.description = %q{Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.} s.email = %q{opensource@pivotallabs.com} s.extra_rdoc_files = [ "CHANGES", - "README.rdoc" + "README.rdoc" ] s.files = [ "CHANGES", - "MIT-LICENSE", - "README.rdoc", - "Rakefile", - "VERSION.yml", - "generators/desert_plugin/USAGE", - "generators/desert_plugin/desert_plugin_generator.rb", - "generators/desert_plugin/templates/desert_routes.rb", - "generators/desert_plugin/templates/desert_routes.rb", - "generators/desert_plugin/templates/empty_file", - "generators/desert_plugin/templates/empty_file", - "generators/desert_plugin/templates/plugin_migration.rb", - "generators/desert_plugin/templates/plugin_migration.rb", - "generators/desert_plugin/templates/spec_helper.rb", - "generators/desert_plugin/templates/spec_helper.rb", - "init.rb", - "lib/desert.rb", - "lib/desert/manager.rb", - "lib/desert/plugin.rb", - "lib/desert/plugin_migrations.rb", - "lib/desert/plugin_migrations/1.2/extensions/schema_statements.rb", - "lib/desert/plugin_migrations/1.2/migrator.rb", - "lib/desert/plugin_migrations/2.1/extensions/schema_statements.rb", - "lib/desert/plugin_migrations/2.1/migrator.rb", - "lib/desert/plugin_migrations/migrator.rb", - "lib/desert/plugin_templates.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/edge/action_view.rb", - "lib/desert/rails.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/ruby.rb", - "lib/desert/ruby/object.rb", - "lib/desert/supported_rails_versions.rb", - "lib/desert/tasks.rb", - "lib/desert/version_checker.rb" + "MIT-LICENSE", + "README.rdoc", + "Rakefile", + "VERSION.yml", + "generators/desert_plugin/USAGE", + "generators/desert_plugin/desert_plugin_generator.rb", + "generators/desert_plugin/templates/desert_routes.rb", + "generators/desert_plugin/templates/desert_routes.rb", + "generators/desert_plugin/templates/empty_file", + "generators/desert_plugin/templates/empty_file", + "generators/desert_plugin/templates/plugin_migration.rb", + "generators/desert_plugin/templates/plugin_migration.rb", + "generators/desert_plugin/templates/spec_helper.rb", + "generators/desert_plugin/templates/spec_helper.rb", + "init.rb", + "lib/desert.rb", + "lib/desert/manager.rb", + "lib/desert/plugin.rb", + "lib/desert/plugin_migrations.rb", + "lib/desert/plugin_migrations/1.2/extensions/schema_statements.rb", + "lib/desert/plugin_migrations/1.2/migrator.rb", + "lib/desert/plugin_migrations/2.1/extensions/schema_statements.rb", + "lib/desert/plugin_migrations/2.1/migrator.rb", + "lib/desert/plugin_migrations/migrator.rb", + "lib/desert/plugin_templates.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/2.2.0/action_view.rb", + "lib/desert/plugin_templates/action_controller.rb", + "lib/desert/plugin_templates/action_view.rb", + "lib/desert/rails.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/ruby.rb", + "lib/desert/ruby/object.rb", + "lib/desert/supported_rails_versions.rb", + "lib/desert/tasks.rb", + "lib/desert/version_checker.rb" ] - s.has_rdoc = true s.homepage = %q{http://pivotallabs.com} s.rdoc_options = ["--main", "README.rdoc", "--inline-source", "--line-numbers"] s.require_paths = ["lib"] s.rubyforge_project = %q{desert} - s.rubygems_version = %q{1.3.1} + s.rubygems_version = %q{1.3.5} s.summary = %q{Desert is a component framework for Rails that allows your plugins to be packaged as mini Rails apps.} if s.respond_to? :specification_version then current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION - s.specification_version = 2 + s.specification_version = 3 if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then else desert.gemspec @@ -6,4 +6,3 @@ gems: version: 1.1.12 - name: sqlite3-ruby # required for rails tests version: 1.2.4 # This may be required on OSX: sudo env ARCHFLAGS="-arch i386" gem install sqlite3-ruby - \ No newline at end of file geminstaller.yml @@ -11,13 +11,13 @@ module ActionMailer #:nodoc alias_method_chain :template_path, :plugin_routing def initialize_template_class(assigns) - view_paths = Dir[template_path].collect do |path| + self.view_paths = Dir[template_path].collect do |path| File.dirname(path) - end + 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 \ No newline at end of file +end lib/desert/plugin_templates/2.0.0/action_mailer.rb @@ -1,4 +1,7 @@ class SpiffyMailer < ActionMailer::Base def spiffy_mail + @recipients = 'foo@example.com' + @subject = 'Desert Email' + @from = "desert@example.com" end -end \ No newline at end of file +end spec/rails_root/app/models/spiffy_mailer.rb @@ -15,7 +15,6 @@ ActionController::Routing::Routes.draw do |map| # Allow downloading Web Service WSDL as a file with an extension # instead of a file named 'wsdl' - map.routes_from_plugin :load_me_once map.routes_from_plugin :super_spiffy spec/rails_root/config/routes.rb @@ -14,4 +14,11 @@ module ActionMailer end end end + describe "view_paths" do + it "should be memoized" do + ActionMailer::Base.view_paths = [] + SpiffyMailer.deliver_spiffy_mail + ActionMailer::Base.view_paths.should_not be_nil + end + end end spec/rails_root/spec/desert/action_mailer_integration_spec.rb @@ -5,6 +5,7 @@ require "#{dir}/../config/environment" require "action_controller/test_process" require "spec" +require "spec/autorun" require "rr" require "rr/adapters/rspec" spec/rails_root/spec/rails_spec_helper.rb @@ -2,7 +2,6 @@ class UnitSpecSuite def run dir = File.dirname(__FILE__) Dir["#{dir}/desert/**/*_spec.rb"].each do |file| -# puts "require '#{file}'" require file end end spec/unit_spec_suite.rb a0a322a1990a2b8f2738cf17a6b81ad3ccbf7d1d pivotal pivotal@albion.flood.pivotallabs.com http://github.com/pivotal/desert/commit/6239818ea8118c802ffebbd56e0dfc7ef2dc90eb 6239818ea8118c802ffebbd56e0dfc7ef2dc90eb 2009-08-26T10:22:49-07:00 2009-08-26T10:22:49-07:00 joemoore - using ActionMailer.view_paths now, which are cached. Specs in the sample Rails project now run (and fail!!). Bumped version to 0.5.1. 07b3b909b5d6bfa88104598448c88a24ce68e918 pivotal pivotal@albion.flood.pivotallabs.com