Merge remote branch 'public2/master' into hw2_start

Conflicts:
	.gitignore
	Gemfile
	config/environments/production.rb
	db/development.sqlite3

Author: Richard Xia

.gitignore

@@ -1,4 +1,4 @@
-#*
+\#*\#
 *~
 TAGS
 db/schema.rb

Gemfile

@@ -8,6 +8,10 @@ gem 'rails', '3.1.0'
 # for Heroku deployment - as described in Ap. A of ELLS book
 group :development, :test do
   gem 'sqlite3'
+  gem 'ruby-debug19', :require => 'ruby-debug'
+end
+group :production do
+  gem 'pg'
 end
 
 # Gems used only for assets and not required
@@ -28,5 +32,4 @@ gem 'jquery-rails'
 # gem 'capistrano'
 
 # To use debugger
-gem 'ruby-debug19', :require => 'ruby-debug'
 gem 'haml'

app/models/.gitkeep

@@ -14,8 +14,8 @@
   # Compress JavaScripts and CSS
   config.assets.compress = true
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
+  # DO fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = true
 
   # Generate digests for assets URLs
   config.assets.digest = true

config/environments/production.rb

@@ -0,0 +1,25 @@
+class AddMoreMovies < ActiveRecord::Migration
+  MORE_MOVIES = [
+    {:title => 'Aladdin', :rating => 'G', :release_date => '25-Nov-1992'},
+    {:title => 'The Terminator', :rating => 'R', :release_date => '26-Oct-1984'},
+    {:title => 'When Harry Met Sally', :rating => 'R', :release_date => '21-Jul-1989'},
+    {:title => 'The Help', :rating => 'PG-13', :release_date => '10-Aug-2011'},
+    {:title => 'Chocolat', :rating => 'PG-13', :release_date => '5-Jan-2001'},
+    {:title => 'Amelie', :rating => 'R', :release_date => '25-Apr-2001'},
+    {:title => '2001: A Space Odyssey', :rating => 'G', :release_date => '6-Apr-1968'},
+    {:title => 'The Incredibles', :rating => 'PG', :release_date => '5-Nov-2004'},
+    {:title => 'Raiders of the Lost Ark', :rating => 'PG', :release_date => '12-Jun-1981'},
+    {:title => 'Chicken Run', :rating => 'G', :release_date => '21-Jun-2000'},
+  ]
+  def up
+    MORE_MOVIES.each do |movie|
+      Movie.create!(movie)
+    end
+  end
+
+  def down
+    MORE_MOVIES.each do |movie|
+      Movie.find_by_title_and_rating(movie[:title], movie[:rating]).destroy
+    end
+  end
+end