what_a_world 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dfb9c52e2cfa0684595cdae320557266d649bfc
-  data.tar.gz: dcbfe7e70af52fea12ea5e3c75f54fee4a58765d
+  metadata.gz: d8f02f245188882c2e5b7b412e28f88be6d46ecb
+  data.tar.gz: 6c1bae5ee86d6b63fdf09ca5718689168f337f06
 SHA512:
-  metadata.gz: ed7a2b99309782d25d93abd88df5703682f92f6e1a3fa8f5cf446f7ab1285556b1e65c64dbc80f7a554c0c3c7d7b925421aba6f29e1c523feb7b472f98c259ab
-  data.tar.gz: f0410b1e3e69446432458fa6bfef31ff779aebd16ef0fdf4526126092a327e67401e66f673e9ae4a320da8c09af73ecb8d2522359ed904a8cd69959fbe0a35a7
+  metadata.gz: 9252a93ac5b9a13ea634f8506b6726e4db8b7e6147c65678feb42621b4abc54fe25d0adc279db868145749870f48969e32b2f60f5f82bfb8027e09d32be036e1
+  data.tar.gz: 396c5128dfa0aa9e72d6e02f2070f112633bf666685721f5c08a51c5c08bc2afad29a7c37f9e254e5549ee7d50d963bbfcb21b013ae2168beb68787cd960fab6

data/lib/what_a_world/cli.rb

@@ -27,16 +27,16 @@ class WhatAWorld::CLI
      end
 
     def welcome 
-        puts "What A World!"
+        "What A World!".print_fit
         sleep(1.0)
-        puts "Explore transnational issues on a location-by-location basis."
+        "Explore transnational issues on a location-by-location basis.".print_fit
         sleep(1.0)
-        puts "Information provided by the C.I.A."
+        "Information provided by the C.I.A.".print_fit
     end
 
     def goodbye
         puts ""
-        puts "Goodbye, and" + " peace".colorize(:blue) + " to the " + "world!".colorize(:green)
+        "Goodbye, and peace to the world!".print_fit
         puts ""
     end
 
@@ -103,22 +103,22 @@ class WhatAWorld::CLI
          if !trafficking.empty?
             puts "__________________________________"
             puts "#{trafficking_label}".colorize(:red)
-            puts trafficking
+            trafficking.print_fit
          end
          if !drugs.empty?
             puts "__________________________________"
             puts "#{drugs_label}".colorize(:red)
-            puts drugs
+            drugs.print_fit
          end
          if !refugees.empty?
             puts "__________________________________"
             puts "#{refugees_label}".colorize(:red)
-            puts refugees
+            refugees.print_fit
          end
          if !disputes.empty?
             puts "__________________________________"
             puts "#{disputes_label}".colorize(:red)
-            puts disputes
+            disputes.print_fit
          end
          if disputes.empty? && refugees.empty? && drugs.empty? && trafficking.empty?
             puts "__________________________________"

data/lib/what_a_world/print_fit.rb

@@ -0,0 +1,27 @@
+class String
+
+    def print_fit
+        dimensions = IO.console.winsize
+        window_length = dimensions[1]
+        word_array = self.split(" ")
+        word_index = 0
+
+        remaining_room = window_length
+        while remaining_room >= 0 && word_index < word_array.size
+            remaining_room -= word_array[word_index].size
+            if remaining_room >=0
+                print word_array[word_index]
+                if remaining_room > 0
+                    print " "
+                    remaining_room -= 1
+                end
+            else
+                puts ""
+                print word_array[word_index] + " "
+                remaining_room = window_length - word_array[word_index].size - 1
+            end
+            word_index += 1
+        end
+        puts ""
+    end
+end

data/lib/what_a_world/scraper.rb

@@ -86,19 +86,15 @@ class WhatAWorld::Scraper
             mod_extension = mod_extension.join
         end
 
-        def create_string(iterator)
-            "//ul[last()]/li[last()]/div[" + iterator.to_s + "]"
-        end
-
         def scraped_string(iterator)
-            @country_page.xpath(create_string(iterator)).text.strip
+            @country_page.css("li").last.css("div")[iterator].text.strip if @country_page.css("li").last.css("div")[iterator]
         end
         
         def scrape_issues
-            iterator = 1
+            iterator = 0
             scraped_string(iterator)
-            unfamiliar_setup = false
-            while scraped_string(iterator) != "" && !unfamiliar_setup
+            finished = false
+            while !finished
                 if  @@disputes == scraped_string(iterator)
                     iterator = add_content(iterator, self.disputes_content)
                 elsif @@refugees == scraped_string(iterator)
@@ -108,7 +104,7 @@ class WhatAWorld::Scraper
                 elsif @@drugs == scraped_string(iterator)
                     iterator = add_content(iterator, self.drugs_content)
                 else
-                    unfamiliar_setup = true
+                    finished = true
                 end 
             end
         self.disputes_hash[@@disputes] = self.disputes_content
@@ -120,7 +116,7 @@ class WhatAWorld::Scraper
         def add_content(iterator, content)
             iterator +=1
             scraped = scraped_string(iterator)
-            while scraped != @@disputes && scraped != @@refugees && scraped != @@trafficking && scraped != @@drugs && scraped != ""
+            while scraped != @@disputes && scraped != @@refugees && scraped != @@trafficking && scraped != @@drugs && scraped != nil
                 content << scraped
                 iterator +=1
                 scraped = scraped_string(iterator)

data/lib/what_a_world/version.rb

@@ -1,3 +1,3 @@
 module WhatAWorld
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/what_a_world.rb

@@ -6,5 +6,7 @@ require 'require_all'
 require 'pry'
 require 'colorize'
 
+require 'io/console'
 require_all './lib/what_a_world'
 
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: what_a_world
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - gb23
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/what_a_world/cli.rb
 - lib/what_a_world/country.rb
 - lib/what_a_world/issues.rb
+- lib/what_a_world/print_fit.rb
 - lib/what_a_world/scraper.rb
 - lib/what_a_world/version.rb
 - spec.md