Changeset 344

Timestamp:

04/06/06 16:16:01 (3 years ago)

Author:

lazyatom

Message:

Releasing Engines plugin 1.1.1 to the public

Files:

• plugins/engines/CHANGELOG (modified) (2 diffs)
• plugins/engines/generators/engine/engine_generator.rb (modified) (3 diffs)
• plugins/engines/generators/engine/templates/init_engine.erb (copied) (copied from engines/tags/rel_1.1.1/generators/engine/templates/init_engine.erb)
• plugins/engines/generators/engine/templates/init_engine.rb (deleted)
• plugins/engines/generators/engine/templates/install.erb (copied) (copied from engines/tags/rel_1.1.1/generators/engine/templates/install.erb)
• plugins/engines/generators/engine/templates/lib/engine.erb (copied) (copied from engines/tags/rel_1.1.1/generators/engine/templates/lib/engine.erb)
• plugins/engines/generators/engine/templates/lib/engine.rb (deleted)
• plugins/engines/generators/engine/templates/test/test_helper.erb (copied) (copied from engines/tags/rel_1.1.1/generators/engine/templates/test/test_helper.erb)
• plugins/engines/generators/engine/templates/test/test_helper.rb (deleted)
• plugins/engines/lib/engines.rb (modified) (6 diffs)
• plugins/engines/lib/engines/action_mailer_extensions.rb (modified) (2 diffs)
• plugins/engines/lib/engines/active_record_extensions.rb (modified) (1 diff)
• plugins/engines/lib/engines/dependencies_extensions.rb (modified) (3 diffs)
• plugins/engines/tasks/engines.rake (modified) (3 diffs)

plugins/engines/CHANGELOG

@@ -1 +1 @@
-*SVN*
-
+-----
+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)
+
+-----
+1.1.0
+
-- Improved regexp matching for Rails 1.0 engines with peculiar paths
-
-
-
-
-
+
+
-- 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
-
-
-
-
-
+
+
-    Engines.config :edge, true
-  to your environment.rb file.
-- Merged changes from /branches/edge and /branches/rb_1.0 into /trunk
-
-
-
-
+
+
+
-
------
@@ -28 +38 @@
-
-- Added ability to determine version information for engines: rake engine_info
-
-
+
-- Added some more tests (in particular, see rails_engines/applications/engines_test).
-
-
-
-
-
-
+
-- Added (finally) patch from Ticket #22 - ActionMailer helpers should now load
-
-
-
-
-
-
-
-
+
+
+
+
-- Added ability to force config values even if given as a hash (Ticket #62)
-

plugins/engines/generators/engine/engine_generator.rb

@@ -148 +148 @@
-        :insert => @license.to_s
-
-
+
+
+
-        File.join('vendor', 'plugins', @engine_underscored_name, 'init_engine.rb'),
-        :sandbox => lambda {create_sandbox},
@@ -162 +164 @@
-      m.directory File.join('vendor', 'plugins', @engine_underscored_name, 'db', 'migrate')
-      m.directory File.join('vendor', 'plugins', @engine_underscored_name, 'lib')
-
+e
-        File.join('vendor', 'plugins', @engine_underscored_name, 'lib', "#{@engine_underscored_name}.rb"),
-        :sandbox => lambda {create_sandbox},
@@ -177 +179 @@
-      m.template File.join('tasks', 'engine.rake'), File.join('vendor', 'plugins', @engine_underscored_name, 'tasks', "#{@engine_underscored_name}.rake")
-      m.directory File.join('vendor', 'plugins', @engine_underscored_name, 'test')
-
+e
-      m.directory File.join('vendor', 'plugins', @engine_underscored_name, 'test', 'fixtures')
-      m.directory File.join('vendor', 'plugins', @engine_underscored_name, 'test', 'functional')

plugins/engines/lib/engines.rb

@@ -1 +1 @@
-require 'logger'
-
-
+
+
+
+
+
+
+
-require 'engines/ruby_extensions'
-# ... further files are required at the bottom of this file
@@ -129 +135 @@
-
-      # This mechanism is no longer required in Rails trunk
-= "1.0.0"
+~ /^1.0/
-        Controllers.add_path(engine_controllers) if File.exist?(engine_controllers)
-        Controllers.add_path(engine_components) if File.exist?(engine_components)
@@ -136 +142 @@
-      # copy the files unless indicated otherwise
-      if options[:copy_files] != false
-opy_engine_files(current_engine)
+urrent_engine.mirror_engine_files
-      end
-
@@ -196 +202 @@
-    end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-Files in this directory are automatically generated from your Rails Engines.
-They are copied from the 'public' directories of each engine into this directory
@@ -216 +221 @@
-should edit the files within the <engine_name>/public/ directory itself.
-EOS
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-      end
-    end
@@ -378 +325 @@
-    File.join("/", Engines.config(:public_dir), name)
-  end
+  
+  # Replicates the subdirectories under the engine's /public directory into
+  # the corresponding public directory.
+  def mirror_engine_files
+    
+    begin
+      Engines.create_base_public_directory
+  
+      source = File.join(root, "public")
+      Engines.log.debug "Attempting to copy public engine files from '#{source}'"
+  
+      # if there is no public directory, just return after this file
+      return if !File.exist?(source)
+
+      source_files = Dir[source + "/**/*"]
+      source_dirs = source_files.select { |d| File.directory?(d) }
+      source_files -= source_dirs  
+    
+      Engines.log.debug "source dirs: #{source_dirs.inspect}"
+
+      # Create the engine_files/<something>_engine dir if it doesn't exist
+      new_engine_dir = File.join(RAILS_ROOT, "public", public_dir)
+      if !File.exists?(new_engine_dir)
+        # Create <something>_engine dir with a message
+        Engines.log.debug "Creating #{public_dir} public dir"
+        FileUtils.mkdir_p(new_engine_dir)
+      end
+
+      # create all the directories, transforming the old path into the new path
+      source_dirs.uniq.each { |dir|
+        begin        
+          # strip out the base path and add the result to the public path, i.e. replace 
+          #   ../script/../vendor/plugins/engine_name/public/javascript
+          # with
+          #   engine_name/javascript
+          #
+          relative_dir = dir.gsub(File.join(root, "public"), name)
+          target_dir = File.join(Engines.public_engine_dir, relative_dir)
+          unless File.exist?(target_dir)
+            Engines.log.debug "creating directory '#{target_dir}'"
+            FileUtils.mkdir_p(target_dir)
+          end
+        rescue Exception => e
+          raise "Could not create directory #{target_dir}: \n" + e
+        end
+      }
+
+      # copy all the files, transforming the old path into the new path
+      source_files.uniq.each { |file|
+        begin
+          # change the path from the ENGINE ROOT to the public directory root for this engine
+          target = file.gsub(File.join(root, "public"), 
+                             File.join(Engines.public_engine_dir, name))
+          unless File.exist?(target) && FileUtils.identical?(file, target)
+            Engines.log.debug "copying file '#{file}' to '#{target}'"
+            FileUtils.cp(file, target)
+          end 
+        rescue Exception => e
+          raise "Could not copy #{file} to #{target}: \n" + e 
+        end
+      }
+    rescue Exception => e
+      Engines.log.warn "WARNING: Couldn't create the engine public file structure for engine '#{name}'; Error follows:"
+      Engines.log.warn e
+    end
+  end  
-end
-

plugins/engines/lib/engines/action_mailer_extensions.rb

@@ -30 +30 @@
-          # the given action name
-          templates.each do |path|
-
-
-
-
-
+
+
+
+
+
+
+
+
-              :disposition => "inline", :charset => charset,
-File.basename(path).split(".")[0..-2].join('.')
+template_name
-          end
-          unless @parts.empty?
-            @content_type = "multipart/alternative"
-            @charset = nil
-            @parts = sort_parts(@parts, @implicit_parts_order)
-          end
@@ -100 +102 @@
-        seen_names = []
-        template_paths.each { |path|
-.
+
-          all_templates_for_path.each { |template|
-            name = File.basename(template)

plugins/engines/lib/engines/active_record_extensions.rb

@@ -15 +15 @@
-  end
-end
+
+# Set ActiveRecord to ignore the engine_schema_info table by default
+::ActiveRecord::SchemaDumper.ignore_tables << 'engine_schema_info'

plugins/engines/lib/engines/dependencies_extensions.rb

@@ -25 +25 @@
-    file_name = $1 if file_name =~ /^(.*)\.rb$/
-    
-DGE
+ngines 1.1
-
-    # try and load the engine code first
@@ -57 +57 @@
-    file_name = $1 if file_name =~ /^(.*)\.rb$/
-
-1.0.0 require_or_load for
+Engines 1.0.0 require_or_load
-
-    # if the file_name ends in "_controller" or "_controller.rb", strip all
@@ -105 +105 @@
-
-# We only need to deal with LoadingModules in Rails 1.0.0
-
+ && !Engines.config(:edge)
-  module ::Dependencies
-    class RootLoadingModule < LoadingModule

plugins/engines/tasks/engines.rake

@@ -67 +67 @@
-        puts "Couldn't find an engine called '#{ENV["ENGINE"]}'"
-      else
-
+ && !ENV["ENGINE"]
-          # ignore the VERSION, since it makes no sense in this context; we wouldn't
-          # want to revert ALL engines to the same version because of a misttype
@@ -83 +83 @@
-              puts "Should be: #{migration_directory}"
-            end
-
+
+
+
-          end
-        end
@@ -140 +142 @@
-  end
-end
+
+namespace :test do
+  desc "Run the engine tests in vendor/plugins/**/test (or specify with ENGINE=name)"
+  # NOTE: we're using the Rails 1.0 non-namespaced task here, just to maintain
+  # compatibility with Rails 1.0
+  # TODO: make this work with Engines.config(:root)
+  Rake::TestTask.new(:engines => :prepare_test_database) do |t|
+    t.libs << "test"
+
+    if ENV['ENGINE']
+      t.pattern = "vendor/plugins/#{ENV['ENGINE']}/test/**/*_test.rb"
+    else
+      t.pattern = 'vendor/plugins/**/test/**/*_test.rb'
+    end
+
+    t.verbose = true
+  end  
+end