diff options
| -rw-r--r-- | activesupport/Rakefile | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json.rb | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json/encoders/core.rb | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/activesupport/Rakefile b/activesupport/Rakefile index 74a8635a9c..0ae800e377 100644 --- a/activesupport/Rakefile +++ b/activesupport/Rakefile @@ -29,7 +29,7 @@ dist_dirs = [ "lib", "test"] Rake::RDocTask.new { |rdoc| rdoc.rdoc_dir = 'doc' rdoc.title = "Active Support -- Utility classes and standard library extensions from Rails" - rdoc.options << '--line-numbers' << '--inline-source' << '--main README' + rdoc.options << '--line-numbers' << '--inline-source' rdoc.template = "#{ENV['template']}.rb" if ENV['template'] rdoc.rdoc_files.include('README', 'CHANGELOG') rdoc.rdoc_files.include('lib/active_support.rb') diff --git a/activesupport/lib/active_support/json.rb b/activesupport/lib/active_support/json.rb index 943adebd35..7d5304ddd4 100644 --- a/activesupport/lib/active_support/json.rb +++ b/activesupport/lib/active_support/json.rb @@ -2,11 +2,12 @@ require 'active_support/json/encoders' module ActiveSupport module JSON #:nodoc: - class CircularReferenceError < StandardError; end + 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 + class Variable < String #:nodoc: def to_json self end diff --git a/activesupport/lib/active_support/json/encoders/core.rb b/activesupport/lib/active_support/json/encoders/core.rb index d3193af555..97f994ac9a 100644 --- a/activesupport/lib/active_support/json/encoders/core.rb +++ b/activesupport/lib/active_support/json/encoders/core.rb @@ -1,6 +1,6 @@ module ActiveSupport module JSON #:nodoc: - module Encoders + module Encoders #:nodoc: define_encoder Object do |object| object.instance_values.to_json end |