activesupport 2.3.8 → 2.3.9.pre

data/lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb

@@ -0,0 +1,29 @@
+class Hash
+  def slice(*keep_keys)
+    h = {}
+    keep_keys.each { |key| h[key] = fetch(key) }
+    h
+  end unless Hash.method_defined?(:slice)
+
+  def except(*less_keys)
+    slice(*keys - less_keys)
+  end unless Hash.method_defined?(:except)
+
+  def deep_symbolize_keys
+    inject({}) { |result, (key, value)|
+      value = value.deep_symbolize_keys if value.is_a?(Hash)
+      result[(key.to_sym rescue key) || key] = value
+      result
+    }
+  end unless Hash.method_defined?(:deep_symbolize_keys)
+
+  # deep_merge_hash! by Stefan Rusterholz, see http://www.ruby-forum.com/topic/142809
+  MERGER = proc do |key, v1, v2|
+    Hash === v1 && Hash === v2 ? v1.merge(v2, &MERGER) : v2
+  end
+  
+  def deep_merge!(data)
+    merge!(data, &MERGER)
+  end unless Hash.method_defined?(:deep_merge!)
+end
+

data/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/core_ext/string/interpolate.rb

@@ -7,13 +7,13 @@
   You may redistribute it and/or modify it under the same license terms as Ruby.
 =end
 
-if RUBY_VERSION < '1.9'
-
+begin
+  raise ArgumentError if ("a %{x}" % {:x=>'b'}) != 'a b'
+rescue ArgumentError
   # KeyError is raised by String#% when the string contains a named placeholder
   # that is not contained in the given arguments hash. Ruby 1.9 includes and
   # raises this exception natively. We define it to mimic Ruby 1.9's behaviour
   # in Ruby 1.8.x
-
   class KeyError < IndexError
     def initialize(message = nil)
       super(message || "key not found")
@@ -24,7 +24,6 @@ if RUBY_VERSION < '1.9'
   #
   # String#% method which accept "named argument". The translator can know
   # the meaning of the msgids using "named argument" instead of %s/%d style.
-
   class String
     # For older ruby versions, such as ruby-1.8.5
     alias :bytesize :size unless instance_methods.find {|m| m.to_s == 'bytesize'}

data/lib/active_support/vendor/{i18n-0.3.7 → i18n-0.4.1}/i18n/gettext.rb

@@ -5,6 +5,8 @@ module I18n
     PLURAL_SEPARATOR  = "\001"
     CONTEXT_SEPARATOR = "\004"
 
+    autoload :Helpers, 'i18n/gettext/helpers'
+
     @@plural_keys = { :en => [:one, :other] }
 
     class << self

data/lib/active_support/vendor/{i18n-0.3.7/i18n/helpers/gettext.rb → i18n-0.4.1/i18n/gettext/helpers.rb}

@@ -2,12 +2,12 @@
 require 'i18n/gettext'
 
 module I18n
-  module Helpers
+  module Gettext
     # Implements classical Gettext style accessors. To use this include the
     # module to the global namespace or wherever you want to use it.
     #
     #   include I18n::Helpers::Gettext
-    module Gettext
+    module Helpers
       def gettext(msgid, options = {})
         I18n.t(msgid, { :default => msgid, :separator => '|' }.merge(options))
       end

data/lib/active_support/vendor/i18n-0.4.1/i18n/version.rb

@@ -0,0 +1,3 @@
+module I18n
+  VERSION = "0.4.1"
+end

data/lib/active_support/version.rb

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

data/lib/active_support/whiny_nil.rb

@@ -45,7 +45,7 @@ class NilClass
     def method_missing(method, *args, &block)
       # Ruby 1.9.2: disallow explicit coercion via method_missing.
       if method == :to_ary || method == :to_str
-        raise NoMethodError, "undefined method `#{method}' for nil:NilClass"
+        super
       elsif klass = METHOD_CLASS_MAP[method]
         raise_nil_warning_for klass, method, caller
       else

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activesupport
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 2
   - 3
-  - 8
-  version: 2.3.8
+  - 9
+  - pre
+  version: 2.3.9.pre
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -07:00
+date: 2010-08-29 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +59,7 @@ files:
 - lib/active_support/core_ext/blank.rb
 - lib/active_support/core_ext/cgi/escape_skipping_slashes.rb
 - lib/active_support/core_ext/cgi.rb
+- lib/active_support/core_ext/class/attribute.rb
 - lib/active_support/core_ext/class/attribute_accessors.rb
 - lib/active_support/core_ext/class/delegating_attributes.rb
 - lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -96,6 +98,7 @@ files:
 - lib/active_support/core_ext/kernel/debugger.rb
 - lib/active_support/core_ext/kernel/reporting.rb
 - lib/active_support/core_ext/kernel/requires.rb
+- lib/active_support/core_ext/kernel/singleton_class.rb
 - lib/active_support/core_ext/kernel.rb
 - lib/active_support/core_ext/load_error.rb
 - lib/active_support/core_ext/logger.rb
@@ -108,6 +111,7 @@ files:
 - lib/active_support/core_ext/module/introspection.rb
 - lib/active_support/core_ext/module/loading.rb
 - lib/active_support/core_ext/module/model_naming.rb
+- lib/active_support/core_ext/module/remove_method.rb
 - lib/active_support/core_ext/module/synchronization.rb
 - lib/active_support/core_ext/module.rb
 - lib/active_support/core_ext/name_error.rb
@@ -214,42 +218,41 @@ files:
 - lib/active_support/vendor/builder-2.1.2/builder/xmlevents.rb
 - lib/active_support/vendor/builder-2.1.2/builder/xmlmarkup.rb
 - lib/active_support/vendor/builder-2.1.2/builder.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record/missing.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record/store_procs.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record/translation.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/base.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/cache.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/cascade.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/chain.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/cldr.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/fallbacks.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/fast.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/gettext.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/helpers.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/interpolation_compiler.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/links.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/metadata.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/pluralization.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend/simple.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/backend.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/except.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/hash/slice.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/object/meta_class.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/core_ext/string/interpolate.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/exceptions.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/gettext/po_parser.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/gettext.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/helpers/gettext.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/helpers.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/locale/fallbacks.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/locale/tag/parents.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/locale/tag/rfc4646.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/locale/tag/simple.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/locale/tag.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/locale.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n/version.rb
-- lib/active_support/vendor/i18n-0.3.7/i18n.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/missing.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/store_procs.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record/translation.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/active_record.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/base.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/cache.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/cascade.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/chain.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/cldr.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/fallbacks.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/flatten.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/gettext.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/interpolation_compiler.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/key_value.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/memoize.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/metadata.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/pluralization.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/simple.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend/transliterator.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/backend.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/config.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/hash.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/core_ext/string/interpolate.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/exceptions.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/gettext/helpers.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/gettext/po_parser.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/gettext.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/locale/fallbacks.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/parents.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/rfc4646.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag/simple.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/locale/tag.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/locale.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n/version.rb
+- lib/active_support/vendor/i18n-0.4.1/i18n.rb
 - lib/active_support/vendor/memcache-client-1.7.4/memcache.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone.rb
 - lib/active_support/vendor/tzinfo-0.3.12/tzinfo/data_timezone_info.rb
@@ -419,11 +422,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: activesupport

data/lib/active_support/vendor/i18n-0.3.7/i18n/backend/active_record.rb

@@ -1,66 +0,0 @@
-require 'i18n/backend/base'
-require 'i18n/backend/active_record/translation'
-
-module I18n
-  module Backend
-    class ActiveRecord
-      autoload :Missing,     'i18n/backend/active_record/missing'
-      autoload :StoreProcs,  'i18n/backend/active_record/store_procs'
-      autoload :Translation, 'i18n/backend/active_record/translation'
-
-      include Base, Links
-
-      def reload!
-      end
-
-      def store_translations(locale, data, options = {})
-        separator = options[:separator] || I18n.default_separator
-        wind_keys(data, separator).each do |key, value|
-          store_link(locale, key, value) if value.is_a?(Symbol)
-          Translation.locale(locale).lookup(expand_keys(key, separator), separator).delete_all
-          Translation.create(:locale => locale.to_s, :key => key.to_s, :value => value)
-        end
-      end
-
-      def available_locales
-        begin
-          Translation.available_locales
-        rescue ::ActiveRecord::StatementInvalid
-          []
-        end
-      end
-
-      protected
-
-        def lookup(locale, key, scope = [], options = {})
-          return unless key
-
-          separator = options[:separator] || I18n.default_separator
-
-          key = resolve_link(locale, key)
-          key = (Array(scope) + Array(key)).join(separator)
-          result = Translation.locale(locale).lookup(key, separator).all
-
-          if result.empty?
-            return nil
-          elsif result.first.key == key
-            return result.first.value
-          else
-            chop_range = (key.size + separator.size)..-1
-            result = result.inject({}) do |hash, r|
-              hash[r.key.slice(chop_range)] = r.value
-              hash
-            end
-            deep_symbolize_keys(unwind_keys(result, separator))
-          end
-        end
-
-        # For a key :'foo.bar.baz' return ['foo', 'foo.bar', 'foo.bar.baz']
-        def expand_keys(key, separator = I18n.default_separator)
-          key.to_s.split(separator).inject([]) do |keys, key|
-            keys << [keys.last, key].compact.join(separator)
-          end
-        end
-    end
-  end
-end

data/lib/active_support/vendor/i18n-0.3.7/i18n/backend/fast.rb

@@ -1,69 +0,0 @@
-# encoding: utf-8
-
-# The Fast module contains optimizations that can tremendously speed up the
-# lookup process on the Simple backend. It works by flattening the nested
-# translation hash to a flat hash (e.g. { :a => { :b => 'c' } } becomes
-# { :'a.b' => 'c' }).
-#
-# To enable these optimizations you can simply include the Fast module to
-# the Simple backend:
-#
-#   I18n::Backend::Simple.send(:include, I18n::Backend::Fast)
-module I18n
-  module Backend
-    module Fast
-      include Links
-
-      def reset_flattened_translations!
-        @flattened_translations = nil
-      end
-
-      def flattened_translations
-        @flattened_translations ||= flatten_translations(translations)
-      end
-
-      def merge_translations(locale, data, options = {})
-        super
-        reset_flattened_translations!
-      end
-
-      def init_translations
-        super
-        reset_flattened_translations!
-      end
-
-      protected
-        def flatten_translations(translations)
-          # don't flatten locale roots
-          translations.inject({}) do |result, (locale, translations)|
-            result[locale] = wind_keys(translations, nil, true)
-            result[locale].each do |key, value|
-              store_link(locale, key, value) if value.is_a?(Symbol)
-            end
-            result
-          end
-        end
-
-        def lookup(locale, key, scope = nil, options = {})
-          return unless key
-          init_translations unless initialized?
-
-          return nil unless flattened_translations.has_key?(locale.to_sym)
-
-          separator = options[:separator]
-          if separator && I18n.default_separator != separator
-            key   = cleanup_non_standard_separator(key, separator)
-            scope = Array(scope).map{|k| cleanup_non_standard_separator(k, separator)} if scope
-          end
-          
-          key = resolve_link(locale, key)
-          key = (Array(scope) + [key]).join(I18n.default_separator) if scope
-          flattened_translations[locale.to_sym][key.to_sym]
-        end
-
-        def cleanup_non_standard_separator(key, user_separator)
-          escape_default_separator(key).tr(user_separator, I18n.default_separator)
-        end
-    end
-  end
-end

data/lib/active_support/vendor/i18n-0.3.7/i18n/backend/helpers.rb

@@ -1,68 +0,0 @@
-module I18n
-  module Backend
-    module Helpers
-      SEPARATOR_ESCAPE_CHAR = "\001"
-
-      # Return a new hash with all keys and nested keys converted to symbols.
-      def deep_symbolize_keys(hash)
-        hash.inject({}) { |result, (key, value)|
-          value = deep_symbolize_keys(value) if value.is_a?(Hash)
-          result[(key.to_sym rescue key) || key] = value
-          result
-        }
-      end
-
-      # Flatten keys for nested Hashes by chaining up keys using the separator
-      #   >> { "a" => { "b" => { "c" => "d", "e" => "f" }, "g" => "h" }, "i" => "j"}.wind
-      #   => { "a.b.c" => "d", "a.b.e" => "f", "a.g" => "h", "i" => "j" }
-      def wind_keys(hash, separator = nil, subtree = false, prev_key = nil, result = {}, orig_hash=hash)
-        separator ||= I18n.default_separator
-
-        hash.each_pair do |key, value|
-          key = escape_default_separator(key, separator)
-          curr_key = [prev_key, key].compact.join(separator).to_sym
-
-          if value.is_a?(Hash)
-            result[curr_key] = value if subtree
-            wind_keys(value, separator, subtree, curr_key, result, orig_hash)
-          else
-            result[unescape_default_separator(curr_key)] = value
-          end
-        end
-
-        result
-      end
-
-      def escape_default_separator(key, separator=nil)
-        key.to_s.tr(separator || I18n.default_separator, SEPARATOR_ESCAPE_CHAR)
-      end
-      
-      def unescape_default_separator(key, separator=nil)
-        key.to_s.tr(SEPARATOR_ESCAPE_CHAR, separator || I18n.default_separator).to_sym
-      end
-
-      # Expand keys chained by the the given separator through nested Hashes
-      #   >> { "a.b.c" => "d", "a.b.e" => "f", "a.g" => "h", "i" => "j" }.unwind
-      #   => { "a" => { "b" => { "c" => "d", "e" => "f" }, "g" => "h" }, "i" => "j"}
-      def unwind_keys(hash, separator = ".")
-        result = {}
-        hash.each do |key, value|
-          keys = key.to_s.split(separator)
-          curr = result
-          curr = curr[keys.shift] ||= {} while keys.size > 1
-          curr[keys.shift] = value
-        end
-        result
-      end
-
-      # # Flatten the given array once
-      # def flatten_once(array)
-      #   result = []
-      #   for element in array # a little faster than each
-      #     result.push(*element)
-      #   end
-      #   result
-      # end
-    end
-  end
-end