radiant 0.6.4 → 0.6.5

data/vendor/rails/activesupport/lib/active_support/version.rb

@@ -1,8 +1,8 @@
 module ActiveSupport
   module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 4
-    TINY  = 4
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/vendor/rails/activesupport/lib/active_support/whiny_nil.rb

@@ -1,23 +1,23 @@
-# Extensions to nil which allow for more helpful error messages for 
+# Extensions to nil which allow for more helpful error messages for
 # people who are new to rails.
 #
 # The aim is to ensure that when users pass nil to methods where that isn't
 # appropriate, instead of NoMethodError and the name of some method used
-# by the framework users will see a message explaining what type of object 
+# by the framework users will see a message explaining what type of object
 # was expected.
 
 class NilClass
-  WHINERS = [ ::ActiveRecord::Base, ::Array ]
-  
+  WHINERS = [::Array]
+  WHINERS << ::ActiveRecord::Base if defined? ::ActiveRecord
+
   @@method_class_map = Hash.new
-  
+
   WHINERS.each do |klass|
     methods = klass.public_instance_methods - public_instance_methods
-    methods.each do |method|
-      @@method_class_map[method.to_sym] = klass
-    end
+    class_name = klass.name
+    methods.each { |method| @@method_class_map[method.to_sym] = class_name }
   end
-  
+
   def id
     raise RuntimeError, "Called id for nil, which would mistakenly be 4 -- if you really wanted the id of nil, use object_id", caller
   end
@@ -27,11 +27,11 @@ class NilClass
       raise_nil_warning_for @@method_class_map[method], method, caller
     end
 
-    def raise_nil_warning_for(klass = nil, selector = nil, with_caller = nil)
+    def raise_nil_warning_for(class_name = nil, selector = nil, with_caller = nil)
       message = "You have a nil object when you didn't expect it!"
-      message << "\nYou might have expected an instance of #{klass}." if klass
+      message << "\nYou might have expected an instance of #{class_name}." if class_name
       message << "\nThe error occurred while evaluating nil.#{selector}" if selector
-      
+
       raise NoMethodError, message, with_caller || caller
     end
 end

data/vendor/rails/activesupport/lib/activesupport.rb

@@ -0,0 +1 @@
+require 'active_support'

data/vendor/rails/activesupport/test/abstract_unit.rb

@@ -1,7 +1,20 @@
 require 'test/unit'
 
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
+$:.unshift File.dirname(__FILE__)
 require 'active_support'
 
+# Wrap tests that use Mocha and skip if unavailable.
+unless defined? uses_mocha
+  def uses_mocha(test_name)
+    require 'rubygems'
+    gem 'mocha', '>= 0.5.5'
+    require 'mocha'
+    yield
+  rescue LoadError
+    $stderr.puts "Skipping #{test_name} tests. `gem install mocha` and try again."
+  end
+end
+
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true

data/vendor/rails/activesupport/test/buffered_logger_test.rb

@@ -0,0 +1,107 @@
+require File.dirname(__FILE__) + '/abstract_unit'
+require 'stringio'
+
+class BufferedLoggerTest < Test::Unit::TestCase
+  def setup
+    @message = "A debug message"
+    @integer_message = 12345
+    @output  = StringIO.new
+    @logger  = ActiveSupport::BufferedLogger.new(@output)
+  end
+
+  def test_should_log_debugging_message_when_debugging
+    @logger.level = Logger::DEBUG
+    @logger.add(Logger::DEBUG, @message)
+    assert @output.string.include?(@message)
+  end
+
+  def test_should_not_log_debug_messages_when_log_level_is_info
+    @logger.level = Logger::INFO
+    @logger.add(Logger::DEBUG, @message)
+    assert ! @output.string.include?(@message)
+  end
+
+  def test_should_add_message_passed_as_block_when_using_add
+    @logger.level = Logger::INFO
+    @logger.add(Logger::INFO) {@message}
+    assert @output.string.include?(@message)
+  end
+
+  def test_should_add_message_passed_as_block_when_using_shortcut
+    @logger.level = Logger::INFO
+    @logger.info {@message}
+    assert @output.string.include?(@message)
+  end
+
+  def test_should_convert_message_to_string
+    @logger.level = Logger::INFO
+    @logger.info @integer_message
+    assert @output.string.include?(@integer_message.to_s)
+  end
+
+  def test_should_convert_message_to_string_when_passed_in_block
+    @logger.level = Logger::INFO
+    @logger.info {@integer_message}
+    assert @output.string.include?(@integer_message.to_s)
+  end
+
+  def test_should_not_evaluate_block_if_message_wont_be_logged
+    @logger.level = Logger::INFO
+    evaluated = false
+    @logger.add(Logger::DEBUG) {evaluated = true}
+    assert evaluated == false
+  end
+
+  def test_should_not_mutate_message
+    message_copy = @message.dup
+    @logger.info @message
+    assert_equal message_copy, @message
+  end
+
+
+  [false, nil, 0].each do |disable|
+    define_method "test_disabling_auto_flush_with_#{disable.inspect}_should_buffer_until_explicit_flush" do
+      @logger.auto_flushing = disable
+
+      4.times do
+        @logger.info 'wait for it..'
+        assert @output.string.empty?, @output.string
+      end
+
+      @logger.flush
+      assert !@output.string.empty?, @logger.buffer.size
+    end
+
+    define_method "test_disabling_auto_flush_with_#{disable.inspect}_should_flush_at_max_buffer_size_as_failsafe" do
+      @logger.auto_flushing = disable
+      assert_equal ActiveSupport::BufferedLogger::MAX_BUFFER_SIZE, @logger.auto_flushing
+
+      (ActiveSupport::BufferedLogger::MAX_BUFFER_SIZE - 1).times do
+        @logger.info 'wait for it..'
+        assert @output.string.empty?, @output.string
+      end
+
+      @logger.info 'there it is.'
+      assert !@output.string.empty?, @logger.buffer.size
+    end
+  end
+  
+  def test_should_know_if_its_loglevel_is_below_a_given_level
+    ActiveSupport::BufferedLogger::Severity.constants.each do |level|
+      @logger.level = ActiveSupport::BufferedLogger::Severity.const_get(level) - 1
+      assert @logger.send("#{level.downcase}?"), "didn't know if it was #{level.downcase}? or below"
+    end
+  end
+
+  def test_should_auto_flush_every_n_messages
+    @logger.auto_flushing = 5
+
+    4.times do
+      @logger.info 'wait for it..'
+      assert @output.string.empty?, @output.string
+    end
+
+    @logger.info 'there it is.'
+    assert !@output.string.empty?, @output.string
+  end
+end

data/vendor/rails/activesupport/test/clean_logger_test.rb

@@ -40,41 +40,18 @@ class CleanLoggerTest < Test::Unit::TestCase
 
     assert_equal "error\nfatal\nerror\nfatal\nunsilenced\n", @out.string
   end
-end
-
-class CleanLogger_182_to_183_Test < Test::Unit::TestCase
-  def setup
-    silence_warnings do
-      if Logger.method_defined?(:formatter=)
-        Logger.send(:alias_method, :hide_formatter=, :formatter=)
-        Logger.send(:undef_method, :formatter=)
-      else
-        Logger.send(:define_method, :formatter=) { }
-      end
-      load File.dirname(__FILE__) + '/../lib/active_support/clean_logger.rb'
-    end
-
-    @out = StringIO.new
-    @logger = Logger.new(@out)
-    @logger.progname = 'CLEAN LOGGER TEST'
-  end
-
-  def teardown
-    silence_warnings do
-      if Logger.method_defined?(:hide_formatter=)
-        Logger.send(:alias_method, :formatter=, :hide_formatter=)
-      else
-        Logger.send(:undef_method, :formatter=)
-      end
-      load File.dirname(__FILE__) + '/../lib/active_support/clean_logger.rb'
-    end
+  
+  def test_datetime_format
+    @logger.formatter = Logger::Formatter.new
+    @logger.datetime_format = "%Y-%m-%d"
+    @logger.debug 'debug'
+    assert_equal "%Y-%m-%d", @logger.datetime_format
+    assert_match(/D, \[\d\d\d\d-\d\d-\d\d#\d+\] DEBUG -- : debug/, @out.string)
   end
-
-  # Since we've fooled Logger into thinking we're on 1.8.2 if we're on 1.8.3
-  # and on 1.8.3 if we're on 1.8.2, it'll define format_message with the
-  # wrong order of arguments and therefore print progname instead of msg.
-  def test_format_message_with_faked_version
-    @logger.error 'error'
-    assert_equal "CLEAN LOGGER TEST\n", @out.string
+  
+  def test_nonstring_formatting
+    an_object = [1, 2, 3, 4, 5]
+    @logger.debug an_object
+    assert_equal("#{an_object.inspect}\n", @out.string)
   end
 end

data/vendor/rails/activesupport/test/core_ext/array_ext_test.rb

@@ -1,7 +1,27 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 require 'bigdecimal'
 
+class ArrayExtAccessTests < Test::Unit::TestCase
+  def test_from
+    assert_equal %w( a b c d ), %w( a b c d ).from(0)
+    assert_equal %w( c d ), %w( a b c d ).from(2)
+    assert_nil %w( a b c d ).from(10)
+  end
+
+  def test_to
+    assert_equal %w( a ), %w( a b c d ).to(0)
+    assert_equal %w( a b c ), %w( a b c d ).to(2)
+    assert_equal %w( a b c d ), %w( a b c d ).to(10)
+  end
+end
+
 class ArrayExtToParamTests < Test::Unit::TestCase
+  class ToParam < String
+    def to_param
+      "#{self}1"
+    end
+  end
+  
   def test_string_array
     assert_equal '', %w().to_param
     assert_equal 'hello/world', %w(hello world).to_param
@@ -11,6 +31,10 @@ class ArrayExtToParamTests < Test::Unit::TestCase
   def test_number_array
     assert_equal '10/20', [10, 20].to_param
   end
+  
+  def test_to_param_array
+    assert_equal 'custom1/param1', [ToParam.new('custom'), ToParam.new('param')].to_param
+  end
 end
 
 class ArrayExtToSentenceTests < Test::Unit::TestCase
@@ -19,11 +43,14 @@ class ArrayExtToSentenceTests < Test::Unit::TestCase
     assert_equal "one", ['one'].to_sentence
     assert_equal "one and two", ['one', 'two'].to_sentence
     assert_equal "one, two, and three", ['one', 'two', 'three'].to_sentence
-
   end
 
   def test_to_sentence_with_connector
     assert_equal "one, two, and also three", ['one', 'two', 'three'].to_sentence(:connector => 'and also')
+    assert_equal "one, two, three", ['one', 'two', 'three'].to_sentence(:connector => '')
+    assert_equal "one, two, three", ['one', 'two', 'three'].to_sentence(:connector => nil)
+    assert_equal "one, two,  three", ['one', 'two', 'three'].to_sentence(:connector => ' ')
+    assert_equal "one, two, and  three", ['one', 'two', 'three'].to_sentence(:connector => 'and ')
   end
 
   def test_to_sentence_with_skip_last_comma
@@ -32,11 +59,16 @@ class ArrayExtToSentenceTests < Test::Unit::TestCase
 
   def test_two_elements
     assert_equal "one and two", ['one', 'two'].to_sentence
+    assert_equal "one two", ['one', 'two'].to_sentence(:connector => '')
   end
 
   def test_one_element
     assert_equal "one", ['one'].to_sentence
   end
+
+  def test_one_non_string_element
+    assert_equal '1', [1].to_sentence
+  end
 end
 
 class ArrayExtToSTests < Test::Unit::TestCase
@@ -121,12 +153,12 @@ class ArrayToXmlTests < Test::Unit::TestCase
       { :name => "Jason", :age => 31, :age_in_millis => BigDecimal.new('1.0') }
     ].to_xml(:skip_instruct => true, :indent => 0)
 
-    assert_equal "<records><record>", xml.first(17), xml
+    assert_equal '<records type="array"><record>', xml.first(30)
     assert xml.include?(%(<age type="integer">26</age>)), xml
     assert xml.include?(%(<age-in-millis type="integer">820497600000</age-in-millis>)), xml
     assert xml.include?(%(<name>David</name>)), xml
     assert xml.include?(%(<age type="integer">31</age>)), xml
-    assert xml.include?(%(<age-in-millis type="numeric">1.0</age-in-millis>)), xml
+    assert xml.include?(%(<age-in-millis type="decimal">1.0</age-in-millis>)), xml
     assert xml.include?(%(<name>Jason</name>)), xml
   end
 
@@ -135,7 +167,7 @@ class ArrayToXmlTests < Test::Unit::TestCase
       { :name => "David", :age => 26, :age_in_millis => 820497600000 }, { :name => "Jason", :age => 31 }
     ].to_xml(:skip_instruct => true, :indent => 0, :root => "people")
 
-    assert_equal "<people><person>", xml.first(16)
+    assert_equal '<people type="array"><person>', xml.first(29)
   end
 
   def test_to_xml_with_options
@@ -176,7 +208,43 @@ class ArrayToXmlTests < Test::Unit::TestCase
       { :name => "Jason", :age => 31, :age_in_millis => BigDecimal.new('1.0') }
     ].to_xml(:skip_instruct => false, :indent => 0)
 
-    assert(/^<\?xml [^>]*/.match(xml))
-    assert xml.rindex(/<\?xml /) == 0
+    assert_match(/^<\?xml [^>]*/, xml)
+    assert_equal 0, xml.rindex(/<\?xml /)
   end
+
+  def test_to_xml_with_block
+    xml = [
+      { :name => "David", :age => 26, :age_in_millis => 820497600000 },
+      { :name => "Jason", :age => 31, :age_in_millis => BigDecimal.new('1.0') }
+    ].to_xml(:skip_instruct => true, :indent => 0) do |builder|
+      builder.count 2
+    end
+
+    assert xml.include?(%(<count>2</count>)), xml
+  end
+end
+
+class ArrayExtractOptionsTests < Test::Unit::TestCase
+  def test_extract_options
+    assert_equal({}, [].extract_options!)
+    assert_equal({}, [1].extract_options!)
+    assert_equal({:a=>:b}, [{:a=>:b}].extract_options!)
+    assert_equal({:a=>:b}, [1, {:a=>:b}].extract_options!)
+  end
+end
+
+uses_mocha "ArrayExtRandomTests" do
+
+class ArrayExtRandomTests < Test::Unit::TestCase
+  def test_random_element_from_array
+    assert_nil [].rand
+
+    Kernel.expects(:rand).with(1).returns(0)
+    assert_equal 'x', ['x'].rand
+
+    Kernel.expects(:rand).with(3).returns(1)
+    assert_equal 2, [1, 2, 3].rand
+  end
+end
+
 end

data/vendor/rails/activesupport/test/core_ext/blank_test.rb

@@ -1,11 +1,19 @@
 require File.dirname(__FILE__) + '/../abstract_unit'
 
+class EmptyTrue
+  def empty?() true; end
+end
+
+class EmptyFalse
+  def empty?() false; end
+end
+
 class BlankTest < Test::Unit::TestCase
-  BLANK = [nil, false, '', '   ', "  \n\t  \r ", [], {}]
-  NOT   = [true, 0, 1, 'a', [nil], { nil => 0 }]
+  BLANK = [ EmptyTrue.new, nil, false, '', '   ', "  \n\t  \r ", [], {} ]
+  NOT   = [ EmptyFalse.new, Object.new, true, 0, 1, 'a', [nil], { nil => 0 } ]
 
   def test_blank
-    BLANK.each { |v| assert v.blank?  }
-    NOT.each   { |v| assert !v.blank? }
+    BLANK.each { |v| assert v.blank?, "#{v.inspect} should be blank" }
+    NOT.each   { |v| assert !v.blank?, "#{v.inspect} should not be blank" }
   end
 end

data/vendor/rails/activesupport/test/core_ext/class/class_inheritable_attributes_test.rb

@@ -205,4 +205,20 @@ class ClassInheritableAttributesTest < Test::Unit::TestCase
     assert_equal 1, @sub.a.keys.size
     assert_equal 0, @klass.a.keys.size
   end
+  
+  def test_reset_inheritable_attributes
+    @klass.class_inheritable_accessor :a
+    @klass.a = 'a'
+
+    @sub = eval("class Inheriting < @klass; end; Inheriting")
+
+    assert_equal 'a', @klass.a
+    assert_equal 'a', @sub.a
+
+    @klass.reset_inheritable_attributes
+    @sub = eval("class NotInheriting < @klass; end; NotInheriting")
+
+    assert_equal nil, @klass.a
+    assert_equal nil, @sub.a
+  end
 end

data/vendor/rails/activesupport/test/core_ext/class/delegating_attributes_test.rb

@@ -0,0 +1,105 @@
+require File.dirname(__FILE__) + '/../../abstract_unit'
+
+module DelegatingFixtures
+  class Parent
+  end
+
+  class Child < Parent
+    superclass_delegating_accessor :some_attribute
+  end
+
+  class Mokopuna < Child
+  end
+end
+
+class DelegatingAttributesTest < Test::Unit::TestCase
+  include DelegatingFixtures
+  attr_reader :single_class
+
+  def setup
+    @single_class = Class.new(Object)
+  end
+
+  def test_simple_reader_declaration
+    single_class.superclass_delegating_reader   :only_reader
+    # The class and instance should have an accessor, but there
+    # should be no mutator
+    assert single_class.respond_to?(:only_reader)
+    assert single_class.public_instance_methods.map(&:to_s).include?("only_reader")
+    assert !single_class.respond_to?(:only_reader=)
+  end
+
+  def test_simple_writer_declaration
+    single_class.superclass_delegating_writer   :only_writer
+    # The class should have a mutator, the instances shouldn't
+    # neither should have an accessor
+    assert single_class.respond_to?(:only_writer=)
+    assert !single_class.public_instance_methods.include?("only_writer=")
+    assert !single_class.public_instance_methods.include?("only_writer")
+    assert !single_class.respond_to?(:only_writer)
+  end
+
+  def test_simple_accessor_declaration
+    single_class.superclass_delegating_accessor :both
+    # Class should have accessor and mutator
+    # the instance should have an accessor only
+    assert single_class.respond_to?(:both)
+    assert single_class.respond_to?(:both=)
+    assert single_class.public_instance_methods.map(&:to_s).include?("both")
+    assert !single_class.public_instance_methods.map(&:to_s).include?("both=")
+  end
+
+  def test_working_with_simple_attributes
+    single_class.superclass_delegating_accessor :both
+    single_class.both= "HMMM"
+    assert_equal "HMMM", single_class.both
+    assert_equal "HMMM", single_class.new.both
+  end
+
+  def test_working_with_accessors
+    single_class.superclass_delegating_reader   :only_reader
+    single_class.instance_variable_set("@only_reader", "reading only")
+    assert_equal "reading only", single_class.only_reader
+    assert_equal "reading only", single_class.new.only_reader
+  end
+
+  def test_working_with_simple_mutators
+    single_class.superclass_delegating_writer   :only_writer
+    single_class.only_writer="written"
+    assert_equal "written", single_class.instance_variable_get("@only_writer")
+  end
+
+  def test_child_class_delegates_to_parent_but_can_be_overridden
+    parent = Class.new
+    parent.superclass_delegating_accessor :both
+    child = Class.new(parent)
+    parent.both= "1"
+    assert_equal "1", child.both
+
+    child.both="2"
+    assert_equal "1", parent.both
+    assert_equal "2", child.both
+
+    parent.both="3"
+    assert_equal "3", parent.both
+    assert_equal "2", child.both
+  end
+
+  def test_delegation_stops_at_the_right_level
+    assert_nil Mokopuna.some_attribute
+    assert_nil Child.some_attribute
+    Child.some_attribute="1"
+    assert_equal "1", Mokopuna.some_attribute
+  ensure
+    Child.some_attribute=nil
+  end
+  
+  def test_delegation_stops_for_nil
+    Mokopuna.some_attribute = nil
+    Child.some_attribute="1"
+    
+    assert_equal "1", Child.some_attribute
+    assert_nil Mokopuna.some_attribute
+  end
+
+end