shoutcast_api 0.1.2 → 0.1.3

data/README.rdoc

@@ -18,11 +18,18 @@ Uses httparty and roxml for fetching and parsing data from http://yp.shoutcast.c
   # Genres
   Shoutcast.genres # => all genres
 
+== Install via gemcutter
+  gem install gemcutter
+  gem tumble
+  gem install shoutcast_api
+
 == Command line
 
-  shoutcast_api lib/shoutcast_api.rb # Genres
+  shoutcast_api               # List genres
+
+  shoutcast_api name=Chronix  # Search for station "Chronix"
 
-  shoutcast_api name=Chronix
+  # Search for station with genre "metal", bitrate 128 and media type "audio/mpeg"
   shoutcast_api genre=metal br=128 mt=audio/mpeg
 
 == Authors
@@ -31,3 +38,4 @@ Uses httparty and roxml for fetching and parsing data from http://yp.shoutcast.c
 == TODO
 
 * command line options transformations
+* Use mock-server for mocking API requests

data/Rakefile

@@ -7,7 +7,7 @@ task :default => :test
 
 require 'echoe'
 Echoe.new('shoutcast_api') do |gem|
-  gem.version = '0.1.2'
+  gem.version = '0.1.3'
   gem.author = 'Peter Suschlik'
   gem.summary = 'Simple shoutcast.com API.'
   gem.email = 'peter-scapi@suschlik.de'

data/lib/shoutcast_api.rb

@@ -62,7 +62,8 @@ module Shoutcast
     private
 
     def self.fetch(options={}, &block) # :nodoc:
-      options.update(:nocache => Time.now.to_f)  if options
+      options ||= {}
+      options.update(:nocache => Time.now.to_f) unless options.key?(:nocache)
       data = get("/sbin/newxml.phtml", :query => options).body
 
       block.call(data)  unless data.empty?

data/shoutcast_api.gemspec

@@ -2,29 +2,28 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shoutcast_api}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Suschlik"]
-  s.date = %q{2009-05-14}
+  s.date = %q{2009-11-04}
   s.default_executable = %q{shoutcast_search}
-  s.description = %q{Simple Shoutcast.com API.}
+  s.description = %q{Simple shoutcast.com API.}
   s.email = %q{peter-scapi@suschlik.de}
   s.executables = ["shoutcast_search"]
-  s.extra_rdoc_files = ["bin/shoutcast_search", "lib/shoutcast_api.rb", "README.rdoc"]
-  s.files = ["Rakefile", "bin/shoutcast_search", "lib/shoutcast_api.rb", "README.rdoc", "Manifest", "test/test_xml.rb", "test/helper.rb", "test/test_fetcher.rb", "test/fixtures/genrelist.plain", "test/fixtures/search_death.plain", "test/fixtures/empty.plain", "test/test_basic.rb", "shoutcast_api.gemspec"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = ["lib/shoutcast_api.rb", "README.rdoc", "bin/shoutcast_search"]
+  s.files = ["lib/shoutcast_api.rb", "Rakefile", "test/test_xml.rb", "test/helper.rb", "test/test_basic.rb", "test/fixtures/empty.plain", "test/fixtures/genrelist.plain", "test/fixtures/search_death.plain", "test/test_fetcher.rb", "README.rdoc", "Manifest", "bin/shoutcast_search", "shoutcast_api.gemspec"]
   s.homepage = %q{http://github.com/splattael/shoutcast_api}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Shoutcast_api", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{shoutcast_api}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Ruby API for Shoutcast.com.}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Simple shoutcast.com API.}
   s.test_files = ["test/test_xml.rb", "test/test_fetcher.rb", "test/test_basic.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<httparty>, ["~> 0.4"])

data/test/test_fetcher.rb

@@ -1,5 +1,21 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
+require 'ostruct'
+class FakeResponse < OpenStruct
+  def initialize(&block)
+    super
+    block.call(self) if block
+  end
+
+  def empty?
+    false
+  end
+
+  def body
+    self
+  end
+end
+
 class FetcherTest < Test::Unit::TestCase
   include Shoutcast
 
@@ -7,6 +23,36 @@ class FetcherTest < Test::Unit::TestCase
     assert_equal "http://yp.shoutcast.com", Stationlist.base_uri
   end
 
+  def test_nocache_paramater
+    fetcher = Fetcher.clone
+
+    def fetcher.get(path, options)
+      FakeResponse.new do |response|
+        response.options = options
+      end
+    end
+
+    # {}
+    response = fetcher.send(:fetch) { |response| response }
+    assert response
+    assert_instance_of Hash, response.options
+    assert_instance_of Hash, response.options[:query]
+    assert response.options[:query][:nocache]
+
+    # { :nocache => "random" }
+    response = fetcher.send(:fetch, :nocache => "random") { |response| response }
+    assert response
+    assert_instance_of Hash, response.options
+    assert_instance_of Hash, response.options[:query]
+    assert_equal "random", response.options[:query][:nocache]
+
+    # nil
+    response = fetcher.send(:fetch, nil) { |response| response }
+    assert_instance_of Hash, response.options
+    assert_instance_of Hash, response.options[:query]
+    assert response.options[:query][:nocache]
+  end
+
   def test_genres_list
     stub_http_response_with("genrelist.plain")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shoutcast_api
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Peter Suschlik
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-14 00:00:00 +02:00
-default_executable: shoutcast_search
+date: 2009-11-04 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -32,29 +32,29 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.5"
     version: 
-description: Simple Shoutcast.com API.
+description: Simple shoutcast.com API.
 email: peter-scapi@suschlik.de
 executables: 
 - shoutcast_search
 extensions: []
 
 extra_rdoc_files: 
-- bin/shoutcast_search
 - lib/shoutcast_api.rb
 - README.rdoc
-files: 
-- Rakefile
 - bin/shoutcast_search
+files: 
 - lib/shoutcast_api.rb
-- README.rdoc
-- Manifest
+- Rakefile
 - test/test_xml.rb
 - test/helper.rb
-- test/test_fetcher.rb
+- test/test_basic.rb
+- test/fixtures/empty.plain
 - test/fixtures/genrelist.plain
 - test/fixtures/search_death.plain
-- test/fixtures/empty.plain
-- test/test_basic.rb
+- test/test_fetcher.rb
+- README.rdoc
+- Manifest
+- bin/shoutcast_search
 - shoutcast_api.gemspec
 has_rdoc: true
 homepage: http://github.com/splattael/shoutcast_api
@@ -87,8 +87,8 @@ requirements: []
 rubyforge_project: shoutcast_api
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: Ruby API for Shoutcast.com.
+specification_version: 3
+summary: Simple shoutcast.com API.
 test_files: 
 - test/test_xml.rb
 - test/test_fetcher.rb