berklee-valencia 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4c6d4e1d5c6a7edf4b6736d09a94397febea0925b3a49179bf729a60cd7f38c
-  data.tar.gz: f0c23fadc209fcda3c4778dbea92574cf1c7c3beb90f4ed84ab1f5598f0647aa
+  metadata.gz: c48bdb68e6a29bd188073d0788a71b4bf943983b1b9558fa4f143f85f6c5e735
+  data.tar.gz: 1a597db768565282bf7f205ce6ca887fbcff6bb1901e528cbd1b73024a807399
 SHA512:
-  metadata.gz: 5ddeb506895a651fb0175393e4d7d1e463e69d4ac19887b52dfbe155e46b5b17b8c06fa7095413d322e69d4fdc4bbe6c9d111db810a76694ec225cf30c49cb06
-  data.tar.gz: 5c3559a4858233bd37a3ffdd013ecdeeed603cf738dfcf2ef5d2db348c8f10ac7858f2fa6470542de8545eb659a5b299e08687ff11cbb69bf625714a88f2d25b
+  metadata.gz: bc127b52a598c66dacd15c926dcdaa82a8c23540e0a080a96a329e64996e7d9ea9b6ca6a1b55c1fa0b2825ab8e86b51f9bdd1763a6c2cc19074216ae9d56bd70
+  data.tar.gz: 63874aaad8ac760e927625589c1d89fefb46bbb2c8aff4723696c9e211c74bf2725ca929ff22a5a6f2223c8cb71aa2dda1639c4e9761de2dd8cdad8f58a6cd48

data/bin/berklee-valencia

@@ -3,8 +3,8 @@
 require_relative '../lib/berklee_valencia.rb'
 #
 # BerkleeValencia::CLI.new.call
-session = BerkleeValencia::CLI.new.call
- 
+BerkleeValencia::CLI.new.call
+
 
 
 #  ||

data/config/environment.rb

@@ -1,18 +1,10 @@
 require 'nokogiri'
 require 'open-uri'
-require "open_uri_redirections"
-#
-# require_relative "../lib/berklee_valencia/version.rb"
-# require_relative '../lib/berklee_valencia/cli.rb'
-# require_relative '../lib/berklee_valencia/scraper.rb'
-# require_relative '../lib/berklee_valencia/news_article.rb'
-# require_relative '../lib/berklee_valencia/program.rb'
-# require_relative '../lib/berklee_valencia/printer.rb'
-# require_relative '../lib/berklee_valencia/formatter.rb'
-# require_relative '../lib/berklee_valencia/printer.rb'
-# require_relative '../lib/berklee_valencia/news_article.rb'
+require 'open_uri_redirections'
+require 'pry'
 
-require_relative "../lib/berklee_valencia/version.rb"
+
+require_relative '../lib/berklee_valencia/version.rb'
 require_relative '../lib/berklee_valencia/cli.rb'
 require_relative '../lib/berklee_valencia/scraper.rb'
 require_relative '../lib/berklee_valencia/item.rb'

data/lib/berklee_valencia.rb

@@ -2,4 +2,3 @@ module BerkleeValencia
 end
 
 require_relative '../config/environment.rb'
- 

data/lib/berklee_valencia/category.rb

@@ -6,6 +6,7 @@ class BerkleeValencia::CATEGORY
   def initialize(title)
     @title = title
     @articles = []
+    self.i = @@all.length + 1
     @@all << self
   end
 
@@ -17,20 +18,18 @@ class BerkleeValencia::CATEGORY
     if find_by_title(article.category)
       find_by_title(article.category).articles << article
     else
-      self.new(article.category).tap {|cat| cat.articles << article}
+      self.new(article.category).articles << article
     end
   end
 
   def self.find_cat_by_index(input)
     all.detect{|cat| cat.i == input.to_i}
+    # Any point in changing to all[input.to_i - 1] ?
   end
 
   def find_article_by_index(input)
     @articles.detect{|article| article.i == input.to_i}
-  end
-
-  def self.index_categories
-    @@all.each.with_index(1) {|cat, i| cat.i = i}
+    # Any point in changing @articles[input.to_i - 1] ?
   end
 
   def index_articles

data/lib/berklee_valencia/cli.rb

@@ -46,36 +46,6 @@ class BerkleeValencia::CLI
     end
   end
 
