From 41a94048e55e082f373e19d9fcee311860aaba9e Mon Sep 17 00:00:00 2001
From: Matt Jones <al2o3cr@gmail.com>
Date: Sat, 6 Jun 2009 17:59:33 -0400
Subject: Fix several issues with the 2.3.2 gem loader.

Incorporates the following:

- migrates back small change to gems:build:force from bfc1609a501fc3ed442685819de5bcdb5fbada1c to finish closing #2266.

- unrolls to_proc calls in gems.rake, to match the change in master.

- fixes #2722 by passing the options hash to dependencies during build. (includes a test)

- fixes #2721 by loading the specification directly in from_directory_name. Adds an option to opt-out of specification loading when needed (in gems:refresh_specs, for instance). Includes tests.

- fixes #2679 by refreshing specs for all frozen gems rather than just gems loaded from the environment.

- fixes #2678 by passing the options hash to dependencies during unpack.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 railties/lib/rails/gem_dependency.rb | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index ee3d0d81ba..3a82202bd0 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -29,11 +29,18 @@ module Rails
       end
     end
 
-    def self.from_directory_name(directory_name)
+    def self.from_directory_name(directory_name, load_spec=true)
       directory_name_parts = File.basename(directory_name).split('-')
       name    = directory_name_parts[0..-2].join('-')
       version = directory_name_parts.last
-      self.new(name, :version => version)
+      result = self.new(name, :version => version)
+      spec_filename = File.join(unpacked_path, directory_name, '.specification')
+      if load_spec
+        raise "Missing specification file in #{File.dirname(spec_filename)}. Perhaps you need to do a 'rake gems:refresh_specs'?" unless File.exists?(spec_filename)
+        spec = YAML::load_file(spec_filename)
+        result.specification = spec
+      end
+      result
     rescue ArgumentError => e
       raise "Unable to determine gem name and version from '#{directory_name}'"
     end
@@ -104,6 +111,10 @@ module Rails
       end
     end
 
+    def specification=(s)
+      @spec = s
+    end
+
     def requirement
       r = version_requirements
       (r == Gem::Requirement.default) ? nil : r
@@ -170,13 +181,14 @@ module Rails
 
     def build(options={})
       require 'rails/gem_builder'
+      return if specification.nil?
       if options[:force] || !built?
         return unless File.exists?(unpacked_specification_filename)
         spec = YAML::load_file(unpacked_specification_filename)
         Rails::GemBuilder.new(spec, unpacked_gem_directory).build_extensions
         puts "Built gem: '#{unpacked_gem_directory}'"
       end
-      dependencies.each { |dep| dep.build }
+      dependencies.each { |dep| dep.build(options) }
     end
 
     def install
@@ -236,7 +248,7 @@ module Rails
         real_spec = Gem::Specification.load(specification.loaded_from)
         write_specification(real_spec)
       end
-      dependencies.each { |dep| dep.unpack } if options[:recursive]
+      dependencies.each { |dep| dep.unpack(options) } if options[:recursive]
     end
 
     def write_specification(spec)
-- 
cgit v1.2.3


From d7e0cb05cc8adad430d0e97efef1608eef58db80 Mon Sep 17 00:00:00 2001
From: Matt Jones <al2o3cr@gmail.com>
Date: Tue, 9 Jun 2009 12:26:52 -0400
Subject: Fix incorrect specification path in GemDependency#from_directory_name

Signed-off-by: Michael Koziarski <michael@koziarski.com>
---
 railties/lib/rails/gem_dependency.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 3a82202bd0..3cc75494e4 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -34,7 +34,7 @@ module Rails
       name    = directory_name_parts[0..-2].join('-')
       version = directory_name_parts.last
       result = self.new(name, :version => version)
-      spec_filename = File.join(unpacked_path, directory_name, '.specification')
+      spec_filename = File.join(directory_name, '.specification')
       if load_spec
         raise "Missing specification file in #{File.dirname(spec_filename)}. Perhaps you need to do a 'rake gems:refresh_specs'?" unless File.exists?(spec_filename)
         spec = YAML::load_file(spec_filename)
-- 
cgit v1.2.3


From f2aea4d3eac467b85a63593ba7e2de28b2a2eb0a Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 19 Jun 2009 11:13:38 -0700
Subject: Get initializer_test.rb to pass with the new initializer.

---
 railties/lib/rails/plugin/loader.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/plugin/loader.rb b/railties/lib/rails/plugin/loader.rb
index bc22dfc591..7ea9c7c0f3 100644
--- a/railties/lib/rails/plugin/loader.rb
+++ b/railties/lib/rails/plugin/loader.rb
@@ -105,7 +105,7 @@ module Rails
         end
 
         def register_plugin_as_loaded(plugin)
-          initializer.loaded_plugins << plugin
+          initializer.config.loaded_plugins << plugin
         end
 
         def configuration
@@ -174,7 +174,7 @@ module Rails
         end
 
         def loaded?(plugin_name)
-          initializer.loaded_plugins.detect { |plugin| plugin.name == plugin_name.to_s }
+          initializer.config.loaded_plugins.detect { |plugin| plugin.name == plugin_name.to_s }
         end
 
         def ensure_all_registered_plugins_are_loaded!
-- 
cgit v1.2.3


From 3aad4d7fbec6b0881733d3a9b2aff756f775ad35 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Tue, 23 Jun 2009 16:10:43 -0700
Subject: Separate Rails module methods, the config object, and the initializer
 into separate files.

---
 railties/lib/rails/configuration.rb | 239 ++++++++++++++++++++++++++++++++++++
 railties/lib/rails/core.rb          |  97 +++++++++++++++
 2 files changed, 336 insertions(+)
 create mode 100644 railties/lib/rails/configuration.rb
 create mode 100644 railties/lib/rails/core.rb

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
new file mode 100644
index 0000000000..c48c989b18
--- /dev/null
+++ b/railties/lib/rails/configuration.rb
@@ -0,0 +1,239 @@
+module Rails
+  class Configuration
+    attr_accessor :cache_classes, :load_paths, :eager_load_paths, :framework_paths,
+                  :load_once_paths, :gems_dependencies_loaded, :after_initialize_blocks,
+                  :frameworks, :framework_root_path, :root_path, :plugin_paths, :plugins,
+                  :plugin_loader, :plugin_locators, :gems, :loaded_plugins, :reload_plugins,
+                  :i18n, :gems, :whiny_nils, :consider_all_requests_local,
+                  :action_controller, :active_record, :action_view, :active_support,
+                  :action_mailer, :active_resource,
+                  :log_path, :log_level, :logger, :preload_frameworks,
+                  :database_configuration_file, :cache_store, :time_zone,
+                  :view_path, :metals, :controller_paths, :routes_configuration_file,
+                  :eager_load_paths, :dependency_loading
+
+    def initialize
+      set_root_path!
+
+      @framework_paths              = []
+      @load_once_paths              = []
+      @after_initialize_blocks      = []
+      @loaded_plugins               = []
+      @dependency_loading           = true
+      @eager_load_paths             = default_eager_load_paths
+      @load_paths                   = default_load_paths
+      @plugin_paths                 = default_plugin_paths
+      @frameworks                   = default_frameworks
+      @plugin_loader                = default_plugin_loader
+      @plugin_locators              = default_plugin_locators
+      @gems                         = default_gems
+      @i18n                         = default_i18n
+      @log_path                     = default_log_path
+      @log_level                    = default_log_level
+      @cache_store                  = default_cache_store
+      @view_path                    = default_view_path
+      @controller_paths             = default_controller_paths
+      @routes_configuration_file    = default_routes_configuration_file
+      @database_configuration_file  = default_database_configuration_file
+
+      for framework in default_frameworks
+        self.send("#{framework}=", Rails::OrderedOptions.new)
+      end
+      self.active_support = Rails::OrderedOptions.new
+    end
+
+    def after_initialize(&blk)
+      @after_initialize_blocks << blk if blk
+    end
+
+    def set_root_path!
+      raise 'RAILS_ROOT is not set' unless defined?(RAILS_ROOT)
+      raise 'RAILS_ROOT is not a directory' unless File.directory?(RAILS_ROOT)
+
+      self.root_path =
+        # Pathname is incompatible with Windows, but Windows doesn't have
+        # real symlinks so File.expand_path is safe.
+        if RUBY_PLATFORM =~ /(:?mswin|mingw)/
+          File.expand_path(RAILS_ROOT)
+
+        # Otherwise use Pathname#realpath which respects symlinks.
+        else
+          Pathname.new(RAILS_ROOT).realpath.to_s
+        end
+
+      RAILS_ROOT.replace self.root_path
+    end
+
+    # Enable threaded mode. Allows concurrent requests to controller actions and
+    # multiple database connections. Also disables automatic dependency loading
+    # after boot, and disables reloading code on every request, as these are
+    # fundamentally incompatible with thread safety.
+    def threadsafe!
+      self.preload_frameworks = true
+      self.cache_classes = true
+      self.dependency_loading = false
+      self.action_controller.allow_concurrency = true
+      self
+    end
+
+    def framework_paths
+      paths = %w(railties railties/lib activesupport/lib)
+      paths << 'actionpack/lib' if frameworks.include?(:action_controller) || frameworks.include?(:action_view)
+
+      [:active_record, :action_mailer, :active_resource, :action_web_service].each do |framework|
+        paths << "#{framework.to_s.gsub('_', '')}/lib" if frameworks.include?(framework)
+      end
+
+      paths.map { |dir| "#{framework_root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+    end
+
+    def framework_root_path
+      defined?(::RAILS_FRAMEWORK_ROOT) ? ::RAILS_FRAMEWORK_ROOT : "#{root_path}/vendor/rails"
+    end
+
+    # TODO: Fix this when there is an application object
+    def middleware
+      require 'action_controller'
+      ActionController::Dispatcher.middleware
+    end
+
+    # Loads and returns the contents of the #database_configuration_file. The
+    # contents of the file are processed via ERB before being sent through
+    # YAML::load.
+    def database_configuration
+      require 'erb'
+      YAML::load(ERB.new(IO.read(database_configuration_file)).result)
+    end
+
+    def default_routes_configuration_file
+      File.join(root_path, 'config', 'routes.rb')
+    end
+
+    def default_controller_paths
+      paths = [File.join(root_path, 'app', 'controllers')]
+      paths.concat builtin_directories
+      paths
+    end
+
+    def default_cache_store
+      if File.exist?("#{root_path}/tmp/cache/")
+        [ :file_store, "#{root_path}/tmp/cache/" ]
+      else
+        :memory_store
+      end
+    end
+
+    def default_database_configuration_file
+      File.join(root_path, 'config', 'database.yml')
+    end
+
+    def default_view_path
+      File.join(root_path, 'app', 'views')
+    end
+
+    def default_eager_load_paths
+      %w(
+        app/metal
+        app/models
+        app/controllers
+        app/helpers
+      ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+    end
+
+    def default_load_paths
+      paths = []
+
+      # Add the old mock paths only if the directories exists
+      paths.concat(Dir["#{root_path}/test/mocks/#{RAILS_ENV}"]) if File.exists?("#{root_path}/test/mocks/#{RAILS_ENV}")
+
+      # Add the app's controller directory
+      paths.concat(Dir["#{root_path}/app/controllers/"])
+
+      # Followed by the standard includes.
+      paths.concat %w(
+        app
+        app/metal
+        app/models
+        app/controllers
+        app/helpers
+        app/services
+        lib
+        vendor
+      ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
+
+      paths.concat builtin_directories
+    end
+
+    def builtin_directories
+      # Include builtins only in the development environment.
+      (RAILS_ENV == 'development') ? Dir["#{RAILTIES_PATH}/builtin/*/"] : []
+    end
+
+    def default_log_path
+      File.join(root_path, 'log', "#{RAILS_ENV}.log")
+    end
+
+    def default_log_level
+      RAILS_ENV == 'production' ? :info : :debug
+    end
+
+    def default_frameworks
+      [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ]
+    end
+
+    def default_plugin_paths
+      ["#{root_path}/vendor/plugins"]
+    end
+
+    def default_plugin_loader
+      require 'rails/plugin/loader'
+      Plugin::Loader
+    end
+
+    def default_plugin_locators
+      require 'rails/plugin/locator'
+      locators = []
+      locators << Plugin::GemLocator if defined? Gem
+      locators << Plugin::FileSystemLocator
+    end
+
+    def default_i18n
+      i18n = Rails::OrderedOptions.new
+      i18n.load_path = []
+
+      if File.exist?(File.join(RAILS_ROOT, 'config', 'locales'))
+        i18n.load_path << Dir[File.join(RAILS_ROOT, 'config', 'locales', '*.{rb,yml}')]
+        i18n.load_path.flatten!
+      end
+
+      i18n
+    end
+
+    # Adds a single Gem dependency to the rails application. By default, it will require
+    # the library with the same name as the gem. Use :lib to specify a different name.
+    #
+    #   # gem 'aws-s3', '>= 0.4.0'
+    #   # require 'aws/s3'
+    #   config.gem 'aws-s3', :lib => 'aws/s3', :version => '>= 0.4.0', \
+    #     :source => "http://code.whytheluckystiff.net"
+    #
+    # To require a library be installed, but not attempt to load it, pass :lib => false
+    #
+    #   config.gem 'qrp', :version => '0.4.1', :lib => false
+    def gem(name, options = {})
+      @gems << Rails::GemDependency.new(name, options)
+    end
+
+    def default_gems
+      []
+    end
+
+    def environment_path
+      "#{root_path}/config/environments/#{RAILS_ENV}.rb"
+    end
+
+    def reload_plugins?
+      @reload_plugins
+    end
+  end
+end
\ No newline at end of file
diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb
new file mode 100644
index 0000000000..33695a27b9
--- /dev/null
+++ b/railties/lib/rails/core.rb
@@ -0,0 +1,97 @@
+module Rails
+  # Needs to be duplicated from Active Support since its needed before Active
+  # Support is available. Here both Options and Hash are namespaced to prevent
+  # conflicts with other implementations AND with the classes residing in Active Support.
+  # ---
+  # TODO: w0t?
+  class << self
+    # The Configuration instance used to configure the Rails environment
+    def configuration
+      @@configuration
+    end
+
+    def configuration=(configuration)
+      @@configuration = configuration
+    end
+
+    def initialized?
+      @initialized || false
+    end
+
+    def initialized=(initialized)
+      @initialized ||= initialized
+    end
+
+    def logger
+      if defined?(RAILS_DEFAULT_LOGGER)
+        RAILS_DEFAULT_LOGGER
+      else
+        nil
+      end
+    end
+
+    def backtrace_cleaner
+      @@backtrace_cleaner ||= begin
+        # Relies on ActiveSupport, so we have to lazy load to postpone definition until AS has been loaded
+        require 'rails/backtrace_cleaner'
+        Rails::BacktraceCleaner.new
+      end
+    end
+
+    def root
+      Pathname.new(RAILS_ROOT) if defined?(RAILS_ROOT)
+    end
+
+    def env
+      @_env ||= ActiveSupport::StringInquirer.new(RAILS_ENV)
+    end
+
+    def cache
+      RAILS_CACHE
+    end
+
+    def version
+      VERSION::STRING
+    end
+
+    def public_path
+      @@public_path ||= self.root ? File.join(self.root, "public") : "public"
+    end
+
+    def public_path=(path)
+      @@public_path = path
+    end
+  end
+
+  class OrderedOptions < Array #:nodoc:
+    def []=(key, value)
+      key = key.to_sym
+
+      if pair = find_pair(key)
+        pair.pop
+        pair << value
+      else
+        self << [key, value]
+      end
+    end
+
+    def [](key)
+      pair = find_pair(key.to_sym)
+      pair ? pair.last : nil
+    end
+
+    def method_missing(name, *args)
+      if name.to_s =~ /(.*)=$/
+        self[$1.to_sym] = args.first
+      else
+        self[name]
+      end
+    end
+
+  private
+    def find_pair(key)
+      self.each { |i| return i if i.first == key }
+      return false
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 8ee60660cec54f008ddaa54a4e8e06d099d8c7f5 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Thu, 25 Jun 2009 14:23:03 -0700
Subject: Try speeding up rails booting

---
 railties/lib/rails/configuration.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index c48c989b18..fdb071fc18 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -93,7 +93,6 @@ module Rails
 
     # TODO: Fix this when there is an application object
     def middleware
-      require 'action_controller'
       ActionController::Dispatcher.middleware
     end
 
-- 
cgit v1.2.3


From 4153c6b720563e1c43bb96e95f0ff5fbd59d6be7 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 26 Jun 2009 15:36:38 -0700
Subject: Finished a first stab at the Rails application path object.

---
 railties/lib/rails/paths.rb | 85 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 railties/lib/rails/paths.rb

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
new file mode 100644
index 0000000000..0b43725e32
--- /dev/null
+++ b/railties/lib/rails/paths.rb
@@ -0,0 +1,85 @@
+require 'set'
+
+module Rails
+  class Application
+    module PathParent
+      def method_missing(id, *args)
+        name = id.to_s
+
+        if name =~ /^(.*)=$/
+          @children[$1] = Path.new(args.first, @root)
+        elsif path = @children[name]
+          path
+        else
+          super
+        end
+      end
+    end
+
+    class Root
+      include PathParent
+
+      attr_reader :path, :load_once, :eager_load
+      def initialize(path)
+        raise unless path.is_a?(String)
+
+        @children = {}
+
+        # TODO: Move logic from set_root_path initializer
+        @path = File.expand_path(path)
+        @root = self
+        @load_once, @eager_load = Set.new, Set.new
+      end
+    end
+
+    class Path
+      include PathParent
+
+      attr_reader :path
+      attr_accessor :glob
+
+      def initialize(path, root)
+        @children = {}
+        @root     = root
+        @paths    = [path].flatten
+        @glob     = "**/*.rb"
+      end
+
+      def push(path)
+        @paths.push path
+      end
+
+      alias << push
+
+      def unshift(path)
+        @paths.unshift path
+      end
+
+      def load_once!
+        @load_once = true
+        @root.load_once << self
+      end
+
+      def load_once?
+        @load_once
+      end
+
+      def eager_load!
+        @eager_load = true
+        @root.eager_load << self
+      end
+
+      def eager_load?
+        @eager_load
+      end
+
+      def paths
+        @paths.map do |path|
+          path.index('/') == 0 ? path : File.join(@root.path, path)
+        end
+      end
+
+      alias to_a paths
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3


From 188a892c5a097ee6d62249d048a6be7d2dfe9649 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 26 Jun 2009 17:32:05 -0700
Subject: Starting to replace scattered path configuration settings with the
 path object

---
 railties/lib/rails/configuration.rb | 33 ++++++++++++++++++++++++++--
 railties/lib/rails/paths.rb         | 43 +++++++++++++++++++++++++++++++++----
 2 files changed, 70 insertions(+), 6 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index fdb071fc18..59132efe98 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -10,7 +10,7 @@ module Rails
                   :log_path, :log_level, :logger, :preload_frameworks,
                   :database_configuration_file, :cache_store, :time_zone,
                   :view_path, :metals, :controller_paths, :routes_configuration_file,
-                  :eager_load_paths, :dependency_loading
+                  :eager_load_paths, :dependency_loading, :paths
 
     def initialize
       set_root_path!
@@ -61,7 +61,36 @@ module Rails
           Pathname.new(RAILS_ROOT).realpath.to_s
         end
 
-      RAILS_ROOT.replace self.root_path
+      @paths = Rails::Application::Root.new(root_path)
+      @paths.app                 = "app"
+      @paths.app.metals          = "app/metal"
+      @paths.app.models          = "app/models"
+      @paths.app.controllers     = "app/controllers"
+      @paths.app.helpers         = "app/helpers"
+      @paths.app.services        = "app/services"
+      @paths.lib                 = "lib"
+      @paths.vendor              = "vendor"
+      @paths.vendor.plugins      = "vendor/plugins"
+      @paths.cache               = "tmp/cache"
+      @paths.config              = "config"
+      @paths.config.locales      = "config/locales"
+      @paths.config.environments = "config/environments"
+
+      @paths.app.controllers.push *builtin_directories
+
+      @paths.app.load_path!
+      @paths.app.metals.load_path!
+      @paths.app.models.eager_load!
+      @paths.app.controllers.eager_load!
+      @paths.app.helpers.eager_load!
+      @paths.app.services.load_path!
+      @paths.app.metals.eager_load!
+      @paths.lib.load_path!
+      @paths.vendor.load_path!
+
+      @paths.config.environments.glob = "#{RAILS_ENV}.rb"
+
+      RAILS_ROOT.replace root_path
     end
 
     # Enable threaded mode. Allows concurrent requests to controller actions and
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index 0b43725e32..aada7d4a56 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -19,7 +19,7 @@ module Rails
     class Root
       include PathParent
 
-      attr_reader :path, :load_once, :eager_load
+      attr_reader :path
       def initialize(path)
         raise unless path.is_a?(String)
 
@@ -28,7 +28,32 @@ module Rails
         # TODO: Move logic from set_root_path initializer
         @path = File.expand_path(path)
         @root = self
-        @load_once, @eager_load = Set.new, Set.new
+        @load_once, @eager_load, @all_paths = [], [], []
+      end
+
+      def load_once
+        @load_once.uniq!
+        @load_once
+      end
+
+      def eager_load
+        @eager_load.uniq!
+        @eager_load
+      end
+
+      def all_paths
+        @all_paths.uniq!
+        @all_paths
+      end
+
+      def load_paths
+        all_paths.map { |path| path.paths }.flatten
+      end
+
+      def add_to_load_path
+        load_paths.reverse_each do |path|
+          $LOAD_PATH.unshift(path) if File.directory?(path)
+        end
       end
     end
 
@@ -57,7 +82,7 @@ module Rails
 
       def load_once!
         @load_once = true
-        @root.load_once << self
+        @root.load_once.push *self.paths
       end
 
       def load_once?
@@ -66,13 +91,23 @@ module Rails
 
       def eager_load!
         @eager_load = true
-        @root.eager_load << self
+        @root.all_paths << self
+        @root.eager_load.push *self.paths
       end
 
       def eager_load?
         @eager_load
       end
 
+      def load_path!
+        @load_path = true
+        @root.all_paths << self
+      end
+
+      def load_path?
+        @load_path
+      end
+
       def paths
         @paths.map do |path|
           path.index('/') == 0 ? path : File.join(@root.path, path)
-- 
cgit v1.2.3


From f66b5d79c15c92e0712315b5843e611114390a12 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 30 Jun 2009 09:01:46 -0700
Subject: Stop the initializer from blowing up when builtin_directories is
 empty

---
 railties/lib/rails/configuration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 59132efe98..7a903211fa 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -76,7 +76,7 @@ module Rails
       @paths.config.locales      = "config/locales"
       @paths.config.environments = "config/environments"
 
-      @paths.app.controllers.push *builtin_directories
+      builtin_directories.each { |dir| @paths.app.controllers << dir }
 
       @paths.app.load_path!
       @paths.app.metals.load_path!
-- 
cgit v1.2.3


From 132e6d00638dc6370fafa0f1377d3bca17eee2d1 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 30 Jun 2009 13:55:11 -0700
Subject: Add #concat to Rails::Application::Path

---
 railties/lib/rails/configuration.rb | 2 +-
 railties/lib/rails/paths.rb         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 7a903211fa..d877915460 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -76,7 +76,7 @@ module Rails
       @paths.config.locales      = "config/locales"
       @paths.config.environments = "config/environments"
 
-      builtin_directories.each { |dir| @paths.app.controllers << dir }
+      @paths.app.controllers.concat builtin_directories
 
       @paths.app.load_path!
       @paths.app.metals.load_path!
diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index aada7d4a56..d2f6d83659 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -80,6 +80,10 @@ module Rails
         @paths.unshift path
       end
 
+      def concat(paths)
+        @paths.concat paths
+      end
+
       def load_once!
         @load_once = true
         @root.load_once.push *self.paths
-- 
cgit v1.2.3


From db3de78a83379ab2a58e0d29fb10622b813a4d44 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Tue, 30 Jun 2009 14:37:12 -0700
Subject: Bump up the version to 3.0.pre

---
 railties/lib/rails/version.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index 99c7516a65..9a65096061 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -1,8 +1,8 @@
 module Rails
   module VERSION #:nodoc:
-    MAJOR = 2
-    MINOR = 3
-    TINY  = 2
+    MAJOR = 3
+    MINOR = 0
+    TINY  = "pre"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
-- 
cgit v1.2.3


From 9eab435631e1b0a659126d068972ee88cff160de Mon Sep 17 00:00:00 2001
From: "J.D. Hollis" <jd@densityofspace.com>
Date: Tue, 30 Jun 2009 08:58:35 -0400
Subject: Only check for built extensions on gem dependencies that are in
 vendor/gems. [#2825 state:resolved]

Signed-off-by: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
---
 railties/lib/rails/gem_dependency.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb
index 3cc75494e4..06d830ba24 100644
--- a/railties/lib/rails/gem_dependency.rb
+++ b/railties/lib/rails/gem_dependency.rb
@@ -122,10 +122,14 @@ module Rails
 
     def built?
       return false unless frozen?
-      specification.extensions.each do |ext|
-        makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
-        return false unless File.exists?(makefile)
+
+      if vendor_gem?
+        specification.extensions.each do |ext|
+          makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
+          return false unless File.exists?(makefile)
+        end
       end
+
       true
     end
 
-- 
cgit v1.2.3


From 913bb2f4c2feb79dcbc9ed2c0fb1ef6d436f7d02 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Thu, 2 Jul 2009 15:47:11 -0700
Subject: Modify the Rails::Application::Path object to allow for more concise
 path definition.

---
 railties/lib/rails/paths.rb | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index d2f6d83659..ca56199cbc 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -6,8 +6,8 @@ module Rails
       def method_missing(id, *args)
         name = id.to_s
 
-        if name =~ /^(.*)=$/
-          @children[$1] = Path.new(args.first, @root)
+        if name =~ /^(.*)=$/ || args.any?
+          @children[$1 || name] = Path.new(@root, *args)
         elsif path = @children[name]
           path
         else
@@ -28,17 +28,15 @@ module Rails
         # TODO: Move logic from set_root_path initializer
         @path = File.expand_path(path)
         @root = self
-        @load_once, @eager_load, @all_paths = [], [], []
+        @all_paths = []
       end
 
       def load_once
-        @load_once.uniq!
-        @load_once
+        all_paths.map { |path| path.paths if path.load_once? }.compact.flatten.uniq
       end
 
       def eager_load
-        @eager_load.uniq!
-        @eager_load
+        all_paths.map { |path| path.paths if path.eager_load? }.compact.flatten.uniq
       end
 
       def all_paths
@@ -47,7 +45,7 @@ module Rails
       end
 
       def load_paths
-        all_paths.map { |path| path.paths }.flatten
+        all_paths.map { |path| path.paths if path.load_path? }.compact.flatten.uniq
       end
 
       def add_to_load_path
@@ -55,6 +53,14 @@ module Rails
           $LOAD_PATH.unshift(path) if File.directory?(path)
         end
       end
+
+      def push(*)
+        raise "Application root can only have one physical path"
+      end
+
+      alias unshift push
+      alias << push
+      alias concat push
     end
 
     class Path
@@ -63,11 +69,18 @@ module Rails
       attr_reader :path
       attr_accessor :glob
 
-      def initialize(path, root)
+      def initialize(root, *paths)
+        @options  = paths.extract_options!
         @children = {}
         @root     = root
-        @paths    = [path].flatten
-        @glob     = "**/*.rb"
+        @paths    = paths.flatten
+        @glob     = @options[:glob] || "**/*.rb"
+
+        @load_once  = @options[:load_once]
+        @eager_load = @options[:eager_load]
+        @load_path  = @options[:load_path] || @eager_load
+
+        @root.all_paths << self
       end
 
       def push(path)
@@ -86,7 +99,6 @@ module Rails
 
       def load_once!
         @load_once = true
-        @root.load_once.push *self.paths
       end
 
       def load_once?
@@ -95,8 +107,7 @@ module Rails
 
       def eager_load!
         @eager_load = true
-        @root.all_paths << self
-        @root.eager_load.push *self.paths
+        @load_path  = true
       end
 
       def eager_load?
@@ -105,7 +116,6 @@ module Rails
 
       def load_path!
         @load_path = true
-        @root.all_paths << self
       end
 
       def load_path?
-- 
cgit v1.2.3


From 940aad225af0b963f435a0bf015daece2218d502 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Thu, 2 Jul 2009 15:49:35 -0700
Subject: Compact the way application paths are defined

---
 railties/lib/rails/configuration.rb | 40 ++++++++++++-------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index d877915460..1a2f217d20 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -62,33 +62,19 @@ module Rails
         end
 
       @paths = Rails::Application::Root.new(root_path)
-      @paths.app                 = "app"
-      @paths.app.metals          = "app/metal"
-      @paths.app.models          = "app/models"
-      @paths.app.controllers     = "app/controllers"
-      @paths.app.helpers         = "app/helpers"
-      @paths.app.services        = "app/services"
-      @paths.lib                 = "lib"
-      @paths.vendor              = "vendor"
-      @paths.vendor.plugins      = "vendor/plugins"
-      @paths.cache               = "tmp/cache"
-      @paths.config              = "config"
-      @paths.config.locales      = "config/locales"
-      @paths.config.environments = "config/environments"
-
-      @paths.app.controllers.concat builtin_directories
-
-      @paths.app.load_path!
-      @paths.app.metals.load_path!
-      @paths.app.models.eager_load!
-      @paths.app.controllers.eager_load!
-      @paths.app.helpers.eager_load!
-      @paths.app.services.load_path!
-      @paths.app.metals.eager_load!
-      @paths.lib.load_path!
-      @paths.vendor.load_path!
-
-      @paths.config.environments.glob = "#{RAILS_ENV}.rb"
+      @paths.app                 "app",             :load_path => true
+      @paths.app.metals          "app/metal",       :eager_load => true
+      @paths.app.models          "app/models",      :eager_load => true
+      @paths.app.controllers     "app/controllers", builtin_directories, :eager_load => true
+      @paths.app.helpers         "app/helpers",     :eager_load => true
+      @paths.app.services        "app/services",    :load_path => true
+      @paths.lib                 "lib",             :load_path => true
+      @paths.vendor              "vendor",          :load_path => true
+      @paths.vendor.plugins      "vendor/plugins"
+      @paths.cache               "tmp/cache"
+      @paths.config              "config"
+      @paths.config.locales      "config/locales"
+      @paths.config.environments "config/environments", :glob => "#{RAILS_ENV}.rb"
 
       RAILS_ROOT.replace root_path
     end
-- 
cgit v1.2.3


From 3c1dab72259d01c6335bf359d7f9b3af69d45bb4 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Fri, 3 Jul 2009 12:23:57 +0100
Subject: Revert "Modify the Rails::Application::Path object to allow for more
 concise path definition."

This reverts commit 913bb2f4c2feb79dcbc9ed2c0fb1ef6d436f7d02.

Reason : The server does not start
---
 railties/lib/rails/paths.rb | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/paths.rb b/railties/lib/rails/paths.rb
index ca56199cbc..d2f6d83659 100644
--- a/railties/lib/rails/paths.rb
+++ b/railties/lib/rails/paths.rb
@@ -6,8 +6,8 @@ module Rails
       def method_missing(id, *args)
         name = id.to_s
 
-        if name =~ /^(.*)=$/ || args.any?
-          @children[$1 || name] = Path.new(@root, *args)
+        if name =~ /^(.*)=$/
+          @children[$1] = Path.new(args.first, @root)
         elsif path = @children[name]
           path
         else
@@ -28,15 +28,17 @@ module Rails
         # TODO: Move logic from set_root_path initializer
         @path = File.expand_path(path)
         @root = self
-        @all_paths = []
+        @load_once, @eager_load, @all_paths = [], [], []
       end
 
       def load_once
-        all_paths.map { |path| path.paths if path.load_once? }.compact.flatten.uniq
+        @load_once.uniq!
+        @load_once
       end
 
       def eager_load
-        all_paths.map { |path| path.paths if path.eager_load? }.compact.flatten.uniq
+        @eager_load.uniq!
+        @eager_load
       end
 
       def all_paths
@@ -45,7 +47,7 @@ module Rails
       end
 
       def load_paths
-        all_paths.map { |path| path.paths if path.load_path? }.compact.flatten.uniq
+        all_paths.map { |path| path.paths }.flatten
       end
 
       def add_to_load_path
@@ -53,14 +55,6 @@ module Rails
           $LOAD_PATH.unshift(path) if File.directory?(path)
         end
       end
-
-      def push(*)
-        raise "Application root can only have one physical path"
-      end
-
-      alias unshift push
-      alias << push
-      alias concat push
     end
 
     class Path
@@ -69,18 +63,11 @@ module Rails
       attr_reader :path
       attr_accessor :glob
 
-      def initialize(root, *paths)
-        @options  = paths.extract_options!
+      def initialize(path, root)
         @children = {}
         @root     = root
-        @paths    = paths.flatten
-        @glob     = @options[:glob] || "**/*.rb"
-
-        @load_once  = @options[:load_once]
-        @eager_load = @options[:eager_load]
-        @load_path  = @options[:load_path] || @eager_load
-
-        @root.all_paths << self
+        @paths    = [path].flatten
+        @glob     = "**/*.rb"
       end
 
       def push(path)
@@ -99,6 +86,7 @@ module Rails
 
       def load_once!
         @load_once = true
+        @root.load_once.push *self.paths
       end
 
       def load_once?
@@ -107,7 +95,8 @@ module Rails
 
       def eager_load!
         @eager_load = true
-        @load_path  = true
+        @root.all_paths << self
+        @root.eager_load.push *self.paths
       end
 
       def eager_load?
@@ -116,6 +105,7 @@ module Rails
 
       def load_path!
         @load_path = true
+        @root.all_paths << self
       end
 
       def load_path?
-- 
cgit v1.2.3


From a4bdc00fec623f72592e663e6d7830eea0bc6ea4 Mon Sep 17 00:00:00 2001
From: Pratik Naik <pratiknaik@gmail.com>
Date: Fri, 3 Jul 2009 12:24:26 +0100
Subject: Revert "Compact the way application paths are defined"

This reverts commit 940aad225af0b963f435a0bf015daece2218d502.

Reason : The server does not start
---
 railties/lib/rails/configuration.rb | 40 +++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 13 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb
index 1a2f217d20..d877915460 100644
--- a/railties/lib/rails/configuration.rb
+++ b/railties/lib/rails/configuration.rb
@@ -62,19 +62,33 @@ module Rails
         end
 
       @paths = Rails::Application::Root.new(root_path)
-      @paths.app                 "app",             :load_path => true
-      @paths.app.metals          "app/metal",       :eager_load => true
-      @paths.app.models          "app/models",      :eager_load => true
-      @paths.app.controllers     "app/controllers", builtin_directories, :eager_load => true
-      @paths.app.helpers         "app/helpers",     :eager_load => true
-      @paths.app.services        "app/services",    :load_path => true
-      @paths.lib                 "lib",             :load_path => true
-      @paths.vendor              "vendor",          :load_path => true
-      @paths.vendor.plugins      "vendor/plugins"
-      @paths.cache               "tmp/cache"
-      @paths.config              "config"
-      @paths.config.locales      "config/locales"
-      @paths.config.environments "config/environments", :glob => "#{RAILS_ENV}.rb"
+      @paths.app                 = "app"
+      @paths.app.metals          = "app/metal"
+      @paths.app.models          = "app/models"
+      @paths.app.controllers     = "app/controllers"
+      @paths.app.helpers         = "app/helpers"
+      @paths.app.services        = "app/services"
+      @paths.lib                 = "lib"
+      @paths.vendor              = "vendor"
+      @paths.vendor.plugins      = "vendor/plugins"
+      @paths.cache               = "tmp/cache"
+      @paths.config              = "config"
+      @paths.config.locales      = "config/locales"
+      @paths.config.environments = "config/environments"
+
+      @paths.app.controllers.concat builtin_directories
+
+      @paths.app.load_path!
+      @paths.app.metals.load_path!
+      @paths.app.models.eager_load!
+      @paths.app.controllers.eager_load!
+      @paths.app.helpers.eager_load!
+      @paths.app.services.load_path!
+      @paths.app.metals.eager_load!
+      @paths.lib.load_path!
+      @paths.vendor.load_path!
+
+      @paths.config.environments.glob = "#{RAILS_ENV}.rb"
 
       RAILS_ROOT.replace root_path
     end
-- 
cgit v1.2.3