marvel_101 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58a980450a4c9aeba5dd762844b3a4477e86cd2e
-  data.tar.gz: acb63ead81f330ac641be23801833cee4fed709c
+  metadata.gz: 941d8e0298abee9dafad8888b09fd5275f50dafb
+  data.tar.gz: 39a7e6ab9825202c70462fbf0bd7310f84c2b3ee
 SHA512:
-  metadata.gz: fb496842beff97b38cf7f3a8e1e6cce8b7f493115fe473d9c3a2282700ae061f82825cb09680bafc2d3b7bebeab988cdc825d1731b3ab438424e0d4bf4d762d0
-  data.tar.gz: f8ab53a71fa52dc94705c4f12c5ce7bfa9cf031db863f09f9808f91b72471668a91d823815d589cec61c9c7d8cb92cd04b2de185b1e765ff084cefa142fdbc49
+  metadata.gz: a7c348c7475488c726428c7c369a172feb7dd568a3aaecf43188428893df0319b6d1a013db4ebd491f72f9ba3975bd16ab19bb2fb7ded7c8d44984c9a73a0f8a
+  data.tar.gz: efc292eb19f5c863b8a59f211daeb151a2aee4a3b8eea4736cc1c6b89efe40f968e888e6e2b0ec5648170399f135a11b784263704c767d9efc55fab4d0616c63

data/lib/marvel_101/character.rb

@@ -16,8 +16,11 @@ class Marvel101::Character < Marvel101::Topic
 
   def display_details
     DETAIL_ORDER.each do |type|
-      title = type.to_s.split("_").join(" ").upcase
-      puts "#{title}: #{details[type]}" if details.include?(type)
+      if details.include?(type)
+        title = type.to_s.split("_").join(" ").upcase
+        format_output("#{title}: #{details[type]}")
+        puts "" if "#{title}: #{details[type]}".size > 60
+      end
     end
   end
 

data/lib/marvel_101/cli.rb

@@ -10,6 +10,8 @@ class Marvel101::CLI
     ["The Women of Marvel", "list/996/women_of_marvel"]
   ]
 
+  LINE_LEN = 80
+
   def call
     puts "\nWelcome to Marvel 101!"
     main_menu
@@ -19,6 +21,7 @@ class Marvel101::CLI
     display_main
     print ">> "
     input = gets.chomp.downcase
+
     if input.to_i.between?(1, STARTING_PAGES.size)
       name, url = STARTING_PAGES[input.to_i - 1]
       topic_menu(Marvel101::List.find_or_create_by_name(name, SOURCE + url))
@@ -34,6 +37,7 @@ class Marvel101::CLI
     display_topic(topic)
     print ">> "
     input = gets.chomp.downcase
+
     case input
     when "101","wiki" then open_link("url_#{input}".to_sym, topic)
     when "source" then open_link(:url, topic)
@@ -48,19 +52,19 @@ class Marvel101::CLI
   end
 
   def display_main
-    puts "\n" + "-" * 80
+    puts "\n" + "-" * LINE_LEN
     puts "Here are your primary options:"
     STARTING_PAGES.each.with_index(1) {|page, idx| puts "#{idx}. #{page[0]}!"}
-    puts "-" * 80
+    puts "-" * LINE_LEN
     puts "You can also enter (E)xit to... exit"
     puts "Select a number from the options above and we'll get started!"
   end
 
   def display_topic(topic)
-    break_len = (80 - topic.name.size) / 2
-    puts "\n" + "-" * break_len + "#{topic.name}" + "-" * break_len
+    break_len = (LINE_LEN - topic.name.size) / 2.0
+    puts "\n" + "-" * break_len.floor + "#{topic.name}" + "-" * break_len.ceil
     topic.display
-    puts "-" * (break_len * 2 + topic.name.size)
+    puts "-" * LINE_LEN
     options_message(topic)
   end
 
@@ -80,8 +84,8 @@ class Marvel101::CLI
     puts "Type (T)eam to return to #{topic.team.name} menu" if topic.has_team?
   end
 
-  def error(subject)
+  def error(topic)
     puts "\nSorry, that wasn't a valid option. Let's try again."
-    subject == "main" ? main_menu : topic_menu(subject)
+    topic == "main" ? main_menu : topic_menu(topic)
   end
 end

data/lib/marvel_101/scraper.rb

@@ -47,7 +47,8 @@ class Marvel101::Scraper
   def get_description
     info = doc.css("div.featured-item-desc p:nth-child(2)").text
     unless info.strip.empty?
-      topic.description = info.gsub(/\r?\n\s*([ml][oe][rs][es])?/," ").strip
+      info = info.gsub(/\r?\n\s*([ml][oe][rs][es])?/," ").strip
+      topic.description = info.gsub("â", "\'").gsub("Â", "")
     end
   end
 
@@ -69,7 +70,7 @@ class Marvel101::Scraper
       detail = raw_detail.css("strong").text.downcase.strip.split(" ").join("_")
       info = raw_detail.css("p:last-child span").text.strip
       info = raw_detail.css("p:last-child").text if info.empty?
-      topic.details[detail.to_sym] = info
+      topic.details[detail.to_sym] = info.gsub("â", "\'").gsub("Â", "")
     end
   end
 

data/lib/marvel_101/topic.rb

@@ -2,6 +2,8 @@ class Marvel101::Topic
 
   attr_accessor :name, :description, :urls, :scraped
 
+  LINE_LEN = 80
+
   @@all = []
 
   def initialize(name, url)
@@ -18,17 +20,30 @@ class Marvel101::Topic
   end
 
   def display_description
-    puts "DESCRIPTION: #{description}" if description
+    if description
+      format_output("DESCRIPTION: #{description}")
+      puts "" if "DESCRIPTION: #{description}".size > 60
+    end
   end
 
   def display_links
     puts "" if urls.size > 1
     ["wiki", "101"].each do |url|
-      output = "Marvel #{url} available! Type '#{url}' to open in browser"
+      output = "*Marvel #{url} available! Type '#{url}' to open in browser*"
       puts output if urls.include?("url_#{url}".to_sym)
     end
   end
 
+  def format_output(text)
+    i = LINE_LEN
+    while i < text.size
+      line_break = text[0..i].rindex(" ")
+      puts text[i - LINE_LEN...line_break]
+      i = line_break + LINE_LEN + 1
+    end
+    puts text[i - LINE_LEN..-1]
+  end
+
   def takes_input?
     list? || (team? && !members.empty?)
   end

data/lib/marvel_101/version.rb

@@ -1,3 +1,3 @@
 module Marvel101
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marvel_101
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tyler Buchheim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2017-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri