pandora 0.1.1 → 0.1.2

data/lib/pandora/user.rb

@@ -86,24 +86,24 @@ module Pandora
     # description:: Description of the station
     # date:: Date the station was created
     # artwork:: Artwork of the station
-    # songSeed_song:: Name of song used to create station
-    # songSeed_artist:: Name of the artist for the song used to create the station
-    # composerSeed:: Name of the composer used to create the station
-    # artistSeed:: Name of the artist used to create the station
+    # songSeed:: Array of hashes {:song => "..", :artist => ".."} representing songs used to create the station
+    # composerSeed:: Array of names of the composers used to create the station
+    # artistSeed:: Array of names of the artists used to create the station
     #
     def stations
       doc = request(@user, "stations")
       stations = []
       doc.xpath('//rss/channel/item').each do |node|
-        stations << { :title       => node.xpath('title').text.strip,
-                      :link        => node.xpath('link').text.strip,
-                      :description => node.xpath('description').text.strip,
-                      :date        => node.xpath('pubDate').text.strip,
-                      :artwork     => node.xpath('pandora:stationAlbumArtImageUrl').text.strip,
-                      :songSeed_song   => node.xpath('pandora:seeds/pandora:songSeed/pandora:song').text.strip,
-                      :songSeed_artist => node.xpath('pandora:seeds/pandora:songSeed/pandora:artist').text.strip,
-                      :composerSeed    => node.xpath('pandora:seeds/pandora:composerSeed/pandora:composer').text.strip,
-                      :artistSeed      => node.xpath('pandora:seeds/pandora:artistSeed/pandora:artist').text.strip}
+        seeds = parse_seeds(node)
+        
+        stations << { :title          => node.xpath('title').text.strip,
+                      :link           => node.xpath('link').text.strip,
+                      :description    => node.xpath('description').text.strip,
+                      :date           => node.xpath('pubDate').text.strip,
+                      :artwork        => node.xpath('pandora:stationAlbumArtImageUrl').text.strip,
+                      :songSeed       => seeds[:song],
+                      :composerSeed   => seeds[:composer],
+                      :artistSeed     => seeds[:artist]}
       end
       stations
     end
@@ -119,24 +119,24 @@ module Pandora
     # description:: Description of the station
     # date:: Date the station was last played
     # artwork:: Artwork of the station
-    # songSeed_song:: Name of song used to create station
-    # songSeed_artist:: Name of the artist for the song used to create the station
-    # composerSeed:: Name of the composer used to create the station
-    # artistSeed:: Name of the artist used to create the station
+    # songSeed:: Array of hashes {:song => "..", :artist => ".."} representing songs used to create the station
+    # composerSeed:: Array of names of the composers used to create the station
+    # artistSeed:: Array of names of the artists used to create the station
     #
     def now_playing
       doc = request(@user, "nowplaying")
       station = []
       doc.xpath('//rss/channel/item').each do |node|
-        station << { :title       => node.xpath('title').text.strip,
-                     :link        => node.xpath('link').text.strip,
-                     :description => node.xpath('description').text.strip,
-                     :date        => node.xpath('pubDate').text.strip,
-                     :artwork     => node.xpath('pandora:stationAlbumArtImageUrl').text.strip,
-                     :songSeed_song   => node.xpath('pandora:seeds/pandora:songSeed/pandora:song').text.strip,
-                     :songSeed_artist => node.xpath('pandora:seeds/pandora:songSeed/pandora:artist').text.strip,
-                     :composerSeed    => node.xpath('pandora:seeds/pandora:composerSeed/pandora:composer').text.strip,
-                     :artistSeed      => node.xpath('pandora:seeds/pandora:artistSeed/pandora:artist').text.strip }
+        seeds = parse_seeds(node)
+        
+        station << { :title         => node.xpath('title').text.strip,
+                     :link          => node.xpath('link').text.strip,
+                     :description   => node.xpath('description').text.strip,
+                     :date          => node.xpath('pubDate').text.strip,
+                     :artwork       => node.xpath('pandora:stationAlbumArtImageUrl').text.strip,
+                     :songSeed      => seeds[:song],
+                     :composerSeed  => seeds[:composer],
+                     :artistSeed    => seeds[:artist]}
       end
       station
     end
@@ -173,5 +173,37 @@ module Pandora
       end
       items
     end
+    
+    private
+      def parse_seeds(node)
+        seeds = {
+          :song     => [],
+          :composer => [],
+          :artist   => []
+        }
+        
+        if node.is_a? Nokogiri::XML::Node
+          node.xpath('pandora:seeds/pandora:songSeed').each do |s|
+            
+            song    = s.xpath("pandora:song").text.strip
+            artist  = s.xpath("pandora:artist").text.strip
+            
+            seeds[:song] << {
+              :song   => song,
+              :artist => artist
+            }
+          end
+          
+          node.xpath('pandora:seeds/pandora:composerSeed/pandora:composer').each do |c|
+            seeds[:composer] << c.text.strip
+          end
+          
+          node.xpath('pandora:seeds/pandora:artistSeed/pandora:artist').each do |a|
+            seeds[:artist] << a.text.strip
+          end
+        end
+        
+        seeds
+      end
   end
 end

data/lib/pandora/version.rb

@@ -1,3 +1,3 @@
 module Pandora
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/pandora.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |s|
   s.description = %q{A Ruby wrapper for the Pandora public user feeds}
   
   s.add_runtime_dependency 'nokogiri','~> 1.4'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'yard'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,37 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pandora
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Anil
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70178239905760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70178239905760
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70178239905340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70178239905340
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &70178239904740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70178239904740
 description: A Ruby wrapper for the Pandora public user feeds
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .yardopts
 - Gemfile
@@ -44,30 +62,33 @@ files:
 - pandora.gemspec
 homepage: http://github.com/anilv/pandora
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -1909941597842625503
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -1909941597842625503
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Get Music data from Pandora
 test_files: []
-
+has_rdoc: