radiant 0.6.3 → 0.6.4

data/vendor/rails/activerecord/test/fixtures/db_definitions/schema.rb

@@ -8,6 +8,14 @@ ActiveRecord::Schema.define do
       ActiveRecord::Base.connection.create_table(*args, &block)
       ActiveRecord::Base.connection.execute "SET GENERATOR #{args.first}_seq TO 10000"
     end
+    
+    create_table :sql_server_defaults, :force => true do |t|
+      t.column :string_with_null_default, :string, :default => nil
+      t.column :string_with_pretend_null_one, :string, :default => 'null'
+      t.column :string_with_pretend_null_two, :string, :default => '(null)'
+      t.column :string_with_pretend_null_three, :string, :default => 'NULL'
+      t.column :string_with_pretend_null_four, :string, :default => '(NULL)'
+    end
   end
 
   create_table :taggings, :force => true do |t|
@@ -57,4 +65,9 @@ ActiveRecord::Schema.define do
   create_table :lock_without_defaults_cust, :force => true do |t|
     t.column :custom_lock_version, :integer
   end
+  
+  create_table :audit_logs, :force => true do |t|
+    t.column :message, :string, :null=>false
+    t.column :developer_id, :integer, :null=>false
+  end
 end

data/vendor/rails/activerecord/test/fixtures/developer.rb

@@ -31,8 +31,18 @@ class Developer < ActiveRecord::Base
 
   has_and_belongs_to_many :special_projects, :join_table => 'developers_projects', :association_foreign_key => 'project_id'
 
+  has_many :audit_logs
+
   validates_inclusion_of :salary, :in => 50000..200000
   validates_length_of    :name, :within => 3..20
+
+  before_create do |developer|
+    developer.audit_logs.build :message => "Computer created"
+  end
+end
+
+class AuditLog < ActiveRecord::Base
+  belongs_to :developer
 end
 
 DeveloperSalary = Struct.new(:amount)

data/vendor/rails/activerecord/test/fixtures_test.rb

@@ -12,13 +12,15 @@ class FixturesTest < Test::Unit::TestCase
   self.use_instantiated_fixtures = true
   self.use_transactional_fixtures = false
 
-  fixtures :topics, :developers, :accounts, :tasks, :categories, :funny_jokes
+  fixtures :topics, :developers, :accounts, :tasks, :categories, :funny_jokes, :binaries
 
-  FIXTURES = %w( accounts companies customers
+  FIXTURES = %w( accounts binaries companies customers
                  developers developers_projects entrants
                  movies projects subscribers topics tasks )
   MATCH_ATTRIBUTE_NAME = /[a-zA-Z][-_\w]*/
 
+  BINARY_FIXTURE_PATH = File.dirname(__FILE__) + '/fixtures/flowers.jpg'
+
   def test_clean_fixtures
     FIXTURES.each do |name|
       fixtures = nil
@@ -100,7 +102,6 @@ class FixturesTest < Test::Unit::TestCase
     assert first
   end
 
-
   def test_bad_format
     path = File.join(File.dirname(__FILE__), 'fixtures', 'bad_fixtures')
     Dir.entries(path).each do |file|
@@ -174,7 +175,6 @@ class FixturesTest < Test::Unit::TestCase
     end
   end
 
-
   def test_yml_file_in_subdirectory
     assert_equal(categories(:sub_special_1).name, "A special category in a subdir file")
     assert_equal(categories(:sub_special_1).class, SpecialCategory)
@@ -185,7 +185,11 @@ class FixturesTest < Test::Unit::TestCase
     assert_equal(categories(:sub_special_3).class, SpecialCategory)
   end
 
-
+  def test_binary_in_fixtures
+    assert_equal 1, @binaries.size
+    data = File.read(BINARY_FIXTURE_PATH).freeze
+    assert_equal data, @flowers.data
+  end
 end
 
 if Account.connection.respond_to?(:reset_pk_sequence!)

data/vendor/rails/activerecord/test/migration_test.rb

@@ -170,7 +170,7 @@ if ActiveRecord::Base.connection.supports_migrations?
     # SQL Server and Sybase will not allow you to add a NOT NULL column
     # to a table without specifying a default value, so the
     # following test must be skipped
-    unless current_adapter?(:SQLServerAdapter, :SybaseAdapter)
+    unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :SQLiteAdapter)
       def test_add_column_not_null_without_default
         Person.connection.create_table :testings do |t|
           t.column :foo, :string
@@ -209,7 +209,7 @@ if ActiveRecord::Base.connection.supports_migrations?
     def test_native_decimal_insert_manual_vs_automatic
       # SQLite3 always uses float in violation of SQL
       # 16 decimal places
-      correct_value = (current_adapter?(:SQLiteAdapter) ? '0.123456789012346E20' : '0012345678901234567890.0123456789').to_d
+      correct_value = '0012345678901234567890.0123456789'.to_d
 
       Person.delete_all
       Person.connection.add_column "people", "wealth", :decimal, :precision => '30', :scale => '10'
@@ -227,8 +227,9 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_kind_of BigDecimal, row.wealth
 
       # If this assert fails, that means the SELECT is broken!
-      assert_equal correct_value, row.wealth
-
+      unless current_adapter?(:SQLite3Adapter)
+        assert_equal correct_value, row.wealth
+      end
       # Reset to old state
       Person.delete_all
 
@@ -240,8 +241,9 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_kind_of BigDecimal, row.wealth
 
       # If these asserts fail, that means the INSERT (create function, or cast to SQL) is broken!
-      assert_equal correct_value, row.wealth
-
+      unless current_adapter?(:SQLite3Adapter)
+        assert_equal correct_value, row.wealth
+      end
       # Reset to old state
       Person.connection.del_column "people", "wealth" rescue nil
       Person.reset_column_information
@@ -267,10 +269,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
       # Test for 30 significent digits (beyond the 16 of float), 10 of them
       # after the decimal place.
-      if current_adapter?(:SQLiteAdapter)
-        # SQLite3 uses float in violation of SQL. Test for 16 decimal places.
-        assert_equal BigDecimal.new('0.123456789012346E20'), bob.wealth
-      else
+      unless current_adapter?(:SQLite3Adapter)
         assert_equal BigDecimal.new("0012345678901234567890.0123456789"), bob.wealth
       end
 

data/vendor/rails/activerecord/test/mixin_test.rb

@@ -211,6 +211,53 @@ class ListTest < Test::Unit::TestCase
     assert_equal [new2, new1, new3], ListMixin.find(:all, :conditions => 'parent_id IS NULL', :order => 'pos')
   end
 
+  def test_remove_from_list_should_then_fail_in_list?
+    assert_equal true, mixins(:list_1).in_list?
+    mixins(:list_1).remove_from_list
+    assert_equal false, mixins(:list_1).in_list?
+  end
+
+  def test_remove_from_list_should_set_position_to_nil
+    assert_equal [mixins(:list_1),
+                  mixins(:list_2),
+                  mixins(:list_3),
+                  mixins(:list_4)],
+                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos')
+
+    mixins(:list_2).remove_from_list
+
+    assert_equal [mixins(:list_2, :reload),
+                  mixins(:list_1, :reload),
+                  mixins(:list_3, :reload),
+                  mixins(:list_4, :reload)],
+                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos')
+
+    assert_equal 1, mixins(:list_1).pos
+    assert_equal nil, mixins(:list_2).pos
+    assert_equal 2, mixins(:list_3).pos
+    assert_equal 3, mixins(:list_4).pos
+  end
+
+  def test_remove_before_destroy_does_not_shift_lower_items_twice
+    assert_equal [mixins(:list_1),
+                  mixins(:list_2),
+                  mixins(:list_3),
+                  mixins(:list_4)],
+                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos')
+
+    mixins(:list_2).remove_from_list
+    mixins(:list_2).destroy
+
+  assert_equal [mixins(:list_1, :reload),
+                mixins(:list_3, :reload),
+                mixins(:list_4, :reload)],
+                  ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos')
+
+    assert_equal 1, mixins(:list_1).pos
+    assert_equal 2, mixins(:list_3).pos
+    assert_equal 3, mixins(:list_4).pos
+  end
+
 end
 
 class TreeTest < Test::Unit::TestCase

data/vendor/rails/activerecord/test/validations_test.rb

@@ -631,7 +631,7 @@ class ValidationsTest < Test::Unit::TestCase
     t = Topic.new('title' => 'noreplies', 'content' => 'whatever')
     assert !t.save
     assert t.errors.on(:replies)
-    t.replies.create('title' => 'areply', 'content' => 'whateveragain')
+    t.replies.build('title' => 'areply', 'content' => 'whateveragain')
     assert t.valid?
   end
 
@@ -824,7 +824,7 @@ class ValidationsTest < Test::Unit::TestCase
       t = Topic.new('title' => 'あいうえお', 'content' => 'かきくけこ')
       assert !t.save
       assert t.errors.on(:replies)
-      t.replies.create('title' => 'あいうえお', 'content' => 'かきくけこ')
+      t.replies.build('title' => 'あいうえお', 'content' => 'かきくけこ')
       assert t.valid?
     end
   end

data/vendor/rails/activesupport/CHANGELOG

@@ -1,3 +1,19 @@
+*1.4.4* (October 12th, 2007)
+
+* Backport: allow array and hash query parameters. Array route parameters are converted/to/a/path as before.  #6765, #7047, #7462 [bgipsy, Jeremy McAnally, Dan Kubb, brendan, Diego Algorta Casamayou]
+
+
+*1.4.3* (October 4th, 2007)
+
+* Demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin.  #8453 [candlerb, Jeremy Kemper]
+
+* Document Object#blank?.  #6491 [Chris Mear]
+
+* Update Dependencies to ignore constants inherited from ancestors. Closes #6951. [Nicholas Seckar]
+
+* Improved multibyte performance by relying less on exception raising #8159 [Blaine]
+
+
 *1.4.2* (March 12th, 2007)
 
 * Ruby 1.8.6 and 1.9 define private Time#to_date and #to_datetime; make them

data/vendor/rails/activesupport/lib/active_support/core_ext/blank.rb

@@ -1,5 +1,11 @@
-class Object #:nodoc:
-  # "", "   ", nil, [], and {} are blank
+class Object
+  # An object is blank if it's nil, empty, or a whitespace string.
+  # For example, "", "   ", nil, [], and {} are blank.
+  #
+  # This simplifies
+  #   if !address.nil? && !address.empty?
+  # to
+  #   if !address.blank?
   def blank?
     if respond_to?(:empty?) && respond_to?(:strip)
       empty? or strip.empty?
@@ -47,4 +53,4 @@ class Numeric #:nodoc:
   def blank?
     false
   end
-end
+end

data/vendor/rails/activesupport/lib/active_support/core_ext/hash/conversions.rb

@@ -1,5 +1,44 @@
 require 'date'
 require 'xml_simple'
+require 'cgi'
+ 
+# Extensions needed for Hash#to_query
+class Object
+  def to_param #:nodoc:
+    to_s
+  end
+
+  def to_query(key) #:nodoc:
+    "#{CGI.escape(key.to_s)}=#{CGI.escape(to_param.to_s)}"
+  end
+end
+
+class Array
+  def to_query(key) #:nodoc:
+    collect { |value| value.to_query("#{key}[]") }.sort * '&'
+  end
+end
+
+# Locked down XmlSimple#xml_in_string
+class XmlSimple
+  # Same as xml_in but doesn't try to smartly shoot itself in the foot.
+  def xml_in_string(string, options = nil)
+    handle_options('in', options)
+
+    @doc = parse(string)
+    result = collapse(@doc.root)
+
+    if @options['keeproot']
+      merge({}, @doc.root.name, result)
+    else
+      result
+    end
+  end
+
+  def self.xml_in_string(string, options = nil)
+    new.xml_in_string(string, options)
+  end
+end
 
 module ActiveSupport #:nodoc:
   module CoreExtensions #:nodoc:
@@ -27,6 +66,12 @@ module ActiveSupport #:nodoc:
           klass.extend(ClassMethods)
         end
 
+        def to_query(namespace = nil)
+          collect do |key, value|
+            value.to_query(namespace ? "#{namespace}[#{key}]" : key)
+          end.sort * '&'
+        end
+
         def to_xml(options = {})
           options[:indent] ||= 2
           options.reverse_merge!({ :builder => Builder::XmlMarkup.new(:indent => options[:indent]),
@@ -81,14 +126,14 @@ module ActiveSupport #:nodoc:
         module ClassMethods
           def from_xml(xml)
             # TODO: Refactor this into something much cleaner that doesn't rely on XmlSimple
-            undasherize_keys(typecast_xml_value(XmlSimple.xml_in(xml,
+            undasherize_keys(typecast_xml_value(XmlSimple.xml_in_string(xml,
               'forcearray'   => false,
               'forcecontent' => true,
               'keeproot'     => true,
               'contentkey'   => '__content__')
-            ))            
+            ))
           end
-          
+
           def create_from_xml(xml)
             ActiveSupport::Deprecation.warn("Hash.create_from_xml has been renamed to Hash.from_xml", caller)
             from_xml(xml)

data/vendor/rails/activesupport/lib/active_support/core_ext/module/introspection.rb

@@ -18,4 +18,18 @@ class Module
     parents << Object unless parents.include? Object
     parents
   end
+  
+  # Return the constants that have been defined locally by this object and not
+  # in an ancestor. This method may miss some constants if their definition in
+  # the ancestor is identical to their definition in the receiver.
+  def local_constants
+    inherited = {}
+    ancestors.each do |anc|
+      next if anc == self
+      anc.constants.each { |const| inherited[const] = anc.const_get(const) }
+    end
+    constants.select do |const|
+      ! inherited.key?(const) || inherited[const].object_id != const_get(const).object_id
+    end
+  end
 end

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

@@ -318,13 +318,13 @@ module Dependencies #:nodoc:
     watch_frames = descs.collect do |desc|
       if desc.is_a? Module
         mod_name = desc.name
-        initial_constants = desc.constants
+        initial_constants = desc.local_constants
       elsif desc.is_a?(String) || desc.is_a?(Symbol)
         mod_name = desc.to_s
         
         # Handle the case where the module has yet to be defined.
         initial_constants = if qualified_const_defined?(mod_name)
-          mod_name.constantize.constants
+          mod_name.constantize.local_constants
         else
          []
         end
@@ -349,7 +349,7 @@ module Dependencies #:nodoc:
         
         mod = mod_name.constantize
         next [] unless mod.is_a? Module
-        new_constants = mod.constants - prior_constants
+        new_constants = mod.local_constants - prior_constants
         
         # Make sure no other frames takes credit for these constants.
         constant_watch_stack.each do |frame_name, constants|

data/vendor/rails/activesupport/lib/active_support/json/encoders/core.rb

@@ -23,12 +23,14 @@ module ActiveSupport
         "\n" =>    '\n',
         "\r" =>    '\r',
         "\t" =>    '\t',
-        '"' =>     '\"',
-        '\\' =>    '\\\\'
+        '"'  =>    '\"',
+        '\\' =>    '\\\\',
+        '<'  =>    '\\074',
+        '>'  =>    '\\076'
       }
       
       define_encoder String do |string|
-        '"' + string.gsub(/[\010\f\n\r\t"\\]/) { |s|
+        '"' + string.gsub(/[\010\f\n\r\t"\\<>]/) { |s|
           ESCAPED_CHARS[s]
         }.gsub(/([\xC0-\xDF][\x80-\xBF]|
                  [\xE0-\xEF][\x80-\xBF]{2}|

data/vendor/rails/activesupport/lib/active_support/multibyte/chars.rb

@@ -43,7 +43,7 @@ module ActiveSupport::Multibyte #:nodoc:
     
     # Create a new Chars instance.
     def initialize(str)
-      @string = (str.string rescue str)
+      @string = str.respond_to?(:string) ? str.string : str
     end
     
     # Returns -1, 0 or +1 depending on whether the Chars object is to be sorted before, equal or after the
@@ -70,18 +70,18 @@ module ActiveSupport::Multibyte #:nodoc:
     def method_missing(m, *a, &b)
       begin
         # Simulate methods with a ! at the end because we can't touch the enclosed string from the handlers.
-        if m.to_s =~ /^(.*)\!$/
+        if m.to_s =~ /^(.*)\!$/ && handler.respond_to?($1)
           result = handler.send($1, @string, *a, &b)
           if result == @string
             result = nil
           else
             @string.replace result
           end
-        else
+        elsif handler.respond_to?(m)
           result = handler.send(m, @string, *a, &b)
+        else
+          result = @string.send(m, *a, &b)
         end
-      rescue NoMethodError
-        result = @string.send(m, *a, &b)
       rescue Handlers::EncodingError
         @string.replace handler.tidy_bytes(@string)
         retry
@@ -126,4 +126,4 @@ begin
   ActiveSupport::Multibyte::Chars.handler = ActiveSupport::Multibyte::Handlers::UTF8HandlerProc
 rescue LoadError
   ActiveSupport::Multibyte::Chars.handler = ActiveSupport::Multibyte::Handlers::UTF8Handler
-end
+end

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

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