From 3202fbabe6df3591d7e2c35727ea9c8b68df8828 Mon Sep 17 00:00:00 2001 From: Sam Stephenson Date: Sun, 18 Mar 2007 07:05:58 +0000 Subject: Refactor ActiveSupport::JSON to be less obtuse. Add support for JSON decoding by way of Syck with ActiveSupport::JSON.decode(json_string). Prevent hash keys that are JavaScript reserved words from being unquoted during encoding. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6443 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../lib/active_support/core_ext/object/extending.rb | 16 ++++++++-------- activesupport/lib/active_support/core_ext/object/misc.rb | 11 +---------- 2 files changed, 9 insertions(+), 18 deletions(-) (limited to 'activesupport/lib/active_support/core_ext/object') diff --git a/activesupport/lib/active_support/core_ext/object/extending.rb b/activesupport/lib/active_support/core_ext/object/extending.rb index 8a82f71c0f..0815909410 100644 --- a/activesupport/lib/active_support/core_ext/object/extending.rb +++ b/activesupport/lib/active_support/core_ext/object/extending.rb @@ -1,9 +1,9 @@ -class Object #:nodoc: - def remove_subclasses_of(*superclasses) +class Object + def remove_subclasses_of(*superclasses) #:nodoc: Class.remove_class(*subclasses_of(*superclasses)) end - def subclasses_of(*superclasses) + def subclasses_of(*superclasses) #:nodoc: subclasses = [] ObjectSpace.each_object(Class) do |k| next unless # Exclude this class unless @@ -16,23 +16,23 @@ class Object #:nodoc: subclasses end - def extended_by + def extended_by #:nodoc: ancestors = class << self; ancestors end ancestors.select { |mod| mod.class == Module } - [ Object, Kernel ] end - def copy_instance_variables_from(object, exclude = []) + def copy_instance_variables_from(object, exclude = []) #:nodoc: exclude += object.protected_instance_variables if object.respond_to? :protected_instance_variables instance_variables = object.instance_variables - exclude.map { |name| name.to_s } instance_variables.each { |name| instance_variable_set(name, object.instance_variable_get(name)) } end - def extend_with_included_modules_from(object) + def extend_with_included_modules_from(object) #:nodoc: object.extended_by.each { |mod| extend mod } end - def instance_values + def instance_values #:nodoc: instance_variables.inject({}) do |values, name| values[name[1..-1]] = instance_variable_get(name) values @@ -40,7 +40,7 @@ class Object #:nodoc: end unless defined? instance_exec # 1.9 - def instance_exec(*arguments, &block) + def instance_exec(*arguments, &block) #:nodoc: block.bind(self)[*arguments] end end diff --git a/activesupport/lib/active_support/core_ext/object/misc.rb b/activesupport/lib/active_support/core_ext/object/misc.rb index d82bb929a2..ea893c54b8 100644 --- a/activesupport/lib/active_support/core_ext/object/misc.rb +++ b/activesupport/lib/active_support/core_ext/object/misc.rb @@ -43,21 +43,12 @@ class Object yield ActiveSupport::OptionMerger.new(self, options) end - # Dumps object in JSON (JavaScript Object Notation). See www.json.org for more info. - # - # Account.find(1).to_json - # => "{attributes: {username: \"foo\", id: \"1\", password: \"bar\"}}" - # - def to_json - ActiveSupport::JSON.encode(self) - end - # A duck-type assistant method. For example, ActiveSupport extends Date # to define an acts_like_date? method, and extends Time to define # acts_like_time?. As a result, we can do "x.acts_like?(:time)" and # "x.acts_like?(:date)" to do duck-type-safe comparisons, since classes that # we want to act like Time simply need to define an acts_like_time? method. def acts_like?(duck) - respond_to? :"acts_like_#{duck}?" + respond_to? "acts_like_#{duck}?" end end \ No newline at end of file -- cgit v1.2.3