-  def list_programs
-    if BerkleeValencia::PROGRAM.all == []
-      BerkleeValencia::SCRAPER.make_programs
-    end
-    puts ""
-    puts "----------------------------------------------------------------"
-    puts " Enter the number of the program you'd like to read more about"
-    puts "     or type 'news' to browse our latest news and articles."
-    puts "----------------------------------------------------------------"
-    BerkleeValencia::PRINTER.print_programs_list
-    input = gets.strip.downcase
-    if input.to_i.between?(1,BerkleeValencia::PROGRAM.all.length)
-      show_program(input)
-    elsif input == "news"
-      list_article_categories
-    else
-      if_not_that_then_this(input)
-    end
-  end
-
-  def show_program(input)
-    program = BerkleeValencia::PROGRAM.find_by_index(input.to_i)
-    if !program.introduction
-      attributes = BerkleeValencia::SCRAPER.get_program_extended_info(program.url)
-      program.extended_info_from_scraper(attributes)
-    end
-    BerkleeValencia::PRINTER.print_program(program)
-    what_next
-  end
-
   def list_article_categories
     if BerkleeValencia::ARTICLE.all == []
       BerkleeValencia::SCRAPER.make_articles
@@ -85,7 +55,6 @@ class BerkleeValencia::CLI
     puts " Which kind of article are you interested in?"
     puts "  Type 'programs' to browse programs instead"
     puts "----------------------------------------------"
-    BerkleeValencia::CATEGORY.index_categories
     BerkleeValencia::PRINTER.print_article_categories
     input = gets.strip.downcase
     if input.to_i.between?(1,BerkleeValencia::CATEGORY.all.length)
@@ -124,28 +93,46 @@ class BerkleeValencia::CLI
     what_next
   end
 
-  def please_wait
-    puts ""
-    puts "    Please be patient whilst we get up to date with all our news!"
-    puts ""
-    puts "        ...                    ...                    ..."
+  def list_programs
+    if BerkleeValencia::PROGRAM.all == []
+      BerkleeValencia::SCRAPER.make_programs
+    end
     puts ""
+    puts "----------------------------------------------------------------"
+    puts " Enter the number of the program you'd like to read more about"
+    puts "     or type 'news' to browse our latest news and articles."
+    puts "----------------------------------------------------------------"
+    BerkleeValencia::PRINTER.print_programs_list
+    input = gets.strip.downcase
+    if input.to_i.between?(1,BerkleeValencia::PROGRAM.all.length)
+      show_program(input)
+    elsif input == "news"
+      list_article_categories
+    else
+      if_not_that_then_this(input)
+    end
   end
 
-  def what_next
+  def show_program(input)
+    program = BerkleeValencia::PROGRAM.find_by_index(input.to_i)
+    if !program.introduction
+      attributes = BerkleeValencia::SCRAPER.get_program_extended_info(program.url)
+      program.extended_info_from_scraper(attributes)
+    end
+    BerkleeValencia::PRINTER.print_program(program)
+    what_next
+  end
+
+  def please_wait
     puts ""
-    puts "What would you like to do next?"
-    puts "1. See news articles"
-    puts "2. See programs"
+    puts "    Please be patient whilst we get up to date with all our news!"
     puts ""
-    puts "  If you're all set, you can just say ciao for now and we will "
-    puts "  see you next time with the latest news from Berklee Valencia!"
+    puts "        ...                    ...                    ..."
     puts ""
-    programs_or_news
   end
 
   def if_not_that_then_this(input)
-    if input.match(/hasta luego|exit|bye|ciao/)
+    if input.match(/ta luego|exit|bye|ciao/)
       goodbye
     elsif input == "menu"
       menu
@@ -160,6 +147,18 @@ class BerkleeValencia::CLI
     what_next
   end
 
+  def what_next
+    puts ""
+    puts "What would you like to do next?"
+    puts "1. See news articles"
+    puts "2. See programs"
+    puts ""
+    puts "  If you're all set, you can just say ciao for now and we will "
+    puts "  see you next time with the latest news from Berklee Valencia!"
+    puts ""
+    programs_or_news
+  end
+
   def goodbye
     puts ""
     puts "Hasta luego!"

data/lib/berklee_valencia/formatter.rb

@@ -4,6 +4,10 @@ class Formatter
 	  text.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
 	end
 
+  def self.urlwrap(text, width=80)
+	  text.gsub(/(.{1,#{width}})/, "\\1\n")
+	end
+
   class Formatter::FORMATARTICLE < Formatter
     def self.header(article)
       border = border_maker(article)
@@ -17,25 +21,15 @@ class Formatter
 
     def self.border_maker(article)
       border = ""
-      if article.title.length < (article.author.length + article.date.length)
-        borderlength = article.author.length + article.date.length + 5
-        borderlength.times {border << "-"}
-      elsif article.title.length > 80
-        80.times {border << "-"}
-      else
-        borderlength = article.title.length
-        borderlength.times {border << "-"}
-      end
+      bordertestlength = [article.title.length, (article.author.length + article.date.length + 5)].max
+      borderlength = [bordertestlength, 80].min
+      borderlength.times {border << "-"}
       border
     end
 
     def self.gap_maker(article, border)
       gap = ""
-      if border.length > article.title.length
-        5.times {gap << " "}
-      else
-        (article.title.length - article.author.length - article.date.length).times {gap << " "}
-      end
+      (border.length - article.author.length - article.date.length).times {gap << " "}
       gap
     end
 
@@ -44,19 +38,17 @@ class Formatter
         if paragraph.match(/-{3} /)
           puts " ______________________________________________________________________________"
           puts "  ||               Press enter to scroll to the next section                ||"
-          puts "  ||                   or type 'menu' to see all options                    ||"
+          puts "  ||                or type 'end' to skip to end of article.                ||"
           puts " ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾"
           input = gets.strip
-          if input == "menu"
-            return "menu"
+          if input == "end"
+            return "end"
           end
-        elsif !paragraph.downcase.match(/click here/)
-          if paragraph.match(/below/)
-            puts "#{wrap(paragraph)}"
-            puts "        Vist #{article.related_links.shift}"
-          elsif paragraph ==  " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
-              puts "        Vist #{article.related_links.shift}"
-              puts paragraph
+          puts "#{wrap(paragraph)}"
+          puts ""
+        elsif !paragraph.match(/click here/i) && !paragraph.match(/•/)
+          if paragraph.match(/below:/) || paragraph.match(/^Watch|^Listen/)
+            media_compiler(article, paragraph)
           else
             puts "#{wrap(paragraph)}"
             puts ""
@@ -65,12 +57,33 @@ class Formatter
       end #do
     end #print_body method
 
-    def self.end
+    def self.media_compiler(article, paragraph)
+      if paragraph.match(/below:/)
+        puts " - - - - - - - - - - - - - - - - - Media - - - - - - - - - - - - - - - - - - -"
+        puts "#{wrap(paragraph)}"
+        puts "#{urlwrap("        Visit #{(article.related_links.shift)}")}"
+        puts "#{urlwrap("        Visit #{(article.related_links.shift)}")}"
+        puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+      elsif paragraph.match(/watch|listen/i) && paragraph.match(/:\s?\z/)
+        puts " - - - - - - - - - - - - - - - - - Media - - - - - - - - - - - - - - - - - - -"
+        puts "#{wrap(paragraph)}"
+        puts "#{urlwrap("        Visit #{(article.related_links.shift)}")}"
+        puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+      end
+    end
+
+    def self.end(article)
       puts ""
       puts " ______________________________________________________________________________"
-      puts "  ||                             END OF ARTICLE                             ||"
+      puts "  ||                          END OF ARTICLE                                ||"
+      puts "  ||              Type 'open' to see full article in browser                ||"
+      puts "  ||                    or hit enter to see all options                     ||"
       puts " ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾"
       2.times {puts ""}
+      input = gets.strip
+      if input == "open"
+        system("open #{article.url}")
+      end
     end
   end #class
 
@@ -107,9 +120,13 @@ class Formatter
       puts "--------------------------------------------------------------------------------"
       puts "                        For full program information:"
       puts "--------------------------------------------------------------------------------"
-      puts "Visit #{program.url}"
+      puts "Type 'open' to visit program homepage or hit enter to see more options."
       2.times {puts "--------------------------------------------------------------------------------"}
       2.times {puts ""}
+      input = gets.strip
+      if input == "open"
+        system("open #{program.url}")
+      end
     end
 
   end #Program class

data/lib/berklee_valencia/printer.rb

@@ -1,4 +1,23 @@
 class BerkleeValencia::PRINTER
+  def self.print_article_categories
+    BerkleeValencia::CATEGORY.all.each {|cat| puts "#{cat.i}. #{cat.title}"}
+    puts ""
+  end
+
+  def self.print_articles_list(category)
+    category.articles.each do |article|
+      puts "#{article.i}: #{Formatter.wrap(article.title)}"
+      puts "  // Posted on #{article.date}"
+      puts "#{Formatter.wrap(article.excerpt)}"
+      puts ""
+    end
+  end
+
+  def self.print_article(article)
+    Formatter::FORMATARTICLE.header(article)
+    Formatter::FORMATARTICLE.body(article)
+    Formatter::FORMATARTICLE.end(article)
+  end
 
   def self.print_programs_list
     puts "Graduate Programs"
@@ -30,24 +49,4 @@ class BerkleeValencia::PRINTER
     Formatter::FORMATPROGRAM.more_info(program)
   end
 
-  def self.print_article_categories
-    BerkleeValencia::CATEGORY.all.each {|cat| puts "#{cat.i}. #{cat.title}"}
-    puts ""
-  end
-
-  def self.print_articles_list(category)
-    category.articles.each do |article|
-      puts "#{article.i}: #{Formatter.wrap(article.title)}"
-      puts "  // Posted on #{article.date}"
-      puts "#{Formatter.wrap(article.excerpt)}"
-      puts ""
-    end
-  end
-
-  def self.print_article(article)
-    Formatter::FORMATARTICLE.header(article)
-    Formatter::FORMATARTICLE.body(article)
-    Formatter::FORMATARTICLE.end
-  end
-
 end

data/lib/berklee_valencia/program.rb

@@ -5,12 +5,13 @@ class BerkleeValencia::PROGRAM < BerkleeValencia::ITEM
   @@other_programs = []
 
   def self.new_from_scraper(attribute_hash)
-    new_program = BerkleeValencia::PROGRAM.new(attribute_hash[:title], attribute_hash[:url])
-    new_program.type = attribute_hash[:type]
-    new_program.subtitle = attribute_hash[:subtitle]
-    new_program.i = @@all.length + 1
-    @@all << new_program
-    new_program.type == "Graduate Programs" ? @@graduate_programs << new_program : @@other_programs << new_program
+    BerkleeValencia::PROGRAM.new(attribute_hash[:title], attribute_hash[:url]).tap do |program|
+      program.type = attribute_hash[:type]
+      program.subtitle = attribute_hash[:subtitle]
+      program.i = @@all.length + 1
+      @@all << program
+      program.type == "Graduate Programs" ? @@graduate_programs << program : @@other_programs << program
+    end
   end
 
   def extended_info_from_scraper(attribute_hash)

data/lib/berklee_valencia/scraper.rb

@@ -2,21 +2,6 @@ class BerkleeValencia::SCRAPER
   @@bv_news = "https://valencia.berklee.edu/news/"
   @@bv_programs = "https://valencia.berklee.edu/academic-programs/"
 
-  def self.make_programs
-    course_types = Nokogiri::HTML(open(@@bv_programs, :allow_redirections => :all)).css("div.col-3-5")
-    course_types.each do |type|
-      type.css("ul a").each do |program|
-        attributes = {
-          title: program.text,
-          subtitle: program.css("span").text,
-          url: program.attribute("href").value,
-          type: type.css("h4").text
-        }
-      BerkleeValencia::PROGRAM.new_from_scraper(attributes)
-      end
-    end
-  end
-
   def self.make_articles
     articles = Nokogiri::HTML(open(@@bv_news, :allow_redirections => :all))
     articles.css("div#news_container div.content").each do |article|
@@ -42,6 +27,22 @@ class BerkleeValencia::SCRAPER
     extended_info
   end
 
+  def self.make_programs
+    course_types = Nokogiri::HTML(open(@@bv_programs, :allow_redirections => :all)).css("div.col-3-5")
+    course_types.each do |type|
+      type.css("ul a").each do |program|
+        attributes = {
+          title: program.text,
+          subtitle: program.css("span").text,
+          url: program.attribute("href").value,
+          type: type.css("h4").text
+        }
+      BerkleeValencia::PROGRAM.new_from_scraper(attributes)
+      end
+    end
+  end
+
+
   def self.get_program_extended_info(url)
     program = Nokogiri::HTML(open(url, :allow_redirections => :all))
     extended_info = {
@@ -55,17 +56,13 @@ class BerkleeValencia::SCRAPER
 
   def self.sort_content(article, extended_info)
     article.css("div#tab_intro p").each do |para|
-      if para.css("iframe").length == 0 && para.css("em").text.length < 30 && para.css("strong").text == "" && !para.text.match(/•/)
+      if para.css("iframe").length == 0 && para.css("strong").text == ""
         extended_info[:body] << para.text
       elsif para.css("strong").text != ""
         extended_info[:body] << " --- #{para.text} ---"
-      elsif para.css("em").text != ""
-        comment = "#{para.text}"
-        extended_info[:body] << " - - - - - - - - - - - - - - - - - Media - - - - - - - - - - - - - - - - - - -"
-        extended_info[:body] << comment
-        extended_info[:body] << " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
       elsif para.css("iframe").length > 0
-       extended_info[:related_links] << para.css("iframe").attribute("src").value
+        extended_info[:body] << para.text
+        extended_info[:related_links] << para.css("iframe").attribute("src").value
       end
     end
     extended_info

data/lib/berklee_valencia/version.rb

@@ -1,3 +1,3 @@
 module BerkleeValencia
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berklee-valencia
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Gingertonic