spof 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e67eb54727921db21214c372c07994b195a3d79c
-  data.tar.gz: d7c6afe3ce115e661447a740c44d3559802ee16e
+  metadata.gz: d45c7f6f97bfa4030b84355b1e8aba9ba9dffa6b
+  data.tar.gz: bdb7e3dc76cf2343855c0cfe4a203ff6f19abb32
 SHA512:
-  metadata.gz: 046d4636494ddffb0bde59767f3703fdf16c596de48ba4c121b1cb063e2ef1a80920834b9c62e39cca9e71dfa0c0cafe42b8cf699eb4253f8840a00b12541d8a
-  data.tar.gz: 1647b7fd105c2be5812c103a7c865f67c059083e913c24d1f54a0d0cd1edff558912ba7e5f31cdf0656df55138da6bc83aab21b0eadce457e53d86677c54b412
+  metadata.gz: ae1627c65e6b37bac9efe25fce5551451c34bf176cef6957dbb83d2d9fd29deb8b2e35d0639bc2104755a97295129f72a630c96cd7f1d7131d6d9866a168fa30
+  data.tar.gz: 8348ea7d148b0109c21ce4b7b558d5e1c025a33591164f546322ca850840de0675d456417709b6d518f3e59bdb4752bf67890a048c2ac898aa8868156a2b1d15

data/README.md

@@ -7,6 +7,8 @@ Ruby wrapper for the Spotify Search & Lookup API. Under development.
 
 [![Gem Version](https://badge.fury.io/rb/spof.png)](http://badge.fury.io/rb/spof)
 
+[![Stories in Ready](https://badge.waffle.io/ignaciocontreras/spof.png?label=ready)](https://waffle.io/ignaciocontreras/spof)
+
 
 Usage
 -----

data/lib/spof/version.rb

@@ -1,3 +1,3 @@
 module Spof
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/wrapper.rb

@@ -25,12 +25,41 @@ module Spof
 			self
 		end
 
+		def all(num)
+			@all = true
+		end
+
 		def search(text)
-			if [:album, :artist, :track].include?(@type)
-				Spof::Search.send(@type, text)
-			else
-				raise Spof::SpofError, "Invalid search type"
+			@type ||= :all
+			@all ||= false
+
+			continue = true
+
+			result = []
+			while continue
+				res = case @type
+							when :album
+								Spof::Search.album(text)[:albums]
+							when :artist
+								Spof::Search.artist(text)[:artists]
+							when :track
+								Spof::Search.track(text)[:tracks]
+							when :all?
+							else
+								raise Spof::SpofError, "Invalid search type #{@type}"
+							end
+				result |= res
+				if res.empty?
+					continue = false
+				else
+					continue = @all
+				end
 			end
+
+			@type = nil # TODO: reset search type?
+			@all = nil
+
+			return result
 		end
 
 	end

data/test/test_wrapper_basic_search.rb

@@ -4,23 +4,23 @@ require 'test/unit'
 class TestBasicWrapper < Test::Unit::TestCase
 
   def setup
-    @w = Spof::Wrapper.new :testing => true
+    @w = Spof::Wrapper.new :testing => false # testing actual responses!
   end
 
-  def test_search_album_request
-    expected = Spof::Search.album('space oddity')
+  def test_search_album_response
+    expected = Spof::Search.album('space oddity')[:albums]
     real = @w.album.search('space oddity')
     assert_equal expected, real
   end
 
-  def test_search_artist_request
-    expected = Spof::Search.artist('david bowie')
+  def test_search_artist_response
+    expected = Spof::Search.artist('david bowie')[:artists]
     real = @w.artist.search('david bowie')
     assert_equal expected, real
   end
 
-  def test_search_track_request
-    expected = Spof::Search.track('life on mars')
+  def test_search_track_response
+    expected = Spof::Search.track('life on mars')[:tracks]
     real = @w.track.search('life on mars')
     assert_equal expected, real
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spof
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ignacio Contreras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler