activesupport 3.0.0.beta3 → 3.0.0.beta4

data/lib/active_support/railtie.rb

@@ -33,6 +33,7 @@ module I18n
     config.i18n = ActiveSupport::OrderedOptions.new
     config.i18n.railties_load_path = []
     config.i18n.load_path = []
+    config.i18n.fallbacks = ActiveSupport::OrderedOptions.new
 
     initializer "i18n.initialize" do
       ActiveSupport.on_load(:i18n) do
@@ -47,6 +48,8 @@ module I18n
     # Set the i18n configuration from config.i18n but special-case for
     # the load_path which should be appended to what's already set instead of overwritten.
     config.after_initialize do |app|
+      fallbacks = app.config.i18n.delete(:fallbacks)
+
       app.config.i18n.each do |setting, value|
         case setting
         when :railties_load_path
@@ -58,7 +61,40 @@ module I18n
         end
       end
 
+      init_fallbacks(fallbacks) if fallbacks && validate_fallbacks(fallbacks)
       I18n.reload!
     end
+
+    class << self
+      protected
+
+        def init_fallbacks(fallbacks)
+          include_fallbacks_module
+          args = case fallbacks
+          when ActiveSupport::OrderedOptions
+            [*(fallbacks[:defaults] || []) << fallbacks[:map]].compact
+          when Hash, Array
+            Array.wrap(fallbacks)
+          else # TrueClass
+            []
+          end
+          I18n.fallbacks = I18n::Locale::Fallbacks.new(*args)
+        end
+
+        def include_fallbacks_module
+          I18n.backend.class.send(:include, I18n::Backend::Fallbacks)
+        end
+      
+        def validate_fallbacks(fallbacks)
+          case fallbacks
+          when ActiveSupport::OrderedOptions
+            !fallbacks.empty?
+          when TrueClass, Array, Hash
+            true
+          else
+            raise "Unexpected fallback type #{fallbacks.inspect}"
+          end
+        end
+    end
   end
 end

data/lib/active_support/rescuable.rb

@@ -1,3 +1,4 @@
+require 'active_support/concern'
 require 'active_support/core_ext/class/attribute'
 require 'active_support/core_ext/proc'
 require 'active_support/core_ext/string/inflections'

data/lib/active_support/ruby/shim.rb

@@ -15,6 +15,7 @@ require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/process/daemon'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/string/interpolation'
+require 'active_support/core_ext/string/encoding'
 require 'active_support/core_ext/rexml'
 require 'active_support/core_ext/time/conversions'
 require 'active_support/core_ext/file/path'

data/lib/active_support/testing/declarative.rb

@@ -7,7 +7,7 @@ module ActiveSupport
           
           unless method_defined?(:describe)
             def self.describe(text)
-              class_eval <<-RUBY_EVAL
+              class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
                 def self.name
                   "#{text}"
                 end

data/lib/active_support/testing/isolation.rb

@@ -1,3 +1,4 @@
+require 'rbconfig'
 module ActiveSupport
   module Testing
     class RemoteError < StandardError
@@ -33,7 +34,7 @@ module ActiveSupport
 
     module Isolation
       def self.forking_env?
-        !ENV["NO_FORK"] && RUBY_PLATFORM !~ /mswin|mingw|java/
+        !ENV["NO_FORK"] && ((Config::CONFIG['host_os'] !~ /mswin|mingw/) && (RUBY_PLATFORM !~ /java/))
       end
 
       def self.included(base)

data/lib/active_support/testing/setup_and_teardown.rb

@@ -1,3 +1,6 @@
+require 'active_support/concern'
+require 'active_support/callbacks'
+
 module ActiveSupport
   module Testing
     module SetupAndTeardown

data/lib/active_support/values/time_zone.rb

@@ -1,4 +1,11 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/try'
+begin
+  require 'tzinfo'
+rescue LoadError => e
+  $stderr.puts "You don't have tzinfo installed in your application. Please add it to your Gemfile and run bundle install"
+  raise e
+end
 
 # The TimeZone class serves as a wrapper around TZInfo::Timezone instances. It allows us to do the following:
 #
@@ -189,6 +196,7 @@ module ActiveSupport
 
     include Comparable
     attr_reader :name
+    attr_reader :tzinfo
 
     # Create a new TimeZone object with the given name and offset. The
     # offset is the number of seconds that this time zone is offset from UTC
@@ -197,7 +205,7 @@ module ActiveSupport
     def initialize(name, utc_offset = nil, tzinfo = nil)
       @name = name
       @utc_offset = utc_offset
-      @tzinfo = tzinfo
+      @tzinfo = tzinfo || TimeZone.find_tzinfo(name)
       @current_period = nil
     end
 
@@ -205,8 +213,8 @@ module ActiveSupport
       if @utc_offset
         @utc_offset
       else
-        @current_period ||= tzinfo.current_period
-        @current_period.utc_offset
+        @current_period ||= tzinfo.try(:current_period)
+        @current_period.try(:utc_offset)
       end
     end
 
