Permalink
Browse files

fixes doc generation

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information...
fxn authored and jeremy committed Feb 10, 2010
1 parent 97650bf commit 9fd9e5d4f7ce96dd10c775bf46be75cf49e070f4
Showing with 18 additions and 15 deletions.
  1. +4 −0 Rakefile
  2. +11 −0 activemodel/CHANGELOG
  3. +0 −12 activemodel/CHANGES
  4. +3 −3 activemodel/Rakefile
View
@@ -104,6 +104,10 @@ Rake::RDocTask.new do |rdoc|
rdoc.rdoc_files.include('activesupport/CHANGELOG')
rdoc.rdoc_files.include('activesupport/lib/active_support/**/*.rb')
rdoc.rdoc_files.exclude('activesupport/lib/active_support/vendor/*')
+
+ rdoc.rdoc_files.include('activemodel/README')
+ rdoc.rdoc_files.include('activemodel/CHANGELOG')
+ rdoc.rdoc_files.include('activemodel/lib/active_model/**/*.rb')
end
# Enhance rdoc task to copy referenced images also
View
@@ -1,5 +1,16 @@
*Edge*
+* ActiveModel::Observer#add_observer!
+
+ It has a custom hook to define after_find that should really be in a
+ ActiveRecord::Observer subclass:
+
+ def add_observer!(klass)
+ klass.add_observer(self)
+ klass.class_eval 'def after_find() end' unless
+ klass.respond_to?(:after_find)
+ end
+
* Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 [DHH]
* Add validates_format_of :without => /regexp/ option. #430 [Elliot Winkler, Peer Allan]
View
@@ -1,12 +0,0 @@
-Changes from extracting bits to ActiveModel
-
-* ActiveModel::Observer#add_observer!
-
- It has a custom hook to define after_find that should really be in a
- ActiveRecord::Observer subclass:
-
- def add_observer!(klass)
- klass.add_observer(self)
- klass.class_eval 'def after_find() end' unless
- klass.respond_to?(:after_find)
- end
View
@@ -32,13 +32,13 @@ require 'rake/rdoctask'
# Generate the RDoc documentation
Rake::RDocTask.new do |rdoc|
- rdoc.rdoc_dir = "#{dir}/doc"
+ rdoc.rdoc_dir = "doc"
rdoc.title = "Active Model"
rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
rdoc.options << '--charset' << 'utf-8'
rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : '../doc/template/horo'
- rdoc.rdoc_files.include("#{dir}/README", "#{dir}/CHANGES")
- rdoc.rdoc_files.include("#{dir}/lib/**/*.rb")
+ rdoc.rdoc_files.include("README", "CHANGELOG")
+ rdoc.rdoc_files.include("lib/**/*.rb")
end

0 comments on commit 9fd9e5d

Please sign in to comment.