puke 0.0.1 → 0.0.2

data/library/puke.rb

@@ -1,19 +1,22 @@
 # encoding: utf-8
 
-require 'tinysong'
-require 'net/http'
+require 'cgi'
 require 'json'
+require 'open-uri'
+
+require 'puke/piece'
 
 module Puke
-  Version = 0, 0, 1
-  
-module_function
+  Version = "0.0.2"
+
+  def self.search query, key
+    pieces = []
 
-  def search query
-    Tinysong.search(query).tap do |result|
-      result.each { |song| yield song } if block_given?
+    open "http://tinysong.com/s/#{URI.escape query}?format=json&key=#{key}" do |response|
+      songs  = JSON.parse response.read
+      pieces = songs.map &Piece.method(:new)
     end
+
+    pieces
   end
-  
-  def client; @client ||= Client.new end
 end

data/library/puke/piece.rb

@@ -8,7 +8,7 @@ module Puke
       end
     end
     
-    attribute :id, :SongID
+    attribute :id,     :SongID
     attribute :title,  :SongName
     attribute :artist, :ArtistName
     attribute :album,  :AlbumName
@@ -25,7 +25,7 @@ module Puke
     end
     
     def to_s
-      %{#<#{self.class.name}:#{id} @name=#{name.inspect} @artist=#{artist.inspect} @album=#{album.inspect}>}
+      %{#<#{self.class.name}:#{id} @title=#{title.inspect} @artist=#{artist.inspect} @album=#{album.inspect}>}
     end
   end
 end

metadata

@@ -1,68 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puke
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mikkel Kroman
 autorequire: 
 bindir: executables
 cert_chain: []
-
-date: 2011-01-22 00:00:00 +01:00
-default_executable: 
+date: 2011-10-15 00:00:00.000000000 Z
 dependencies: []
-
 description: 
 email: mk@maero.dk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - library/puke.rb
 - library/puke/piece.rb
-- library/tinysong.rb
-has_rdoc: true
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - library
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Puke is a minimal grooveshark library for ruby, using the Tinysong.com api instead of grooveshark.com
+summary: Puke is a minimal grooveshark library for ruby, using the Tinysong.com api
+  instead of grooveshark.com
 test_files: []
-

data/library/tinysong.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-require 'json'
-require 'net/http'
-require 'puke/piece'
-
-module Tinysong
-  Version = 0, 0, 1
-  
-module_function
-  
-  def search query
-    Net::HTTP.get(URI "http://tinysong.com/s/#{URI.escape query}?format=json").tap do |response|
-      return JSON.parse(response).map &Puke::Piece.method(:new)
-    end
-  end
-  
-end