activerecord 1.6.0 → 1.7.0

data/lib/active_record/support/inflector.rb

@@ -1,84 +0,0 @@
-# The Inflector transforms words from singular to plural, class names to table names, modulized class names to ones without,
-# and class names to foreign keys.
-module Inflector 
-  extend self
-
-  def pluralize(word)
-    result = word.to_s.dup
-    plural_rules.each do |(rule, replacement)|
-      break if result.gsub!(rule, replacement)
-    end
-    return result
-  end
-
-  def singularize(word)
-    result = word.to_s.dup
-    singular_rules.each do |(rule, replacement)|
-      break if result.gsub!(rule, replacement)
-    end
-    return result
-  end
-
-  def camelize(lower_case_and_underscored_word)
-    lower_case_and_underscored_word.to_s.gsub(/(^|_)(.)/){$2.upcase}
-  end
-  
-  def underscore(camel_cased_word)
-    camel_cased_word.to_s.gsub(/([A-Z]+)([A-Z])/,'\1_\2').gsub(/([a-z])([A-Z])/,'\1_\2').downcase
-  end
-
-  def humanize(lower_case_and_underscored_word)
-    lower_case_and_underscored_word.to_s.gsub(/_/, " ").capitalize
-  end
-
-  def demodulize(class_name_in_module)
-    class_name_in_module.to_s.gsub(/^.*::/, '')
-  end
-
-  def tableize(class_name)
-    pluralize(underscore(class_name))
-  end
-  
-  def classify(table_name)
-    camelize(singularize(table_name))
-  end
-
-  def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
-    Inflector.underscore(Inflector.demodulize(class_name)) + 
-      (separate_class_name_and_id_with_underscore ? "_id" : "id")
-  end
-  
-  private
-    def plural_rules #:doc:
-      [
-        [/(x|ch|ss|sh)$/, '\1es'],               # search, switch, fix, box, process, address
-        [/([^aeiouy]|qu)ies$/, '\1y'],
-        [/([^aeiouy]|qu)y$/, '\1ies'],        # query, ability, agency
-        [/(?:([^f])fe|([lr])f)$/, '\1\2ves'], # half, safe, wife
-        [/sis$/, 'ses'],                      # basis, diagnosis
-        [/([ti])um$/, '\1a'],                 # datum, medium
-        [/person$/, 'people'],                # person, salesperson
-        [/man$/, 'men'],                      # man, woman, spokesman
-        [/child$/, 'children'],               # child
-        [/s$/, 's'],                          # no change (compatibility)
-        [/$/, 's']
-      ]
-    end
-
-    def singular_rules #:doc:
-      [
-        [/(x|ch|ss)es$/, '\1'],
-        [/movies$/, 'movie'],
-        [/([^aeiouy]|qu)ies$/, '\1y'],
-        [/([lr])ves$/, '\1f'],
-        [/([^f])ves$/, '\1fe'],
-        [/(analy|ba|diagno|parenthe|progno|synop|the)ses$/, '\1sis'],
-        [/([ti])a$/, '\1um'],
-        [/people$/, 'person'],
-        [/men$/, 'man'],
-        [/status$/, 'status'],
-        [/children$/, 'child'],
-        [/s$/, '']
-      ]
-    end
-end

data/lib/active_record/support/misc.rb

@@ -1,8 +0,0 @@
-def silence_warnings
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  begin
-    yield
-  ensure
-    $VERBOSE = old_verbose
-  end
-end

data/lib/active_record/support/module_attribute_accessors.rb

@@ -1,57 +0,0 @@
-# Extends the module object with module and instance accessors for class attributes, 
-# just like the native attr* accessors for instance attributes.
-class Module # :nodoc:
-  def mattr_reader(*syms)
-    syms.each do |sym|
-      class_eval <<-EOS
-        if ! defined? @@#{sym.id2name}
-          @@#{sym.id2name} = nil
-        end
-        
-        def self.#{sym.id2name}
-          @@#{sym}
-        end
-
-        def #{sym.id2name}
-          @@#{sym}
-        end
-
-        def call_#{sym.id2name}
-          case @@#{sym.id2name}
-            when Symbol then send(@@#{sym})
-            when Proc   then @@#{sym}.call(self)
-            when String then @@#{sym}
-            else nil
-          end
-        end
-      EOS
-    end
-  end
-  
-  def mattr_writer(*syms)
-    syms.each do |sym|
-      class_eval <<-EOS
-        if ! defined? @@#{sym.id2name}
-          @@#{sym.id2name} = nil
-        end
-        
-        def self.#{sym.id2name}=(obj)
-          @@#{sym.id2name} = obj
-        end
-
-        def self.set_#{sym.id2name}(obj)
-          @@#{sym.id2name} = obj
-        end
-
-        def #{sym.id2name}=(obj)
-          @@#{sym} = obj
-        end
-      EOS
-    end
-  end
-  
-  def mattr_accessor(*syms)
-    mattr_reader(*syms)
-    mattr_writer(*syms)
-  end
-end