lastfm12 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,6 @@
+== 0.0.2 2010-7-17
+* bug fix
+
 == 0.0.1 2008-12-28
 
 * 1 major enhancement:

data/Manifest.txt

@@ -7,6 +7,8 @@ config/hoe.rb
 config/requirements.rb
 lib/lastfm12.rb
 lib/lastfm12/version.rb
+sample/play.rb
+sample/more_simple_play.rb
 script/console
 script/destroy
 script/generate

data/PostInstall.txt

@@ -1,7 +1,4 @@
 
 For more information on lastfm12, see http://lastfm12.rubyforge.org
 
-NOTE: Change this information in PostInstall.txt 
-You can also delete it if you don't want it.
-
 

data/README.rdoc

@@ -4,29 +4,29 @@
 
 == DESCRIPTION:
 
-FIX (describe your package)
+* lastfm12 is a wrapper around the Last.fm protocol version 1.2. This library can manipulate last.fm radio streams. So, you can implement easily a last.fm radio.
 
 == FEATURES/PROBLEMS:
 
-* FIX (list of features or problems)
+* foo
 
 == SYNOPSIS:
 
-  FIX (code sample of usage)
+  
 
 == REQUIREMENTS:
 
-* FIX (list of requirements)
+* rubygems
 
 == INSTALL:
 
-* FIX (sudo gem install, anything else)
+* sudo gem install lastfm12
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2008 FIXME full name
+Copyright (c) 2008 Keiichiro Ui
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/lastfm12.rb

@@ -85,7 +85,6 @@ class LastFM12
   #:user_agent or "user_agent":: an string used as an user agent name for handshake, ajusting radio station and playlist requests
   #:station or "staion":: an array of strings such as ["tag","electoro"]. refer _adjust_station_ method
   #:verbose or "verbose":: true: output oparations, false: no output
-
   def initialize(username,password,opt=nil)
     
     @user_name = username.to_s
@@ -102,7 +101,7 @@ class LastFM12
         when "station", :station
           @station = _make_lastfm_url(*(v.to_a))
         when "verbose", :verbose
-          @verbose = true
+          @verbose = v
         end
       end
     end
@@ -136,7 +135,7 @@ class LastFM12
     station = _make_lastfm_url(param_name, param)
 
     if @station == station
-      puts "Already Adjusted The Station" if @verbose
+      puts "[lastfm12] Already Adjusted The Station" if @verbose
       return station
     else
       @station = station
@@ -148,7 +147,7 @@ class LastFM12
 
   #Getting tracks
   #Return a array of tracks.
-  #[_num_] the minimun number of tracks
+  #[_min_num_tracks_] the minimun number of tracks
   #===Note
   #The length of the returned array is vary. So, sometime, _get_tracks_ get no track.
   #Give _min_num_tracks_, if you want to get tracks more than _min_num_tracks_.
@@ -165,7 +164,8 @@ class LastFM12
         
         if @verbose
           z = ret.length.zero?
-          puts "#{z ? '' : 'Success'} Getting #{z ? 'No' : ret.length } Tracks"
+          o = (ret.length == 1)
+          puts "[lastfm12] #{z ? '' : 'Success'} Getting #{z ? 'No' : ret.length } Track#{z and o}s"
         end
 
       end
@@ -178,6 +178,7 @@ class LastFM12
 
   end
 
+  
   def play_loop(&block)
 
     loop do
@@ -185,7 +186,33 @@ class LastFM12
     end
 
   end
-
+  
+  #More simple API
+  #LastFM12.play_loop(_username_, _password_, _opt_, &block)
+  #  or
+  #LastFM12.play_loop(_hash_, &block)
+  #
+  #[_username_]
+  # an account name on last.fm
+  #[_password_]
+  # an password for the account
+  #[_opt_]
+  # a hash as Fig.A
+  #[_hash_]
+  # a hash as Fig.A*
+  #
+  #===Fig.A
+  #_key_:: _value_
+  #:user_agent or "user_agent":: an string used as an user agent name for handshake, ajusting radio station and playlist requests
+  #:station or "staion":: an array of strings such as ["tag","electoro"]. refer _adjust_station_ method
+  #:verbose or "verbose":: true: output oparations, false: no output
+  #===Fig.A*
+  #_key_:: _value_
+  #:user_name or "user_name":: an account name on last.fm
+  #:password or "password":: an password for the account
+  #:user_agent or "user_agent":: an string used as an user agent name for handshake, ajusting radio station and playlist requests
+  #:station or "staion":: an array of strings such as ["tag","electoro"]. refer _adjust_station_ method
+  #:verbose or "verbose":: true: output oparations, false: no output
   def LastFM12.play_loop(*args,&block)
 
     if args.length == 1 and args[0].kind_of?(Hash)
@@ -194,6 +221,8 @@ class LastFM12
       hash = args[2]
       hash[:user_name] = args[0]
       hash[:password] = args[1]
+    else
+      raise ArgumentError
     end
 
     new_hash = Hash.new
@@ -203,7 +232,7 @@ class LastFM12
     if @@instance.nil? or @@instance.user_name != hash[:user_name]
       @@instance = LastFM12.new(hash[:user_name],hash[:password],hash)
     else
-      puts "Skip Handshake" if @@instance.verbose
+      puts "[lastfm12] Skip Handshake" if @@instance.verbose
     end
 
     @@instance.play_loop(&block)
@@ -370,9 +399,9 @@ class LastFM12
       @base_url = ret['base_url']
       @base_path = ret['base_path']
       if @session.nil? or @base_url.nil? or @base_path.nil?
-        raise HandshakeError, "handshake error(session: #{@session}, base_url#{@base_url}, base_path: #{@base_path})"
+        raise HandshakeError, "handshake error(session: '#{@session}', base_url: '#{@base_url}', base_path: '#{@base_path}')"
       else
-        puts "Success Handshake" if @verbose
+        puts "[lastfm12] Success Handshake" if @verbose
       end
     end
 
@@ -402,7 +431,7 @@ class LastFM12
       if ret['response'] == 'FAILED'
         raise AdjustingError, AdjustingError::Messages[ret['error'].to_i-1]
       else
-        puts "Success Adjusting #{ret[%[stationname]]} Station" if @verbose
+        puts "[lastfm12] Success Adjusting #{ret[%[stationname]]} Station" if @verbose
       end
     end
 
@@ -432,7 +461,7 @@ class LastFM12
       xspf = REXML::Document.new(res.body)
       station = xspf.elements['/playlist/title']
       if station.nil? or station.text.nil?
-        puts "Failure of Getting the Playlist Title" if @verbose
+        puts "[lastfm12] Failure of Getting the Playlist Title" if @verbose
         return []
       end
 
@@ -447,6 +476,7 @@ class LastFM12
         tr[:user_agent] = @user_agent
         tracks << Track.new(tr)
       end
+
     end # End of "Net::HTTP.new(@base_url).request_get(..."
 
     tracks
@@ -479,13 +509,9 @@ class LastFM12
       tmp % ["user", "#{param}/neighbours"]
     when :recommended
       tmp % ["user", "#{param}/recommended/100"]
+    else
+      raise ArgumentError, "unknown 1st argment (#{param_name.to_s})"
     end
   end
 
 end
-
-if $0 == __FILE__
-  Lastfm12.new("daftbeats","iamcrz4b",:station => ["tag","bossa"]).get_tracks.each do |tr|
-    puts tr
-  end
-end

data/lib/lastfm12/version.rb

@@ -2,7 +2,7 @@ module Lastfm12
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     self

data/sample/more_simple_play.rb

@@ -0,0 +1,26 @@
+#!ruby
+#
+# more simple example with mpg123
+# play similar tracks to Queen
+#
+
+user_name = "lastfm_user_name"
+password = "lastfm_password"
+
+require "rubygems"
+require "lastfm12"
+
+LastFM12.play_loop(
+                   "user_name" => user_name,
+                   "password" => password,
+                   "user_agent"=> "lastfm12_sample",
+                   "station" => ["artist", "Queen"],
+                   "verbose"=> true
+                   ) do |track|
+  puts "-------------------------------------------"
+  puts "artist: #{track.artist}"
+  puts "title:  #{track.title}"
+  puts "album:  #{track.album}"
+  puts "length: #{track.length/1000}[sec]"
+  `mpg123 -b 1024 #{track.location}`
+end

data/sample/play.rb

@@ -0,0 +1,36 @@
+#!ruby
+#
+# basic example with mpg123
+# play similar tracks to Queen
+#
+
+user_name = "lastfm_user_name"
+password = "lastfm_password"
+
+require "rubygems"
+require "lastfm12"
+
+opt = {
+  #"user_agent": "lastfm12_sample", # user-agent
+  #"verbose": true                  # verbose output
+}
+
+# handshake
+lastfm = LastFM12.new(user_name,password, opt)
+puts "Success Handshake"
+
+lastfm.adjust_station("artist", "Queen")
+puts "Success Adjusting Station(#{lastfm.station})"
+
+loop do
+  tracks = lastfm.get_tracks
+  puts "*** Got #{tracks.length} track#{tracks.length==1 ? nil : 's'}"
+  tracks.each do |track|
+    puts "-------------------------------------------"
+    puts "artist: #{track.artist}"
+    puts "title:  #{track.title}"
+    puts "album:  #{track.album}"
+    puts "length: #{track.length/1000}[sec]"
+    `mpg123 -b 1024 #{track.location}`
+  end
+end

data/website/index.html

@@ -33,10 +33,10 @@
     <h1>lastfm12</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/lastfm12"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/lastfm12" class="numbers">0.0.1</a>
+      <a href="http://rubyforge.org/projects/lastfm12" class="numbers">0.0.2</a>
     </div>
     <h2>What</h2>
-<p>lastfm12 is a wrapper around the Last.fm protocol version 1.2. This library can manipulate the last.fm radio streams. So, you can implement easily the last.fm radio.</p>
+<p>lastfm12 is a wrapper around the Last.fm protocol version 1.2. This library can manipulate the last.fm radio streams. So, you can implement easily a last.fm radio.</p>
 <h2>Installing</h2>
 <p><pre class='syntax'><span class="ident">sudo</span> <span class="ident">gem</span> <span class="ident">install</span> <span class="ident">lastfm12</span></pre></p>
 <h2>Demonstration of usage</h2>

data/website/index.txt

@@ -2,7 +2,7 @@ h1. lastfm12
 
 h2. What
 
-lastfm12 is a wrapper around the Last.fm protocol version 1.2. This library can manipulate the last.fm radio streams. So, you can implement easily the last.fm radio.
+lastfm12 is a wrapper around the Last.fm protocol version 1.2. This library can manipulate the last.fm radio streams. So, you can implement easily a last.fm radio.
 
 h2. Installing
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lastfm12
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Keiichiro Ui
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-28 00:00:00 +09:00
+date: 2010-07-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
+        version: 2.6.1
+  type: :development
+  version_requirements: *id001
 description: lastfm12 is a wrapper around the Last.fm protocol version 1.2. This library can manipulate the last.fm radio streams. So, you can implement easily the last.fm radio.
 email: 
 - keiichiro.ui@gmail.com
@@ -33,7 +45,6 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
-- README.rdoc
 - website/index.txt
 files: 
 - History.txt
@@ -45,6 +56,8 @@ files:
 - config/requirements.rb
 - lib/lastfm12.rb
 - lib/lastfm12/version.rb
+- sample/play.rb
+- sample/more_simple_play.rb
 - script/console
 - script/destroy
 - script/generate
@@ -62,37 +75,42 @@ files:
 - website/template.html.erb
 has_rdoc: true
 homepage: http://lastfm12.rubyforge.org
+licenses: []
+
 post_install_message: |+
   
   For more information on lastfm12, see http://lastfm12.rubyforge.org
   
-  NOTE: Change this information in PostInstall.txt 
-  You can also delete it if you don't want it.
-  
   
 rdoc_options: 
 - --main
-- README.rdoc
+- README.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: lastfm12
-rubygems_version: 1.2.0
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: lastfm12 is a wrapper around the Last.fm protocol version 1.2. This library can manipulate the last.fm radio streams. So, you can implement easily the last.fm radio.
 test_files: 
 - test/test_helper.rb