rockstar 0.4.0 → 0.4.1

data/Rakefile

@@ -1,7 +1,7 @@
 # Rakefile
 require 'rubygems'
 require 'rake'
-require 'lib/rockstar/version'
+require File.expand_path('../lib/rockstar/version', __FILE__)
 
 begin
   require 'jeweler'
@@ -19,3 +19,14 @@ begin
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :test => :check_dependencies
+
+task :default => :test

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/rockstar.rb

@@ -2,6 +2,10 @@
 
 $: << File.expand_path(File.dirname(__FILE__))
 
+require 'rubygems'
+require 'active_record'
+require 'time'
+
 require 'rockstar/base'
 require 'rockstar/version'
 

data/lib/rockstar/album.rb

@@ -75,7 +75,7 @@ module Rockstar
     def load_info
       doc           = self.class.fetch_and_parse("album.getInfo", {:artist => @artist, :album =>@name})
       @url          = Base.fix_url((doc).at(:url).inner_html)
-      @release_date = Time.parse((doc).at(:releasedate).inner_html.strip)
+      @release_date = Base.parse_time((doc).at(:releasedate).inner_html.strip)
 
       @images = {}
       (doc/'image').each {|image|

data/lib/rockstar/base.rb

@@ -12,6 +12,7 @@ module Rockstar
       def fetch_and_parse(resource, params = {}, sign_request = false)
         Hpricot::XML(connection.get(resource, sign_request, params))
       end
+
     end
     
     private
@@ -33,5 +34,10 @@ module Rockstar
         end
         url
       end
+
+      def self.parse_time(time_str)
+        return nil if time_str.blank?
+        Time.parse(time_str)
+      end
   end
 end

data/lib/rockstar/event.rb

@@ -22,8 +22,8 @@ module Rockstar
           e.headliners <<  h.inner_html
         }
 
-        e.start_date  = Time.parse(xml.search("/startDate").inner_html.strip)
-        e.end_date    = Time.parse(xml.search("/endDate").inner_html.strip)
+        e.start_date  = Base.parse_time(xml.search("/startDate").inner_html.strip)
+        e.end_date    = Base.parse_time(xml.search("/endDate").inner_html.strip)
         e.description = xml.search("/description").inner_html.strip
         e.attendance  = xml.search("/attendance").inner_html.strip.to_i
         e.reviews     = xml.search("/reviews").inner_html.strip.to_i

data/lib/rockstar/tokenauth.rb

@@ -25,7 +25,7 @@ module Rockstar
   #
   # = Get the session token
   # 1. Use the previous token and call 
-  #     new Rockstar::Auth.new.session(token) 
+  #     session = Rockstar::Auth.new.session(token) 
   # 2. Store the session.key and session.username returned. The session.key will not
   #    expire. It is save to store it into your database.
   # 3. Use this session.key as token to authentificate with this class :

data/lib/rockstar/track.rb

@@ -65,7 +65,7 @@ module Rockstar
         t.count         = xml['count']                            if xml['count']
         t.album         = (xml).at(:album).inner_html             if (xml).at(:album)
         t.album_mbid    = (xml).at(:album)['mbid']                if (xml).at(:album) && (xml).at(:album)['mbid']
-        t.date          = Time.parse((xml).at(:date).inner_html)  if (xml).at(:date)
+        t.date          = Base.parse_time((xml).at(:date).inner_html)  if (xml).at(:date)
         t.date_uts      = (xml).at(:date)['uts']                  if (xml).at(:date) && (xml).at(:date)['uts']
         
         t.images = {}

data/rockstar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rockstar}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bodo Tasche"]
-  s.date = %q{2010-07-30}
+  s.date = %q{2010-08-11}
   s.description = %q{This gem is an updated version of jnunemakers scrobbler gem. Rockstar uses v2.0 of the last.fm api.}
   s.email = %q{bodo@bitboxer.de}
   s.extra_rdoc_files = [

data/test/mocks/rest.rb

@@ -27,11 +27,9 @@ module Rockstar
   	      end
   	        	      
   	    elsif @base_url == Rockstar::AUTH_URL
-    	    
   	      # Test Simple Auth
           if args[:hs] == "true" && args[:p] == Rockstar::AUTH_VER.to_s && args[:c] == 'rbs' &&
-             args[:v] == Rockstar::Version.to_s && args[:u] == 'chunky' && !args[:t].blank? &&
-             args[:a] == Digest::MD5.hexdigest('7813258ef8c6b632dde8cc80f6bda62f' + args[:t])
+             args[:v] == Rockstar::Version.to_s && args[:u] == 'chunky' && !args[:t].blank?
             
             "OK\n#{@session_id}\n#{@now_playing_url}\n#{@submission_url}"
           

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
-require File.dirname(__FILE__) + '/../lib/rockstar'
-require File.dirname(__FILE__) + '/mocks/rest'
+
+require File.expand_path('../../lib/rockstar', __FILE__)
+require File.expand_path('..//mocks/rest', __FILE__)
 
 class << Test::Unit::TestCase
   def test(name, &block)

data/test/unit/test_album.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestAlbum < Test::Unit::TestCase
   def setup

data/test/unit/test_artist.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestArtist < Test::Unit::TestCase
 

data/test/unit/test_chart.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestChart < Test::Unit::TestCase
 

data/test/unit/test_geo.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestGeo < Test::Unit::TestCase
   

data/test/unit/test_playing.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestPlaying < Test::Unit::TestCase
 

data/test/unit/test_scrobble.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestScrobble < Test::Unit::TestCase
   

data/test/unit/test_simpleauth.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestSimpleAuth < Test::Unit::TestCase
 

data/test/unit/test_tag.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestTag < Test::Unit::TestCase
 

data/test/unit/test_tokenauth.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestTokenAuth < Test::Unit::TestCase
 

data/test/unit/test_track.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestTrack < Test::Unit::TestCase
 

data/test/unit/test_user.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+# encoding: utf-8
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class TestUser < Test::Unit::TestCase
 
@@ -278,7 +279,8 @@ class TestUser < Test::Unit::TestCase
     assert_equal("http://userserve-ak.last.fm/serve/252/3608276.jpg", first.images["extralarge"])
     
     assert_equal("Innenstadt", first.venue.name)
-    assert_equal("Köln", first.venue.city)
+
+    assert_equal("Köln", first.venue.city.mb_chars)
     assert_equal("Germany", first.venue.country)
     assert_equal("Street", first.venue.street)
     assert_equal("12345", first.venue.postalcode)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rockstar
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Bodo Tasche
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 +02:00
+date: 2010-08-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 163
         segments: 
         - 0
         - 4
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 4
@@ -158,7 +155,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -167,7 +163,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"