Skip to content
This repository
Browse code

fixes doc generation

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

0 notes on commit 9fd9e5d

Please sign in to comment.
Something went wrong with that request. Please try again.