shoutcast_status 0.1.0 → 0.1.1

data/lib/shoutcast_status.rb

@@ -2,7 +2,8 @@ require "open-uri"
 require "johnson"
 
 class ShoutcastStatus
-  DEFAULT_INFO_URL = "http://%s/cast/js.php/%s/streaminfo"
+  DEFAULT_ENDPOINT  = "http://%s/cast/"
+  DEFAULT_INFO_PATH = "js.php/%s/streaminfo"
 
   DUMMY_CALLBACK = <<-END
     function cc_streaminfo_get_callback(details){
@@ -12,12 +13,15 @@ class ShoutcastStatus
 
   # Create a ShoutcastStatus instance for a given station.
   # If one parameter is given, it is taken as the url to the now playing JSONP
-  # callback. If two parameters are given, they are interpreted as the station
-  # host and station name; the information URL will be inferred from this.
+  # callback or the playlist. If two parameters are given, they are interpreted
+  # as the station host and station name; the information URL will be inferred
+  # from this.
   #
   def initialize(url_or_host, station=nil)
     if station
-      @info_url = DEFAULT_INFO_URL % [url_or_host, station]
+      @info_url = (DEFAULT_ENDPOINT % url_or_host) + (DEFAULT_INFO_PATH % station)
+    elsif m = url_or_host.match(%r{^(.*?/)tunein.php/([^/]+)/playlist.pls$})
+      @info_url = m[1] + (DEFAULT_INFO_PATH % m[2])
     else
       @info_url = url_or_host
     end

data/test/shoutcast_status_test.rb

@@ -15,6 +15,15 @@ class ShoutcastStatusTest < Test::Unit::TestCase
     sc.stream_info
   end
 
+  def test_should_convert_tunein_url_to_status_url
+    io = StringIO.new("cc_streaminfo_get_callback({});")
+    sc = ShoutcastStatus.new("http://example.com/arbitrary/location/tunein.php/punkrock/playlist.pls")
+    sc.expects(:open).
+       with("http://example.com/arbitrary/location/js.php/punkrock/streaminfo").
+       yields(io)
+    sc.stream_info
+  end
+
   def test_should_use_url_as_supplied
     io = StringIO.new("cc_streaminfo_get_callback({});")
     sc = ShoutcastStatus.new("http://example.com/some/path")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shoutcast_status
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Paul Battley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 +01:00
+date: 2010-07-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency