kgmusic 0.1.0pre20160517 → 0.1.0pre20160524

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34f94579c2edfe6b9b62d490224f73a5a5e38653
-  data.tar.gz: 354ca55887440e1b8c8a372ccaa521ddf94005b3
+  metadata.gz: 7fd045bd3f769580e8326eb6fe3a67a2b4c6f572
+  data.tar.gz: 2b248d9cd21dbb25b7a27401b3fa7ca73022aec6
 SHA512:
-  metadata.gz: 62a30ea5d3616881032f4aca06861b0ad2c493b7ebe9ddb1ab6bbfb84569ffe5f113ab3452470b54839df4b2f51e75f4b6ad4b27653f9ef54cd78c4bd5f79853
-  data.tar.gz: f07f37ce5c857156e9439a59571ca81de4d976a8b2f9d68d3bc0c3397589ed572c532ed948a04e18d70314956c1fdfc3c4332173b391f00bd3878aa1f3525a13
+  metadata.gz: a33f6172cedf98f79424caf865a1dac55ef4e3c06498e37ce3d09ce06f03b83f8810eef217823c742b6a86f45dbb5611e9b5859afee2211ee05df89836b73a12
+  data.tar.gz: 4766d4f001cc045d985d8f65b5c0820803e1e324226f2fb727f8b031050d8eca3ded8611beedec174bcbc5282a551b39da389ca42e6d83099aa6ac98605956f5

data/README.md

@@ -21,19 +21,20 @@ Or install it yourself as:
 ## Usage
     require 'kgmusic'
 
-    music = KgMusic::Client.new :artist => 'God Is An Astronaut', :album => 'God Is An Astronaut'
+    Using API:
 
-    music.search
+      cli = KgMusic::Client.new
 
-    album = music.download_album
+      popular_artists = cli.popular_artists
 
-## Development
+      popular_genres = cli.popular_genres
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests.
+      all_genres = cli.all_genres
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+    Using Downloader:
 
-## Contributing
+      music = KgMusic::Downloader.new :artist => 'God Is An Astronaut', :album => 'God Is An Astronaut'
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/vitvegl/kgmusic.
+      result = music.search # find album
 
+      album = music.download_album # download album

data/lib/kgmusic/api/client.rb

@@ -0,0 +1,40 @@
+require "curl"
+require "nokogiri"
+
+module KgMusic
+
+  module API
+
+    class Client
+
+      def initialize(url: 'kibergrad.fm')
+        c = Curl::Easy.new(url) do |curl|
+          curl.follow_location = true
+          curl.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
+      end
+
+      def popular_genres
+        list = @@root.xpath("//div/ul[@class='aim-menu css']/li/a")
+        out = []; list.collect { |element| out << "#{element.text}" }
+        out
+      end
+
+      def all_genres
+        list = @@root.xpath("//div//ul[@class='aim-menu css']//li/a")
+        out = []; list.collect { |element| out << "#{element.text}" }
+        out
+      end
+
+    end
+
+  end
+
+end

data/lib/kgmusic/api.rb

@@ -1,45 +1 @@
-require "curl"
-require "nokogiri"
-require "singleton"
-
-module KgMusic
-
-  class API
-
-    include Singleton
-
-    class << self
-
-      private
-      def root
-        root = Curl::Easy.new('kibergrad.fm') do |curl|
-          curl.follow_location = true
-          curl.perform
-        end
-
-        doc = Nokogiri::HTML.parse root.body_str
-      end
-
-      public
-      def popular_artists
-        list = root.xpath("//div[@class='popular-artists']//li/a")
-        out = []; list.collect { |element| out << "#{element.children}" }
-        out
-      end
-
-      def popular_genres
-        list = root.xpath("//div/ul[@class='aim-menu css']/li/a")
-        out = []; list.collect { |element| out << "#{element.text}" }
-        out
-      end
-
-      def all_genres
-        list = root.xpath("//div//ul[@class='aim-menu css']//li/a")
-        out = []; list.collect { |element| out << "#{element.text}" }
-        out
-      end
-
-    end
-
-  end
-end
+require 'kgmusic/api/client'

data/lib/kgmusic/base/basemod.rb

@@ -0,0 +1,84 @@
+require 'kgmusic/version'
+require 'kgmusic/api'
+#require 'unicode_utils/titlecase'
+#require 'fileutils'
+require 'curl'
+require 'nokogiri'
+
+module KgMusic
+  module BaseMod
+    #include UnicodeUtils
+
+    UNALLOWED_SYMBOLS = [
+      "`", "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", ",", "_", "=",
+      "+", "[", "{", "]", "}", "\\", "|", ";", ":", "\"", "<", ".", ">", "/", "?"
+    ]
+
+    protected
+    def go_to(url, params = {})
+      __url = Curl.urlalize(url, params)
+      c = Curl::Easy.new(__url) { |c| c.follow_location = true }
+      c.perform
+      c.body_str
+    end
+
+    def has_unallowed_symbols?(key)
+      counter = UNALLOWED_SYMBOLS.select {|s| key.include?(s)}
+      counter.size > 0 ? true : false
+    end
+
+    def strip_unallowed_symbols!(key)
+      UNALLOWED_SYMBOLS.map! {|s| key.delete(s)}
+    end
+
+    def parse_html doc
+      Nokogiri::HTML.parse doc
+    end
+
+    def validate(key)
+      strip_unallowed_symbols!(key) if has_unallowed_symbols?(key)
+      key
+      #words = key.split
+      #if words.size == 1
+      #  key[0] =~ /^[[:lower:]]$/ ? titlecase(key) : key
+      #elsif words.size > 1
+      #  words.map {|w| titlecase(w) unless (w[0].ord === w[0])}.join(" ")
+      #end
+    end
+
+    def parse_http_header str
+      list = str.split(/[\r\n]+/).map(&:strip)
+      Hash[list.flat_map { |s| s.scan(/^(\S+): (.+)/) }]
+    end
+
+    def __head_request __url
+      c = Curl::Easy.new(__url) { |curl| curl.set(:nobody, true) }
+      c.perform
+      parse_http_header c.header_str
+    end
+
+    def get_content_length __uri
+      response = __head_request __uri
+      response['Content-Length'].to_i
+    end
+
+    def obtain_final_url __uri
+      c = Curl::Easy.new __uri
+      c.perform
+      __headers = parse_http_header c.header_str
+      __headers['Location'] || __uri
+    end
+
+    def get_album_info(url, params={})
+      __response = go_to url, params
+      doc = parse_html __response
+      doc.css('div.album-info')
+    end
+
+    def get_direct_link __url
+      __response = go_to __url
+      doc = parse_html __response
+      @direct_link = doc.css('a.download-block').attr('href').to_s
+    end
+  end
+end

data/lib/kgmusic/basemod.rb

@@ -1,85 +1 @@
-require 'kgmusic/version'
-#require 'unicode_utils/titlecase'
-require 'fileutils'
-require 'curl'
-require 'nokogiri'
-
-module KgMusic
-  module BaseMod
-    #include UnicodeUtils
-
-    UNALLOWED_SYMBOLS = [
-      "`", "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", ",", "_", "=",
-      "+", "[", "{", "]", "}", "\\", "|", ";", ":", "\"", "<", ".", ">", "/", "?"
-    ]
-
-    protected
-
-    def go_to(url, params={})
-      __url = Curl.urlalize(url, params)
-      c = Curl::Easy.new(__url) { |c| c.follow_location = true }
-      c.perform
-      c.body_str
-    end
-
-    def has_unallowed_symbols?(key)
-      counter = UNALLOWED_SYMBOLS.select {|s| key.include?(s)}
-      counter.size > 0 ? true : false
-    end
-
-    def strip_unallowed_symbols!(key)
-      UNALLOWED_SYMBOLS.map! {|s| key.delete(s)}
-    end
-
-    def parse_html doc
-      Nokogiri::HTML.parse doc
-    end
-
-    def validate(key)
-      strip_unallowed_symbols!(key) if has_unallowed_symbols?(key)
-      key
-      #words = key.split
-      #if words.size == 1
-      #  key[0] =~ /^[[:lower:]]$/ ? titlecase(key) : key
-      #elsif words.size > 1
-      #  words.map {|w| titlecase(w) unless (w[0].ord === w[0])}.join(" ")
-      #end
-    end
-
-    def parse_http_header str
-      list = str.split(/[\r\n]+/).map(&:strip)
-      Hash[list.flat_map { |s| s.scan(/^(\S+): (.+)/) }]
-    end
-
-    def __head_request __url
-      c = Curl::Easy.new(__url) { |curl| curl.set(:nobody, true) }
-      c.perform
-      parse_http_header c.header_str
-    end
-
-    def get_content_length __uri
-      response = __head_request __uri
-      response['Content-Length'].to_i
-    end
-
-    def obtain_final_url __uri
-      c = Curl::Easy.new __uri
-      c.perform
-      __headers = parse_http_header c.header_str
-      __headers['Location'] || __uri
-    end
-
-    def get_album_info(url, params={})
-      __response = go_to url, params
-      doc = parse_html __response
-      doc.css('div.album-info')
-    end
-
-    def get_direct_link __url
-      __response = go_to __url
-      doc = parse_html __response
-      @direct_link = doc.css('a.download-block').attr('href').to_s
-    end
-
-  end
-end
+require 'kgmusic/base/basemod'

data/lib/kgmusic/version.rb

@@ -1,3 +1,3 @@
 module KgMusic
-  VERSION = "0.1.0pre20160517"
+  VERSION = "0.1.0pre20160524"
 end

data/lib/kgmusic.rb

@@ -3,14 +3,16 @@ require "kgmusic/basemod"
 
 module KgMusic
 
-  class Client
+  class Client < API::Client; end
+
+  class Downloader
 
     include BaseMod
 
     attr_reader :artist, :album
     attr_reader :result, :download_page, :direct_link
 
-    def initialize args
+    def initialize(args)
       keys = [:artist, :album]
       keys.each do |k|
         if args.keys === keys and args[k].is_a? String
@@ -54,7 +56,7 @@ module KgMusic
         f = File.open(outfile, 'ab+')
         fsize = File.size outfile
         c = Curl::Easy.new url do |curl|
-          curl.set(:resume_from, fsize) if File.exists? outfile
+          curl.set(:resume_from, fsize) if fsize > 0
           curl.on_body { |body| f.write body }
         end
         puts "Please, wait ..."

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kgmusic
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre20160517
+  version: 0.1.0pre20160524
 platform: ruby
 authors:
 - vitvegl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -110,6 +110,8 @@ files:
 - kgmusic.gemspec
 - lib/kgmusic.rb
 - lib/kgmusic/api.rb
+- lib/kgmusic/api/client.rb
+- lib/kgmusic/base/basemod.rb
 - lib/kgmusic/basemod.rb
 - lib/kgmusic/version.rb
 homepage: https://github.com/vitvegl/kgmusic.git
@@ -132,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Find music albums on kibergrad.fm