scrapescrobbler 0.1.2 → 0.2

data/bin/dev_scrapes

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'rubygems'
 # Executable with absolute path to lib for hacking and development
 require File.join('.', File.dirname(__FILE__), '..', 'lib', 'scrapescrobbler')
 Scrapescrobbler::CLI.invoke

data/lib/scrapescrobbler/listener.rb

@@ -19,6 +19,7 @@ module Scrapescrobbler
       if playlist and playlist.length > 0 then
         @now_playing = playlist.first
         playlist.each do |song|
+          next if song == nil
           saved = song.save
           self.scrobble(song) if saved
         end
@@ -27,8 +28,8 @@ module Scrapescrobbler
 
     def scrobble song
       puts "Scrobbling #{song} @ #{song.time || Time.now}"
-      @lastfm.track.scrobble(song.artist, song.title, song.album,
-          song.time.utc.to_i || Time.now.utc.to_i)
+      @lastfm.track.scrobble(song.artist, song.title,
+          song.time.utc.to_i || Time.now.utc.to_i, song.album)
     end
 
     def now_playing
@@ -44,7 +45,7 @@ module Scrapescrobbler
       end
 
       lastfm = Lastfm.new Config['api_key'], Config['api_secret']
-      lastfm.session = Config['session']
+      lastfm.session = Config['session']['key']
       lastfm
     end
   end

data/lib/scrapescrobbler/stations/wyep.rb

@@ -13,19 +13,16 @@ module Scrapescrobbler
       def self.playlist
         doc = open(PLAYLIST_URL) { |f| Hpricot(f) }
 
-        table = doc.at("div#center_right")
-        breaks = table/"tr"/"td"
-        songs = []
-        [table/"td.now_playing", table/"td.odd_row" - breaks, table/"td.even_row" - breaks].each do |row|
-          next unless row.length != 0
-          playlist_entries = row.collect do |cell|
-            cell.inner_html
-          end
-          songs = playlist_entries.chunk(5).collect do |entry|
-            time = entry[0] == "NOW PLAYING" ? Time.now : Time.parse(entry[0])
-            Scrapescrobbler::Song.new :time => time, :artist => entry[1],
-                :title => entry[2], :album => entry[3], :station => Wyep::NAME
-          end
+        table = doc.at("table.playlist")
+        breaks = Array.new(table/"tr"/"td.group")
+        songs = (table/"tr.odd" + table/"tr.even" - breaks).collect do |row|
+          fields = row/"td"
+          next if breaks.include? fields[0]
+          field_data = (fields/"p").collect do |field| field.inner_html end
+          time = field_data[0] == "NOW PLAYING" ? Time.now :
+              Time.parse(field_data[0])
+          Scrapescrobbler::Song.new :time => time, :artist => field_data[1],
+              :title => field_data[2], :album => field_data[3], :station => Wyep::NAME
         end
         songs
       end

data/lib/scrapescrobbler/version.rb

@@ -1,3 +1,3 @@
 module Scrapescrobbler
-  VERSION = "0.1.2" unless defined?(::Scrapescrobbler::VERSION)
+  VERSION = "0.2" unless defined?(::Scrapescrobbler::VERSION)
 end

data/scrapescrobbler.gemspec

@@ -19,13 +19,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "mocha"
   s.add_dependency "hpricot"
-  s.add_dependency "lastfm", ">= 0.2.0"
+  s.add_dependency "lastfm", ">= 1.5.1"
   s.add_dependency "dm-core"
   s.add_dependency "dm-sqlite-adapter"
   s.add_dependency "dm-migrations"
   s.add_dependency "dm-validations"
   s.add_dependency "activesupport", ">= 3.0.0"
-  s.add_dependency "i18n"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- spec/*`.split("\n")

metadata

@@ -1,138 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scrapescrobbler
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: '0.2'
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Christopher Peplin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-01 00:00:00 -04:00
-default_executable: scrapescrobble
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hpricot
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hpricot
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: lastfm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: lastfm
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: dm-core
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: dm-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: dm-sqlite-adapter
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  version_requirements: *id010
-description: Scrapescobbler is a tool to submit tracks you're listening to on an old-fashioned radio station to last.fm.
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+description: Scrapescobbler is a tool to submit tracks you're listening to on an old-fashioned
+  radio station to last.fm.
 email: chris.peplin@rhubarbtech.com
-executables: 
+executables:
 - dev_scrapes
 - scrapes
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CONTRIBUTORS
 - LICENSE
@@ -159,35 +190,31 @@ files:
 - spec/listener_spec.rb
 - spec/models/song_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/peplin/scrapescrobbler
 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'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Radio station last.fm scrobbler
-test_files: 
+test_files:
 - spec/cli/list_spec.rb
 - spec/cli/listen_spec.rb
 - spec/listener_spec.rb