Changeset 9141

Timestamp:

03/30/08 02:35:08 (3 months ago)

Author:

rick

Message:

Small tweak to allow plugins to specify gem dependencies. [rick]

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/initializer.rb (modified) (1 diff)
• trunk/railties/lib/rails/gem_dependency.rb (modified) (1 diff)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Small tweak to allow plugins to specify gem dependencies.  [rick]
+
+  # OLD open_id_authentication plugin init.rb
+  require 'yadis'
+  require 'openid'
+  ActionController::Base.send :include, OpenIdAuthentication
+
+  # NEW
+  config.gem "ruby-openid", :lib => "openid", :version => "1.1.4"
+  config.gem "ruby-yadis",  :lib => "yadis",  :version => "0.3.4"
+
+  config.after_initialize do
+    ActionController::Base.send :include, OpenIdAuthentication
+  end
-
-* Added config.gem for specifying which gems are required by the application, as well as rake tasks for installing and freezing gems. [rick]

trunk/railties/lib/initializer.rb

@@ -103 +103 @@
-      load_gems
-      load_plugins
+
+      # pick up any gems that plugins depend on
+      add_gem_load_paths
+      load_gems
+
-      load_application_initializers
-

trunk/railties/lib/rails/gem_dependency.rb

@@ -36 +36 @@
-
-    def load
-
+ed || @load
-      require(@lib || @name)
-      @loaded = true