kgmusic 0.1.0pre20160525 → 0.1.0pre20160530

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 026be473c388de1d6d9e78abf7725d84aa78ec2c
-  data.tar.gz: 99d337aa7061c503f362a7917c3a28b3b633b7d8
+  metadata.gz: c7213f073068b90898fbc9663382ac7056f55775
+  data.tar.gz: ee0a1bc7822e5b0341dfaa883e83e79cbf2990de
 SHA512:
-  metadata.gz: 3a8a3c1069986898c5fb5931304afef52c6704dcd0d3fac23b66925025fae44c10767010d62aef7b8002aec197f4baef86f550aef8fe1a4c02cb992ea9f787c0
-  data.tar.gz: 85f128695eab5ae5416821b0a5f05f778773b415c3ef6f8e974b145e7a7979e1b9934fa312f71742588d72b9c46173ce8f96ac94bd7a95f7b90f81a16f3cf131
+  metadata.gz: d463a38f32b8a5a53244dd9d4da8709baa25ecbfcaa79a2af1a58b5216e0c6234ed9b43afd51eba4dafd0914ed7f03cd5398451171a88c9eb201295a6919b933
+  data.tar.gz: 241932016c5af72612812aba354f3f811d1dd9c2157524c4a6f8b5d12e38825f921220cae5994aef1a9bf96445feb555e99995028a0b67b5b09463b739d9bcc1

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 ## Usage
     require 'kgmusic'
 
-    Using API:
+    Using Client API:
 
       cli = KgMusic::Client.new
 
@@ -31,6 +31,10 @@ Or install it yourself as:
 
       all_genres = cli.all_genres
 
+    Using Artists API:
+
+      artists = KgMusic::Artists.show_info(146)
+
     Using Downloader:
 
       music = KgMusic::Downloader.new :artist => 'God Is An Astronaut', :album => 'God Is An Astronaut'

data/lib/kgmusic/api/artists.rb

@@ -0,0 +1,59 @@
+require "curl"
+require "nokogiri"
+
+module KgMusic
+
+  module API
+
+    class Artists
+
+      private_class_method :new
+
+      def initialize(url:)
+        c = Curl::Easy.new(url) do |c|
+          c.follow_location = true
+          c.perform
+        end
+
+        @@root = Nokogiri::HTML.parse(c.body_str)
+        last_page_uri_str = @@root.xpath("//div[@class='pager']//li[@class='last']/a/@href").text
+        @@pages = last_page_uri_str.scan(/\d+$/).sample.to_i
+      end
+
+      private
+
+      def self.get_info
+        @@root.xpath("//div[@class='artist-item']").reduce([]) do |out, artist|
+          out << {
+            :artist => artist.css('div.artist-info').at('a').text.strip,
+            :albums => artist.css('ul.artist-albums/li').reduce([]) { |albums, album| albums << album.at('img').attr('title') },
+            :tracks => artist.css('ul.artist-songs/li').reduce([]) { |tracks, track| tracks << track.css('a').text },
+            :all_albums => artist.css('div.albums-count').at('a').text.strip,
+            :all_tracks => artist.css('div.songs-count').at('a').text.strip
+          }
+
+        end
+      end
+
+      public
+
+      def self.show_info ( number )
+
+        new(url: 'kibergrad.fm/artists')
+
+        if number == 1
+          get_info
+        elsif number.between?( 1, @@pages )
+          new( url: "kibergrad.fm/artists?page=#{number}" )
+          get_info
+        else
+          raise RangeError
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/kgmusic/api/client.rb

@@ -7,30 +7,30 @@ module KgMusic
 
     class Client
 
-      def initialize(url: 'kibergrad.fm')
-        c = Curl::Easy.new(url) do |curl|
-          curl.follow_location = true
-          curl.perform
+      def initialize
+        c = Curl::Easy.new('kibergrad.fm') do |c|
+          c.follow_location = true
+          c.perform
         end
         @@root = Nokogiri::HTML.parse(c.body_str)
       end
 
       def popular_artists
-        list = @@root.xpath("//div[@class='popular-artists']//li/a")
-        out = []; list.collect { |element| out << "#{element.children}" }
-        out
+        @@root.xpath("//div[@class='popular-artists']//li/a").reduce([]) do |artists, element|
+          artists << element.text
+        end
       end
 
       def popular_genres
-        list = @@root.xpath("//div/ul[@class='aim-menu css']/li/a")
-        out = []; list.collect { |element| out << "#{element.text}" }
-        out
+        @@root.xpath("//div//ul[@class='aim-menu css']/li/a").reduce([]) do |popular_genres, element|
+          popular_genres << element.text
+        end
       end
 
       def all_genres
-        list = @@root.xpath("//div//ul[@class='aim-menu css']//li/a")
-        out = []; list.collect { |element| out << "#{element.text}" }
-        out
+        @@root.xpath("//div//ul[@class='aim-menu css']//li/a").reduce([]) do |all_genres, element|
+          all_genres << element.text
+        end
       end
 
     end

data/lib/kgmusic/api.rb

@@ -1 +1,2 @@
 require 'kgmusic/api/client'
+require 'kgmusic/api/artists'

data/lib/kgmusic/version.rb

@@ -1,3 +1,3 @@
 module KgMusic
-  VERSION = "0.1.0pre20160525"
+  VERSION = "0.1.0pre20160530"
 end

data/lib/kgmusic.rb

@@ -5,6 +5,8 @@ module KgMusic
 
   class Client < API::Client; end
 
+  class Artists < API::Artists; end
+
   class Downloader
 
     include BaseMod
@@ -54,13 +56,16 @@ module KgMusic
             curl.set(:resume_from, fsize) if fsize > 0
             curl.on_body { |body| f.write body }
           end
-            puts "Please, wait ..."
+          c.on_progress do |dlt, dln, ult, uln|
+            printf("\r %i of %i MBytes received ...", (dln / 1_000_000), (dlt / 1_000_000))
+            true
+          end
           c.perform if content_length > fsize
         end
       rescue => ex
         puts ex.message
       end
-        return File.size(outfile)
+        nil
     end
 
     public

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kgmusic
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre20160525
+  version: 0.1.0pre20160530
 platform: ruby
 authors:
 - vitvegl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -110,6 +110,7 @@ files:
 - kgmusic.gemspec
 - lib/kgmusic.rb
 - lib/kgmusic/api.rb
+- lib/kgmusic/api/artists.rb
 - lib/kgmusic/api/client.rb
 - lib/kgmusic/base/basemod.rb
 - lib/kgmusic/basemod.rb