notu 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e13444a530e59b3049d159ff447ba19c9525be2a861563e47dbe2fed586d728
-  data.tar.gz: b982c666ad9eac6e8fe23be668f7e3270fe528c0f1511fb0db63ebb46ddd0028
+  metadata.gz: efbddd2bb568278da60c542fd1046d39a61d200bf1ca1a20614e7135ac07e66f
+  data.tar.gz: 4c14831c8b1526a402cf47870e64d17fb5e3ffa4b04d0f2ecaefb30d493de4e3
 SHA512:
-  metadata.gz: 1864ecdf4fdccd1629f11c6f789bb354736512c026a55825544087474e4ef0b4c5e73aae863efbed1c8a9cfd84bb06cf9538388068049ed324d36ed4f753c834
-  data.tar.gz: 6c3f3c4041d49547898cad9ef090e2d54711cac2b304ad9e30d829917709302ab6b09aef9272fa4662a6edf7615189d88aca0cc4470bf5f10dd7d394a80e4f17
+  metadata.gz: 60c8869371be7e6b80a4b8f8b26ebfa2406f63cb576d7788cf6aeacb6d963c3f4d534455a5ae33bca7ea0a33236a0bb6ab529980fc3697ba302062e764f96d0c
+  data.tar.gz: 8343035fb3d9a5ce7e9bba05676f13b0265ace6f514e2e492aa5280eeae0ddc25990eb553adf39f698f66767f4da2d5a5d55523e6b04d2fef428cb47129ece3b

data/VERSION

@@ -1 +1 @@
-3.0.0
+4.0.0

data/lib/notu/api.rb

@@ -0,0 +1,25 @@
+module Notu
+
+  class Api
+
+    DEFAULT_KEY = '91f5d6a201de58e0c0a0d858573dddf0'.freeze
+    FORMAT = 'json'.freeze
+    HOST = 'ws.audioscrobbler.com'.freeze
+    VERSION = '2.0'.freeze
+
+    attr_reader :key
+
+    def initialize(key: DEFAULT_KEY)
+      @key = key.try(:squish).presence || raise(Error.new('API key must be specified'))
+    end
+
+    def url(params = {})
+      params = (params || {}).symbolize_keys
+      params.merge!(api_key: key, format: FORMAT)
+      query_string = params.map { |name, value| "#{CGI.escape(name.to_s)}=#{CGI.escape(value.to_s)}" }.join('&')
+      "https://#{HOST}/#{VERSION}?#{query_string}"
+    end
+
+  end
+
+end

data/lib/notu/json_document.rb

@@ -0,0 +1,11 @@
+module Notu
+
+  module JsonDocument
+
+    def self.get(url, options = {})
+      JSON.parse(HttpDownload.get(url, options))
+    end
+
+  end
+
+end

data/lib/notu/library.rb

@@ -2,14 +2,11 @@ module Notu
 
   class Library
 
-    HOST = 'www.last.fm'.freeze
+    attr_reader :api, :username
 
-    attr_reader :username
-
-    def initialize(options = {})
-      @semaphore = Mutex.new
-      options = options.symbolize_keys
-      self.username = options[:username]
+    def initialize(username:, api: Api.new)
+      @api = api.presence || raise(Error.new('API must be specified'))
+      @username = username.try(:squish).presence || raise(Error.new('Username must be specified'))
     end
 
     def loved_tracks
@@ -20,38 +17,12 @@ module Notu
       MostPlayedTracks.new(self, options)
     end
 
-    def played_tracks
-      PlayedTracks.new(self)
-    end
-
-    def url(options = {})
-      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
-        end
-        if query.present?
-          url << '?' << query
-        end
-      end
+    def recent_tracks
+      RecentTracks.new(self)
     end
 
-    private
-
-    def username=(value)
-      @semaphore.synchronize do
-        @username = value.to_s.strip.downcase
-        raise UnknownUsernameError.new(value) if username !~ /^[a-z0-9_]+$/
-        begin
-          HtmlDocument.get(url)
-        rescue
-          raise UnknownUsernameError.new(value)
-        end
-      end
+    def url(params = {})
+      api.url((params || {}).symbolize_keys.merge(user: username))
     end
 
   end

data/lib/notu/loved_tracks.rb

@@ -2,25 +2,33 @@ module Notu
 
   class LovedTracks
 
-    include Listing
+    include Enumerable
+
+    attr_reader :library
+
+    def initialize(library)
+      raise ArgumentError.new("#{self.class}#library must be a library, #{library.inspect} given") unless library.is_a?(Library)
+      @library = library
+    end
 
     def each
       return unless block_given?
-      page_urls.each do |url|
-        document = HtmlDocument.get(url)
-        (document / 'table.chartlist tbody tr').each do |element|
-          artist = (element / 'td.chartlist-artist a').first.try(:text) || next
-          title = (element / 'td.chartlist-name a').first.try(:text) || next
+      pages_count = nil
+      page = 1
+      loop do
+        json = JsonDocument.get(library.url(limit: 50, method: 'user.getLovedTracks', page:))
+        pages_count = json['lovedtracks']['@attr']['totalPages'].to_i
+        json['lovedtracks']['track'].each do |track_json|
+          artist = track_json['artist']['name'] || next
+          title = track_json['name'] || next
           yield(Track.new(artist:, title:))
         end
+        page += 1
+        break if page > pages_count
       end
       nil
     end
 
-    def path
-      'loved'
-    end
-
   end
 
 end

data/lib/notu/most_played_tracks.rb

@@ -2,51 +2,44 @@ module Notu
 
   class MostPlayedTracks
 
-    include Listing
+    include Enumerable
 
-    PERIODS = {
-      '7 days' => 'LAST_7_DAYS',
-      '30 days' => 'LAST_30_DAYS',
-      '90 days' => 'LAST_90_DAYS',
-      '365 days' => 'LAST_365_DAYS',
-      'Overall' => '',
-    }.freeze
+    PERIODS = %w(overall 7day 1month 3month 6month 12month).freeze
 
-    attr_reader :period
+    attr_reader :library, :period
 
     def initialize(library, options = {})
-      super(library)
-      options = options.stringify_keys.reverse_merge('period' => PERIODS.keys.first)
-      self.period = options['period']
+      raise ArgumentError.new("#{self.class}#library must be a library, #{library.inspect} given") unless library.is_a?(Library)
+      @library = library
+      options = options.symbolize_keys.reverse_merge(period: PERIODS.first)
+      self.period = options[:period]
     end
 
     def each
       return unless block_given?
-      page_urls.each do |url|
-        document = HtmlDocument.get(url)
-        (document / 'table.chartlist tbody tr').each do |element|
-          artist = (element / 'td.chartlist-artist a').first.try(:text) || next
-          title = (element / 'td.chartlist-name a').first.try(:text) || next
-          plays_count = (element / 'td.chartlist-bar .chartlist-count-bar-value').text.gsub(/[^\d]/, '').presence || next
+      pages_count = nil
+      page = 1
+      loop do
+        json = JsonDocument.get(library.url(limit: 50, method: 'user.getTopTracks', page:))
+        pages_count = json['toptracks']['@attr']['totalPages'].to_i
+        json['toptracks']['track'].each do |track_json|
+          artist = track_json['artist']['name'] || next
+          title = track_json['name'] || next
+          plays_count = track_json['playcount'] || next
           yield(Track.new(artist:, plays_count:, title:))
         end
+        page += 1
+        break if page > pages_count
       end
       nil
     end
 
-    def params
-      { 'date_preset' => PERIODS[period] }
-    end
-
-    def path
-      'library/tracks'
-    end
-
     private
 
     def period=(value)
-      raise ArgumentError.new("Notu::MostPlayedTracks#period is invalid: #{value.inspect}") unless PERIODS.key?(value.to_s)
-      @period = value.to_s
+      string_value = value.to_s
+      raise ArgumentError.new("Notu::MostPlayedTracks#period is invalid: #{value.inspect}") unless PERIODS.include?(string_value)
+      @period = string_value
     end
 
   end

data/lib/notu/recent_tracks.rb

@@ -0,0 +1,34 @@
+module Notu
+
+  class RecentTracks
+
+    include Enumerable
+
+    attr_reader :library
+
+    def initialize(library)
+      raise ArgumentError.new("#{self.class}#library must be a library, #{library.inspect} given") unless library.is_a?(Library)
+      @library = library
+    end
+
+    def each
+      return unless block_given?
+      pages_count = nil
+      page = 1
+      loop do
+        json = JsonDocument.get(library.url(limit: 50, method: 'user.getRecentTracks', page:))
+        pages_count = json['recenttracks']['@attr']['totalPages'].to_i
+        json['recenttracks']['track'].each do |track_json|
+          artist = track_json['artist']['#text'] || next
+          title = track_json['name'] || next
+          yield(Track.new(artist:, title:))
+        end
+        page += 1
+        break if page > pages_count
+      end
+      nil
+    end
+
+  end
+
+end

data/lib/notu.rb

@@ -3,7 +3,6 @@ require 'active_support/core_ext'
 require 'byebug' if ENV['DEBUGGER']
 require 'cgi'
 require 'net/https'
-require 'nokogiri'
 
 lib_path = "#{__dir__}/notu"
 
@@ -18,12 +17,11 @@ require "#{lib_path}/error"
 require "#{lib_path}/network_error"
 require "#{lib_path}/parse_error"
 
-require "#{lib_path}/html_document"
+require "#{lib_path}/api"
 require "#{lib_path}/http_download"
+require "#{lib_path}/json_document"
 require "#{lib_path}/library"
-require "#{lib_path}/listing"
 require "#{lib_path}/loved_tracks"
 require "#{lib_path}/most_played_tracks"
-require "#{lib_path}/played_tracks"
+require "#{lib_path}/recent_tracks"
 require "#{lib_path}/track"
-require "#{lib_path}/unknown_username_error"

data/notu.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.1.0'
 
   s.add_dependency 'activesupport', '>= 7.0.0', '< 8.0.0'
-  s.add_dependency 'nokogiri', '>= 1.6.0', '< 1.14.0'
 
   s.add_development_dependency 'byebug', '>= 3.2.0', '< 12.0.0'
   s.add_development_dependency 'rake', '>= 10.3.0', '< 14.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notu
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Alexis Toulotte
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2023-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -30,26 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 8.0.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.14.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -220,18 +200,17 @@ files:
 - README.mdown
 - VERSION
 - lib/notu.rb
+- lib/notu/api.rb
 - lib/notu/error.rb
-- lib/notu/html_document.rb
 - lib/notu/http_download.rb
+- lib/notu/json_document.rb
 - lib/notu/library.rb
-- lib/notu/listing.rb
 - lib/notu/loved_tracks.rb
 - lib/notu/most_played_tracks.rb
 - lib/notu/network_error.rb
 - lib/notu/parse_error.rb
-- lib/notu/played_tracks.rb
+- lib/notu/recent_tracks.rb
 - lib/notu/track.rb
-- lib/notu/unknown_username_error.rb
 - notu.gemspec
 homepage: https://github.com/alexistoulotte/notu
 licenses:

data/lib/notu/html_document.rb

@@ -1,19 +0,0 @@
-module Notu
-
-  module HtmlDocument
-
-    def self.get(url, options = {})
-      parse(HttpDownload.get(url, options))
-    end
-
-    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
-
-end

data/lib/notu/listing.rb

@@ -1,32 +0,0 @@
-module Notu
-
-  module Listing
-
-    include Enumerable
-
-    attr_reader :library
-
-    def initialize(library)
-      raise ArgumentError.new("#{self.class}#library must be a library, #{library.inspect} given") unless library.is_a?(Library)
-      @library = library
-    end
-
-    def page_urls
-      (1..pages_count).map do |index|
-        library.url(path:, query: params.merge('page' => index))
-      end
-    end
-
-    def pages_count
-      document = HtmlDocument.get(library.url(path:, query: params))
-      [1, (document / 'ul.pagination-list li.pagination-page').text.split(/\s+/).map(&:to_i)].flatten.compact.max
-    end
-
-    def params
-      # to be overriden
-      {}
-    end
-
-  end
-
-end

data/lib/notu/played_tracks.rb

@@ -1,26 +0,0 @@
-module Notu
-
-  class PlayedTracks
-
-    include Listing
-
-    def each
-      return unless block_given?
-      page_urls.each do |url|
-        document = HtmlDocument.get(url)
-        (document / 'table.chartlist tbody tr').each do |element|
-          artist = (element / 'td.chartlist-artist a').first.try(:text) || next
-          title = (element / 'td.chartlist-name a').first.try(:text) || next
-          yield(Track.new(artist:, title:))
-        end
-      end
-      nil
-    end
-
-    def path
-      'library'
-    end
-
-  end
-
-end

data/lib/notu/unknown_username_error.rb

@@ -1,14 +0,0 @@
-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