berklee-valencia 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abfec51df5da1d9aef8c1e8bbd0b86f1d9c454c93ad8854b4b198ae47539621f
-  data.tar.gz: 72b1672acf9911addaf3ee623a574aded2ff07a5fab944ef6d51806b4bd78b40
+  metadata.gz: 8f285d72b0611c1f7668b8c7e0280fd614c38409dea17fe4dfa683fe6910d27e
+  data.tar.gz: 933831281bdb32e0382c6dff11834af2ee39c68170fc23283f5aa0ae5e8a2748
 SHA512:
-  metadata.gz: cee38cc3dc32f75262aa391a4ed568a7bdc47014992cb1740dc95f1b70ca5ae30adb93106beefd39084c81fc9ac59777c12aeac02bfce42359eac53adbf295b4
-  data.tar.gz: a34fe3de07687a0754e96e477182647a8d3b42e7e6fc524d155cafaa581b5d40892a65533058be5c77830a340f52246c4788cf9009635d51adc6bc0ce1e36de9
+  metadata.gz: a6265963d483e171c9825adc4ac76934b5c6d0e7ae32925c187353482050a7b305c06fac20418995de72903d2fa1fdc20871881d2b60aceeed48fb477443fec4
+  data.tar.gz: e60d265bb275b9d37743d5257ebc58c56f774fd7ab1fb4e3952750cb1e21f7e694f67cb220f169ef22dba4d24ffe16933fca18a3f5837bd186fae1a414d45206

data/bin/berklee-valencia

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

data/config/environment.rb

@@ -1,13 +1,23 @@
 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_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/item.rb'
+require_relative '../lib/berklee_valencia/article.rb'
 require_relative '../lib/berklee_valencia/program.rb'
+require_relative '../lib/berklee_valencia/category.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'

data/lib/berklee_valencia.rb

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

data/lib/berklee_valencia/article.rb

@@ -0,0 +1,25 @@
+class BerkleeValencia::ARTICLE < BerkleeValencia::ITEM
+  attr_accessor :date, :excerpt, :category, :author, :related_links, :body, :i
+  @@all = []
+
+  def self.new_from_scraper(attribute_hash)
+    BerkleeValencia::ARTICLE.new(attribute_hash[:title], attribute_hash[:url]).tap do |article|
+      article.category = attribute_hash[:category]
+      article.date = attribute_hash[:date]
+      article.excerpt = attribute_hash[:excerpt]
+      @@all << article
+      BerkleeValencia::CATEGORY.find_or_create_from_article(article)
+    end
+  end
+
+  def extended_info_from_scraper(attribute_hash)
+    @author = attribute_hash[:author]
+    @related_links = attribute_hash[:related_links]
+    @body = attribute_hash[:body]
+  end
+
+  def self.all
+    @@all
+  end
+
+end

data/lib/berklee_valencia/category.rb

@@ -0,0 +1,44 @@
+class BerkleeValencia::CATEGORY
+  attr_accessor :title, :i, :articles
+
+  @@all = []
+
+  def initialize(title)
+    @title = title
+    @articles = []
+    @@all << self
+  end
+
+  def self.find_by_title(title)
+    @@all.detect {|cat| cat.title == title}
+  end
+
+  def self.find_or_create_from_article(article)
+    if find_by_title(article.category)
+      find_by_title(article.category).articles << article
+    else
+      self.new(article.category).tap {|cat| cat.articles << article}
+    end
+  end
+
+  def self.find_cat_by_index(input)
+    all.detect{|cat| cat.i == input.to_i}
+  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}
+  end
+
+  def index_articles
+    @articles.each.with_index(1) {|article, i| article.i = i}
+  end
+
+  def self.all
+    @@all
+  end
+
+end

data/lib/berklee_valencia/cli.rb

@@ -1,16 +1,17 @@
 class BerkleeValencia::CLI
+
   def call
     puts ""
     puts "||"
     puts "||"
-    puts "||   /||    Buenos Dias!"
+    puts "||   /||    Buenos Días!"
     puts "||  //||"
     puts "|| // ||    Berklee Valencia is Berklee College of Music's"
     puts "||//  ||        graduate campus located in Valencia, Spain"
     puts "||/   ||"
     puts "||    ||            Filled with the"
-    puts "||   /||                musicians"
-    puts "||  //||                  business moguls"
+    puts "||   /||                musicians,"
+    puts "||  //||                  business moguls,"
     puts "|| // ||                      and technologists"
     puts "||//  ||                    of today and tomorrow..."
     puts "||/   ||"
@@ -27,110 +28,120 @@ class BerkleeValencia::CLI
     puts "       1. Meet the people and read the latest news"
     puts "       2. See the available Programs"
     puts ""
-    list_news_or_programs
+    programs_or_news
   end
 
-  def list_news_or_programs
+  def programs_or_news
     input = gets.strip.downcase
     if input.match(/hasta luego|exit|bye|ciao/)
       goodbye
-    else
-      puts ""
-      puts "    Please be patient whilst we get up to date with all our news!"
-      puts ""
-      puts "        ...                    ...                    ..."
-      puts ""
-      if input == "1"
-        show_news_categories
-      elsif input == "2"
-        show_programs
-      elsif input == "programs"
-        what_next
-      else
-        say_what
+    elsif input == "1" || input == "2"
+      please_wait
+      case input
+      when "1"
+        list_article_categories
+      when "2"
+        list_programs
       end
+    else
+      say_what
     end
   end
 
-  def list_news_articles
+  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 > 0
-      puts ""
-      puts "----------------------------------------------------------"
-      puts "Enter the number of the article you'd like to read in full"
-      puts "           or type 'menu' to see all options"
-      puts "----------------------------------------------------------"
-      BerkleeValencia::NEWS_ARTICLE.list_news_articles(input)
-      show_article
-    elsif input == "programs"
-      show_programs
+    if input.to_i.between?(1,BerkleeValencia::PROGRAM.all.length)
+      show_program(input)
+    elsif input == "news"
+      list_article_categories
+    elsif input.match(/hasta luego|exit|bye|ciao/)
+      goodbye
     else
       say_what
     end
   end
 
-  def show_news_categories
-    BerkleeValencia::NEWS_ARTICLE.get_news_categories
+  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
+    end
     puts ""
     puts "----------------------------------------------"
     puts " Which kind of article are you interested in?"
     puts "  Type 'programs' to browse programs instead"
     puts "----------------------------------------------"
-    BerkleeValencia::NEWS_ARTICLE.list_news_categories
-    list_news_articles
-  end
-
-  def show_programs
-    BerkleeValencia::PROGRAM.get_programs
-    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 "----------------------------------------------------------------"
-    puts "Graduate Programs"
-    BerkleeValencia::PROGRAM.list_programs("grad")
-    puts ""
-    puts "Other Programs"
-    BerkleeValencia::PROGRAM.list_programs("other")
-    show_program
-  end
-
-  def show_article
-    puts ""
+    BerkleeValencia::CATEGORY.index_categories
+    BerkleeValencia::PRINTER.print_article_categories
     input = gets.strip.downcase
-    if input.to_i > 0
-      if BerkleeValencia::NEWS_ARTICLE.print_article(input) == "abort mission!"
-        menu
-      else
-        what_next
-      end
-    elsif input == "menu"
-      what_next
+    if input.to_i.between?(1,BerkleeValencia::CATEGORY.all.length)
+      list_articles(input)
+    elsif input == "programs"
+      list_programs
+    elsif input.match(/hasta luego|exit|bye|ciao/)
+      goodbye
     else
       say_what
     end
   end
 
-  def show_program
+  def list_articles(input)
     puts ""
