Updated gems to correct versions; updated form partial (at least one …

…of them) to use new form_for syntax, which requires <%= and not <% on form_for to generate output; fixed syntax in migration since Time.parse and Date.parse take month/day args in opposite order in ruby 1.9 Conflicts: Gemfile Gemfile.lock db/migrate/20110921163745_add_some_movies.rb
drblinken · Oct 29, 2011 · 01f73f3 · 01f73f3
1 parent 6bf1c4d
commit 01f73f3
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 21 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,12 +8,15 @@ gem 'rails', '3.1'
 gem 'sqlite3', '~> 1.3.3'
 gem 'haml'
 gem 'ruby-tmdb'
+gem 'rake', '0.8.7'
 
 group :test, :development do
   gem 'capybara'
   gem 'cucumber-rails'
+  gem 'cucumber'
   gem 'rspec-rails'
-  gem 'ruby-debug'
+  gem 'rspec'
+  gem 'ruby-debug19'
   gem 'rcov'
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,9 +30,13 @@ GEM
       activesupport (= 3.1.0)
     activesupport (3.1.0)
       multi_json (~> 1.0)
+<<<<<<< HEAD
     addressable (2.2.6)
+=======
+    archive-tar-minitar (0.5.2)
+>>>>>>> e60314f... Updated gems to correct versions; updated form partial (at least one of them) to use new form_for syntax, which requires <%= and not <% on form_for to generate output; fixed syntax in migration since Time.parse and Date.parse take month/day args in opposite order in ruby 1.9
     arel (2.2.1)
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
     builder (3.0.0)
     capybara (1.1.1)
       mime-types (>= 1.16)
@@ -44,39 +48,38 @@ GEM
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     columnize (0.3.4)
-    cucumber (1.0.4)
+    cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.18)
+      gherkin (~> 2.5.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.0.3)
+    cucumber-rails (1.1.1)
       capybara (>= 1.1.1)
-      cucumber (~> 1.0.4)
+      cucumber (>= 1.1.0)
       nokogiri (>= 1.5.0)
     deepopenstruct (0.1.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ffi (1.0.9)
-    gherkin (2.4.18)
+    gherkin (2.5.4)
       json (>= 1.4.6)
     haml (3.1.3)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.5.4)
-    json_pure (1.5.4)
-      spruz (~> 0.2.8)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
+    json (1.6.1)
+    json_pure (1.6.1)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     nokogiri (1.5.0)
     polyglot (0.3.2)
-    rack (1.3.2)
+    rack (1.3.5)
     rack-cache (1.0.3)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -100,10 +103,16 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
+<<<<<<< HEAD
     rake (0.9.2)
     rbx-require-relative (0.0.5)
     rcov (0.9.9)
     rdoc (3.9.4)
+=======
+    rake (0.8.7)
+    rdoc (3.11)
+      json (~> 1.4)
+>>>>>>> e60314f... Updated gems to correct versions; updated form partial (at least one of them) to use new form_for syntax, which requires <%= and not <% on form_for to generate output; fixed syntax in migration since Time.parse and Date.parse take month/day args in opposite order in ruby 1.9
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -117,6 +126,7 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.6.0)
+<<<<<<< HEAD
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -126,25 +136,36 @@ GEM
       addressable
       deepopenstruct (>= 0.1.2)
       json
+=======
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+>>>>>>> e60314f... Updated gems to correct versions; updated form partial (at least one of them) to use new form_for syntax, which requires <%= and not <% on form_for to generate output; fixed syntax in migration since Time.parse and Date.parse take month/day args in opposite order in ruby 1.9
     rubyzip (0.9.4)
-    selenium-webdriver (2.5.0)
+    selenium-webdriver (2.9.1)
       childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
+      ffi (= 1.0.9)
       json_pure
       rubyzip
-    sprockets (2.0.0)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    spruz (0.2.13)
     sqlite3 (1.3.4)
-    term-ansicolor (1.0.6)
+    term-ansicolor (1.0.7)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -153,11 +174,19 @@ PLATFORMS
 
 DEPENDENCIES
   capybara
+  cucumber
   cucumber-rails
   haml
   rails (= 3.1)
+<<<<<<< HEAD
   rcov
   rspec-rails
   ruby-debug
   ruby-tmdb
+=======
+  rake (= 0.8.7)
+  rspec
+  rspec-rails
+  ruby-debug19
+>>>>>>> e60314f... Updated gems to correct versions; updated form partial (at least one of them) to use new form_for syntax, which requires <%= and not <% on form_for to generate output; fixed syntax in migration since Time.parse and Date.parse take month/day args in opposite order in ruby 1.9
   sqlite3 (~> 1.3.3)
diff --git a/app/views/movies/_edit_form.html.haml b/app/views/movies/_edit_form.html.haml
@@ -1,4 +1,4 @@
-- form_for(@movie) do |f|
+= form_for(@movie) do |f|
   - field_set_tag "Movie Details" do 
     %ul
       %li