pandata 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76f5e17f3dad6ffb6f02acba86f723335fbb97d4
-  data.tar.gz: 6b828d02d74c2fa63c8c3a109539d81631c670a7
+  metadata.gz: fb5a92a63800d0ff36db81a216df6e872088e325
+  data.tar.gz: e4d9e93ceb1cfd76135af22bec7c17d96db2b787
 SHA512:
-  metadata.gz: 754af5befcfe4bfc58dd1fbf0d24600d43a215188c5b58f3194d49d9c3d0d6ea99af07b0dc700c45f0738f3c73474dda06f476ffadcbea7423b2a98efacce347
-  data.tar.gz: 39ec74d7091a081601f9f3fd193d6c947c75f93a1dbe4bcb50ceeacb0389e528ecedea30affc2eb52a0cc68d6ad25ce221964623e58f145f9925f5211df7a399
+  metadata.gz: 33172828630f417b6ab84a6de9e589af8390d9630a052a597ebfa72a475f68028ae2912d3e38a0bae378c21ab5b338c1c94a2ed418d005d4da077d3e8f722719
+  data.tar.gz: f63b4be008fdcac395c56c4a27a44a26dcd52bf717b38b763b9214842cdfd9bae2c6294a6a020bc9980b52c062d229a744faeaf0310db1733d50b017c969f077

data/lib/pandata.rb

@@ -11,7 +11,7 @@ module Pandata
   module Version
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/pandata/data_urls.rb

@@ -10,7 +10,7 @@ module Pandata
     stations:             "http://feeds.pandora.com/feeds/people/%{webname}/stations.xml?max=#{MAX_RESULTS}",
     bookmarked_tracks:    "http://feeds.pandora.com/feeds/people/%{webname}/favorites.xml?max=#{MAX_RESULTS}",
     bookmarked_artists:   "http://feeds.pandora.com/feeds/people/%{webname}/favoriteartists.xml?max=#{MAX_RESULTS}",
-    liked_tracks:         'http://www.pandora.com/content/tracklikes?likeStartIndex=%{nextLikeStartIndex}&thumbStartIndex=%{nextThumbStartIndex}&webname=%{webname}',
+    liked_tracks:         'http://www.pandora.com/content/mobile/profile_likes_track.vm?likeStartIndex=%{nextLikeStartIndex}&thumbStartIndex=%{nextThumbStartIndex}&webname=%{webname}&pat=%{pat}',
     liked_artists:        'http://www.pandora.com/content/artistlikes?artistStartIndex=%{nextStartIndex}&webname=%{webname}',
     liked_stations:       'http://www.pandora.com/content/stationlikes?stationStartIndex=%{nextStartIndex}&webname=%{webname}',
     liked_albums:         'http://www.pandora.com/content/albumlikes?albumStartIndex=%{nextStartIndex}&webname=%{webname}',

data/lib/pandata/downloader.rb

@@ -10,14 +10,20 @@ module Pandata
     # A GitHub Gist that contains an updated cookie allowing access to 'login-only' visible data.
     CONFIG_URL = 'https://gist.github.com/ustasb/596f1ee96d03463fde77/raw/pandata_config.json'
 
-    # The cached cookie.
-    @@cookie = nil
+    # The cached config hash.
+    @@config = nil
 
     # Downloads and reads a page from a URL.
     # @param url [String]
     # @return [String] contents of page
     def self.read_page(url)
-      download(url, get_cookie).read
+      download(url, get_config['cookie']).read
+    end
+
+    # Returns a pat token needed for mobile requests.
+    # @return [String]
+    def self.get_pat
+      get_config['pat']
     end
 
     private
@@ -36,18 +42,18 @@ module Pandata
       raise PandataError
     end
 
-    def self.get_cookie
-      @@cookie ||= download_cookie
+    def self.get_config
+      @@config ||= download_config
     end
 
-    def self.download_cookie
+    def self.download_config
       config = JSON.parse download(CONFIG_URL).read
 
       if Gem::Version.new(Pandata::Version::STRING) <= Gem::Version.new(config['required_update_for'])
         raise PandataError, 'Pandora.com has changed something and you need to update Pandata!'
       end
 
-      config['cookie']
+      config
     end
 
   end

data/lib/pandata/parser.rb

@@ -23,7 +23,8 @@ module Pandata
     # @param html [String]
     # @return [Hash, False]
     def get_next_data_indices(html)
-      show_more = Nokogiri::HTML(html).css('.show_more')[0]
+      # .js-more-link is found on mobile pages.
+      show_more = Nokogiri::HTML(html).css('.show_more, .js-more-link')[0]
 
       if show_more
         next_indices = {}
@@ -106,8 +107,9 @@ module Pandata
     def get_liked_tracks(html)
       tracks = []
 
-      infobox_each_link(html) do |title, subtitle|
-        tracks << { track: title, artist: subtitle }
+      doublelink_each_link(html) do |title, subtitle|
+        artist = subtitle.sub(/^by\s/i, '')
+        tracks << { track: title, artist: artist }
       end
 
       tracks
@@ -175,6 +177,19 @@ module Pandata
       end
     end
 
+    # Loops over each .double-link container and yields the title and subtitle.
+    # Encountered on mobile pages.
+    # @param html [String]
+    def doublelink_each_link(html)
+      Nokogiri::HTML(html).css('.double-link').each do |doublelink|
+        title_link = doublelink.css('h3 strong').text.strip
+        subtitle_link = doublelink.css('.media--backstageMusic__text div').text.strip
+
+        yield(title_link, subtitle_link)
+      end
+    end
+
+
     # @param html [String]
     # Returns an array of titles from #infobox_each_link.
     def get_infobox_titles(html)

data/lib/pandata/scraper.rb

@@ -172,6 +172,8 @@ module Pandata
       } if next_data_indices.empty?
 
       next_data_indices[:webname] = @webname
+      next_data_indices[:pat] = Downloader.get_pat
+
       DATA_FEED_URLS[data_name] % next_data_indices
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandata
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Brian Ustas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri