woodie · January 3, 2010 23:32 · Sep 5, 2010 · Sep 5, 2010 · Sep 5, 2010 · Sep 5, 2010
diff --git a/README.rdoc b/README.rdoc
@@ -1,4 +1,4 @@
-=Rails 2.3.9 on App Engine (DataMapper)
+=Rails 2.3.5 on App Engine (DataMapper)
 
 Do not use rvm (or install and run from JRuby). The google-appengine gem must install into your system MRI. The appengine-sdk gem includes a complete Java app server. We bootstrap Java from MRI, then your app runs inside a servlet container (with access to all the APIs) using the version of JRuby installed into each app.
 
@@ -11,19 +11,19 @@ See the TInyDS version also: http://gist.github.com/gists/269075
 One meta-gem provides the development environment
  sudo gem install google-appengine
 
-==Install Rails 2.3.9 with required patches
+==Install Rails 2.3.5 with required patches
 
 Install some gems you'll need 
- sudo gem install rails -v "2.3.9"
+ sudo gem install rails -v "2.3.5"
  sudo gem install rails_dm_datastore
  sudo gem install activerecord-nulldb-adapter
 
 Create a folder for your app
  mkdir rails_app; cd rails_app
 
 Download and run the setup script
- curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails239_appengine.rb
- ruby rails239_appengine.rb
+ curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails235_appengine.rb
+ ruby rails235_appengine.rb
 
 ==Working with Your Rails App
 

diff --git a/README.rdoc b/README.rdoc
@@ -22,7 +22,7 @@ Create a folder for your app
  mkdir rails_app; cd rails_app
 
 Download and run the setup script
- curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails238_appengine.rb
+ curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails239_appengine.rb
  ruby rails239_appengine.rb
 
 ==Working with Your Rails App

diff --git a/README.rdoc b/README.rdoc
@@ -1 +1,52 @@
 =Rails 2.3.9 on App Engine (DataMapper)
+
+Do not use rvm (or install and run from JRuby). The google-appengine gem must install into your system MRI. The appengine-sdk gem includes a complete Java app server. We bootstrap Java from MRI, then your app runs inside a servlet container (with access to all the APIs) using the version of JRuby installed into each app.
+
+We assumed Rails 2 would never work without rubygems, and we committed to gem bunlder for JRuby on App Engine, so we were waiting for Rails 3. Fortunately, Takeru Sasaki was able to patch the Rails 2.3.x calls to rubygems, and now we have it working. Rails 2.3.x currently spins up several seconds faster than Rails 3, and just a few seconds behind Sinatra.
+
+See the TInyDS version also: http://gist.github.com/gists/269075
+
+==Install the Development Environment
+
+One meta-gem provides the development environment
+ sudo gem install google-appengine
+
+==Install Rails 2.3.9 with required patches
+
+Install some gems you'll need 
+ sudo gem install rails -v "2.3.9"
+ sudo gem install rails_dm_datastore
+ sudo gem install activerecord-nulldb-adapter
+
+Create a folder for your app
+ mkdir rails_app; cd rails_app
+
+Download and run the setup script
+ curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails238_appengine.rb
+ ruby rails239_appengine.rb
+
+==Working with Your Rails App
+
+Start development server
+ ./script/server.sh
+
+Open local console
+ ./script/console.sh
+
+Publish to production
+ ./script/publish.sh
+
+==Support for generators
+
+We disable rubygems in the development environment, and the generators from Rails 2 perform various Gem dependency checks that are too difficult to patch, so we run the generators from the MRI. We also use Josh Moore's rails_dm_datastore integration plugin.
+
+Generate a restful controller and add it to config/routes.rb
+ ./script/generate scaffold contact title:string summary:text \
+ birthday:date url:string address:string phone:string -f --skip-migration
+
+Generate a model for DataMapper
+
+ ./script/generate dd_model contact title:string summary:text \
+ birthday:date url:link address:postal_address phone:phone_number -f
+
+You’ve created a RESTful controller, and a DataMapper model
diff --git a/contact.rb b/contact.rb
@@ -0,0 +1,13 @@
+class Contact
+  include DataMapper::Resource
+  storage_names[:default] = "Contact"
+
+  property :id,       Serial
+  property :title,    String,        :required => true, :length => 500
+  property :summary,  Text,          :required => true, :lazy => false
+  property :birthday, Date,          :required => true
+  property :url,      Link,          :required => true
+  property :address,  PostalAddress, :required => true
+  property :phone,    PhoneNumber,   :required => true
+  timestamps :at
+end
diff --git a/README.rdoc b/README.rdoc
@@ -1,4 +1 @@
-=Rails 2.3.5 on App Engine (DataMapper)
-
-Please use the updated guide:
-http://gist.github.com/486250
+=Rails 2.3.9 on App Engine (DataMapper)
diff --git a/README.rdoc b/README.rdoc
@@ -1,50 +1,4 @@
 =Rails 2.3.5 on App Engine (DataMapper)
 
-Do not use rvm (or install and run from JRuby). The google-appengine gem must install into your system MRI. The appengine-sdk gem includes a complete Java app server. We bootstrap Java from MRI, then your app runs inside a servlet container (with access to all the APIs) using the version of JRuby installed into each app.
-
-We assumed Rails 2 would never work without rubygems, and we committed to gem bunlder for JRuby on App Engine, so we were waiting for Rails 3. Fortunately, Takeru Sasaki was able to patch the Rails 2.3.5 calls to rubygems, and now we have it working. Rails 2.3.5 currently spins up several seconds faster than Rails 3, and just a few seconds behind Sinatra.
-
-See the TinyDS version also: http://gist.github.com/269075
-
-==Install the Development Environment
-
-The gems for the development environment include a pre-release appengine-tools gem that provides a pre-release version of jruby-rack.
- sudo gem install google-appengine
-
-==Install Rails 2.3.5 with required patches
-
-Create a folder for your app
- mkdir rails_app; cd rails_app
-
-Download and run the setup script
- curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails2_appengine.rb
- ruby rails2_appengine.rb
-
-==Working with Your Rails App
-
-Start development server
- ./script/server.sh
-
-Open local console
- ./script/console.sh
-
-Publish to production
- ./script/publish.sh
-
-==Support for generators
-
-We disable rubygems in the development environment, and the generators from Rails 2 perform various Gem dependency checks that are too difficult to patch, so we run the generators from the MRI. We also use Josh Moore's rails_dm_datastore integration plugin.
- sudo gem install rails -v "2.3.5"
- sudo gem install rails_dm_datastore
- sudo gem install activerecord-nulldb-adapter
-
-Generate a restful controller and add it to config/routes.rb
- ./script/generate scaffold contact title:string summary:text \
- birthday:date url:string address:string phone:string -f --skip-migration
-
-Generate a model for DataMapper
-
- ./script/generate dd_model contact title:string summary:text \
- birthday:date url:link address:postal_address phone:phone_number -f
-
-You’ve created a RESTful controller, and a DataMapper model
+Please use the updated guide:
+http://gist.github.com/486250
diff --git a/contact.rb b/contact.rb
@@ -1,12 +0,0 @@
-class Contact
-  include DataMapper::Resource
-
-  property :id,       Serial
-  property :title,    String,        :required => true, :length => 500
-  property :summary,  Text,          :required => true, :lazy => false
-  property :birthday, Date,          :required => true
-  property :url,      Link,          :required => true
-  property :address,  PostalAddress, :required => true
-  property :phone,    PhoneNumber,   :required => true
-  timestamps :at
-end

diff --git a/README.rdoc b/README.rdoc
@@ -1,6 +1,6 @@
 =Rails 2.3.5 on App Engine (DataMapper)
 
-Do not use rvm (or install and run from JRuby). The google-appengine gem must install into MRI. The appengine-sdk gem includes a complete Java app server. We bootstrap Java from MRI, then your app runs inside a servlet container (with access to all the APIs) using the version of JRuby installed into each app.
+Do not use rvm (or install and run from JRuby). The google-appengine gem must install into your system MRI. The appengine-sdk gem includes a complete Java app server. We bootstrap Java from MRI, then your app runs inside a servlet container (with access to all the APIs) using the version of JRuby installed into each app.
 
 We assumed Rails 2 would never work without rubygems, and we committed to gem bunlder for JRuby on App Engine, so we were waiting for Rails 3. Fortunately, Takeru Sasaki was able to patch the Rails 2.3.5 calls to rubygems, and now we have it working. Rails 2.3.5 currently spins up several seconds faster than Rails 3, and just a few seconds behind Sinatra.
 

diff --git a/README.rdoc b/README.rdoc
@@ -1,6 +1,6 @@
 =Rails 2.3.5 on App Engine (DataMapper)
 
-Do not use rvm (or install and run from JRuby). The google-appengine gem must install into MRI. The appengine-sdk gem includes a complete java app server. We bootstrap java from MRI, then your app runs inside a servlet container using the version of JRuby installed into each app.
+Do not use rvm (or install and run from JRuby). The google-appengine gem must install into MRI. The appengine-sdk gem includes a complete Java app server. We bootstrap Java from MRI, then your app runs inside a servlet container (with access to all the APIs) using the version of JRuby installed into each app.
 
 We assumed Rails 2 would never work without rubygems, and we committed to gem bunlder for JRuby on App Engine, so we were waiting for Rails 3. Fortunately, Takeru Sasaki was able to patch the Rails 2.3.5 calls to rubygems, and now we have it working. Rails 2.3.5 currently spins up several seconds faster than Rails 3, and just a few seconds behind Sinatra.
 

diff --git a/README.rdoc b/README.rdoc
@@ -1,6 +1,6 @@
 =Rails 2.3.5 on App Engine (DataMapper)
 
-Do not use rvm (or install and run from JRuby). The google-appengine gem must install into MRI. The appengine-sdk gem includes a complete java app server, so we bootstrap java from MRI, then you app runs inside a servlet container using the version of JRuby installed into each app.
+Do not use rvm (or install and run from JRuby). The google-appengine gem must install into MRI. The appengine-sdk gem includes a complete java app server. We bootstrap java from MRI, then your app runs inside a servlet container using the version of JRuby installed into each app.
 
 We assumed Rails 2 would never work without rubygems, and we committed to gem bunlder for JRuby on App Engine, so we were waiting for Rails 3. Fortunately, Takeru Sasaki was able to patch the Rails 2.3.5 calls to rubygems, and now we have it working. Rails 2.3.5 currently spins up several seconds faster than Rails 3, and just a few seconds behind Sinatra.
 

diff --git a/README.rdoc b/README.rdoc
@@ -1,5 +1,7 @@
 =Rails 2.3.5 on App Engine (DataMapper)
 
+Do not use rvm (or install and run from JRuby). The google-appengine gem must install into MRI. The appengine-sdk gem includes a complete java app server, so we bootstrap java from MRI, then you app runs inside a servlet container using the version of JRuby installed into each app.
+
 We assumed Rails 2 would never work without rubygems, and we committed to gem bunlder for JRuby on App Engine, so we were waiting for Rails 3. Fortunately, Takeru Sasaki was able to patch the Rails 2.3.5 calls to rubygems, and now we have it working. Rails 2.3.5 currently spins up several seconds faster than Rails 3, and just a few seconds behind Sinatra.
 
 See the TinyDS version also: http://gist.github.com/269075

diff --git a/article.rb → contact.rb b/article.rb → contact.rb
diff --git a/README.rdoc b/README.rdoc
@@ -27,7 +27,7 @@ Open local console
  ./script/console.sh
 
 Publish to production
- ./script/console.sh
+ ./script/publish.sh
 
 ==Support for generators
 

diff --git a/README.rdoc b/README.rdoc
@@ -21,13 +21,13 @@ Download and run the setup script
 ==Working with Your Rails App
 
 Start development server
- dev_appserver.rb .
+ ./script/server.sh
 
 Open local console
- appcfg.rb run -S irb -r config/environment
+ ./script/console.sh
 
 Publish to production
- appcfg.rb update .
+ ./script/console.sh
 
 ==Support for generators
 

diff --git a/README.rdoc b/README.rdoc
@@ -38,11 +38,11 @@ We disable rubygems in the development environment, and the generators from Rail
 
 Generate a restful controller and add it to config/routes.rb
  ./script/generate scaffold contact title:string summary:text \
- url:string address:string phone:string -f --skip-migration
+ birthday:date url:string address:string phone:string -f --skip-migration
 
 Generate a model for DataMapper
 
  ./script/generate dd_model contact title:string summary:text \
- url:link address:postal_address phone:phone_number -f
+ birthday:date url:link address:postal_address phone:phone_number -f
 
 You’ve created a RESTful controller, and a DataMapper model
diff --git a/article.rb b/article.rb
@@ -1,11 +1,12 @@
 class Contact
   include DataMapper::Resource
 
-  property :id,      Serial
-  property :title,   String,        :required => true, :length => 500
-  property :summary, Text,          :required => true, :lazy => false
-  property :url,     Link,          :required => true
-  property :address, PostalAddress, :required => true
-  property :phone,   PhoneNumber,   :required => true
+  property :id,       Serial
+  property :title,    String,        :required => true, :length => 500
+  property :summary,  Text,          :required => true, :lazy => false
+  property :birthday, Date,          :required => true
+  property :url,      Link,          :required => true
+  property :address,  PostalAddress, :required => true
+  property :phone,    PhoneNumber,   :required => true
   timestamps :at
 end
diff --git a/README.rdoc b/README.rdoc
@@ -32,8 +32,9 @@ Publish to production
 ==Support for generators
 
 We disable rubygems in the development environment, and the generators from Rails 2 perform various Gem dependency checks that are too difficult to patch, so we run the generators from the MRI. We also use Josh Moore's rails_dm_datastore integration plugin.
- sudo gem install rails rails_dm_datastore
- sudo gem install activerecord-nulldb-adapter 
+ sudo gem install rails -v "2.3.5"
+ sudo gem install rails_dm_datastore
+ sudo gem install activerecord-nulldb-adapter
 
 Generate a restful controller and add it to config/routes.rb
  ./script/generate scaffold contact title:string summary:text \

diff --git a/README.rdoc b/README.rdoc
@@ -18,10 +18,6 @@ Download and run the setup script
  curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails2_appengine.rb
  ruby rails2_appengine.rb
 
-Fix JRuby-Rack
- curl -sO http://jruby-primer.appspot.com/tools/fix008.rb
- ruby fix008.rb 
-
 ==Working with Your Rails App
 
 Start development server

diff --git a/README.rdoc b/README.rdoc
@@ -45,7 +45,7 @@ Generate a restful controller and add it to config/routes.rb
 
 Generate a model for DataMapper
 
- ./script/generate dm_model contact title:string summary:text \
+ ./script/generate dd_model contact title:string summary:text \
  url:link address:postal_address phone:phone_number -f
 
 You’ve created a RESTful controller, and a DataMapper model
diff --git a/README.rdoc b/README.rdoc
@@ -18,10 +18,9 @@ Download and run the setup script
  curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails2_appengine.rb
  ruby rails2_appengine.rb
 
-Upgrade JRuby-Rack
- cd WEB-INF/lib
- curl -O http://appengine-jruby.googlecode.com/files/jruby-rack-0.9.6.jar
- cd ../..
+Fix JRuby-Rack
+ curl -sO http://jruby-primer.appspot.com/tools/fix008.rb
+ ruby fix008.rb 
 
 ==Working with Your Rails App
 

diff --git a/README.rdoc b/README.rdoc
@@ -8,8 +8,6 @@ See the TinyDS version also: http://gist.github.com/269075
 
 The gems for the development environment include a pre-release appengine-tools gem that provides a pre-release version of jruby-rack.
  sudo gem install google-appengine
- sudo gem uninstall appengine-tools
- sudo gem install appengine-tools --pre
 
 ==Install Rails 2.3.5 with required patches
 

diff --git a/README.rdoc b/README.rdoc
@@ -20,6 +20,11 @@ Download and run the setup script
  curl -O http://appengine-jruby.googlecode.com/hg/demos/rails2/rails2_appengine.rb
  ruby rails2_appengine.rb
 
+Upgrade JRuby-Rack
+ cd WEB-INF/lib
+ curl -O http://appengine-jruby.googlecode.com/files/jruby-rack-0.9.6.jar
+ cd ../..
+
 ==Working with Your Rails App
 
 Start development server

diff --git a/README.rdoc b/README.rdoc
@@ -8,6 +8,8 @@ See the TinyDS version also: http://gist.github.com/269075
 
 The gems for the development environment include a pre-release appengine-tools gem that provides a pre-release version of jruby-rack.
  sudo gem install google-appengine
+ sudo gem uninstall appengine-tools
+ sudo gem install appengine-tools --pre
 
 ==Install Rails 2.3.5 with required patches
 

diff --git a/README.rdoc b/README.rdoc
@@ -8,7 +8,6 @@ See the TinyDS version also: http://gist.github.com/269075
 
 The gems for the development environment include a pre-release appengine-tools gem that provides a pre-release version of jruby-rack.
  sudo gem install google-appengine
- sudo gem install appengine-tools --pre
 
 ==Install Rails 2.3.5 with required patches
 

diff --git a/README.rdoc b/README.rdoc
@@ -25,7 +25,7 @@ Start development server
  dev_appserver.rb .
 
 Open local console
- appcfg.rb run script/console
+ appcfg.rb run -S irb -r config/environment
 
 Publish to production
  appcfg.rb update .

diff --git a/article.rb b/article.rb
@@ -2,7 +2,7 @@ class Contact
   include DataMapper::Resource
 
   property :id,      Serial
-  property :title,   String,        :required => true, :length => 250
+  property :title,   String,        :required => true, :length => 500
   property :summary, Text,          :required => true, :lazy => false
   property :url,     Link,          :required => true
   property :address, PostalAddress, :required => true

diff --git a/article.rb b/article.rb
@@ -2,7 +2,7 @@ class Contact
   include DataMapper::Resource
 
   property :id,      Serial
-  property :title,   String,        :required => true, :length => 100
+  property :title,   String,        :required => true, :length => 250
   property :summary, Text,          :required => true, :lazy => false
   property :url,     Link,          :required => true
   property :address, PostalAddress, :required => true

diff --git a/article.rb b/article.rb
@@ -5,7 +5,7 @@ class Contact
   property :title,   String,        :required => true, :length => 100
   property :summary, Text,          :required => true, :lazy => false
   property :url,     Link,          :required => true
-  property :address, PostalAddress, :nullable => false
+  property :address, PostalAddress, :required => true
   property :phone,   PhoneNumber,   :required => true
   timestamps :at
 end
diff --git a/README.rdoc b/README.rdoc
@@ -37,12 +37,12 @@ We disable rubygems in the development environment, and the generators from Rail
  sudo gem install activerecord-nulldb-adapter 
 
 Generate a restful controller and add it to config/routes.rb
- ./script/generate scaffold article title:string summary:text \
- url:string phone:string -f --skip-migration
+ ./script/generate scaffold contact title:string summary:text \
+ url:string address:string phone:string -f --skip-migration
 
 Generate a model for DataMapper
 
- ./script/generate dm_model article title:string summary:text \
- url:link phone:phone_number -f
+ ./script/generate dm_model contact title:string summary:text \
+ url:link address:postal_address phone:phone_number -f
 
 You’ve created a RESTful controller, and a DataMapper model
diff --git a/article.rb b/article.rb
@@ -1,10 +1,11 @@
-class Article
+class Contact
   include DataMapper::Resource
 
   property :id,      Serial
   property :title,   String,        :required => true, :length => 100
   property :summary, Text,          :required => true, :lazy => false
   property :url,     Link,          :required => true
+  property :address, PostalAddress, :nullable => false
   property :phone,   PhoneNumber,   :required => true
   timestamps :at
 end
diff --git a/article.rb b/article.rb
@@ -2,9 +2,9 @@ class Article
   include DataMapper::Resource
 
   property :id,      Serial
-  property :title,   String,        :nullable => false
-  property :summary, Text,          :nullable => false
-  property :url,     Link,          :nullable => false
-  property :phone,   PhoneNumber,   :nullable => false
+  property :title,   String,        :required => true, :length => 100
+  property :summary, Text,          :required => true, :lazy => false
+  property :url,     Link,          :required => true
+  property :phone,   PhoneNumber,   :required => true
   timestamps :at
 end
diff --git a/README.rdoc b/README.rdoc
@@ -32,7 +32,7 @@ Publish to production
 
 ==Support for generators
 
-We disable rubygems in the development environment, and the generators from Rails 2 perform various Gem dependency checks that are too difficult to patch, so we run the generators from the MRI.
+We disable rubygems in the development environment, and the generators from Rails 2 perform various Gem dependency checks that are too difficult to patch, so we run the generators from the MRI. We also use Josh Moore's rails_dm_datastore integration plugin.
  sudo gem install rails rails_dm_datastore
  sudo gem install activerecord-nulldb-adapter 
 

diff --git a/README.rdoc b/README.rdoc
@@ -45,6 +45,4 @@ Generate a model for DataMapper
  ./script/generate dm_model article title:string summary:text \
  url:link phone:phone_number -f
 
- ./script/generate dm_model article title:string summary:text url:string -f
-
 You’ve created a RESTful controller, and a DataMapper model
diff --git a/README.rdoc b/README.rdoc
@@ -37,11 +37,14 @@ We disable rubygems in the development environment, and the generators from Rail
  sudo gem install activerecord-nulldb-adapter 
 
 Generate a restful controller and add it to config/routes.rb
- ./script/generate scaffold article title:string summary:text url:string \
- -f --skip-migration
+ ./script/generate scaffold article title:string summary:text \
+ url:string phone:string -f --skip-migration
 
 Generate a model for DataMapper
 
+ ./script/generate dm_model article title:string summary:text \
+ url:link phone:phone_number -f
+
  ./script/generate dm_model article title:string summary:text url:string -f
 
 You’ve created a RESTful controller, and a DataMapper model
diff --git a/app/models/article.rb → article.rb b/app/models/article.rb → article.rb
@@ -4,6 +4,7 @@ class Article
   property :id,      Serial
   property :title,   String,        :nullable => false
   property :summary, Text,          :nullable => false
-  property :url,     String,        :nullable => false
+  property :url,     Link,          :nullable => false
+  property :phone,   PhoneNumber,   :nullable => false
   timestamps :at
 end