@@ -309,32 +317,10 @@ module ActiveSupport
       tzinfo.period_for_local(time, dst)
     end
 
-    def tzinfo
-      @tzinfo ||= TimeZone.find_tzinfo(name)
-    end
-
     # TODO: Preload instead of lazy load for thread safety
     def self.find_tzinfo(name)
-      require 'tzinfo' unless defined?(::TZInfo)
-      ::TZInfo::Timezone.get(MAPPING[name] || name)
-    rescue TZInfo::InvalidTimezoneIdentifier
-      nil
-    end
-
-    unless const_defined?(:ZONES)
-      ZONES = []
-      ZONES_MAP = {}
-      MAPPING.each_key do |place|
-        place.freeze
-        zone = new(place)
-        ZONES << zone
-        ZONES_MAP[place] = zone
-      end
-      ZONES.sort!
-      ZONES.freeze
-
-      US_ZONES = ZONES.find_all { |z| z.name =~ /US|Arizona|Indiana|Hawaii|Alaska/ }
-      US_ZONES.freeze
+      require 'active_support/tzinfo' unless defined?(::TZInfo)
+      ::TZInfo::TimezoneProxy.new(MAPPING[name] || name)
     end
 
     class << self
@@ -351,7 +337,11 @@ module ActiveSupport
       # TimeZone objects per time zone, in many cases, to make it easier
       # for users to find their own time zone.
       def all
-        ZONES
+        @zones ||= zones_map.values.sort
+      end
+
+      def zones_map
+        @zones_map ||= Hash[MAPPING.map { |place, _| [place, create(place)] }]
       end
 
       # Locate a specific time zone object. If the argument is a string, it
@@ -362,7 +352,7 @@ module ActiveSupport
       def [](arg)
         case arg
           when String
-            ZONES_MAP[arg] ||= lookup(arg)
+            zones_map[arg] ||= lookup(arg)
           when Numeric, ActiveSupport::Duration
             arg *= 3600 if arg.abs <= 13
             all.find { |z| z.utc_offset == arg.to_i }
@@ -374,7 +364,7 @@ module ActiveSupport
       # A convenience method for returning a collection of TimeZone objects
       # for time zones in the USA.
       def us_zones
-        US_ZONES
+        @us_zones ||= all.find_all { |z| z.name =~ /US|Arizona|Indiana|Hawaii|Alaska/ }
       end
 
       private

data/lib/active_support/version.rb

@@ -3,7 +3,7 @@ module ActiveSupport
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta3"
+    BUILD = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

data/lib/active_support/xml_mini.rb

@@ -9,6 +9,71 @@ module ActiveSupport
   module XmlMini
     extend self
 
+    # This module exists to decorate files deserialized using Hash.from_xml with
+    # the <tt>original_filename</tt> and <tt>content_type</tt> methods.
+    module FileLike #:nodoc:
+      attr_writer :original_filename, :content_type
+
+      def original_filename
+        @original_filename || 'untitled'
+      end
+
+      def content_type
+        @content_type || 'application/octet-stream'
+      end
+    end
+
+    DEFAULT_ENCODINGS = {
+      "binary" => "base64"
+    } unless defined?(TYPE_NAMES)
+
+    TYPE_NAMES = {
+      "Symbol"     => "symbol",
+      "Fixnum"     => "integer",
+      "Bignum"     => "integer",
+      "BigDecimal" => "decimal",
+      "Float"      => "float",
+      "TrueClass"  => "boolean",
+      "FalseClass" => "boolean",
+      "Date"       => "date",
+      "DateTime"   => "datetime",
+      "Time"       => "datetime",
+      "Array"      => "array",
+      "Hash"       => "hash"
+    } unless defined?(TYPE_NAMES)
+
+    FORMATTING = {
+      "symbol"   => Proc.new { |symbol| symbol.to_s },
+      "date"     => Proc.new { |date| date.to_s(:db) },
+      "datetime" => Proc.new { |time| time.xmlschema },
+      "binary"   => Proc.new { |binary| ActiveSupport::Base64.encode64(binary) },
+      "yaml"     => Proc.new { |yaml| yaml.to_yaml }
+    } unless defined?(FORMATTING)
+
+    # TODO: use Time.xmlschema instead of Time.parse;
+    #       use regexp instead of Date.parse
+    unless defined?(PARSING)
+      PARSING = {
+        "symbol"       => Proc.new { |symbol|  symbol.to_sym },
+        "date"         => Proc.new { |date|    ::Date.parse(date) },
+        "datetime"     => Proc.new { |time|    ::Time.parse(time).utc rescue ::DateTime.parse(time).utc },
+        "integer"      => Proc.new { |integer| integer.to_i },
+        "float"        => Proc.new { |float|   float.to_f },
+        "decimal"      => Proc.new { |number|  BigDecimal(number) },
+        "boolean"      => Proc.new { |boolean| %w(1 true).include?(boolean.strip) },
+        "string"       => Proc.new { |string|  string.to_s },
+        "yaml"         => Proc.new { |yaml|    YAML::load(yaml) rescue yaml },
+        "base64Binary" => Proc.new { |bin|     ActiveSupport::Base64.decode64(bin) },
+        "binary"       => Proc.new { |bin, entity| _parse_binary(bin, entity) },
+        "file"         => Proc.new { |file, entity| _parse_file(file, entity) }
+      }
+
+      PARSING.update(
+        "double"   => PARSING["float"],
+        "dateTime" => PARSING["datetime"]
+      )
+    end
+
     attr_reader :backend
     delegate :parse, :to => :backend
 
