upcoming_movies_in_the_park 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b0745e1f5bb40f1fb99715a96b8c8af5996bbaa
-  data.tar.gz: 1d9d9b2ab25e2d2279b040cf5b5f1af3ca524003
+  metadata.gz: e5f37dcb723f9a53dfe02a91d7d85eb6a6fbfa4d
+  data.tar.gz: 7846e309fa3d1f5204fa56a304421734b0be62d9
 SHA512:
-  metadata.gz: 2b82c6604723c229bc51220901d4d6a37c93cc94e457eb1f7b11f656a11ada7b51ef10c798b3d06ab1eaf2cb394feee17b498e6523abd7b874fca3cb8bf844d3
-  data.tar.gz: 0cd935d4f4e93d4a54a7a0c7b861f65d9344a113a043be6580afe829108b7c3cf8665108a9c1b29eb7b9a1ffdf3a31d2957905a00f044362559c55961fc3bead
+  metadata.gz: 0473de5dd70d938fec7e386681dd198d1f47d57c8ff4ddecfca861aab175f8004535bb4fec6614ee7cb9cd1eb025ab60632f0fec6a664757f7985464dc8899af
+  data.tar.gz: c01f1f9ffeb380ee0613aea95093482120525e8da1dadacc92185c8690a1c32c4c841d1c7e0dc263db06de92f6e81bc5910bf56fdb1da0193ffe8917c36c558b

data/config/environment.rb

@@ -3,9 +3,9 @@ require 'open-uri'
 require 'colorize'
 
 require_relative '../lib/upcoming_movies_in_the_park/version'
+require_relative '../lib/upcoming_movies_in_the_park/super'
 require_relative '../lib/upcoming_movies_in_the_park/cli'
 require_relative '../lib/upcoming_movies_in_the_park/showing'
 require_relative '../lib/upcoming_movies_in_the_park/park'
 require_relative '../lib/upcoming_movies_in_the_park/gate'
-require_relative '../lib/upcoming_movies_in_the_park/scraper'
-require_relative '../lib/upcoming_movies_in_the_park/super'
+require_relative '../lib/upcoming_movies_in_the_park/scraper'

data/lib/upcoming_movies_in_the_park/cli.rb

@@ -1,5 +1,3 @@
-
-
 class UpcomingMoviesInThePark::CLI
 
   def call
@@ -107,8 +105,7 @@ class UpcomingMoviesInThePark::CLI
         date.list_showings
         puts "\n"
         by_date_instructions_2
-        input = nil
-        by_date_path_2
+        by_date_path_2(date)
       elsif input == "back"
         menu
         break
@@ -119,7 +116,8 @@ class UpcomingMoviesInThePark::CLI
     end
   end
 
-  def by_date_path_2
+  def by_date_path_2(date)
+    input = nil
     while input != "return"
     input = gets.strip
     if input.to_i > 0 && input.to_i <= date.showings.length
@@ -174,8 +172,7 @@ class UpcomingMoviesInThePark::CLI
         park.list_showings
         puts "\n"
         by_park_instructions_2
-        input = nil
-        by_park_path_2
+        by_park_path_2(park)
       elsif input == "back"
         menu
         break
@@ -186,7 +183,8 @@ class UpcomingMoviesInThePark::CLI
     end
   end
 
-  def by_park_path_2
+  def by_park_path_2(park)
+    input = nil
     while input != "return"
     input = gets.strip
     if input.to_i > 0 && input.to_i <= park.showings.length
@@ -211,7 +209,7 @@ class UpcomingMoviesInThePark::CLI
   def by_park_instructions_1
     print "Enter ".colorize(:green)
     print "a number"
-    puts " to get a list of movies playing in that park".colorize(:green)
+    puts " to get a list of movies playing in that park ".colorize(:green)
     print "or enter ".colorize(:green)
     print "back"
     puts " to go back to the main menu.".colorize(:green)
@@ -223,7 +221,7 @@ class UpcomingMoviesInThePark::CLI
     puts " to get the showing details for that movie".colorize(:cyan)
     print "or enter ".colorize(:cyan)
     print "return"
-    print " to return to the list of parks".colorize(:cyan)
+    print " to return to the list of parks ".colorize(:cyan)
     puts "in which upcoming movies are playing.".colorize(:cyan)
   end
 

data/lib/upcoming_movies_in_the_park/gate.rb

@@ -1,5 +1,3 @@
-require_relative './super'
-
 class UpcomingMoviesInThePark::Gate
   attr_accessor :name, :day, :month, :year, :showings
 

data/lib/upcoming_movies_in_the_park/park.rb

@@ -1,5 +1,3 @@
-require_relative './super'
-
 class UpcomingMoviesInThePark::Park
   attr_accessor :name, :showings
   include UpcomingMoviesInThePark::Super::InstanceMethods
@@ -7,6 +5,7 @@ class UpcomingMoviesInThePark::Park
 
   @@all =[]
 
+
   def self.all
     @@all
   end

data/lib/upcoming_movies_in_the_park/showing.rb

@@ -1,7 +1,3 @@
-require_relative './park'
-require_relative './gate'
-require_relative './super'
-
 class UpcomingMoviesInThePark::Showing
   include UpcomingMoviesInThePark::Super::InstanceMethods
 

data/lib/upcoming_movies_in_the_park/super.rb

@@ -6,11 +6,6 @@ module UpcomingMoviesInThePark::Super
       self.class.all << self
     end 
 
-    def list_showings
-    self.showings.each_with_index {|showing, i| 
-      puts "#{i +1}. #{showing.name}".colorize(:cyan)}
-    end
-
   end
 
   module GateParkInstanceMethods
@@ -18,6 +13,11 @@ module UpcomingMoviesInThePark::Super
     def add_showing(showing)
       self.showings << showing
     end
+
+    def list_showings
+      self.showings.each_with_index {|showing, i| 
+        puts "#{i +1}. #{showing.name}".colorize(:cyan)}
+    end
   
   end
 

data/lib/upcoming_movies_in_the_park/version.rb

@@ -1,3 +1,3 @@
 module UpcomingMoviesInThePark
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upcoming_movies_in_the_park
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - sgibson47
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-17 00:00:00.000000000 Z
+date: 2018-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler