activesupport 1.2.5 → 1.3.0

data/lib/active_support/inflections.rb

@@ -1,53 +1,53 @@
 Inflector.inflections do |inflect|
-  inflect.plural /$/, 's'
-  inflect.plural /s$/i, 's'
-  inflect.plural /(ax|test)is$/i, '\1es'
-  inflect.plural /(octop|vir)us$/i, '\1i'
-  inflect.plural /(alias|status)$/i, '\1es'
-  inflect.plural /(bu)s$/i, '\1ses'
-  inflect.plural /(buffal|tomat)o$/i, '\1oes'
-  inflect.plural /([ti])um$/i, '\1a'
-  inflect.plural /sis$/i, 'ses'
-  inflect.plural /(?:([^f])fe|([lr])f)$/i, '\1\2ves'
-  inflect.plural /(hive)$/i, '\1s'
-  inflect.plural /([^aeiouy]|qu)y$/i, '\1ies'
-  inflect.plural /([^aeiouy]|qu)ies$/i, '\1y'
-  inflect.plural /(x|ch|ss|sh)$/i, '\1es'
-  inflect.plural /(matr|vert|ind)ix|ex$/i, '\1ices'
-  inflect.plural /([m|l])ouse$/i, '\1ice'
-  inflect.plural /^(ox)$/i, '\1en'
-  inflect.plural /(quiz)$/i, '\1zes'
+  inflect.plural(/$/, 's')
+  inflect.plural(/s$/i, 's')
+  inflect.plural(/(ax|test)is$/i, '\1es')
+  inflect.plural(/(octop|vir)us$/i, '\1i')
+  inflect.plural(/(alias|status)$/i, '\1es')
+  inflect.plural(/(bu)s$/i, '\1ses')
+  inflect.plural(/(buffal|tomat)o$/i, '\1oes')
+  inflect.plural(/([ti])um$/i, '\1a')
+  inflect.plural(/sis$/i, 'ses')
+  inflect.plural(/(?:([^f])fe|([lr])f)$/i, '\1\2ves')
+  inflect.plural(/(hive)$/i, '\1s')
+  inflect.plural(/([^aeiouy]|qu)y$/i, '\1ies')
+  inflect.plural(/([^aeiouy]|qu)ies$/i, '\1y')
+  inflect.plural(/(x|ch|ss|sh)$/i, '\1es')
+  inflect.plural(/(matr|vert|ind)ix|ex$/i, '\1ices')
+  inflect.plural(/([m|l])ouse$/i, '\1ice')
+  inflect.plural(/^(ox)$/i, '\1en')
+  inflect.plural(/(quiz)$/i, '\1zes')
 
-  inflect.singular /s$/i, ''
-  inflect.singular /(n)ews$/i, '\1ews'
-  inflect.singular /([ti])a$/i, '\1um'
-  inflect.singular /((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis'
-  inflect.singular /(^analy)ses$/i, '\1sis'
-  inflect.singular /([^f])ves$/i, '\1fe'
-  inflect.singular /(hive)s$/i, '\1'
-  inflect.singular /(tive)s$/i, '\1'
-  inflect.singular /([lr])ves$/i, '\1f'
-  inflect.singular /([^aeiouy]|qu)ies$/i, '\1y'
-  inflect.singular /(s)eries$/i, '\1eries'
-  inflect.singular /(m)ovies$/i, '\1ovie'
-  inflect.singular /(x|ch|ss|sh)es$/i, '\1'
-  inflect.singular /([m|l])ice$/i, '\1ouse'
-  inflect.singular /(bus)es$/i, '\1'
-  inflect.singular /(o)es$/i, '\1'
-  inflect.singular /(shoe)s$/i, '\1'
-  inflect.singular /(cris|ax|test)es$/i, '\1is'
-  inflect.singular /([octop|vir])i$/i, '\1us'
-  inflect.singular /(alias|status)es$/i, '\1'
-  inflect.singular /^(ox)en/i, '\1'
-  inflect.singular /(vert|ind)ices$/i, '\1ex'
-  inflect.singular /(matr)ices$/i, '\1ix'
-  inflect.singular /(quiz)zes$/i, '\1'
+  inflect.singular(/s$/i, '')
+  inflect.singular(/(n)ews$/i, '\1ews')
+  inflect.singular(/([ti])a$/i, '\1um')
+  inflect.singular(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i, '\1\2sis')
+  inflect.singular(/(^analy)ses$/i, '\1sis')
+  inflect.singular(/([^f])ves$/i, '\1fe')
+  inflect.singular(/(hive)s$/i, '\1')
+  inflect.singular(/(tive)s$/i, '\1')
+  inflect.singular(/([lr])ves$/i, '\1f')
+  inflect.singular(/([^aeiouy]|qu)ies$/i, '\1y')
+  inflect.singular(/(s)eries$/i, '\1eries')
+  inflect.singular(/(m)ovies$/i, '\1ovie')
+  inflect.singular(/(x|ch|ss|sh)es$/i, '\1')
+  inflect.singular(/([m|l])ice$/i, '\1ouse')
+  inflect.singular(/(bus)es$/i, '\1')
+  inflect.singular(/(o)es$/i, '\1')
+  inflect.singular(/(shoe)s$/i, '\1')
+  inflect.singular(/(cris|ax|test)es$/i, '\1is')
+  inflect.singular(/([octop|vir])i$/i, '\1us')
+  inflect.singular(/(alias|status)es$/i, '\1')
+  inflect.singular(/^(ox)en/i, '\1')
+  inflect.singular(/(vert|ind)ices$/i, '\1ex')
+  inflect.singular(/(matr)ices$/i, '\1ix')
+  inflect.singular(/(quiz)zes$/i, '\1')
 
-  inflect.irregular 'person', 'people'
-  inflect.irregular 'man', 'men'
-  inflect.irregular 'child', 'children'
-  inflect.irregular 'sex', 'sexes'
-  inflect.irregular 'move', 'moves'
+  inflect.irregular('person', 'people')
+  inflect.irregular('man', 'men')
+  inflect.irregular('child', 'children')
+  inflect.irregular('sex', 'sexes')
+  inflect.irregular('move', 'moves')
 
-  inflect.uncountable %w( equipment information rice money species series fish sheep )
+  inflect.uncountable(%w(equipment information rice money species series fish sheep))
 end

data/lib/active_support/inflector.rb

@@ -109,8 +109,12 @@ module Inflector
     end
   end
 
-  def camelize(lower_case_and_underscored_word)
-    lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+  def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)
+    if first_letter_in_uppercase
+      lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::" + $1.upcase }.gsub(/(^|_)(.)/) { $2.upcase }
+    else
+      lower_case_and_underscored_word.first + camelize(lower_case_and_underscored_word)[1..-1]
+    end
   end
 
   def titleize(word)
@@ -118,7 +122,15 @@ module Inflector
   end
   
   def underscore(camel_cased_word)
-    camel_cased_word.to_s.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
+    camel_cased_word.to_s.gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").
+      downcase
+  end
+  
+  def dasherize(underscored_word)
+    underscored_word.gsub(/_/, '-')
   end
 
   def humanize(lower_case_and_underscored_word)
@@ -143,9 +155,9 @@ module Inflector
 
   def constantize(camel_cased_word)
     raise NameError, "#{camel_cased_word.inspect} is not a valid constant name!" unless
-      camel_cased_word.split("::").all? { |part| /^[A-Z]\w*$/ =~ part }
+      /^(::)?([A-Z]\w*)(::[A-Z]\w*)*$/ =~ camel_cased_word
     
-    camel_cased_word = "::#{camel_cased_word}" unless camel_cased_word[0, 2] == '::'
+    camel_cased_word = "::#{camel_cased_word}" unless $1
     Object.module_eval(camel_cased_word, __FILE__, __LINE__)
   end
 

data/lib/active_support/json.rb

@@ -0,0 +1,37 @@
+require 'active_support/json/encoders'
+
+module ActiveSupport
+  module JSON #:nodoc:
+    class CircularReferenceError < StandardError #:nodoc:
+    end
+    # returns the literal string as its JSON encoded form.  Useful for passing javascript variables into functions.
+    #
+    # page.call 'Element.show', ActiveSupport::JSON::Variable.new("$$(#items li)")
+    class Variable < String #:nodoc:
+      def to_json
+        self
+      end
+    end
+
+    class << self
+      REFERENCE_STACK_VARIABLE = :json_reference_stack
+      
+      def encode(value)
+        raise_on_circular_reference(value) do
+          Encoders[value.class].call(value)
+        end
+      end
+      
+      protected
+        def raise_on_circular_reference(value)
+          stack = Thread.current[REFERENCE_STACK_VARIABLE] ||= []
+          raise CircularReferenceError, 'object references itself' if
+            stack.include? value
+          stack << value
+          yield
+        ensure
+          stack.pop
+        end
+    end
+  end
+end

data/lib/active_support/json/encoders.rb

@@ -0,0 +1,25 @@
+module ActiveSupport
+  module JSON #:nodoc:
+    module Encoders
+      mattr_accessor :encoders
+      @@encoders = {}
+
+      class << self        
+        def define_encoder(klass, &block)
+          encoders[klass] = block
+        end
+        
+        def [](klass)
+          klass.ancestors.each do |k|
+            encoder = encoders[k]
+            return encoder if encoder
+          end
+        end
+      end
+    end
+  end
+end
+
+Dir[File.dirname(__FILE__) + '/encoders/*.rb'].each do |file|
+  require file[0..-4]
+end

data/lib/active_support/json/encoders/core.rb

@@ -0,0 +1,65 @@
+module ActiveSupport
+  module JSON #:nodoc:
+    module Encoders #:nodoc:
+      define_encoder Object do |object|
+        object.instance_values.to_json
+      end
+      
+      define_encoder TrueClass do
+        'true'
+      end
+      
+      define_encoder FalseClass do
+        'false'
+      end
+      
+      define_encoder NilClass do
+        'null'
+      end
+      
+      define_encoder String do |string|
+        returning value = '"' do
+          string.each_char do |char|
+            value << case
+            when char == "\010":  '\b'
+            when char == "\f":    '\f'
+            when char == "\n":    '\n'
+            when char == "\r":    '\r'
+            when char == "\t":    '\t'
+            when char == '"':     '\"'
+            when char == '\\':    '\\\\'  
+            when char.length > 1: "\\u#{'%04x' % char.unpack('U').first}"
+            else;                 char
+            end
+          end
+          value << '"'
+        end
+      end
+      
+      define_encoder Numeric do |numeric|
+        numeric.to_s
+      end
+      
+      define_encoder Symbol do |symbol|
+        symbol.to_s.to_json
+      end
+
+      define_encoder Enumerable do |enumerable|
+        "[#{enumerable.map { |value| value.to_json } * ', '}]"
+      end
+      
+      define_encoder Hash do |hash|
+        returning result = '{' do
+          result << hash.map do |pair|
+            pair.map { |value| value.to_json } * ': '
+          end * ', '
+          result << '}'
+        end
+      end
+
+      define_encoder Regexp do |regexp|
+        regexp.inspect
+      end
+    end
+  end
+end

data/lib/active_support/option_merger.rb

@@ -0,0 +1,25 @@
+module ActiveSupport
+  class OptionMerger #:nodoc:
+    instance_methods.each do |method| 
+      undef_method(method) if method !~ /^(__|instance_eval)/
+    end
+    
+    def initialize(context, options)
+      @context, @options = context, options
+    end
+    
+    private
+      def method_missing(method, *arguments, &block)
+        merge_argument_options! arguments
+        @context.send(method, *arguments, &block)
+      end
+      
+      def merge_argument_options!(arguments)
+        arguments << if arguments.last.respond_to? :merge!
+          arguments.pop.dup.merge!(@options)
+        else
+          @options.dup
+        end  
+      end
+  end
+end

data/lib/active_support/ordered_options.rb

@@ -1,7 +1,5 @@
-class OrderedOptions < Array #:nodoc:
-  def []=(key, value)
-    key = key.to_sym
-    
+class OrderedHash < Array #:nodoc:
+  def []=(key, value)    
     if pair = find_pair(key)
       pair.pop
       pair << value
@@ -11,16 +9,12 @@ class OrderedOptions < Array #:nodoc:
   end
   
   def [](key)
-    pair = find_pair(key.to_sym)
+    pair = find_pair(key)
     pair ? pair.last : nil
   end
 
-  def method_missing(name, *args)
-    if name.to_s =~ /(.*)=$/
-      self[$1.to_sym] = args.first
-    else
-      self[name]
-    end
+  def keys
+    self.collect { |i| i.first }
   end
 
   private
@@ -28,4 +22,22 @@ class OrderedOptions < Array #:nodoc:
       self.each { |i| return i if i.first == key }
       return false
     end
+end
+
+class OrderedOptions < OrderedHash #:nodoc:
+  def []=(key, value)
+    super(key.to_sym, value)
+  end
+  
+  def [](key)
+    super(key.to_sym)
+  end
+
+  def method_missing(name, *args)
+    if name.to_s =~ /(.*)=$/
+      self[$1.to_sym] = args.first
+    else
+      self[name]
+    end
+  end
 end

data/lib/active_support/reloadable.rb

@@ -0,0 +1,30 @@
+# Classes that include this module will automatically be reloaded
+# by the Rails dispatcher when Dependencies.mechanism = :load.
+module Reloadable
+  class << self
+    def included(base) #nodoc:
+      raise TypeError, "Only Classes can be Reloadable!" unless base.is_a? Class
+      
+      unless base.respond_to?(:reloadable?)
+        class << base
+          define_method(:reloadable?) { true }
+        end
+      end
+    end
+    
+    def reloadable_classes
+      included_in_classes.select { |klass| klass.reloadable? }
+    end
+  end
+  
+  # Captures the common pattern where a base class should not be reloaded,
+  # but its subclasses should be.
+  module Subclasses
+    def self.included(base) #nodoc:
+      base.send :include, Reloadable
+      (class << base; self; end).send(:define_method, :reloadable?) do
+         base != self
+      end
+    end
+  end
+end

data/lib/active_support/vendor/builder.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+#--
+# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+require 'builder/xmlmarkup'
+require 'builder/xmlevents'

data/lib/active_support/vendor/builder/blankslate.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+module Builder #:nodoc:
+
+  # BlankSlate provides an abstract base class with no predefined
+  # methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
+  # BlankSlate is useful as a base class when writing classes that
+  # depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
+  class BlankSlate #:nodoc:
+    class << self
+      def hide(name)
+	      undef_method name if
+	        instance_methods.include?(name.to_s) and
+	        name !~ /^(__|instance_eval)/
+      end
+    end
+
+    instance_methods.each { |m| hide(m) }
+  end
+end
+
+# Since Ruby is very dynamic, methods added to the ancestors of
+# BlankSlate <em>after BlankSlate is defined</em> will show up in the
+# list of available BlankSlate methods.  We handle this by defining a hook in the Object and Kernel classes that will hide any defined 
+module Kernel #:nodoc:
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+    def method_added(name)
+      blank_slate_method_added(name)
+      return if self != Kernel
+      Builder::BlankSlate.hide(name)
+    end
+  end
+end
+
+class Object #:nodoc:
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+    def method_added(name)
+      blank_slate_method_added(name)
+      return  if self != Object
+      Builder::BlankSlate.hide(name)
+    end
+  end
+end