@@ -16,7 +81,7 @@ module ActiveSupport
       if name.is_a?(Module)
         @backend = name
       else
-        require "active_support/xml_mini/#{name.to_s.downcase}.rb"
+        require "active_support/xml_mini/#{name.to_s.downcase}"
         @backend = ActiveSupport.const_get("XmlMini_#{name}")
       end
     end
@@ -27,6 +92,66 @@ module ActiveSupport
     ensure
       self.backend = old_backend
     end
+
+    def to_tag(key, value, options)
+      type_name = options.delete(:type)
+      merged_options = options.merge(:root => key, :skip_instruct => true)
+
+      if value.is_a?(::Method) || value.is_a?(::Proc)
+        if value.arity == 1
+          value.call(merged_options)
+        else
+          value.call(merged_options, key.to_s.singularize)
+        end
+      elsif value.respond_to?(:to_xml)
+        value.to_xml(merged_options)
+      else
+        type_name ||= TYPE_NAMES[value.class.name]
+        type_name ||= value.class.name if value && !value.respond_to?(:to_str)
+        type_name   = type_name.to_s   if type_name
+
+        key = rename_key(key.to_s, options)
+
+        attributes = options[:skip_types] || type_name.nil? ? { } : { :type => type_name }
+        attributes[:nil] = true if value.nil?
+
+        encoding = options[:encoding] || DEFAULT_ENCODINGS[type_name]
+        attributes[:encoding] = encoding if encoding
+
+        formatted_value = FORMATTING[type_name] && !value.nil? ?
+          FORMATTING[type_name].call(value) : value
+
+        options[:builder].tag!(key, formatted_value, attributes)
+      end
+    end
+
+    def rename_key(key, options = {})
+      camelize  = options.has_key?(:camelize) && options[:camelize]
+      dasherize = !options.has_key?(:dasherize) || options[:dasherize]
+      key = key.camelize  if camelize
+      key = key.dasherize if dasherize
+      key
+    end
+
+    protected
+
+	  # TODO: Add support for other encodings
+    def _parse_binary(bin, entity) #:nodoc:
+      case entity['encoding']
+      when 'base64'
+        ActiveSupport::Base64.decode64(bin)
+      else
+        bin
+      end
+    end
+
+    def _parse_file(file, entity)
+      f = StringIO.new(ActiveSupport::Base64.decode64(file))
+      f.extend(FileLike)
+      f.original_filename = entity['name']
+      f.content_type = entity['content_type']
+      f
+    end
   end
 
   XmlMini.backend = 'REXML'

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta3
-  version: 3.0.0.beta3
+  - beta4
+  version: 3.0.0.beta4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,65 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 6
-        version: 0.3.6
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 16
-        version: 0.3.16
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: builder
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: memcache-client
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 5
-        version: 1.7.5
-  type: :runtime
-  version_requirements: *id004
+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.
 email: david@loudthinking.com
 executables: []
@@ -91,6 +36,7 @@ files:
 - lib/active_support/basic_object.rb
 - lib/active_support/benchmarkable.rb
 - lib/active_support/buffered_logger.rb
+- lib/active_support/builder.rb
 - lib/active_support/cache/compressed_mem_cache_store.rb
 - lib/active_support/cache/file_store.rb
 - lib/active_support/cache/mem_cache_store.rb
@@ -199,6 +145,7 @@ files:
 - lib/active_support/core_ext/string/access.rb
 - lib/active_support/core_ext/string/behavior.rb
 - lib/active_support/core_ext/string/conversions.rb
+- lib/active_support/core_ext/string/encoding.rb
 - lib/active_support/core_ext/string/exclude.rb
 - lib/active_support/core_ext/string/filters.rb
 - lib/active_support/core_ext/string/inflections.rb
@@ -246,7 +193,7 @@ files:
 - lib/active_support/message_verifier.rb
 - lib/active_support/multibyte/chars.rb
 - lib/active_support/multibyte/exceptions.rb
-- lib/active_support/multibyte/unicode_database.rb
+- lib/active_support/multibyte/unicode.rb
 - lib/active_support/multibyte/utils.rb
 - lib/active_support/multibyte.rb
 - lib/active_support/notifications/fanout.rb