kgmusic 0.1.0pre3 → 0.1.0pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 525b9556e5707ec2b2da80069cc417950e56846a
-  data.tar.gz: 4427436ab96bc56e91fdc0ce40aab2abb306ff14
+  metadata.gz: ffecb0c3212801f6e8c1ae897cd2e7f2c4d84065
+  data.tar.gz: 1a09a8b4ab6fbb7bc87bf0a4fcb84cb8c0d55abb
 SHA512:
-  metadata.gz: bf25d4365229435b1c41f0d2980f64f427d4787142a691e9a7696a89003eaac791cdb978f198a2ba4bcc1afb1e40e2ef30bdbb0c5af61f29d177b5a082262385
-  data.tar.gz: 6fb3ff84c119309a3eacacec4c0b0b7a975cae438a0d0b52df63fe2cc5ac31895f715134a2d4618a913db96587aab395f5c62bd7bf7d6adae845c26148ab5845
+  metadata.gz: ab437cc7d8f544f47fcd5c6054fa473f5e3cdedab5c8c71a1f43906148ab9153252c44a2b9e7d27a1f641d297530196a699620af0c7de36424d4ea3a1af01786
+  data.tar.gz: c72283cb0b640a93e4200d72a7dff0e3fcaa370209fec35f4dc973a9c75647a4b3dab1c2ac2a7d9758a0477b83d54e6bd223ef3604f9adc7fc6d6be7adcd44a6

data/lib/kgmusic/basemod.rb

@@ -0,0 +1,51 @@
+require 'kgmusic/version'
+require 'unicode_utils/titlecase'
+require 'rest-client'
+require 'nokogiri'
+
+module KgMusic
+  module BaseMod
+    include UnicodeUtils
+
+    UNALLOWED_SYMBOLS = [
+      "`", "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", ",", "_", "=",
+      "+", "[", "{", "]", "}", "\\", "|", ";", ":", "\"", "<", ".", ">", "/", "?"
+    ]
+
+    protected
+    def go_to(url, params={})
+      RestClient.get(url, params) do |response, request, result, &block|
+        if [301, 302, 307].include? response.code
+          response.follow_redirection(request, result, &block)
+        else
+          final_url = request.url
+          response.return!(request, result, &block)
+        end
+      end
+    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)}
+      key
+    end
+
+    def parse_html doc
+      Nokogiri::HTML.parse doc
+    end
+
+    def validate(key)
+      strip_unallowed_symbols(key) if has_unallowed_symbols?(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
+  end
+end

data/lib/kgmusic/version.rb

@@ -1,3 +1,3 @@
 module KgMusic
-  VERSION = "0.1.0pre3"
+  VERSION = "0.1.0pre4"
 end

data/lib/kgmusic.rb

@@ -1,22 +1,14 @@
-require 'kgmusic/version'
-require 'unicode_utils/titlecase'
-require 'rest-client'
-require 'nokogiri'
+require "kgmusic/basemod"
 
 module KgMusic
 
   class Search
 
-    include UnicodeUtils
+    include BaseMod
 
     attr_reader :artist, :album
     attr_reader :doc, :info, :result, :download_page, :direct_link
 
-    UNALLOWED_SYMBOLS = [
-      "`", "~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", ",", "_", "=",
-      "+", "[", "{", "]", "}", "\\", "|", ";", ":", "\"", "<", ".", ">", "/", "?"
-    ]
-
     def initialize(args)
       begin
         if args.include?(:artist) and args.include?(:album)
@@ -28,43 +20,13 @@ module KgMusic
     end
 
     protected
-    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)}
-      key
-    end
-
-    def validate(key)
-      strip_unallowed_symbols(key) if has_unallowed_symbols?(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 get_page(url, params={})
-      RestClient.get(url, params) do |response, request, result, &block|
-        if [301, 302, 307].include? response.code
-          response.follow_redirection(request, result, &block)
-        else
-          final_url = request.url
-          response.return!(request, result, &block)
-        end
-      end
-    end
 
     def run
       url = 'kibergrad.fm/search'
       params = {:q => "#{@artist} - #{@album}", :p => "albums"}
 
-      @page = get_page(url, :params => params)
-      @doc = Nokogiri::HTML.parse @page
+      @page = go_to(url, :params => params)
+      @doc = parse_html @page
 
       if not @doc.css('div.album-info').empty?
         begin
@@ -87,8 +49,8 @@ module KgMusic
     end
 
     def visit_download_page
-      dpage = get_page(@download_page)
-      data = Nokogiri::HTML.parse(dpage)
+      page = go_to @download_page
+      data = parse_html page
       link = data.css('a.download-block').attr('href')
       @direct_link = link.to_s
     end
@@ -109,6 +71,7 @@ module KgMusic
     end
 
     public
+
     def search
       run
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kgmusic
 version: !ruby/object:Gem::Version
-  version: 0.1.0pre3
+  version: 0.1.0pre4
 platform: ruby
 authors:
 - vitvegl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unicode_utils
@@ -123,6 +123,7 @@ files:
 - bin/setup
 - kgmusic.gemspec
 - lib/kgmusic.rb
+- lib/kgmusic/basemod.rb
 - lib/kgmusic/version.rb
 homepage: https://github.com/vitvegl/kgmusic.git
 licenses: