Merge remote branch 'mainstream/master'

Conflicts:
	railties/README
	railties/guides/source/active_support_core_extensions.textile
	railties/guides/source/getting_started.textile
	railties/lib/generators/rails/app/templates/README

5 files changed, 25 insertions, 18 deletions

diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index 7489c0daa5..eae337e737 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -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]
diff --git a/activemodel/CHANGES b/activemodel/CHANGES
deleted file mode 100644
index 217a6d6bf7..0000000000
--- a/activemodel/CHANGES
+++ /dev/null
@@ -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
diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index f098ce0671..14c02f183f 100755
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -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
 
 
@@ -50,3 +50,10 @@ spec = eval(File.read("#{dir}/activemodel.gemspec"))
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
+
+desc "Release to gemcutter"
+task :release => :package do
+  require 'rake/gemcutter'
+  Rake::Gemcutter::Tasks.new(spec).define
+  Rake::Task['gem:push'].invoke
+end
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec
index 64ae6e0760..b4fbe26d97 100644
--- a/activemodel/activemodel.gemspec
+++ b/activemodel/activemodel.gemspec
@@ -1,9 +1,10 @@
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name = 'activemodel'
-  s.version = '3.0.0.beta'
+  s.version = '3.0.0.beta1'
   s.summary = "A toolkit for building other modeling frameworks like ActiveRecord"
   s.description = %q{Extracts common modeling concerns from ActiveRecord to share between similar frameworks like ActiveResource.}
+  s.required_ruby_version = '>= 1.8.7'
 
   s.author = "David Heinemeier Hansson"
   s.email = "david@loudthinking.com"
@@ -12,7 +13,7 @@ Gem::Specification.new do |s|
 
   s.has_rdoc = true
 
-  s.add_dependency('activesupport', '= 3.0.0.beta')
+  s.add_dependency('activesupport', '= 3.0.0.beta1')
 
   s.require_path = 'lib'
   s.files = Dir["CHANGELOG", "MIT-LICENSE", "README", "lib/**/*"]
diff --git a/activemodel/lib/active_model/version.rb b/activemodel/lib/active_model/version.rb
index f569447bc8..d51423ae1b 100644
--- a/activemodel/lib/active_model/version.rb
+++ b/activemodel/lib/active_model/version.rb
@@ -2,7 +2,7 @@ module ActiveModel
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = "0.beta"
+    TINY  = "0.beta1"
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end