dutch_top40 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e967e911197a4f3808c7fedc49e0a0f92d0271a527dec75bdea645c28da01a7c
-  data.tar.gz: 22014cfa9241afb49854d2ad445f7d1fef29fba9a0fb72595bf0753a8abf1b7b
+  metadata.gz: cac142781191f70c98ade529228eb77889f100e01d56a921b77235e074fdb58e
+  data.tar.gz: c421ad5174499a51e8ae83bf76ecda996a0bff229a1af0b5a1b83e524ed56de4
 SHA512:
-  metadata.gz: fab741620804eade95d2772a4ad208da5cf32c15f897f325df9f373f510380eebcbdeebf11a2627d1fac03798614e3e08eff763e9e8a8e82629df45b51cb9547
-  data.tar.gz: 636e2d5be57eaeaa73b81c93a04c00371ec267900a88182da752d4ef3acbe1bc0e6e72a39ed39a0530158a73b70782cd2b8c80fd587ed059de07ed471c861854
+  metadata.gz: ee146cc1375899512f759fdf27c25447fd3ba938b48627efd29e95629f85c619d0984ed2e972074f3cb2466e35a4a779d0299f852711369a16ff2a2e8db5ad55
+  data.tar.gz: 7d2db0fbeef8fdf06e3cbbbbf76b962969367af7a017cc006ba3bee3e61ab2b50b84e1d0ce2e93955a8c01f2179c9b6746828d4d9ae85478e8898082cf9d7671

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dutch_top40 (0.1.2)
+    dutch_top40 (0.1.3)
       nokogiri
 
 GEM

data/lib/dutch_top40.rb

@@ -5,4 +5,4 @@ require 'pry'
 
 require_relative './dutch_top40/cli'
 require_relative './dutch_top40/songs'
-
+require_relative './dutch_top40/scraper'

data/lib/dutch_top40/cli.rb

@@ -5,7 +5,6 @@ class DutchTop40::CLI
         puts "Dutch Top40 - week  #{Time.now.strftime("%U")}", ""
         puts "One moment, acquiring data."
         list_songs
-        sleep(5)
         menu
     end
 
@@ -30,7 +29,7 @@ class DutchTop40::CLI
                     when 1..@songs.size
                         puts "Current rank #{input}."
                         puts "#{@songs[input.to_i-1].title} - performing artist(s): #{@songs[input.to_i-1].name}"
-                        puts "weeks listed: #{@songs[input.to_i-1].listed} - last weeks rank #{@songs[input.to_i-1].last_weeks_rank}","" 
+                        puts "weeks in Top40: #{@songs[input.to_i-1].listed} - last weeks rank: #{@songs[input.to_i-1].last_weeks_rank}","" 
                     else 
                         puts "Invalid input!" unless input == 'exit' || input == 'list'
                     if input == 'list' 

data/lib/dutch_top40/scraper.rb

@@ -0,0 +1,19 @@
+class DutchTop40::Scraper
+
+    attr_accessor :title, :name, :listed, :last_weeks_rank
+
+    def self.scrape_songs
+        doc = Nokogiri::HTML(open("http://top40.nl"))
+        doc.search('.listScroller').search('.top40List').each do |song|
+                title = song.search('.songtitle').text.strip
+                name = song.search('.artist').text
+                listed = song.search('.details').text.split(' | ')[1].gsub(/Aantal weken: /,'').strip
+                if song.search('.details').text.split(' | ')[0].gsub(/Vorige week: #/,'').strip  == '-'
+                    last_weeks_rank = 'new entry'
+                else
+                    last_weeks_rank = song.search('.details').text.split(' | ')[0].gsub(/Vorige week: #/,'').strip
+                end
+                DutchTop40::Songs.new(title, name, listed, last_weeks_rank)
+        end
+    end
+end

data/lib/dutch_top40/songs.rb

@@ -14,18 +14,7 @@ class DutchTop40::Songs
 
 
     def self.list
-        self.scrape_songs
-    end
-
-    def self.scrape_songs
-        doc = Nokogiri::HTML(open("http://top40.nl"))
-        doc.search('.listScroller').search('.top40List').each do |song|
-                title = song.search('.songtitle').text.strip
-                name = song.search('.artist').text
-                listed = song.search('.details').text.split(' | ')[1].gsub(/Aantal weken: /,'').strip
-                last_weeks_rank = song.search('.details').text.split(' | ')[0].gsub(/Vorige week: #/,'').strip
-                self.new(title, name, listed, last_weeks_rank)
-        end
+        DutchTop40::Scraper.scrape_songs
         @@songs
     end
 

data/lib/dutch_top40/version.rb

@@ -1,3 +1,3 @@
 module DutchTop40
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dutch_top40
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - raspimeteo
@@ -61,6 +61,7 @@ files:
 - dutch_top40.gemspec
 - lib/dutch_top40.rb
 - lib/dutch_top40/cli.rb
+- lib/dutch_top40/scraper.rb
 - lib/dutch_top40/songs.rb
 - lib/dutch_top40/version.rb
 homepage: https://github.com/raspimeteo/dutch_top40