podcast-book-club 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13d58ac548a2807466d98528427ce2822d9e7767a7a1dfc20460b9421d099f3d
-  data.tar.gz: 07c5d04cd88443a45d8543ca0439c9d57f54098848a86428a8a416c4d7ef3486
+  metadata.gz: 7cd880410f24a83c490284a946f7f8e1ef7fb9f7bc48962b41fecfe0561c3a7f
+  data.tar.gz: 47d9f4fd6aef4c2b0a9d6426c81cc42724518ea702d2f2284c6b53e85f253f54
 SHA512:
-  metadata.gz: 4c0647bbfc9525df595cb791200f00651a954928e095a2fa319ecddbec09cfb1a886cb0cca8fae3d755ccfe458ddb15a43611d68f711f55e93b6ade41f6d3282
-  data.tar.gz: a7118252c685679f0b01b57917e2ca286eabdd176b1189e8e7c0f513024b1db4d3afbda90be8aecb6766eba11bf5f10ea9d299e119e13763b1f605433cff59ad
+  metadata.gz: c76a17d8f75cca411508f83205a86a46d5b59c24615acab7d542fe5df5114ea3639a4bd7be009d5c9378a626e28a61f47d4f3b1498341e8ec841fe2340cbd503
+  data.tar.gz: a0fa7d5f5ea3071be1620cd56ce30a19b0e036db2b08f264a707dc19e73ef5018b21bff581a83086b11fe1898b3344c5f3bd9a2d27a3bf15c42eaca16376e8e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    podcast-book-club (1.0.1)
+    podcast-book-club (1.0.2)
       googlebooks (~> 0.0.9)
       nokogiri (~> 1.6, >= 1.6.8)
       rainbow (~> 3.0)

data/README.md

@@ -41,7 +41,7 @@ end
 Type the code below and follow the prompts to explore book recommendations.
 
 ``` bash
-$ bin/run
+$ podcast_book_club
 ```
 
 ## Development

data/lib/podcast_book_club/author.rb

@@ -11,9 +11,8 @@ class Author
     def initialize(attributes)
         @books = []
 
-        attributes.each do |k,v|
-            self.send("#{k}=", v)
-        end
+        @name = attributes[:name]
+        self.add_book(attributes[:book])
 
     end
 
@@ -21,7 +20,7 @@ class Author
       @@all
     end
 
-    def books=(book)
+    def add_book(book)
         @books << book unless @books.include?(book)
     end
 
@@ -29,15 +28,4 @@ class Author
         @books.map { |book| book.genre }.flatten.uniq
     end
 
-    def output
-
-        puts "\n\n" + Rainbow("#{self.name}").bg(:black).yellow.bright + Rainbow(" (#{self.books.count})").silver
-
-        sorted_books = self.books.sort_by { |book| book.title}
-        sorted_books.each do |book|
-            puts "  #{book.title}"
-        end
-
-    end
-
   end

data/lib/podcast_book_club/book.rb

@@ -6,14 +6,25 @@ class Book
     extend Sortable::ClassMethods
     include Memorable::InstanceMethods
 
-
     @@all = []
 
     def initialize(attributes)
         @episode = []
 
         attributes.each do |k,v|
-            self.send("#{k}=", v) unless v == nil
+            unless v == nil
+
+                if "#{k}" == "genre"
+                    self.add_genre(v)
+                elsif "#{k}" == "episode"
+                    self.add_episode(v)
+                elsif "#{k}" == "author"
+                    self.add_author(v)
+                else
+                    self.send("#{k}=", v)
+                end
+
+            end
         end
 
     end
@@ -22,11 +33,11 @@ class Book
         @@all
     end
 
-    def episode=(episode)
+    def add_episode(episode)
         episode.add_book(self)
     end
 
-    def author=(authors)
+    def add_author(authors)
         @author ||= []
 
         if authors.kind_of?(Array)
@@ -43,7 +54,7 @@ class Book
 
     end
 
-    def genre=(genre)
+    def add_genre(genre)
         @genre ||= []
 
         new_genre = Genre.find_or_create_by_name(genre)
@@ -54,19 +65,4 @@ class Book
         self.all.select { |book| book.title.downcase.include?(keyword) || book.synopsis.downcase.include?(keyword) unless book.synopsis == nil }
     end
 
-    def output(number)
-        authors = []
-        genres = []
-
-        self.author.each {|a| authors << a.name} unless self.author == [] || self.author == nil
-        self.genre.each {|g| genres << g.name} unless self.genre == [] || self.genre == nil
-
-        puts Rainbow("#{number} - #{self.title}").bg(:black).yellow.bright
-        puts Rainbow("Author(s): ").bg(:black).yellow.bright + authors.join(", ") unless authors == []
-        puts Rainbow("Genre: ").bg(:black).yellow.bright + genres.join(", ") unless genres == []
-        puts Rainbow("Synopsis: ").bg(:black).yellow.bright + "#{self.synopsis}" unless self.synopsis == ""
-        puts Rainbow("URL: ").bg(:black).yellow.bright + "#{self.url}\n\n"
-    end
-    
-
 end

data/lib/podcast_book_club/cli.rb

@@ -3,7 +3,7 @@ class PodcastBookClub::CLI
     def initialize
         welcome_message
         @today = Date.today
-
+        
         Whirly.start(spinner: "pencil", color: false, remove_after_stop: true, status: "Loading Episodes") do
             @scraper = Scraper.new
         end
@@ -37,7 +37,7 @@ class PodcastBookClub::CLI
             when "3", "this month"
                 first_date = @today - @today.mday + 1
                 episodes = Episode.find_by_date(first_date, @today)
-                
+
                 select_episodes(episodes)
 
             when "4", "last month"
@@ -61,9 +61,9 @@ class PodcastBookClub::CLI
                 select_episodes(episodes)
 
             when "7", "author"
-                
-                if Book.count > 0        
-                    Author.sort_by_name.each { |author| author.output }
+
+                if Book.count > 0
+                    Author.sort_by_name.each { |author| output_author(author) }
                 else
                     no_books
                 end
@@ -71,7 +71,7 @@ class PodcastBookClub::CLI
             when "8", "genre"
 
                 if Book.count > 0
-                    Genre.sort_by_name.each { |genre| genre.output }
+                    Genre.sort_by_name.each { |genre| output_genre(genre) }
                 else
                     no_books
                 end
@@ -82,14 +82,14 @@ class PodcastBookClub::CLI
                     puts "\n\nEnter a keyword or phrase:"
                     keyword = gets.chomp.downcase
                     books = Book.find_by_keyword(keyword)
-    
+
                     books.each_with_index do |book, i|
                         episodes = book.episode.map { |ep| ep.title}
-    
-                        book.output(i+1)
+
+                        output_book(book, i+1)
                         puts "From the episode(s): #{episodes.join(", ")}\n\n"
                     end
-    
+
                 else
                     no_books
                 end
@@ -102,7 +102,7 @@ class PodcastBookClub::CLI
 
             when "exit"
                 break
-                
+
             else
                 unexpected_input
 
@@ -115,14 +115,14 @@ class PodcastBookClub::CLI
 
     def create_library(episodes)
         episodes.each do |episode|
-            
+
             @scraper.build_books(episode) unless episode.books != []
 
             puts "\n\nHere are the recommendations from \"#{episode.title}\":\n\n"
 
             episode.books.each_with_index do |book, i|
-                book.output(i+1)
-            end    
+                output_book(book, i+1)
+            end
         end
     end
 
@@ -158,14 +158,14 @@ class PodcastBookClub::CLI
 
     private
     def welcome_message
