Atualiza séries, temporadas e episodios

rafael-fernandes · Nov 27, 2017 · e429416 · e429416
1 parent 4333cd3
commit e429416
Show file tree

Hide file tree

Showing 14 changed files with 158 additions and 104 deletions.
diff --git a/app/models/episode.rb b/app/models/episode.rb
@@ -4,4 +4,5 @@ class Episode < ApplicationRecord
   validates :name, presence: true
   validates :number, presence: true, numericality: { greater_than_or_equal_to: 1 }
   validates :release_date, presence: true
+  validates :summary, presence: true
 end
diff --git a/app/models/season.rb b/app/models/season.rb
@@ -1,5 +1,6 @@
 class Season < ApplicationRecord
   belongs_to :series
+  has_many :episodes
 
   validates :name, presence: true
   validates :number, presence: true, numericality: { greater_than_or_equal_to: 1 }

diff --git a/app/views/series/index.html.erb b/app/views/series/index.html.erb
@@ -39,7 +39,7 @@
 							<% end %>
 						</div>
 						<div class="episode">
-							S07E07
+							S0<%= s.seasons.first.number %>E0<%= s.seasons.first.episodes.first.number %>
 						</div>
 						<div class="name">
 							<%= s.title %>

diff --git a/app/views/series/show.html.erb b/app/views/series/show.html.erb
@@ -16,9 +16,9 @@
 
     <div class="row pt-5">
       <div class="col-sm-6 favorite">
-        <%= image_tag "american-horror-story.jpg", width: "100%", height: "auto" %>
+        <%= image_tag @serie.image_path, width: "100%", height: "auto" %>
         <div class="episode">
-          S07E07
+          S0<%= @serie.seasons.first.number %>E0<%= @serie.seasons.first.episodes.first.number %>
         </div>
       </div>
       <div class="col-sm-6 favorite">

diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -55,17 +55,19 @@
       </div>
 
       <div class="row">
-        <% 8.times do %>
+        <% Series.all.each do |s| %>
           <div class="col-sm-3">
             <div class="series-card">
               <div class="photo">
-                <%= image_tag "american-horror-story.jpg" %>
+                <%= link_to series_path(s) do %>
+                  <%= image_tag s.image_path %>
+                <% end %>
               </div>
               <div class="episode">
-                S07E07
+                S0<%= s.seasons.first.number %>E0<%= s.seasons.first.episodes.first.number %>
               </div>
               <div class="name">
-                American Horror Story
+                <%= s.title %>
               </div>
               <div class="next-episode">
                 Próximo episódio: amanhã

diff --git a/app/views/static_pages/my_series.html.erb b/app/views/static_pages/my_series.html.erb
@@ -32,18 +32,18 @@
 		<div class="row">
 			<% @series.each do |s| %>
 				<div class="col-sm-3">
-					<div class="series-card -favorite">
+					<div class="series-card">
 						<div class="photo">
-				            <%= link_to series_path(s) do %>
-				                <%= image_tag "american-horror-story.jpg" %>
-				            <% end %>
+							<%= link_to series_path(s) do %>
+								<%= image_tag s.image_path %>
+									<% end %>
 						</div>
 						<div class="episode">
-							S07E07
-			            </div>
-			            <div class="progress mt-3">
-			              <div class="progress-bar bg-info" role="progressbar" style="width: 70%" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100"></div>
-			            </div>
+							S0<%= s.seasons.first.number %>E0<%= s.seasons.first.episodes.first.number %>
+						</div>
+						<div class="progress mt-3">
+							<div class="progress-bar bg-info" role="progressbar" style="width: 70%" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100"></div>
+						</div>
 						<div class="name">
 							<%= s.title %>
 						</div>

diff --git a/coverage/.last_run.json b/coverage/.last_run.json
@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 100.0
+    "covered_percent": 98.04
   }
 }
diff --git a/coverage/.resultset.json b/coverage/.resultset.json
@@ -8,14 +8,15 @@
         1,
         1,
         1,
+        1,
         null
       ],
       "/home/rafael/ES022017/spec/models/favorite_spec.rb": [
         1,
         null,
         1,
-        2,
-        2,
+        1,
+        1,
         null
       ],
       "/home/rafael/ES022017/app/models/favorite.rb": [
@@ -28,14 +29,14 @@
         1,
         null,
         1,
-        2,
-        null,
-        2,
-        2,
+        1,
         null,
         1,
         1,
         null,
+        1,
+        0,
+        null,
         null,
         null
       ],
@@ -51,8 +52,8 @@
         1,
         null,
         1,
-        2,
-        2,
+        1,
+        1,
         null
       ],
       "/home/rafael/ES022017/app/models/series_list.rb": [
@@ -66,12 +67,12 @@
         1,
         null,
         1,
-        2,
-        2,
-        2,
-        2,
+        1,
+        1,
+        1,
+        1,
         null,
-        2,
+        1,
         null
       ],
       "/home/rafael/ES022017/app/models/series.rb": [
@@ -88,14 +89,14 @@
         1,
         null,
         1,
-        2,
+        1,
         null,
-        2,
-        2,
-        2,
+        1,
+        1,
+        1,
         null
       ]
     },
-    "timestamp": 1511815349
+    "timestamp": 1511815560
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,14 +8,15 @@ @@
 ,
 ,
 ,
+,
             null
           ],
           "/home/rafael/ES022017/spec/models/favorite_spec.rb": [
 ,
             null,
 ,
-,
-,
+,
+,
             null
           ],
           "/home/rafael/ES022017/app/models/favorite.rb": [
@@ Expand All / @@ -28,14 +29,14 @@ @@
 ,
             null,
 ,
-,
-            null,
-,
-,
+,
             null,
 ,
 ,
             null,
+,
+,
+            null,
             null,
             null
           ],
@@ Expand All / @@ -51,8 +52,8 @@ @@
 ,
             null,
 ,
-,
-,
+,
+,
             null
           ],
           "/home/rafael/ES022017/app/models/series_list.rb": [
@@ Expand All / @@ -66,12 +67,12 @@ @@
 ,
             null,
 ,
-,
-,
-,
-,
+,
+,
+,
+,
             null,
-,
+,
             null
           ],
           "/home/rafael/ES022017/app/models/series.rb": [
@@ Expand All / @@ -88,14 +89,14 @@ @@
 ,
             null,
 ,
-,
+,
             null,
-,
-,
-,
+,
+,
+,
             null
           ]
         },
-        "timestamp": 1511815349
+        "timestamp": 1511815560
       }
     }