merging

lewisenator · Oct 19, 2014 · dc379b0 · dc379b0
2 parents 56f59d0 + c968a57
commit dc379b0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/app/controllers/movies_controller.rb b/app/controllers/movies_controller.rb
@@ -34,7 +34,27 @@ def show
       details = fetch_details(imdb_id)[:movie]
       @movie = Movie.new(
           title: details.title,
-          imdb_id: details.imdb_id
+          imdb_id: details.imdb_id,
+          year: details.year,
+          movie_type: details.type,
+          rated: details.rated,
+          released: details.released,
+          runtime: details.runtime,
+          genre: details.genre,
+          director: details.director,
+          writer: details.writer,
+          actors: details.actors,
+          plot: details.plot,
+          poster: details.poster,
+          imdb_rating: details.imdb_rating,
+          imdb_votes: details.imdb_votes,
+          metascore: details.metascore,
+          language: details.language,
+          country: details.country,
+          awards: details.awards,
+          tomato_rating: details.tomato_rating,
+          production: details.production,
+          website: details.website
       )
       @movie.save!
     end

diff --git a/app/models/movie.rb b/app/models/movie.rb
@@ -6,7 +6,6 @@
 #  title         :string(255)
 #  year          :integer
 #  imdb_id       :string(255)
-#  type          :string(255)
 #  rated         :string(255)
 #  released      :date
 #  runtime       :string(255)
@@ -27,6 +26,7 @@
 #  website       :string(255)
 #  created_at    :datetime
 #  updated_at    :datetime
+#  movie_type    :string(255)
 #
 
 class Movie < ActiveRecord::Base

diff --git a/db/migrate/20141019051204_remove_type_from_movie.rb b/db/migrate/20141019051204_remove_type_from_movie.rb
@@ -0,0 +1,6 @@
+class RemoveTypeFromMovie < ActiveRecord::Migration
+  def change
+  	remove_column :movies, :type, :string
+  	add_column :movies, :movie_type, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
@@ -29,7 +29,6 @@
     t.string   "title"
     t.integer  "year"
     t.string   "imdb_id"
-    t.string   "type"
     t.string   "rated"
     t.date     "released"
     t.string   "runtime"
@@ -50,6 +49,7 @@
     t.string   "website"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "movie_type"
   end
 
   create_table "user_movie_joins", force: true do |t|