-        puts Rainbow("                        _               _     _                 _           _       _     
-        _ __   ___   __| | ___ __ _ ___| |_  | |__   ___   ___ | | __   ___| |_   _| |__  
-       | '_ \\ / _ \\ / _` |/ __/ _` / __| __| | '_ \\ / _ \\ / _ \\| |/ /  / __| | | | | '_ \\ 
+        puts Rainbow("                        _               _     _                 _           _       _
+        _ __   ___   __| | ___ __ _ ___| |_  | |__   ___   ___ | | __   ___| |_   _| |__
+       | '_ \\ / _ \\ / _` |/ __/ _` / __| __| | '_ \\ / _ \\ / _ \\| |/ /  / __| | | | | '_ \\
        | |_) | (_) | (_| | (_| (_| \\__ \\ |_  | |_) | (_) | (_) |   <  | (__| | |_| | |_) |
-       | .__/ \\___/ \\__,_|\\___\\__,_|___/\\__| |_.__/ \\___/ \\___/|_|\\_\\  \\___|_|\\__,_|_.__/ 
-       |_|                                                                                
+       | .__/ \\___/ \\__,_|\\___\\__,_|___/\\__| |_.__/ \\___/ \\___/|_|\\_\\  \\___|_|\\__,_|_.__/
+       |_|
 
-").bg(:black).yellow.bright
+").yellow.bright
 
        puts Rainbow(" The Ezra Klein Show ").black.bg(:yellow).bright + " brings you far-reaching conversations about hard problems, big ideas,"
        puts "illuminating theories, and cutting-edge research.\n\n"
@@ -202,7 +202,7 @@ class PodcastBookClub::CLI
 
     def puts_episodes(episodes)
         puts "\n\nI have found " + Rainbow(episodes.count).bg(:black).yellow.bright + " episode(s).\n\n"
-        episodes.each.with_index { |episode, i| episode.output(i+1) }
+        episodes.each.with_index { |episode, i| output_episode(episode, i+1) }
     end
 
     def select_menu(episodes)
@@ -213,6 +213,46 @@ class PodcastBookClub::CLI
         puts "\n\nWhat would you like to do?"
     end
 
+    def output_book(book, number)
+
+        authors = book.author.map {|a| a.name} unless book.author == [] || book.author == nil
+        genres = book.genre.map {|g| g.name} unless book.genre == [] || book.genre == nil
+
+        puts Rainbow("#{number} - #{book.title}").bg(:black).yellow.bright
+        puts Rainbow("Author(s): ").bg(:black).yellow.bright + authors.join(", ") unless authors == []
+        puts Rainbow("Genre: ").bg(:black).yellow.bright + genres.join(", ") unless genres == []
+        puts Rainbow("Synopsis: ").bg(:black).yellow.bright + "#{book.synopsis}" unless book.synopsis == ""
+        puts Rainbow("URL: ").bg(:black).yellow.bright + "#{book.url}\n\n"
+
+    end
+
+    def output_episode(episode, number, display_description = false)
+        puts "#{number} - " + Rainbow("#{episode.title}").bg(:black).yellow.bright + " - #{episode.date}"
+        puts "#{episode.description}" if display_description == true
+    end
+
+    def output_author(author)
+        puts "\n\n" + Rainbow("#{author.name}").bg(:black).yellow.bright + Rainbow(" (#{author.books.count})").silver
+
+        sorted_books = author.books.sort_by { |book| book.title}
+        sorted_books.each do |book|
+            puts "  #{book.title}"
+        end
+
+    end
+
+    def output_genre(genre)
+        puts "\n\n" + Rainbow("#{genre.name}").bg(:black).yellow.bright + " (#{genre.books.count})"
+
+        sorted_books = genre.books.sort_by { |book| book.title}
+        sorted_books.each do |book|
+            authors = []
+            book.author.each { |author| authors << author.name}
+
+            puts "  #{book.title} by #{authors.join(", ")}"
+        end
+    end
+
     def no_books
         puts "Your library has no books! Find an episode to begin building your library."
         menu_options

data/lib/podcast_book_club/episode.rb

@@ -37,9 +37,4 @@ class Episode
     self.all.select { |ep| ep.date >= first_date && ep.date <= last_date }
   end
 
-  def output(number, display_description = false)
-    puts "#{number} - " + Rainbow("#{self.title}").bg(:black).yellow.bright + " - #{self.date}"
-    puts "#{self.description}" if display_description == true
-  end
-
 end

data/lib/podcast_book_club/genre.rb

@@ -10,23 +10,15 @@ class Genre
     @@all = []
 
     def initialize(attributes)
-
       @books = []
-
-      attributes.each do |k,v|
-          self.send("#{k}=", v)
-      end
-
+      @name = attributes[:name]
+      @books << attributes[:book] if attributes[:book]
     end
 
     def self.all
       @@all
     end
 
-    def books=(book)
-      self.books << book
-    end
-
     def add_book(book)
         self.books << book unless self.books.include?(book)
         book.genre << self unless book.genre.include?(self)
@@ -37,16 +29,4 @@ class Genre
       @books.map { |book| book.author }.flatten.uniq
     end
 
-    def output
-      puts "\n\n" + Rainbow("#{self.name}").bg(:black).yellow.bright + " (#{self.books.count})"
-
-      sorted_books = self.books.sort_by { |book| book.title}
-      sorted_books.each do |book|
-        authors = []
-        book.author.each { |author| authors << author.name}
-
-        puts "  #{book.title} by #{authors.join(", ")}"
-      end
-    end
-
   end

data/lib/podcast_book_club/scraper.rb

@@ -1,7 +1,7 @@
 require_relative "../podcast_book_club.rb"
 
 class Scraper
-  
+
     def initialize
         path = build_path
         fetch_episodes(path)
@@ -18,7 +18,7 @@ class Scraper
         title = episode.css(".info-top a").text.strip
         link = "https://player.fm#{episode.css(".info-top a").attribute("href").value}"
         date = Date.strptime(episode.css(".timeago").attribute("datetime").value)
-        
+
         attributes = {
             title: title,
             link: link,
@@ -42,6 +42,7 @@ class Scraper
 
           attributes = {}
 
+
           begin
 
             attributes[:url] = result.info_link unless result.info_link.nil?
@@ -50,13 +51,14 @@ class Scraper
             attributes[:genre] = result.categories unless result.categories.nil? || result.categories == ""
             attributes[:synopsis] = result.description unless result.description.nil?
             attributes[:episode] = episode
+            
 
             Book.find_or_create_by_title(attributes)
 
           rescue
 
-            puts "I'm having trouble adding the book " + Rainbow("#{query}").bg(:black).yellow + "from episode: #{episode.output(Episode.all.index(episode))}."
-          
+            puts "I'm having trouble adding the book " + Rainbow("#{query}.").bg(:black).yellow
+
           end
         end
       end
@@ -88,46 +90,34 @@ class Scraper
         parse_with_links(episode)
       when (without_links...with_links)
         parse_without_links(episode)
-      else 
+      else
         puts "This episode has no recommendations."
       end
 
     end
 
     def parse_with_links(episode)
-        book_titles = []
-
         book_links = @episode_doc.css(".description.prose > a")
 
-        book_links.map do |link|
-            if link.attribute("href").value.include?("amazon")
-              book_titles << link.text
-            end
-        end
+        book_titles = book_links.select { |link| link.attribute("href").value.include?("amazon")}.map {|link| link.text}
 
         description = @description.split(book_titles[0]).pop.to_s
 
-        books = []
-
         book_titles.map.with_index do |title, i|
-          unless i + 1 == book_titles.length
+
+          if i + 1 < book_titles.length
             description = description.split(book_titles[i+1 || i])
             author = description[0].strip
-
-            books << "#{title} #{author}"
-
             description = description.pop
 
+            "#{title} #{author}"
           else
 
-            books << "#{title} #{description[0].strip}"
+            "#{title} #{description[0].strip}"
 
           end
 
         end
-
-        books 
-
     end
 
     def parse_without_links(episode)
@@ -139,7 +129,7 @@ class Scraper
 
         book_queries = []
 
-        book_array.map.with_index do |item, i|
+        book_array.each.with_index do |item, i|
             if i.even?
                 book_queries << "#{item.strip} #{book_array[i+1]}"
             end

data/lib/podcast_book_club/version.rb

@@ -1,3 +1,3 @@
 module PodcastBookClub
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: podcast-book-club
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - jessrezac
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler