sandro-tagooru 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/tagooru.rb

@@ -10,10 +10,14 @@ class Tagooru
 
   include HTTParty
   base_uri 'http://tagoo.ru'
-  default_params :for => :audio, :key => '74d8940f'
+  default_params :for => :audio, :key => '5239980d'
   headers 'Referer' => 'http://tagoo.ru/en/webmaster.php?mode=json_api'
   format :plain
 
+  def self.api_key=(key)
+    default_params :key => key
+  end
+
   # override method from HTTParty to prevent cookies from overriding other
   # header data (httparty 0.4.4)
   def self.perform_request(http_method, path, options) #:nodoc:
@@ -22,7 +26,7 @@ class Tagooru
 
   def self.search(query, page = 1)
     response = get '/api_search.php', :query => {:search => query, :page => page, :seed => generate_seed}
-    data = Crack::JSON.parse(response.sub(/^.+= /, ''))
+    data = Crack::JSON.parse(response.sub(/^.*?= /, ''))
     data['data'].map do |d|
       Track.new d['title'], d['file_url']
     end

data/lib/tagooru/playlist.rb

@@ -21,9 +21,9 @@ class Tagooru
 
     def lines
       @lines ||= begin
-        list = contents.to_a
-        list.shift
-        list.map {|line| line.chomp}
+        lines = contents.split("\n")
+        lines.shift
+        lines.map {|line| line.chomp}
       end
     end
   end

data/spec/tagooru/playlist_spec.rb

@@ -30,13 +30,11 @@ describe Tagooru::Playlist do
 
     describe "#lines" do
       before do
-        @array = @playlist.contents.to_a
-        @playlist.contents.stub!(:to_a => @array)
+        @playlist = Tagooru::Playlist.new "INFO\r\nline1\r\nline2\r\n"
       end
 
       it "skips the first line" do
-        @array.should_receive(:shift).and_return([])
-        @playlist.send(:lines)
+        @playlist.send(:lines)[0].should_not =~ /INFO/
       end
 
       it "removes line separators" do
@@ -44,30 +42,4 @@ describe Tagooru::Playlist do
       end
     end
   end
-
-  describe Tagooru::Track do
-    before do
-      @track = Tagooru::Track.new "Fix You", "http://google.com/?q=fixyou.mp3"
-    end
-
-    it "has a name and location" do
-      @track.name.should == "Fix You"
-      @track.location.should == "http://google.com/?q=fixyou.mp3"
-    end
-
-    describe "accessibility" do
-      it "is accessible" do
-        http = stub(:request_head => stub(:code => 200), :null_object => true)
-        Net::HTTP.stub!(:new => http)
-        @track.should be_accessible
-      end
-
-      it 'is not accessible' do
-        http = stub(:null_object => true)
-        http.should_receive(:request_head).and_raise(SocketError)
-        Net::HTTP.stub!(:new => http)
-        @track.should_not be_accessible
-      end
-    end
-  end
 end

data/spec/tagooru/track_spec.rb

@@ -0,0 +1,38 @@
+require File.expand_path(File.dirname(__FILE__) + '../../spec_helper')
+
+describe Tagooru::Track do
+  before do
+    @track = Tagooru::Track.new "Fix You", "http://google.com/?q=fixyou.mp3"
+  end
+
+  it "has a name and location" do
+    @track.name.should == "Fix You"
+    @track.location.should == "http://google.com/?q=fixyou.mp3"
+  end
+
+  describe "accessibility" do
+    it "is accessible" do
+      http = stub(:request_head => stub(:code => 200), :null_object => true)
+      Net::HTTP.stub!(:new => http)
+      @track.should be_accessible
+    end
+
+    context "not accessible" do
+      before do
+        @http = stub(:null_object => true)
+        Net::HTTP.stub!(:new => @http)
+      end
+
+      it "rescues SocketError" do
+        @http.should_receive(:request_head).and_raise(SocketError)
+        @track.should_not be_accessible
+      end
+
+      it "rescues Timeout::Error" do
+        timeout_error = Timeout::Error.new 'timeout'
+        @http.should_receive(:request_head).and_raise(timeout_error)
+        @track.should_not be_accessible
+      end
+    end
+  end
+end

data/tagooru.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{tagooru}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sandro Turriate"]
-  s.date = %q{2009-08-10}
+  s.date = %q{2009-08-16}
   s.email = %q{sandro.turriate@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -28,6 +31,7 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "spec/tagooru/playlist_spec.rb",
+     "spec/tagooru/track_spec.rb",
      "spec/tagooru_spec.rb",
      "tagooru.gemspec"
   ]
@@ -40,6 +44,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/spec_helper.rb",
      "spec/tagooru/playlist_spec.rb",
+     "spec/tagooru/track_spec.rb",
      "spec/tagooru_spec.rb"
   ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sandro-tagooru
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -38,6 +38,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/tagooru/playlist_spec.rb
+- spec/tagooru/track_spec.rb
 - spec/tagooru_spec.rb
 - tagooru.gemspec
 has_rdoc: true
@@ -70,4 +71,5 @@ summary: Ruby wrapper for the tagoo search engine
 test_files: 
 - spec/spec_helper.rb
 - spec/tagooru/playlist_spec.rb
+- spec/tagooru/track_spec.rb
 - spec/tagooru_spec.rb