notu 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc3c92dbc057aac0be99593d86f551a78ef79554
-  data.tar.gz: 5e0f907bcca8347d1908c46057c8ae50239bc653
+  metadata.gz: 83c849e6aa154adb3210c2665d5ef2ffc64ca013
+  data.tar.gz: 69173c99d6eec9cdb3fd52a671c7c64d80553e86
 SHA512:
-  metadata.gz: 4266ff783b146b3a77bcfc727daab611cad9863c5d3e7be53d79e8edb8874b44e6e2fb468aa454b0ef2195efcb3e3f7d40360d83ce5c2012910c61315fd18477
-  data.tar.gz: 507390a80d95d3bf8d2d8d7c94ff69efc7933096fab9441a89ce284d43ff399dcd42d6d003d158128b491b10f2e4c69506b1b6652452eecfbeb14de6eab19baf
+  metadata.gz: 6700b41e5b70ec40928596227c2bded73092ac80620826d0029c09a041b531142366e7a3ced25751b9bf20d894f6835c3c219b84742e8567f20ee817ab4f57f3
+  data.tar.gz: 6b82941fd297bb5b1255338cd5d642bbc7c91dfe2a6dd9ad827d18d542d75dd812a9f1203096f64e950bde924685c3f320da2d33532212c3a4083566955f856d

data/.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
-.bundle
-.ruby-version
-Gemfile.lock
-pkg/*
+/.bundle/
+/.ruby-version
+/Gemfile.lock
+/pkg/

data/README.mdown

@@ -6,21 +6,25 @@ API to get Last.fm most played and loved tracks.
 
 Just add this into your `Gemfile`:
 
-    gem 'notu'
+```ruby
+gem 'notu'
+```
 
 Then, just run `bundle install`.
 
 ## Example
 
-    library = Notu::Library.new(username: 'johndoe')
+```ruby
+library = Notu::Library.new(username: 'johndoe')
 
-    library.loved_tracks.each do |track|
-      puts track.artist
-    end
+library.loved_tracks.each do |track|
+  puts track.artist
+end
 
-    library.most_played_tracks(period: 'last_month').each do |track|
-      puts "#{track.artist}: #{track.plays_count}"
-    end
+library.most_played_tracks(period: 'last_month').each do |track|
+  puts "#{track.artist}: #{track.plays_count}"
+end
+```
 
 ## Executing test suite
 

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/notu.rb

@@ -14,6 +14,7 @@ require "#{lib_path}/parse_error"
 require "#{lib_path}/html_document"
 require "#{lib_path}/http_download"
 require "#{lib_path}/library"
+require "#{lib_path}/listing"
 require "#{lib_path}/loved_tracks"
 require "#{lib_path}/most_played_tracks"
 require "#{lib_path}/track"

data/lib/notu/listing.rb

@@ -0,0 +1,30 @@
+module Notu
+
+  module Listing
+
+    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: path, query: params.merge('page' => index))
+      end
+    end
+
+    def pages_count
+      document = HtmlDocument.get(library.url(path: path, query: params))
+      [1, (document/'ul.pagination li.pages').text.split(/\s+/).map { |text| text.to_i }].flatten.compact.max
+    end
+
+    def params
+      # to be overriden
+      {}
+    end
+
+  end
+
+end

data/lib/notu/loved_tracks.rb

@@ -3,36 +3,23 @@ module Notu
   class LovedTracks
 
     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
+    include Listing
 
     def each(&block)
       return unless block_given?
       page_urls.each do |url|
         document = HtmlDocument.get(url)
-        (document/'#lovedTracks td.subjectCell').each do |element|
-          yield(Track.new(artist: (element/'a').first.text, title: (element/'a').last.text))
+        (document/'#user-loved-tracks-section tbody tr').each do |element|
+          artist = (element/'td.chartlist-name .link-block-target').first.text
+          title = (element/'td.chartlist-name .chartlist-artists').first.text
+          yield(Track.new(artist: artist, title: title))
         end
       end
       nil
     end
 
-    private
-
-    def page_urls
-      (1..pages_count).map do |index|
-        library.url(path: 'library/loved', query: { 'sortBy' => 'date', 'sortOrder' => 'desc', 'page' => index })
-      end
-    end
-
-    def pages_count
-      document = HtmlDocument.get(library.url(path: 'library/loved'))
-      [1, (document/'div.whittle-pagination a').map { |link| link.text.to_i }].flatten.max
+    def path
+      'loved'
     end
 
   end

data/lib/notu/most_played_tracks.rb

@@ -3,37 +3,46 @@ module Notu
   class MostPlayedTracks
 
     include Enumerable
+    include Listing
 
     PERIODS = {
-      'last_week' => 'week',
-      'last_month' => '1month',
-      'last_3_months' => '3month',
-      'last_6_months' => '6month',
-      'last_year' => 'year',
-      'overall' => 'overall',
+      '7 days' => 'LAST_7_DAYS',
+      '30 days' => 'LAST_30_DAYS',
+      '90 days' => 'LAST_90_DAYS',
+      '365 days' => 'LAST_365_DAYS',
+      'Overall' => '',
     }
 
-    attr_reader :library, :period
+    attr_reader :period
 
     def initialize(library, options = {})
-      raise ArgumentError.new("#{self.class}#library must be a library, #{library.inspect} given") unless library.is_a?(Library)
-      @library = library
+      super(library)
       options = options.stringify_keys.reverse_merge('period' => PERIODS.keys.first)
       self.period = options['period']
     end
 
     def each(&block)
       return unless block_given?
-      document = HtmlDocument.get(library.url(path: 'charts', query: { 'rangetype' => PERIODS[period], 'subtype' => 'tracks' }))
-      (document/'table.chart tbody tr').each do |element|
-        artist = (element/'td.subjectCell a').first.text
-        plays_count = (element/'td.chartbarCell a span').text.strip
-        title = (element/'td.subjectCell a').last.text
-        yield(Track.new(artist: artist, plays_count: plays_count, title: title))
+      page_urls.each do |url|
+        document = HtmlDocument.get(url)
+        (document/'table.chartlist tbody tr').each do |element|
+          artist = (element/'td.chartlist-name .link-block-target').first.text
+          title = (element/'td.chartlist-name .chartlist-artists').first.text
+          plays_count = (element/'td.chartlist-countbar .countbar-bar-value').text.gsub(/[^\d]/, '')
+          yield(Track.new(artist: artist, plays_count: plays_count, title: title))
+        end
       end
       nil
     end
 
+    def params
+      { 'date_preset' => PERIODS[period] }
+    end
+
+    def path
+      'library/tracks'
+    end
+
     private
 
     def period=(value)

data/spec/cassettes/Notu_HtmlDocument/_get/follows_redirects.yml

@@ -19,7 +19,7 @@ http_interactions:
       message: Moved Permanently
     headers:
       Date:
-      - Thu, 28 Aug 2014 22:42:20 GMT
+      - Wed, 19 Aug 2015 01:03:26 GMT
       Server:
       - Apache/2.2.16 (Debian)
       Location:
@@ -43,7 +43,7 @@ http_interactions:
         <address>Apache/2.2.16 (Debian) Server at www.alweb.org Port 80</address>
         </body></html>
     http_version: 
-  recorded_at: Thu, 28 Aug 2014 22:42:21 GMT
+  recorded_at: Wed, 19 Aug 2015 01:03:26 GMT
 - request:
     method: get
     uri: http://alweb.org/
@@ -63,7 +63,7 @@ http_interactions:
       message: OK
     headers:
       Date:
-      - Thu, 28 Aug 2014 22:42:21 GMT
+      - Wed, 19 Aug 2015 01:03:27 GMT
       Server:
       - Apache/2.2.16 (Debian)
       X-Frame-Options:
@@ -73,21 +73,21 @@ http_interactions:
       X-Content-Type-Options:
       - nosniff
       Etag:
-      - '"f24a7f595f7d88d135193e6f203bfbd5"'
+      - '"17883192c98ca0216d45df6579fc74e5"'
       Cache-Control:
       - public
       X-Request-Id:
-      - 005d51c9-30e8-45bc-886a-476b46509307
+      - 7755283b-c2d8-4431-94ad-881df833cf2b
       X-Runtime:
-      - '0.005857'
+      - '0.006922'
       X-Powered-By:
-      - Phusion Passenger 4.0.49
+      - Phusion Passenger 4.0.53
       Status:
       - 200 OK
       Vary:
       - Accept-Encoding
       Content-Length:
-      - '929'
+      - '787'
       Content-Type:
       - text/html; charset=utf-8
     body:
@@ -110,8 +110,8 @@ http_interactions:
           <meta name="DC.creator" content="Alexis Toulotte" />
           <meta name="DC.description" content="Page personnelle d'Alexis Toulotte." />
           <meta name="google-site-verification" content="1dodRvC0Zp-iAZilnTeT5PaY4bPKHwSzs9994-3g304" />
-          <script src="/assets/application-2faf062622c53593fc90ee0ba5667a48.js"></script>
-          <link href="/assets/application-a374b3c70bad2d98bffceac38d81f6d5.css" media="screen" rel="stylesheet" />
+          <script src="/assets/application-eae74a30b96601b52819de1d8f7920d7.js"></script>
+          <link rel="stylesheet" media="screen" href="/assets/application-ccd3cc87d5f63a3e28a2f20ec2ea3a97.css" />
           <link href="/avatar?size=128" rel="icon" type="image/png" />
           <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Dancing Script" />
           <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Raleway" />
@@ -123,13 +123,13 @@ http_interactions:
 
         <ul class="services">
           <li class="github">
-            <a href="https://github.com/alexistoulotte"><span>GitHub</span></a>
+            <a href="/github"><span>GitHub</span></a>
           </li>
           <li class="rubygems">
-            <a href="https://rubygems.org/profiles/alexistoulotte"><span>RubyGems</span></a>
+            <a href="/rubygems"><span>RubyGems</span></a>
           </li>
           <li class="cv">
-            <a href="https://dl.dropbox.com/u/5601946/CV.pdf"><span>CV</span></a>
+            <a href="/cv"><span>CV</span></a>
           </li>
           <li class="email">
             <a href="#"><span>Email</span></a>
@@ -141,31 +141,22 @@ http_interactions:
             <a href="skype:alexistoulotte"><span>Skype</span></a>
           </li>
           <li class="twitter">
-            <a href="https://twitter.com/alexistoulotte"><span>Twitter</span></a>
+            <a href="/twitter"><span>Twitter</span></a>
           </li>
           <li class="facebook">
-            <a href="https://www.facebook.com/alexis.toulotte"><span>Facebook</span></a>
+            <a href="/facebook"><span>Facebook</span></a>
           </li>
-          <li class="linked-in">
-            <a href="https://www.linkedin.com/in/alexistoulotte"><span>LinkedIn</span></a>
+          <li class="linkedin">
+            <a href="/linkedin"><span>LinkedIn</span></a>
           </li>
           <li class="google-plus">
-            <a href="https://plus.google.com/111956742901852825014/posts"><span>Google+</span></a>
-          </li>
-          <li class="youtube">
-            <a href="https://www.youtube.com/alexistoulotte"><span>YouTube</span></a>
+            <a href="/google_plus"><span>Google+</span></a>
           </li>
           <li class="mixcloud">
-            <a href="https://www.mixcloud.com/alexistoulotte"><span>Mixcloud</span></a>
-          </li>
-          <li class="last-fm">
-            <a href="http://www.lastfm.fr/user/alexistoulotte"><span>Last.fm</span></a>
-          </li>
-          <li class="sound-cloud">
-            <a href="https://soundcloud.com/alexistoulotte"><span>SoundCloud</span></a>
+            <a href="/mixcloud"><span>Mixcloud</span></a>
           </li>
-          <li class="delicious">
-            <a href="https://delicious.com/alexistoulotte"><span>Delicious</span></a>
+          <li class="lastfm">
+            <a href="/lastfm"><span>Last.fm</span></a>
           </li>
         </ul>
 
@@ -174,5 +165,5 @@ http_interactions:
 
         </html>
     http_version: 
-  recorded_at: Thu, 28 Aug 2014 22:42:21 GMT
-recorded_with: VCR 2.9.2
+  recorded_at: Wed, 19 Aug 2015 01:03:27 GMT
+recorded_with: VCR 2.9.3

data/spec/cassettes/Notu_HtmlDocument/_get/raise_a_NetworkError_on_404.yml

@@ -19,29 +19,29 @@ http_interactions:
       message: Not Found
     headers:
       Date:
-      - Thu, 28 Aug 2014 22:42:24 GMT
+      - Wed, 19 Aug 2015 01:03:25 GMT
       Server:
       - Apache/2.2.16 (Debian)
       X-Request-Id:
-      - b680fd44-8c4c-4057-b22c-137c56a3d2fe
+      - cd80c4e1-b689-4add-a080-552bc5fb6ca2
       X-Runtime:
-      - '0.003575'
+      - '0.003299'
       X-Powered-By:
-      - Phusion Passenger 4.0.49
+      - Phusion Passenger 4.0.53
       Status:
       - 404 Not Found
       Vary:
       - Accept-Encoding
       Content-Length:
-      - '495'
+      - '309'
       Content-Type:
       - text/html; charset=utf-8
     body:
       encoding: UTF-8
       string: |
-        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        <!DOCTYPE html>
 
-        <html xmlns="http://www.w3.org/1999/xhtml">
+        <html>
 
         <head>
             <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -63,18 +63,11 @@ http_interactions:
             <p>
                 You may have mistyped the address or the page may have moved.
             </p>
-
-            <p class="footer">
-                Powered by
-                <a href="http://httpd.apache.org" title="The Apache HTTP Server Project">Apache</a>
-                and
-                <a href="http://debian.org" title="The Universal Operating System">Debian</a>.
-            </p>
         </div>
 
         </body>
 
         </html>
     http_version: 
-  recorded_at: Thu, 28 Aug 2014 22:42:24 GMT
-recorded_with: VCR 2.9.2
+  recorded_at: Wed, 19 Aug 2015 01:03:25 GMT
+recorded_with: VCR 2.9.3

data/spec/cassettes/Notu_HtmlDocument/_get/raise_a_ParseError_if_not_a_valid_document.yml

@@ -19,7 +19,7 @@ http_interactions:
       message: Found
     headers:
       Date:
-      - Thu, 28 Aug 2014 22:42:23 GMT
+      - Wed, 19 Aug 2015 01:03:28 GMT
       Server:
       - Apache/2.2.16 (Debian)
       X-Frame-Options:
@@ -29,15 +29,15 @@ http_interactions:
       X-Content-Type-Options:
       - nosniff
       Etag:
-      - '"f24a7f595f7d88d135193e6f203bfbd5"'
+      - '"fcc9c11bad7747937dfc96cd94e35bca"'
       Cache-Control:
       - public
       X-Request-Id:
-      - e9e38d91-fea7-449b-9ae1-3c5390ef8bdc
+      - 8b9c16a1-d4b1-4634-8b62-2781713921f7
       X-Runtime:
-      - '0.003488'
+      - '0.003552'
       X-Powered-By:
-      - Phusion Passenger 4.0.49
+      - Phusion Passenger 4.0.53
       Location:
       - http://www.gravatar.com/avatar/c090d5749bd9877588ac8563e0817042
       Status:
@@ -52,7 +52,7 @@ http_interactions:
       encoding: UTF-8
       string: <html><body>You are being <a href="http://www.gravatar.com/avatar/c090d5749bd9877588ac8563e0817042">redirected</a>.</body></html>
     http_version: 
-  recorded_at: Thu, 28 Aug 2014 22:42:23 GMT
+  recorded_at: Wed, 19 Aug 2015 01:03:28 GMT
 - request:
     method: get
     uri: http://www.gravatar.com/avatar/c090d5749bd9877588ac8563e0817042
@@ -71,32 +71,34 @@ http_interactions:
       code: 200
       message: OK
     headers:
+      Date:
+      - Wed, 19 Aug 2015 00:59:59 GMT
+      Last-Modified:
+      - Thu, 24 Jan 2013 00:31:59 GMT
+      Connection:
+      - Keep-Alive
+      Cache-Control:
+      - max-age=300
+      Age:
+      - '210'
       Accept-Ranges:
       - bytes
       Access-Control-Allow-Origin:
       - "*"
-      Cache-Control:
-      - max-age=300
       Content-Disposition:
       - inline; filename="c090d5749bd9877588ac8563e0817042.png"
       Content-Type:
       - image/png
-      Date:
-      - Thu, 28 Aug 2014 22:42:23 GMT
       Expires:
-      - Thu, 28 Aug 2014 22:47:23 GMT
-      Last-Modified:
-      - Thu, 24 Jan 2013 00:31:59 GMT
+      - Wed, 19 Aug 2015 01:04:59 GMT
+      Link:
+      - <http://www.gravatar.com/avatar/c090d5749bd9877588ac8563e0817042>; rel="canonical"
       Server:
       - ECS (syd/EBA1)
       Source-Age:
       - '0'
-      Via:
-      - 1.1 varnish
-      X-Cache:
-      - HIT
       X-Varnish:
-      - '271336745'
+      - '429679271'
       Content-Length:
       - '11789'
     body:
@@ -365,5 +367,5 @@ http_interactions:
         0nq4U7qFDsaylSsypzHmjP5Aa8QrNs33AowZ7kMMtcj/Kwwzi4jsmgCKY16w
         HkbsMQmjmC6gSeNGLyXZEkoxlIaZ8f8Dl9VUi97Go/gAAAAASUVORK5CYII=
     http_version: 
-  recorded_at: Thu, 28 Aug 2014 22:42:23 GMT
-recorded_with: VCR 2.9.2
+  recorded_at: Wed, 19 Aug 2015 01:03:29 GMT
+recorded_with: VCR 2.9.3