notu 1.0.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4032c7dd049dce2940bee2dd832c6393c0144948
-  data.tar.gz: eb3a7c6206040c2a57cc2a7dd6852f2904729033
+  metadata.gz: a7e6c16f6e1f48be1810ff11d5e35626e14740c8
+  data.tar.gz: c7eb34d1781dc7a0283d9e49f3dbabb739cce687
 SHA512:
-  metadata.gz: 99ffcde104872dc9bab4f7c02a2c7687c7ac4a806221fb11e9d9f54576ca0ce6dcb6943db47dc0a114b110f9f6b2a88b602e596bc2d3f0d1a1803cb54628f4eb
-  data.tar.gz: cb0d3de34dccd6b92963928cd9b334297df8c9baf8581517101b4afb7f6ed48cdf8e39f1c29fc2935e6ef8b6c6c97823a524e1789bbd743a0f05213356db70dd
+  metadata.gz: 769b9ccdb8356903c55cb0d8bbcf93afda157d7ca7c5d779474efee32628d63a712ad5ee71f5f4359d82542a3262408487be15b06180bbf77733b505dae40136
+  data.tar.gz: a2da6e59c943176fd7767feb56c6aadf57e220b1b5f354b81b2697782597ebe7f477c439883270bcc0d6c0e64403bd8fbe874200cd040c18a4f2cb5615ad09b0

data/VERSION

@@ -1 +1 @@
-1.0.6
+2.0.0

data/lib/notu.rb

@@ -26,3 +26,4 @@ require "#{lib_path}/loved_tracks"
 require "#{lib_path}/most_played_tracks"
 require "#{lib_path}/played_tracks"
 require "#{lib_path}/track"
+require "#{lib_path}/unknown_username_error"

data/lib/notu/html_document.rb

@@ -6,14 +6,13 @@ module Notu
       parse(HttpDownload.get(url, options))
     end
 
-    private
-
     def self.parse(data)
       data = data.gsub(/ /i, ' ').gsub(/\s+/, ' ')
       document = Nokogiri::HTML.parse(data, nil, 'UTF-8')
       raise ParseError.new('Invalid HTML document') if (document/'head').empty?
       document
     end
+    private_class_method :parse
 
   end
 

data/lib/notu/library.rb

@@ -2,14 +2,13 @@ module Notu
 
   class Library
 
-    DEFAULT_HOST = 'www.last.fm'
+    HOST = 'www.last.fm'.freeze
 
-    attr_reader :host, :username
+    attr_reader :username
 
     def initialize(options = {})
-      options = options.stringify_keys
-      self.host = options['host']
-      self.username = options['username']
+      options = options.symbolize_keys
+      self.username = options[:username]
     end
 
     def loved_tracks
@@ -25,11 +24,11 @@ module Notu
     end
 
     def url(options = {})
-      options = options.stringify_keys
-      path = options['path'].presence
-      query = options['query'].presence
-      query = options['query'].map { |name, value| "#{CGI.escape(name.to_s)}=#{CGI.escape(value.to_s)}" }.join('&') if options['query'].is_a?(Hash)
-      "https://#{host}/user/#{username}".tap do |url|
+      options = options.symbolize_keys
+      path = options[:path].presence
+      query = options[:query].presence
+      query = options[:query].map { |name, value| "#{CGI.escape(name.to_s)}=#{CGI.escape(value.to_s)}" }.join('&') if options[:query].is_a?(Hash)
+      "https://#{HOST}/user/#{username}".tap do |url|
         if path.present?
           url << '/' unless path.starts_with?('/')
           url << path
@@ -42,13 +41,14 @@ module Notu
 
     private
 
-    def host=(value)
-      @host = value.presence || DEFAULT_HOST
-    end
-
     def username=(value)
       @username = value.to_s.strip.downcase
-      raise Error.new("Invalid Last.fm username: #{value.inspect}") if username !~ /^[a-z0-9_]+$/
+      raise UnknownUsernameError.new(value) if username !~ /^[a-z0-9_]+$/
+      begin
+        HtmlDocument.get(url)
+      rescue
+        raise UnknownUsernameError.new(value)
+      end
     end
 
   end

data/lib/notu/unknown_username_error.rb

@@ -0,0 +1,14 @@
+module Notu
+
+  class UnknownUsernameError < Error
+
+    attr_reader :username
+
+    def initialize(username)
+      @username = username
+      super("No such Last.fm username: #{self.username.inspect}")
+    end
+
+  end
+
+end

data/notu.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'byebug', '>= 3.2.0', '< 10.0.0'
   s.add_development_dependency 'rake', '>= 10.3.0', '< 13.0.0'
-  s.add_development_dependency 'rspec', '>= 3.1.0', '< 3.7.0'
-  s.add_development_dependency 'vcr', '>= 2.9.0', '< 3.1.0'
+  s.add_development_dependency 'rspec', '>= 3.1.0', '< 4.0.0'
+  s.add_development_dependency 'vcr', '>= 4.0.0', '< 5.0.0'
   s.add_development_dependency 'webmock', '>= 3.0.0', '< 4.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notu
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,7 +99,7 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,27 +109,27 @@ dependencies:
         version: 3.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +171,7 @@ files:
 - lib/notu/parse_error.rb
 - lib/notu/played_tracks.rb
 - lib/notu/track.rb
+- lib/notu/unknown_username_error.rb
 - notu.gemspec
 homepage: https://github.com/alexistoulotte/notu
 licenses:
@@ -192,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: API for Last.fm