+    puts "----------------------------------------------------------"
+    puts "Enter the number of the article you'd like to read in full"
+    puts "           or type 'menu' to see all options"
+    puts "----------------------------------------------------------"
+    category = BerkleeValencia::CATEGORY.find_cat_by_index(input)
+    category.index_articles
+    BerkleeValencia::PRINTER.print_articles_list(category)
     input = gets.strip.downcase
-    if input.to_i > 0
-      BerkleeValencia::PROGRAM.print_program(input)
-      what_next
-    elsif input == "news"
-      show_news_categories
+    if input.to_i.between?(1,category.articles.length)
+      show_article(category, input)
+    elsif input == "menu"
+      programs_or_news
+    elsif input.match(/hasta luego|exit|bye|ciao/)
+      goodbye
     else
       say_what
     end
   end
 
-  def say_what
-    puts ""
-    puts "Sorry, I didn't understand that!"
+  def show_article(category, input)
+    article = category.find_article_by_index(input)
+    if !article.body
+      attributes = BerkleeValencia::SCRAPER.get_article_extended_info(article.url)
+      article.extended_info_from_scraper(attributes)
+    end
+    BerkleeValencia::PRINTER.print_article(article)
     what_next
   end
 
+  def please_wait
+    puts ""
+    puts "    Please be patient whilst we get up to date with all our news!"
+    puts ""
+    puts "        ...                    ...                    ..."
+    puts ""
+  end
+
   def what_next
     puts ""
     puts "What would you like to do next?"
@@ -140,13 +151,20 @@ class BerkleeValencia::CLI
     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 ""
-    list_news_or_programs
+    programs_or_news
   end
 
+  def say_what
+    puts ""
+    puts "Sorry, I didn't understand that!"
+    what_next
+  end
 
   def goodbye
     puts ""
     puts "Hasta luego!"
     puts ""
+    exit!
   end
+
 end

data/lib/berklee_valencia/formatter.rb

@@ -4,43 +4,43 @@ class Formatter
 	  text.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
 	end
 
-  class Article < Formatter
-    def self.header(article, article_extended)
-      border = border_maker(article, article_extended)
+  class Formatter::FORMATARTICLE < Formatter
+    def self.header(article)
+      border = border_maker(article)
       puts ""
       2.times {puts "#{border}"}
-      puts "#{wrap(article[:title])}"
-      gap = gap_maker(article, article_extended, border)
-      puts "#{article_extended[:author]}#{gap}#{article[:date]}"
+      puts "#{wrap(article.title)}"
+      gap = gap_maker(article, border)
+      puts "#{article.author}#{gap}#{article.date}"
       2.times {puts "#{border}"}
     end
 
-    def self.border_maker(article, article_extended)
+    def self.border_maker(article)
       border = ""
-      if article[:title].length < (article_extended[:author].length + article[:date].length)
-        borderlength = article_extended[:author].length + article[:date].length + 5
+      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
+      elsif article.title.length > 80
         80.times {border << "-"}
       else
-        borderlength = article[:title].length
+        borderlength = article.title.length
         borderlength.times {border << "-"}
       end
       border
     end
 
-    def self.gap_maker(article, article_extended, border)
+    def self.gap_maker(article, border)
       gap = ""
-      if border.length > article[:title].length
+      if border.length > article.title.length
         5.times {gap << " "}
       else
-        (article[:title].length - article_extended[:author].length - article[:date].length).times {gap << " "}
+        (article.title.length - article.author.length - article.date.length).times {gap << " "}
       end
       gap
     end
 
-    def self.body(article, article_extended)
-      article_extended[:body].each do |paragraph|
+    def self.body(article)
+      article.body.each do |paragraph|
         if paragraph.match(/-{3} /)
           puts " ______________________________________________________________________________"
           puts "  ||               Press enter to scroll to the next section                ||"
@@ -48,16 +48,14 @@ class Formatter
           puts " ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾"
           input = gets.strip
           if input == "menu"
-            return "abort mission!"
+            return "menu"
           end
-        end
-
-        if !paragraph.downcase.match(/click here/)
+        elsif !paragraph.downcase.match(/click here/)
           if paragraph.match(/below/)
             puts "#{wrap(paragraph)}"
-            puts "        Vist #{article_extended[:related_links].shift}"
+            puts "        Vist #{article.related_links.shift}"
           elsif paragraph ==  " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
-              puts "        Vist #{article_extended[:related_links].shift}"
+              puts "        Vist #{article.related_links.shift}"
               puts paragraph
           else
             puts "#{wrap(paragraph)}"
@@ -74,33 +72,31 @@ class Formatter
       puts " ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾"
       2.times {puts ""}
     end
-  end
+  end #class
 
-  class Program < Formatter
+  class Formatter::FORMATPROGRAM < Formatter
     def self.header(program)
       border = ""
-      (program[:name].gsub("#{program[:detail]}", "").length + 4).times {border << "-"}
+      (program.title.length + 4).times {border << "-"}
       puts ""
       2.times {puts border}
-      puts "  #{program[:name].gsub("#{program[:detail]}", "")}"
-      if program[:detail] != ""
-        puts "  (#{program[:detail]})"
-      end
+      puts "  #{program.title}"
+      puts "  #{program.type}"
     end
 
-    def self.intro(program_extended)
+    def self.intro(program)
       puts "--------------------------------------------------------------------------------"
       puts "                                Introduction"
       puts "--------------------------------------------------------------------------------"
-      puts "#{wrap(program_extended[:introduction])}"
+      puts "#{wrap(program.introduction)}"
       puts ""
     end
 
-    def self.highlights(program_extended)
+    def self.highlights(program)
       puts "--------------------------------------------------------------------------------"
       puts "                               Program Highlights"
       puts "--------------------------------------------------------------------------------"
-      program_extended[:highlights].each do |highlight|
+      program.highlights.each do |highlight|
         puts "| #{highlight[:hl_title]} |"
         puts "#{wrap(highlight[:hl_body])}"
         puts ""
@@ -111,7 +107,7 @@ class Formatter
       puts "--------------------------------------------------------------------------------"
       puts "                        For full program information:"
       puts "--------------------------------------------------------------------------------"
-      puts "Visit #{program[:url]}"
+      puts "Visit #{program.url}"
       2.times {puts "--------------------------------------------------------------------------------"}
       2.times {puts ""}
     end

data/lib/berklee_valencia/item.rb

@@ -0,0 +1,10 @@
+class BerkleeValencia::ITEM
+  attr_reader :title, :url
+
+  def initialize(title, url)
+    @title = title
+    @url = url
+  end
+
+
+end

data/lib/berklee_valencia/printer.rb

@@ -1,16 +1,53 @@
 class BerkleeValencia::PRINTER
-  def self.print_article(article, article_extended)
-    Formatter::Article.header(article, article_extended)
-    Formatter::Article.body(article, article_extended)
-    Formatter::Article.end
+
+  def self.print_programs_list
+    puts "Graduate Programs"
+    BerkleeValencia::PROGRAM.graduate_programs.each do |program|
+      if program.subtitle.length > 0
+        puts "#{program.i}: #{program.title.gsub(program.subtitle, "")} (#{program.subtitle})"
+      else
+        puts "#{program.i}: #{program.title}"
+      end
+    end
+    puts ""
+    puts "Other Programs"
+    BerkleeValencia::PROGRAM.other_programs.each do |program|
+      if program.subtitle.length > 0
+        puts "#{program.i}: #{program.title.gsub(program.subtitle, "")} (#{program.subtitle})"
+      else
+        puts "#{program.i}: #{program.title}"
+      end
+    end
+    puts ""
   end
 
-  def self.print_program(program, program_extended)
-    Formatter::Program.header(program)
-    Formatter::Program.intro(program_extended)
-    if program_extended[:highlights].length > 0
-      Formatter::Program.highlights(program_extended)
+  def self.print_program(program)
+    Formatter::FORMATPROGRAM.header(program)
+    Formatter::FORMATPROGRAM.intro(program)
+    if program.highlights.length > 0
+      Formatter::FORMATPROGRAM.highlights(program)
     end
-    Formatter::Program.more_info(program)
+    Formatter::FORMATPROGRAM.more_info(program)
   end
-end #class
+
+  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

@@ -1,28 +1,37 @@
-class BerkleeValencia::PROGRAM
-  @@grad_programs
-  @@other_programs
+class BerkleeValencia::PROGRAM < BerkleeValencia::ITEM
+  attr_accessor :type, :introduction, :subtitle, :highlights, :i
+  @@all = []
+  @@graduate_programs = []
+  @@other_programs = []
 
-  def self.get_programs
-    @@grad_programs = BerkleeValencia::SCRAPER.scrape_programs("grad")
-    @@other_programs = BerkleeValencia::SCRAPER.scrape_programs("other")
+  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
   end
 
-  def self.list_programs(type)
-    type == "grad" ? programs = @@grad_programs : programs = @@other_programs
-    programs == @@grad_programs ? i = 1 : i = (@@grad_programs.length + 1)
-    programs.each.with_index(i) do |program, i|
-      (program[:detail] != "") ? (puts "#{i}: #{program[:name].gsub("#{program[:detail]}", "")} (#{program[:detail]})") : (puts "#{i}: #{program[:name]}")
-      program[:i] = i
-    end# do
-  end #list programs method
+  def extended_info_from_scraper(attribute_hash)
+    @highlights = attribute_hash[:highlights]
+    @introduction = attribute_hash[:introduction]
+  end
+
+  def self.find_by_index(input)
+    @@all.detect{|program| program.i == input}
+  end
+
+  def self.graduate_programs
+    @@graduate_programs
+  end
+
+  def self.other_programs
+    @@other_programs
+  end
 
-  def self.print_program(input)
-    programs = @@grad_programs
-    @@other_programs.each { |program| programs << program }
-    program = programs.find { |program| program[:i] == input.to_i }
-    url = program[:url]
-    program_extended = BerkleeValencia::SCRAPER.scrape_program(url)
-    BerkleeValencia::PRINTER.print_program(program, program_extended)
-  end #method
+  def self.all
+    @@all
+  end
 
-end #class
+end

data/lib/berklee_valencia/scraper.rb

@@ -1,36 +1,37 @@
 class BerkleeValencia::SCRAPER
-@bv_news = "https://valencia.berklee.edu/news/"
-@bv_programs = "https://valencia.berklee.edu/academic-programs/"
+  @@bv_news = "https://valencia.berklee.edu/news/"
+  @@bv_programs = "https://valencia.berklee.edu/academic-programs/"
 
-  def self.scrape_news
-    news = Nokogiri::HTML(open(@bv_news))
-    articles = []
-    news.css("div#news_container div.content").each do |article|
-      articles << {
-        date: article.css("div.news_excerpt span.date").text,
-        title: article.css("div.news_excerpt h3 a").text,
-        excerpt: article.css("div.news_excerpt p").text,
-        url: article.css("div.news_excerpt h3 a").attribute("href").value,
-        category: article.css("span.category_name").text
-      }
+  def self.make_programs
+    course_types = Nokogiri::HTML(open(@@bv_programs)).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
-    articles
   end
 
-  def self.scrape_programs(type)
-    type == "grad" ? academics = Nokogiri::HTML(open(@bv_programs)).css("div.col-3-5").first : academics = Nokogiri::HTML(open(@bv_programs)).css("div.col-3-5").last
-    programs = []
-    academics.css("ul a").each do |program|
-      programs << {
-        name: program.text,
-        detail: program.css("span").text,
-        url: program.attribute("href").value
+  def self.make_articles
+    articles = Nokogiri::HTML(open(@@bv_news))
+    articles.css("div#news_container div.content").each do |article|
+      attributes = {
+        title: article.css("div.news_excerpt h3 a").text,
+        category: article.css("span.category_name").text,
+        date: article.css("div.news_excerpt span.date").text,
+        excerpt: article.css("div.news_excerpt p").text,
+        url: article.css("div.news_excerpt h3 a").attribute("href").value
       }
+      BerkleeValencia::ARTICLE.new_from_scraper(attributes)
     end
-    programs
   end
 
-  def self.scrape_article(url)
+  def self.get_article_extended_info(url)
     article = Nokogiri::HTML(open(url))
     extended_info = {
       author: article.css("span.author").text,
@@ -38,6 +39,18 @@ class BerkleeValencia::SCRAPER
       body: []
     }
     sort_content(article, extended_info)
+    extended_info
+  end
+
+  def self.get_program_extended_info(url)
+    program = Nokogiri::HTML(open(url, :allow_redirections => :all))
+    extended_info = {
+      introduction: "",
+      highlights: []
+    }
+    scrape_program_intro(program, extended_info)
+    scrape_program_highlights(program, extended_info)
+    extended_info
   end
 
   def self.sort_content(article, extended_info)
@@ -58,18 +71,7 @@ class BerkleeValencia::SCRAPER
     extended_info
   end
 
-  def self.scrape_program(url)
-    program = Nokogiri::HTML(open(url, :allow_redirections => :all))
-    extended_info = {
-      highlights: [],
-      list: []
-    }
-    scrape_program_intro(program, extended_info)
-    scrape_program_highlights(program, extended_info)
-  end
-
   def self.scrape_program_intro(program, extended_info)
-    # scrape intro
     if program.css("div#tab_intro p").first.text.length > 0
       extended_info[:introduction] = program.css("div#tab_intro p").first.text
     elsif program.css("div#tab_intro h4").length > 0
@@ -89,8 +91,6 @@ class BerkleeValencia::SCRAPER
         hl_body: hl_body
       }
     end
-    extended_info
   end
 
-
-end
+end #class

data/lib/berklee_valencia/version.rb

@@ -1,3 +1,3 @@
 module BerkleeValencia
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berklee-valencia
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Gingertonic
@@ -106,9 +106,11 @@ files:
 - bin/berklee-valencia
 - config/environment.rb
 - lib/berklee_valencia.rb
+- lib/berklee_valencia/article.rb
+- lib/berklee_valencia/category.rb
 - lib/berklee_valencia/cli.rb
 - lib/berklee_valencia/formatter.rb
-- lib/berklee_valencia/news_article.rb
+- lib/berklee_valencia/item.rb
 - lib/berklee_valencia/printer.rb
 - lib/berklee_valencia/program.rb
 - lib/berklee_valencia/scraper.rb

data/lib/berklee_valencia/news_article.rb

@@ -1,39 +0,0 @@
-class BerkleeValencia::NEWS_ARTICLE
-  @@categories
-  @@articles
-  @@matches
-
-  def self.get_news_categories
-    @@articles = BerkleeValencia::SCRAPER.scrape_news
-    @@categories = []
-    @@articles.each do |article|
-      @@categories.push(article[:category])
-    end
-    @@categories.uniq!
-  end
-
-  def self.list_news_categories
-    @@categories.each.with_index(1) do |category, i|
-      puts "#{i}. #{category}"
-    end
-  end
-
-  def self.list_news_articles(input)
-    @@matches = @@articles.find_all {|article| article[:category] == @@categories[input.to_i-1]}
-    @@matches.each.with_index(1) do |article, i|
-        puts "#{i}: #{Formatter.wrap(article[:title])}"
-        puts "  // Posted on #{article[:date]}"
-        puts "#{Formatter.wrap(article[:excerpt])}"
-        puts ""
-        article[:i] = i
-      end
-  end
-
-  def self.print_article(input)
-    article = @@articles.find { |article| article[:i] == input.to_i }
-    url = article[:url]
-    article_extended = BerkleeValencia::SCRAPER.scrape_article(url)
-    BerkleeValencia::PRINTER.print_article(article, article_extended)
-  end
-
-end