parlement 0.6 → 0.7

data/test/unit/mail_test.rb

@@ -210,5 +210,22 @@ class MailTest < Test::Unit::TestCase
 		assert_equal 1, eltChild2.result
 		assert_equal 1, elt.result
 	end
+
+	def test_receive_avatar
+		mail = TMail::Mail.parse(read_fixture('avatar').to_s)
+		elt = Mail.receive(mail).elt
+		assert elt.person.image.match(/^\/attachment\/file\/Re_people\/#{mail.parts.last.disposition_param('filename')}$/)
+	end
+
+	def test_send_avatar
+		ActionMailer::Base.deliveries = []
+		deliveredMailsCount = ActionMailer::Base.deliveries.size
+		mail = TMail::Mail.parse(read_fixture('avatar').to_s)
+		elt = Mail.receive(mail).elt
+		assert_equal deliveredMailsCount + 2, ActionMailer::Base.deliveries.size
+		assert_equal 1, elt.attachments.size
+		assert_equal "image/jpeg", elt.attachments.first.content_type
+		assert_equal 2, ActionMailer::Base.deliveries.last.parts.size
+	end
 end
 

data/vendor/plugins/engines/CHANGELOG

@@ -1,99 +1,137 @@
 *SVN*
 
 
+-----
+1.1.4
+
+Fixed creation of multipart emails (Ticket #190)
+Added a temporary fix to the code-mixing issue. In your engine's test/test_helper.rb, please add the following lines:
+
+  # Ensure that the code mixing and view loading from the application is disabled
+  Engines.disable_app_views_loading = true
+  Engines.disable_app_code_mixing = true
+
+is will prevent code mixing for controllers and helpers, and loading views from the application. One thing to remember is to load any controllers/helpers using 'require_or_load' in your tests, to ensure that the engine behaviour is respected (Ticket #135)
+Added tasks to easily test engines individually (Ticket #120)
+Fixture extensions will now fail with an exception if the corresponding class cannot be loaded (Ticket #138)
+Patch for new routing/controller loading in Rails 1.1.6. The routing code is now replaced with the contents of config.controller_paths, along with controller paths from any started engines (Ticket #196)
+Rails' Configuration instance is now stored, and available from all engines and plugins.
+
+
+-----
+1.1.3
+
+Fixed README to show 'models' rather than 'model' class (Ticket #167)
+Fixed dependency loading to work with Rails 1.1.4 (Ticket #180)
+
+
+-----
+1.1.2
+
+Added better fix to version checking (Ticket #130, jdell@gbdev.com).
+Fixed generated init_engine.rb so that VERSION module doesn't cause probems (Ticket #131, japgolly@gmail.com)
+Fixed error with Rails 1.0 when trying to ignore the engine_schema_info table (Ticket #132, snowblink@gmail.com)
+Re-added old style rake tasks (Ticket #133)
+No longer adding all subdirectories of <engine>/app or <engine>/lib, as this can cause issues when files are grouped in modules (Ticket #149, kasatani@gmail.com)
+Fixed engine precidence ordering for Rails 1.1 (Ticket #146)
+Added new Engines.each method to assist in processing the engines in the desired order (Ticket #146)
+Fixed annoying error message at appears when starting the console in development mode (Ticket #134)
+Engines is now super-careful about loading the correct version of Rails from vendor (Ticket #154)
+
+
 -----
 1.1.1
 
-- Fixed migration rake task failing when given a specific version (Ticket #115)
-- Added new rake task "test:engines" which will test engines (and other plugins) but ensure that the test database is cloned from development beforehand (Ticket #125)
-- Fixed issue where 'engine_schema_info' table was included in schema dumps (Ticket #87)
-- Fixed multi-part emails (Ticket #121)
-- Added an 'install.rb' file to new engines created by the bundled generator, which installs the engines plugin automatically if it doesn't already exist (Ticket #122)
-- Added a default VERSION module to generated engines (Ticket #123)
-- Refactored copying of engine's public files to a method of an Engine instance. You can now call Engines.get(:engine_name).copy_public_files (Ticket #108)
-- Changed engine generator templates from .rb files to .erb files (Ticket #106)
-- Fixed the test_helper.erb file to use the correct testing extensions and not load any schema - the schema will be cloned automatically via rake test:engines
-- Fixed problem when running with Rails 1.1.1 where version wasn't determined correctly (Ticket #129)
-- Fixed bug preventing engines from loading when both Rails 1.1.0 and 1.1.1 gems are installed and in use.
-- Updated version (d'oh!)
+Fixed migration rake task failing when given a specific version (Ticket #115)
+Added new rake task "test:engines" which will test engines (and other plugins) but ensure that the test database is cloned from development beforehand (Ticket #125)
+Fixed issue where 'engine_schema_info' table was included in schema dumps (Ticket #87)
+Fixed multi-part emails (Ticket #121)
+Added an 'install.rb' file to new engines created by the bundled generator, which installs the engines plugin automatically if it doesn't already exist (Ticket #122)
+Added a default VERSION module to generated engines (Ticket #123)
+Refactored copying of engine's public files to a method of an Engine instance. You can now call Engines.get(:engine_name).copy_public_files (Ticket #108)
+Changed engine generator templates from .rb files to .erb files (Ticket #106)
+Fixed the test_helper.erb file to use the correct testing extensions and not load any schema - the schema will be cloned automatically via rake test:engines
+Fixed problem when running with Rails 1.1.1 where version wasn't determined correctly (Ticket #129)
+Fixed bug preventing engines from loading when both Rails 1.1.0 and 1.1.1 gems are installed and in use.
+Updated version (d'oh!)
 
 
 -----
 1.1.0
 
-- Improved regexp matching for Rails 1.0 engines with peculiar paths
-- Engine instance objects can be accessed via Engines[:name], an alias for Engines.get(:name) (Ticket #99)
-- init_engine.rb is now processed as the final step in the Engine.start process, so it can access files within the lib directory, which is now in the $LOAD_PATH at that point. (Ticket #99)
-- Clarified MIT license (Ticket #98)
-- Updated Rake tasks to integrate smoothly with Rails 1.1 namespaces
-- Changed the version to "1.1.0 (svn)"
-- Added more information about using the plugin with Edge Rails to the README
-- moved extensions into lib/engines/ directory to enable use of Engines module in extension code.
-- Added conditional require_or_load method which attempts to detect the current Rails version. To use the Edge Rails version of the loading mechanism, add the line:
-    Engines.config :edge, true
-  to your environment.rb file.
-- Merged changes from /branches/edge and /branches/rb_1.0 into /trunk
-- engine_schema_info now respects the prefix/suffixes set for ActiveRecord::Base (Ticket #67)
-- added ActiveRecord::Base.wrapped_table_name(name) method to assist in determining the correct table name
+Improved regexp matching for Rails 1.0 engines with peculiar paths
+Engine instance objects can be accessed via Engines[:name], an alias for Engines.get(:name) (Ticket #99)
+init_engine.rb is now processed as the final step in the Engine.start process, so it can access files within the lib directory, which is now in the $LOAD_PATH at that point. (Ticket #99)
+Clarified MIT license (Ticket #98)
+Updated Rake tasks to integrate smoothly with Rails 1.1 namespaces
+Changed the version to "1.1.0 (svn)"
+Added more information about using the plugin with Edge Rails to the README
+moved extensions into lib/engines/ directory to enable use of Engines module in extension code.
+Added conditional require_or_load method which attempts to detect the current Rails version. To use the Edge Rails version of the loading mechanism, add the line:
+  Engines.config :edge, true
+to your environment.rb file.
+Merged changes from /branches/edge and /branches/rb_1.0 into /trunk
+engine_schema_info now respects the prefix/suffixes set for ActiveRecord::Base (Ticket #67)
+added ActiveRecord::Base.wrapped_table_name(name) method to assist in determining the correct table name
 
 
 -----
 1.0.6
 
-- Added ability to determine version information for engines: rake engine_info
-- Added a custom logger for the Engines module, to stop pollution of the Rails logs.
-- Added some more tests (in particular, see rails_engines/applications/engines_test).
-- Another attempt at solving Ticket #53 - controllers and helpers should now be loadable from modules, and if a full path (including RAILS_ROOT/ENGINES_ROOT) is given, it should be safely stripped from the require filename such that corresponding files can be located in any active engines. In other words, controller/helper overloading should now completely work, even if the controllers/helpers are in modules.
-- Added (finally) patch from Ticket #22 - ActionMailer helpers should now load
-- Removed support for Engines.start :engine, :engine_name => 'whatever'. It was pointless.
-- Fixed engine name referencing; engine_stylesheet/engine_javascript can now happily use shorthand engine names (i.e. :test == :test_engine) (Ticket #45)
-- Fixed minor documentation error ('Engine.start' ==> 'Engines.start') (Ticket #57)
-- Fixed double inclusion of RAILS_ROOT in engine_migrate rake task (Ticket #61)
-- Added ability to force config values even if given as a hash (Ticket #62)
+Added ability to determine version information for engines: rake engine_info
+Added a custom logger for the Engines module, to stop pollution of the Rails logs.
+Added some more tests (in particular, see rails_engines/applications/engines_test).
+Another attempt at solving Ticket #53 - controllers and helpers should now be loadable from modules, and if a full path (including RAILS_ROOT/ENGINES_ROOT) is given, it should be safely stripped from the require filename such that corresponding files can be located in any active engines. In other words, controller/helper overloading should now completely work, even if the controllers/helpers are in modules.
+Added (finally) patch from Ticket #22 - ActionMailer helpers should now load
+Removed support for Engines.start :engine, :engine_name => 'whatever'. It was pointless.
+Fixed engine name referencing; engine_stylesheet/engine_javascript can now happily use shorthand engine names (i.e. :test == :test_engine) (Ticket #45)
+Fixed minor documentation error ('Engine.start' ==> 'Engines.start') (Ticket #57)
+Fixed double inclusion of RAILS_ROOT in engine_migrate rake task (Ticket #61)
+Added ability to force config values even if given as a hash (Ticket #62)
 
 
 -----
 1.0.5
 
-- Fixed bug stopping fixtures from loading with PostgreSQL
+Fixed bug stopping fixtures from loading with PostgreSQL
 
 
 -----
 1.0.4
 
-- Another attempt at loading controllers within modules (Ticket #56)
+Another attempt at loading controllers within modules (Ticket #56)
 
 
 -----
 1.0.3
 
-- Fixed serious dependency bug stopping controllers being loaded (Ticket #56)
+Fixed serious dependency bug stopping controllers being loaded (Ticket #56)
 
 
 -----
 1.0.2
 
-- Fixed bug with overloading controllers in modules from /app directory
-- Fixed exception thrown when public files couldn't be created; exception is now logged (Ticket #52)
-- Fixed problem with generated test_helper.rb file via File.expand_path (Ticket #50)
+Fixed bug with overloading controllers in modules from /app directory
+Fixed exception thrown when public files couldn't be created; exception is now logged (Ticket #52)
+Fixed problem with generated test_helper.rb file via File.expand_path (Ticket #50)
 
 
 -----
 1.0.1
 
-- Added engine generator for creation of new engines
-- Fixed 'Engine' typo in README
-- Fixed bug in fixtures extensions
-- Fixed /lib path management bug
-- Added method to determine public directory location from Engine object
-- Fixed bug in the error message in get_engine_dir()
-- Added proper component loading
-- Added preliminary tests for the config() methods module
+Added engine generator for creation of new engines
+Fixed 'Engine' typo in README
+Fixed bug in fixtures extensions
+Fixed /lib path management bug
+Added method to determine public directory location from Engine object
+Fixed bug in the error message in get_engine_dir()
+Added proper component loading
+Added preliminary tests for the config() methods module
 
 
 -----
 pre-v170
 
-- Fixed copyright notices to point to DHH, rather than me.
-- Moved extension require statements into lib/engines.rb, so the will be loaded if another module/file calls require 'engines
-- Added a CHANGELOG file (this file)
+Fixed copyright notices to point to DHH, rather than me.
+Moved extension require statements into lib/engines.rb, so the will be loaded if another module/file calls require 'engines
+Added a CHANGELOG file (this file)

data/vendor/plugins/engines/README

@@ -174,7 +174,7 @@ Here's a sample rails application with a detailed listing of an example engines
                   |- init_engine.rb
                   |- app
                   |     |- controllers
-                  |     |- model
+                  |     |- models
                   |     |- helpers
                   |     |- views
                   |- db

data/vendor/plugins/engines/generators/engine/templates/init_engine.erb

@@ -1,9 +1,11 @@
 <%= license %>
 
-module <%= engine_class_name %>::VERSION
-  Major = 0 # change implies compatibility breaking with previous versions
-  Minor = 1 # change implies backwards-compatible change to API
-  Release = 0 # incremented with bug-fixes, updates, etc.
+module <%= engine_class_name %>
+  module VERSION
+    Major = 0 # change implies compatibility breaking with previous versions
+    Minor = 1 # change implies backwards-compatible change to API
+    Release = 0 # incremented with bug-fixes, updates, etc.
+  end
 end
 
 Engines.current.version = <%= engine_class_name %>::VERSION

data/vendor/plugins/engines/generators/engine/templates/test/test_helper.erb

@@ -3,6 +3,10 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../../test/test_helper
 # ensure that the Engines testing enhancements are loaded.
 require File.join(Engines.config(:root), "engines", "lib", "engines", "testing_extensions")
 
+# Ensure that the code mixing and view loading from the application is disabled
+Engines.disable_app_views_loading = true
+Engines.disable_app_code_mixing = true
+
 # force these config values
 module <%= engine_class_name %>
 #  config :some_option, "some_value"
@@ -10,4 +14,4 @@ end
 
 # set up the fixtures location
 Test::Unit::TestCase.fixture_path = File.dirname(__FILE__)  + "/fixtures/"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)

data/vendor/plugins/engines/init.rb

@@ -25,17 +25,17 @@
 # = IN OTHER WORDS:
 #
 # You are free to use this software as you please, but if it breaks you'd
-# come a'cryin...
+# best not come a'cryin...
 #++
 
-
+# Load the engines & bundles extensions
 require 'engines'
 require 'bundles'
 
 module ::Engines::Version
   Major = 1 # change implies compatibility breaking with previous versions
   Minor = 1 # change implies backwards-compatible change to API
-  Release = 1 # incremented with bug-fixes, updates, etc.
+  Release = 4 # incremented with bug-fixes, updates, etc.
 end
 
 #--
@@ -46,3 +46,8 @@ if !File.exist?(Engines.config(:root))
   FileUtils.mkdir_p(Engines.config(:root))
 end
 
+# Keep a hold of the Rails Configuration object
+Engines.rails_config = config
+
+# Initialize the routing (controller_paths)
+Engines.initialize_routing

data/vendor/plugins/engines/lib/engines/action_mailer_extensions.rb

@@ -51,9 +51,11 @@ module ActionMailer
         # normal template exists (or if there were no implicit parts) we render
         # it.
         template_exists = @parts.empty?
-        #template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| i.split(".").length == 2 }
-        template_exists ||= templates.any? { |i| File.basename(i).split(".").length == 2 }
-        #RAILS_DEFAULT_LOGGER.debug "template_exists? #{template_exists}"
+        # template_exists ||= Dir.glob("#{template_path}/#{@template}.*").any? { |i| i.split(".").length == 2 }
+        template_exists ||= templates.any? do |i|
+          arr = File.basename(i).split(".")
+          (arr.length == 2) && (arr[0] == @template) 
+        end
         @body = render_message(@template, @body) if template_exists
 
         # Finally, if there are other message parts and a textual body exists,
@@ -86,7 +88,7 @@ module ActionMailer
       # Return all ActionView template paths from the app and all Engines
       def template_paths
         paths = [template_path]
-        Engines.active.each { |engine|
+        Engines.each { |engine|
           # add a path for every engine if one exists.
           engine_template_path = File.join(engine.root, "app", "views", mailer_name)
           paths << engine_template_path if File.exists?(engine_template_path)
@@ -129,7 +131,6 @@ module ActionMailer
       # template root
       def initialize_template_class(assigns, method_name)
         engine_template = find_template_root_for(method_name)
-        #ActionView::Base.new(engine_template, assigns, self)
         action_view_class = Class.new(ActionView::Base).send(:include, master_helper_module)
         action_view_class.new(engine_template, assigns, self)        
       end

data/vendor/plugins/engines/lib/engines/action_view_extensions.rb

@@ -2,18 +2,22 @@ require 'fileutils'
 
 module ::ActionView
   class Base
+    
     private
       def full_template_path(template_path, extension)
 
-        # If the template exists in the normal application directory,
-        # return that path
-        default_template = "#{@base_path}/#{template_path}.#{extension}"
-        return default_template if File.exist?(default_template)
+        unless Engines.disable_app_views_loading
+          # If the template exists in the normal application directory,
+          # return that path
+          default_template = "#{@base_path}/#{template_path}.#{extension}"
+          return default_template if File.exist?(default_template)
+        end
 
         # Otherwise, check in the engines to see if the template can be found there.
         # Load this in order so that more recently started Engines will take priority.
-        Engines.active.each do |engine|
-          site_specific_path = File.join(engine.root, 'app', 'views',  template_path.to_s + '.' + extension.to_s)
+        Engines.each(:precidence_order) do |engine|
+          site_specific_path = File.join(engine.root, 'app', 'views',  
+                                         template_path.to_s + '.' + extension.to_s)
           return site_specific_path if File.exist?(site_specific_path)
         end
 

data/vendor/plugins/engines/lib/engines/active_record_extensions.rb

@@ -16,4 +16,6 @@ module ::ActiveRecord
 end
 
 # Set ActiveRecord to ignore the engine_schema_info table by default
-::ActiveRecord::SchemaDumper.ignore_tables << 'engine_schema_info'
+unless Rails::VERSION::STRING =~ /^1\.0\./
+  ::ActiveRecord::SchemaDumper.ignore_tables << 'engine_schema_info'
+end

data/vendor/plugins/engines/lib/engines/dependencies_extensions.rb

@@ -8,9 +8,11 @@ module ::Dependencies
   def require_or_load(file_name)
     if Engines.config(:edge)
       rails_edge_require_or_load(file_name)
+    
     elsif Rails::VERSION::STRING =~ /^1.1/
       # otherwise, assume we're on trunk (1.1 at the moment)
       rails_1_1_require_or_load(file_name)
+    
     elsif Rails::VERSION::STRING =~ /^1.0/
       # use the old dependency load method
       rails_1_0_require_or_load(file_name)
@@ -22,37 +24,42 @@ module ::Dependencies
   end
   
   def rails_1_1_require_or_load(file_name)
-    file_name = $1 if file_name =~ /^(.*)\.rb$/
-    
     Engines.log.debug("Engines 1.1 require_or_load: #{file_name}")
 
+    found = false
+
     # try and load the engine code first
     # can't use model, as there's nothing in the name to indicate that the file is a 'model' file
     # rather than a library or anything else.
     ['controller', 'helper'].each do |type| 
       # if we recognise this type
-      if file_name.include?('_' + type)
+      # (this regexp splits out the module/filename from any instances of app/#{type}, so that
+      #  modules are still respected.)
+      if file_name =~ /^(.*app\/#{type}s\/)?(.*_#{type})(\.rb)?$/
  
-        # ... go through the active engines from last started to first
-        Engines.active.each do |engine|
+        # ... go through the active engines from first started to last, so that
+        # code with a high precidence (started later) will override lower precidence
+        # implementations
+        Engines.each(:load_order) do |engine|
  
-          engine_file_name = File.expand_path(File.join(engine.root, 'app', "#{type}s", file_name))
-          engine_file_name = $1 if engine_file_name =~ /^(.*)\.rb$/
-          Engines.log.debug("- checking engine '#{engine.name}' for '#{engine_file_name}'")
+          engine_file_name = File.expand_path(File.join(engine.root, 'app', "#{type}s", $2))
+          #engine_file_name = $1 if engine_file_name =~ /^(.*)\.rb$/
+          Engines.log.debug("checking engine '#{engine.name}' for '#{engine_file_name}'")
           if File.exist?("#{engine_file_name}.rb")
             Engines.log.debug("==> loading from engine '#{engine.name}'")
             rails_pre_engines_require_or_load(engine_file_name)
+            found = true
           end
         end
       end 
     end
     
     # finally, load any application-specific controller classes using the 'proper'
-    # rails load mechanism
-    rails_pre_engines_require_or_load(file_name)
+    # rails load mechanism, EXCEPT when we're testing engines and could load this file
+    # from an engine
+    rails_pre_engines_require_or_load(file_name) unless Engines.disable_app_code_mixing && found
   end
   
-  
   def rails_1_0_require_or_load(file_name)
     file_name = $1 if file_name =~ /^(.*)\.rb$/
 
@@ -61,16 +68,17 @@ module ::Dependencies
     # if the file_name ends in "_controller" or "_controller.rb", strip all
     # path information out of it except for module context, and load it. Ditto
     # for helpers.
-    if file_name =~ /_controller(.rb)?$/
+    found = if file_name =~ /_controller(.rb)?$/
       require_engine_files(file_name, 'controller')
     elsif file_name =~ /_helper(.rb)?$/ # any other files we can do this with?
       require_engine_files(file_name, 'helper')
     end
     
     # finally, load any application-specific controller classes using the 'proper'
-    # rails load mechanism
+    # rails load mechanism, EXCEPT when we're testing engines and could load this file
+    # from an engine
     Engines.log.debug("--> loading from application: '#{file_name}'")
-    rails_pre_engines_require_or_load(file_name)
+    rails_pre_engines_require_or_load(file_name) unless Engines.disable_app_code_mixing && found
     Engines.log.debug("--> Done loading.")
   end
   
@@ -86,10 +94,11 @@ module ::Dependencies
   # then you might have trouble. Sorry, just please don't have your web application
   # running under a path like that.
   def require_engine_files(file_name, type='')
+    found = false
     Engines.log.debug "requiring #{type} file '#{file_name}'"
     processed_file_name = file_name.gsub(/[\w\W\/\.]*app\/#{type}s\//, '')    
     Engines.log.debug "--> rewrote to '#{processed_file_name}'"
-    Engines.active.reverse.each do |engine|
+    Engines.each(:load_order) do |engine|
       engine_file_name = File.join(engine.root, 'app', "#{type}s", processed_file_name)
       engine_file_name += '.rb' unless ! load? || engine_file_name[-3..-1] == '.rb'
       Engines.log.debug "--> checking '#{engine.name}' for #{engine_file_name}"
@@ -97,8 +106,10 @@ module ::Dependencies
         (engine_file_name[-3..-1] != '.rb' && File.exist?(engine_file_name + '.rb'))
         Engines.log.debug "--> found, loading from engine '#{engine.name}'"
         rails_pre_engines_require_or_load(engine_file_name)
+        found = true
       end
-    end     
+    end
+    found
   end
 end
 

data/vendor/plugins/engines/lib/engines/routing_extensions.rb

@@ -0,0 +1,28 @@
+module ActionController
+  module Routing
+    
+    class << self
+      # This holds the global list of valid controller paths
+      attr_accessor :controller_paths
+    end
+    
+    class ControllerComponent
+      class << self
+      protected
+        def safe_load_paths #:nodoc:
+          if defined?(RAILS_ROOT)
+            paths = $LOAD_PATH.select do |base|
+              base = File.expand_path(base)
+              # Check that the path matches one of the allowed paths in controller_paths
+              base.match(/^#{ActionController::Routing.controller_paths.map { |p| File.expand_path(p) } * '|'}/)
+            end
+            Engines.log.debug "Engines safe_load_paths: #{paths.inspect}"
+            paths
+          else
+            $LOAD_PATH
+          end
+        end        
+      end
+    end
+  end
+end

data/vendor/plugins/engines/lib/engines/testing_extensions.rb

@@ -83,8 +83,12 @@ class Fixtures < YAML::Omap
     if load_instances
       ActiveRecord::Base.silence do
         fixtures.each do |name, fixture|
-          if model = fixture.find
-            object.instance_variable_set "@#{name}", model
+          begin
+            if model = fixture.find
+              object.instance_variable_set "@#{name}", model
+            end
+          rescue FixtureClassNotFound
+            # Let's hope the developer has included it himself
           end
         end
       end