splattael-shoutcast_api 0.1.0 → 0.1.1

data/Manifest

@@ -1,6 +1,5 @@
 Rakefile
 bin/shoutcast_search
-lib/delegator.rb
 lib/shoutcast_api.rb
 README.rdoc
 Manifest
@@ -11,5 +10,4 @@ test/fixtures/genrelist.plain
 test/fixtures/search_death.plain
 test/fixtures/empty.plain
 test/test_basic.rb
-test/test_delegator.rb
 shoutcast_api.gemspec

data/Rakefile

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

data/bin/shoutcast_search

@@ -1,5 +1,14 @@
 #!/usr/bin/env ruby
 
+# Command line interface for shoutcast.com API.
+# See documentation of Shoutcast for more information.
+#
+# === Usage
+#
+#   shoutcast_search # => lists all genres
+#
+#   shoutcast_search name=Chronix br=128 # => display a list of all Chronix stations with bitrate of 128
+#
 require 'rubygems'
 
 require 'shoutcast_api'

data/lib/shoutcast_api.rb

@@ -2,12 +2,20 @@ require 'httparty'
 require 'roxml'
 require 'forwardable'
 
-require 'delegator'
-
+#
+# Simple API for http://shoutcast.com.
+#
+# === Usage
+#
+#   Shoutcast.genres # => Genrelist
+#
+#   Shoutcast.search(:search => "Metal", :br => 128) # => Stationlist
 module Shoutcast
+
   extend Forwardable
   extend self
 
+  # Delegate module methods to +Fetcher+.
   def_delegators :Fetcher, :genres, :search
 
   class Fetcher
@@ -93,9 +101,9 @@ module Shoutcast
 
   class Stationlist
     include Xml
-    include Delegator
+    extend Forwardable
 
-    delegate_all :@stations, Array
+    def_delegators :@stations, *(Array.instance_methods - instance_methods)
 
     # <tunein base="/sbin/tunein-station.pls"/>
     # <station... /> <station .../>
@@ -131,9 +139,9 @@ module Shoutcast
 
   class Genrelist
     include Xml
-    include Delegator
+    extend Forwardable
 
-    delegate_all :@genres, Array
+    def_delegators :@genres, *(Array.instance_methods - instance_methods)
 
     xml_attr :genres, :as => [ Genre ]
 

data/shoutcast_api.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shoutcast_api}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Suschlik"]
@@ -11,8 +11,8 @@ Gem::Specification.new do |s|
   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/delegator.rb", "lib/shoutcast_api.rb", "README.rdoc"]
-  s.files = ["Rakefile", "bin/shoutcast_search", "lib/delegator.rb", "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", "test/test_delegator.rb", "shoutcast_api.gemspec"]
+  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.homepage = %q{http://github.com/splattael/shoutcast_api}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Shoutcast_api", "--main", "README.rdoc"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{shoutcast_api}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{Simple Shoutcast.com API.}
-  s.test_files = ["test/test_xml.rb", "test/test_fetcher.rb", "test/test_basic.rb", "test/test_delegator.rb"]
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: splattael-shoutcast_api
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Peter Suschlik
@@ -40,13 +40,11 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/shoutcast_search
-- lib/delegator.rb
 - lib/shoutcast_api.rb
 - README.rdoc
 files: 
 - Rakefile
 - bin/shoutcast_search
-- lib/delegator.rb
 - lib/shoutcast_api.rb
 - README.rdoc
 - Manifest
@@ -57,7 +55,6 @@ files:
 - test/fixtures/search_death.plain
 - test/fixtures/empty.plain
 - test/test_basic.rb
-- test/test_delegator.rb
 - shoutcast_api.gemspec
 has_rdoc: true
 homepage: http://github.com/splattael/shoutcast_api
@@ -94,4 +91,3 @@ test_files:
 - test/test_xml.rb
 - test/test_fetcher.rb
 - test/test_basic.rb
-- test/test_delegator.rb

data/lib/delegator.rb

@@ -1,36 +0,0 @@
-module Shoutcast
-
-  # Delegates methods via Forwardable.
-  module Delegator
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      # Delegates all methods defined +klass+ to +object+.
-      #
-      # === Usage
-      #   class ArrayMimic < SomeInheritance
-      #
-      #     delegate_all :@array, Array
-      #
-      #   end
-      #
-      #   array = ArrayMimic.new
-      #   array.push 1, 2, 3
-      #   array.each do |item|
-      #     p item
-      #   end
-      #
-      def delegate_all(object, klass)
-        class_eval <<-EVAL
-          extend Forwardable
-
-          def_delegators :#{object}, *(#{klass}.instance_methods - instance_methods)
-        EVAL
-      end
-    end
-
-  end
-
-end

data/test/test_delegator.rb

@@ -1,27 +0,0 @@
-require File.join(File.dirname(__FILE__), 'helper')
-
-class ArrayMimic
-  include Shoutcast::Delegator
-
-  delegate_all :@array, Array
-
-  def initialize
-    @array = []
-  end
-
-end
-
-class DelegatorTest < Test::Unit::TestCase
-
-  def test_method_delegation
-    ary = ArrayMimic.new
-    ary.push 1, 2, 3
-
-    assert_equal 3, ary.size
-    assert_equal 1, ary.first
-    assert_equal 3, ary.last
-    assert_respond_to ary, :each
-    assert_equal [].methods.sort, ary.methods.sort
-  end
-
-end