Changeset 3169

Timestamp:

11/23/05 21:31:51 (3 years ago)

Author:

bitsweat

Message:

Enable warnings on first load only. File which are loaded but raise an exception are not added to loaded set.

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/dependencies.rb (modified) (3 diffs)
• trunk/activesupport/test/dependencies_test.rb (modified) (2 diffs)
• trunk/activesupport/test/dependencies/check_warnings.rb (added)
• trunk/activesupport/test/dependencies/raises_exception.rb (added)

trunk/activesupport/CHANGELOG

@@ -3 +3 @@
-* Active Support is warnings-safe.  #1792 [Eric Hodel]
-
-
+for the first time 
-
-* Add Symbol#to_proc, which allows for, e.g. [:foo, :bar].map(&:to_s). [Marcel Molina Jr.]

trunk/activesupport/lib/active_support/dependencies.rb

@@ +1 @@
+require 'set'
-require File.dirname(__FILE__) + '/module_attribute_accessors'
-require File.dirname(__FILE__) + '/core_ext/load_error'
@@ -6 +7 @@
-  extend self
-
-
+
+
+
+
+
-  mattr_accessor :loaded
-
-
+
+
+
-  mattr_accessor :mechanism
-
+
+
-  def load?
-    mechanism == :load
-  end
-
+
-  def depend_on(file_name, swallow_load_errors = false)
-    unless loaded.include?(file_name)
-      loaded << file_name
-
-      begin
-        require_or_load(file_name)
@@ -31 +36 @@
-    depend_on(file_name, true)
-  end
-
+
-  def clear
-self.loaded = [ ]
+loaded.clear
-  end
-
-  def require_or_load(file_name)
-    file_name = "#{file_name}.rb" unless ! load? || file_name[-3..-1] == '.rb'
-    if load?
-
+
+
+
+
+
+
+
+
+
-    else
-      require file_name
-    end
+
+    # Record that we've seen this file.
+    loaded  << file_name
+    history << file_name
-  end
-

trunk/activesupport/test/dependencies_test.rb

@@ -8 +8 @@
-  end
-
-require_dependency
+tracking_loaded_files
-    require_dependency(File.dirname(__FILE__) + "/dependencies/service_one")
-    require_dependency(File.dirname(__FILE__) + "/dependencies/service_two")
-    assert_equal 2, Dependencies.loaded.size
-  end
-
-require_dependency_two_tim
+
+tracking_identical_loaded_fil
-    require_dependency(File.dirname(__FILE__) + "/dependencies/service_one")
-    require_dependency(File.dirname(__FILE__) + "/dependencies/service_one")
@@ -20 +20 @@
-  end
-
-require_missing_dependency
+missing_dependency_raises_missing_source_file
-    assert_raises(MissingSourceFile) { require_dependency("missing_service") }
-  end
-
-require_missing_association
+
+missing_association_raises_nothing
-    assert_nothing_raised { require_association("missing_model") }
-  end
+
+  def test_dependency_which_raises_exception_isnt_added_to_loaded_set
+    old_mechanism, Dependencies.mechanism = Dependencies.mechanism, :load
+
+    filename = "#{File.dirname(__FILE__)}/dependencies/raises_exception"
+    $raises_exception_load_count = 0
+
+    5.times do |count|
+      assert_raises(RuntimeError) { require_dependency filename }
+      assert_equal count + 1, $raises_exception_load_count
+
+      assert !Dependencies.loaded.include?(filename)
+      assert !Dependencies.history.include?(filename)
+    end
+  ensure
+    Dependencies.mechanism = old_mechanism
+  end
+
+  def test_warnings_should_be_enabled_on_first_load
+    old_mechanism, Dependencies.mechanism = Dependencies.mechanism, :load
+
+    filename = "#{File.dirname(__FILE__)}/dependencies/check_warnings"
+    $check_warnings_load_count = 0
+
+    assert !Dependencies.loaded.include?(filename)
+    assert !Dependencies.history.include?(filename)
+
+    silence_warnings { require_dependency filename }
+    assert_equal 1, $check_warnings_load_count
+    assert_equal true, $checked_verbose, 'On first load warnings should be enabled.'
+
+    assert Dependencies.loaded.include?(filename)
+    Dependencies.clear
+    assert !Dependencies.loaded.include?(filename)
+    assert Dependencies.history.include?(filename)
+
+    silence_warnings { require_dependency filename }
+    assert_equal 2, $check_warnings_load_count
+    assert_equal nil, $checked_verbose, 'After first load warnings should be left alone.'
+
+    assert Dependencies.loaded.include?(filename)
+    Dependencies.clear
+    assert !Dependencies.loaded.include?(filename)
+    assert Dependencies.history.include?(filename)
+
+    enable_warnings { require_dependency filename }
+    assert_equal 3, $check_warnings_load_count
+    assert_equal true, $checked_verbose, 'After first load warnings should be left alone.'
+
+    assert Dependencies.loaded.include?(filename)
+  ensure
+    Dependencies.mechanism = old_mechanism
+  end
-end