spof 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45c7f6f97bfa4030b84355b1e8aba9ba9dffa6b
-  data.tar.gz: bdb7e3dc76cf2343855c0cfe4a203ff6f19abb32
+  metadata.gz: 5bbe79932270b033c3f97f8746a01851fb3df73d
+  data.tar.gz: 738704ac1289fb279c443c39236ad7569ff58969
 SHA512:
-  metadata.gz: ae1627c65e6b37bac9efe25fce5551451c34bf176cef6957dbb83d2d9fd29deb8b2e35d0639bc2104755a97295129f72a630c96cd7f1d7131d6d9866a168fa30
-  data.tar.gz: 8348ea7d148b0109c21ce4b7b558d5e1c025a33591164f546322ca850840de0675d456417709b6d518f3e59bdb4752bf67890a048c2ac898aa8868156a2b1d15
+  metadata.gz: c9c6325b48909bc842ca41f1734cb2d4185425a5cd39253cb879f48de4efce46fcf6de888b11703e8a40ab484bcb2141665c921ea7aeb89e085b87a7f3a19a14
+  data.tar.gz: fdfc6e8845acc1649140cc0b731e6f86c3c76d14c60b5314eb73dfeb0f9476f03e8e4289ffde6778f4967e46f85b0e6692e1b194d63a3611aca1574c18b6dfc8

data/lib/lookup.rb

@@ -3,18 +3,12 @@ module Spof
   module Lookup
 
     def self.album(spotify_uri, *extras)
-      legal_extras = [:track, :trackdetail]
-      extras.each do |e|
-        raise SpofError, "Illegal extra" if not legal_extras.include?(e)
-      end
+      check_extras(extras, [:track, :trackdetail])
       return get(spotify_uri, *extras)
     end
 
     def self.artist(spotify_uri, *extras)
-      legal_extras = [:album, :albumdetail]
-      extras.each do |e|
-        raise SpofError, "Illegal extra" if not legal_extras.include?(e)
-      end
+      check_extras(extras,  [:album, :albumdetail])
       return get(spotify_uri, *extras)
     end
 
@@ -33,6 +27,13 @@ module Spof
       return JSON.parse(response, :symbolize_names => true)
     end
 
+    private
+    def self.check_extras(extras, legal_extras)
+      extras.each do |e|
+        raise Spof::SpofError, "Illegal extra" if not legal_extras.include?(e)
+      end
+    end
+
   end
 
 end

data/lib/spof/version.rb

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

data/lib/wrapper.rb

@@ -25,35 +25,33 @@ module Spof
 			self
 		end
 
-		def all(num)
+		def all
 			@all = true
+			self
 		end
 
 		def search(text)
 			@type ||= :all
 			@all ||= false
 
-			continue = true
-
 			result = []
-			while continue
+			page = 0
+			loop do
 				res = case @type
 							when :album
-								Spof::Search.album(text)[:albums]
+								Spof::Search.album(text, page)[:albums]
 							when :artist
-								Spof::Search.artist(text)[:artists]
+								Spof::Search.artist(text, page)[:artists]
 							when :track
-								Spof::Search.track(text)[:tracks]
+								Spof::Search.track(text, page)[:tracks]
 							when :all?
 							else
 								raise Spof::SpofError, "Invalid search type #{@type}"
 							end
 				result |= res
-				if res.empty?
-					continue = false
-				else
-					continue = @all
-				end
+				page += 1
+				break unless @all
+				break if res.empty?
 			end
 
 			@type = nil # TODO: reset search type?

data/test/test_wrapper_basic_search.rb

@@ -25,4 +25,17 @@ class TestBasicWrapper < Test::Unit::TestCase
     assert_equal expected, real
   end
 
+  def test_all_search_response
+    expected = []
+    page = 0
+    loop do
+      res = Spof::Search.album('nine inch nails', page)[:albums]
+      page += 1
+      expected |= res
+      break if res.empty?
+    end
+    real = @w.album.all.search('nine inch nails')
+    assert_equal expected, real
+  end
+
 end

metadata

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