activesupport 3.0.7 → 3.0.8.rc1

data/CHANGELOG

@@ -1,3 +1,7 @@
+*Rails 3.0.8 (unreleased)*
+
+* No changes.
+
 *Rails 3.0.7 (April 18, 2011)*
 
 * Hash.from_xml no longer loses attributes on tags containing only whitespace [André Arko]

data/lib/active_support/buffered_logger.rb

@@ -41,19 +41,17 @@ module ActiveSupport
 
     def initialize(log, level = DEBUG)
       @level         = level
-      @buffer        = {}
+      @buffer        = Hash.new { |h,k| h[k] = [] }
       @auto_flushing = 1
       @guard = Mutex.new
 
       if log.respond_to?(:write)
         @log = log
       elsif File.exist?(log)
-        @log = open(log, (File::WRONLY | File::APPEND))
-        @log.sync = true
+        @log = open_log(log, (File::WRONLY | File::APPEND))
       else
         FileUtils.mkdir_p(File.dirname(log))
-        @log = open(log, (File::WRONLY | File::APPEND | File::CREAT))
-        @log.sync = true
+        @log = open_log(log, (File::WRONLY | File::APPEND | File::CREAT))
       end
     end
 
@@ -100,13 +98,8 @@ module ActiveSupport
 
     def flush
       @guard.synchronize do
-        unless buffer.empty?
-          old_buffer = buffer
-          all_content = StringIO.new
-          old_buffer.each do |content|
-            all_content << content
-          end
-          @log.write(all_content.string)
+        buffer.each do |content|
+          @log.write(content)
         end
 
         # Important to do this even if buffer was empty or else @buffer will
@@ -127,11 +120,20 @@ module ActiveSupport
       end
 
       def buffer
-        @buffer[Thread.current] ||= []
+        @buffer[Thread.current]
       end
 
       def clear_buffer
         @buffer.delete(Thread.current)
       end
+
+    private
+
+    def open_log(log, mode)
+      open(log, mode).tap do |log|
+        log.set_encoding(Encoding::BINARY) if log.respond_to?(:set_encoding)
+        log.sync = true
+      end
+    end
   end
 end

data/lib/active_support/cache/file_store.rb

@@ -120,7 +120,7 @@ module ActiveSupport
         # Lock a file for a block so only one process can modify it at a time.
         def lock_file(file_name, &block) # :nodoc:
           if File.exist?(file_name)
-            File.open(file_name, 'r') do |f|
+            File.open(file_name, 'r+') do |f|
               begin
                 f.flock File::LOCK_EX
                 yield

data/lib/active_support/core_ext/big_decimal/conversions.rb

@@ -1,4 +1,10 @@
 require 'bigdecimal'
+
+begin
+  require 'psych'
+rescue LoadError
+end
+
 require 'yaml'
 
 class BigDecimal
@@ -12,12 +18,19 @@ class BigDecimal
   #
   # Note that reconstituting YAML floats to native floats may lose precision.
   def to_yaml(opts = {})
+    return super if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
+
     YAML.quick_emit(nil, opts) do |out|
       string = to_s
       out.scalar(YAML_TAG, YAML_MAPPING[string] || string, :plain)
     end
   end
 
+  def encode_with(coder)
+    string = to_s
+    coder.represent_scalar(nil, YAML_MAPPING[string] || string)
+  end
+
   def to_d
     self
   end

data/lib/active_support/core_ext/hash/conversions.rb

@@ -96,7 +96,8 @@ class Hash
                   raise "can't typecast #{entries.inspect}"
                 end
               end
-            elsif value['type'] == 'file' || value["__content__"].present?
+            elsif value['type'] == 'file' || 
+               (value["__content__"] && (value.keys.size == 1 || value["__content__"].present?))
               content = value["__content__"]
               if parser = ActiveSupport::XmlMini::PARSING[value["type"]]
                 parser.arity == 1 ? parser.call(content) : parser.call(content, value)

data/lib/active_support/json/backends/yaml.rb

@@ -7,14 +7,21 @@ module ActiveSupport
         ParseError = ::StandardError
         extend self
 
+        EXCEPTIONS = [::ArgumentError] # :nodoc:
+        begin
+          require 'psych'
+          EXCEPTIONS << Psych::SyntaxError
+        rescue LoadError
+        end
+
         # Parses a JSON string or IO and converts it into an object
         def decode(json)
           if json.respond_to?(:read)
             json = json.read
           end
           YAML.load(convert_json_to_yaml(json))
-        rescue ArgumentError
-          raise ParseError, "Invalid JSON string"
+        rescue *EXCEPTIONS => e
+          raise ParseError, "Invalid JSON string: '%s'" % json
         end
 
         protected
@@ -32,7 +39,7 @@ module ActiveSupport
                   if valid_date?(json[pos..scanner.pos-2])
                     # found a date, track the exact positions of the quotes so we can
                     # overwrite them with spaces later.
-                    times << pos << scanner.pos
+                    times << pos
                   end
                   quoting = false
                 end
@@ -63,7 +70,7 @@ module ActiveSupport
                 chunk = scanner.peek(right_pos[i] - scanner.pos + 1)
                 # overwrite the quotes found around the dates with spaces
                 while times.size > 0 && times[0] <= right_pos[i]
-                  chunk[times.shift - scanner.pos - 1] = ' '
+                  chunk.insert(times.shift - scanner.pos - 1, '! ')
                 end
                 chunk.gsub!(/\\([\\\/]|u[[:xdigit:]]{4})/) do
                   ustr = $1

data/lib/active_support/log_subscriber.rb

@@ -81,7 +81,7 @@ module ActiveSupport
 
       # Flush all log_subscribers' logger.
       def flush_all!
-        flushable_loggers.each(&:flush)
+        flushable_loggers.each { |log| log.flush }
       end
     end
 

data/lib/active_support/ordered_hash.rb

@@ -1,3 +1,8 @@
+begin
+  require 'psych'
+rescue LoadError
+end
+
 require 'yaml'
 
 YAML.add_builtin_type("omap") do |type, val|
@@ -11,9 +16,17 @@ module ActiveSupport
       "!tag:yaml.org,2002:omap"
     end
 
+    def encode_with(coder)
+      coder.represent_seq '!omap', map { |k,v| { k => v } }
+    end
+
     def to_yaml(opts = {})
+      if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck?
+        return super
+      end
+
       YAML.quick_emit(self, opts) do |out|
-        out.seq(taguri, to_yaml_style) do |seq|
+        out.seq(taguri) do |seq|
           each do |k, v|
             seq.add(k => v)
           end

data/lib/active_support/time_with_zone.rb

@@ -135,14 +135,20 @@ module ActiveSupport
       end
     end
 
-    def to_yaml(options = {})
-      if options.kind_of?(YAML::Emitter)
-        utc.to_yaml(options)
+    def encode_with(coder)
+      if coder.respond_to?(:represent_object)
+        coder.represent_object(nil, utc)
       else
-        time.to_yaml(options).gsub('Z', formatted_offset(true, 'Z'))
+        coder.represent_scalar(nil, utc.strftime("%Y-%m-%d %H:%M:%S.%9NZ"))
       end
     end
 
+    def to_yaml(options = {})
+      return super if defined?(YAML::ENGINE) && !YAML::ENGINE.syck?
+
+      utc.to_yaml(options)
+    end
+
     def httpdate
       utc.httpdate
     end

data/lib/active_support/version.rb

@@ -2,8 +2,8 @@ module ActiveSupport
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 7
-    PRE   = nil
+    TINY  = 8
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 15424055
+  prerelease: 6
   segments: 
   - 3
   - 0
-  - 7
-  version: 3.0.7
+  - 8
+  - rc
+  - 1
+  version: 3.0.8.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-05-25 00:00:00 Z
 dependencies: []
 
 description: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.
@@ -258,16 +260,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: activesupport
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.