spof 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14e4d99c31f28c5dfa38a952cb824c919d57d060
-  data.tar.gz: 4a912d496c0ce57d59a8f7969f33165d4c3d80af
+  metadata.gz: e67eb54727921db21214c372c07994b195a3d79c
+  data.tar.gz: d7c6afe3ce115e661447a740c44d3559802ee16e
 SHA512:
-  metadata.gz: 08dc22de887e35eaaae93875009580a69fa7d2755528ca8372694e8c9b10f50d1227eb171eff94f9dfc3f055f79ef5829b426354da95ec5642592ea602eda160
-  data.tar.gz: daaf8cc22d21929419fb278842150bdcf503be0a754193e53f1c10777210d0ba231e833a2e02a6458a32c842c60b27cd67c0aea0fd4a9710b021afeac5b666a6
+  metadata.gz: 046d4636494ddffb0bde59767f3703fdf16c596de48ba4c121b1cb063e2ef1a80920834b9c62e39cca9e71dfa0c0cafe42b8cf699eb4253f8840a00b12541d8a
+  data.tar.gz: 1647b7fd105c2be5812c103a7c865f67c059083e913c24d1f54a0d0cd1edff558912ba7e5f31cdf0656df55138da6bc83aab21b0eadce457e53d86677c54b412

data/lib/lookup.rb

@@ -0,0 +1,38 @@
+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
+      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
+      return get(spotify_uri, *extras)
+    end
+
+    def self.track(spotify_uri)
+      return get(spotify_uri)
+    end
+
+    def self.get(spotify_uri, *extras)
+      uri = URI('http://ws.spotify.com/lookup/1/.json')
+      uri.query = URI.encode_www_form({
+        :uri => spotify_uri,
+        :extras => extras
+        })
+      response = Net::HTTP.get(uri)
+      return uri.to_s if Spof.testing?
+      return JSON.parse(response, :symbolize_names => true)
+    end
+
+  end
+
+end

data/lib/search.rb

@@ -0,0 +1,34 @@
+module Spof
+
+  module Search
+
+    def self.album(text, page = 1)
+      url = 'http://ws.spotify.com/search/1/album.json'
+      return get_response(url, text, page)
+    end
+
+    def self.artist(text, page = 1)
+      url = 'http://ws.spotify.com/search/1/artist.json'
+      return get_response(url, text, page)
+    end
+
+    def self.track(text, page = 1)
+      url = 'http://ws.spotify.com/search/1/track.json'
+      return get_response(url, text, page)
+    end
+
+    private
+    def self.get_response(url, text, page = 1)
+      uri = URI(url)
+      uri.query = URI.encode_www_form({
+        :q => text,
+        :page => page
+        })
+      return uri.to_s if Spof.testing?
+      response = Net::HTTP.get(uri)
+      return JSON.parse(response, :symbolize_names => true)
+    end
+
+  end
+
+end

data/lib/spof/version.rb

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

data/lib/spof.rb

@@ -1,7 +1,10 @@
 require "spof/version"
-require 'net/http'
-require 'json'
+require "search"
+require "lookup"
+require "wrapper"
 
+require "net/http"
+require "json"
 
 module Spof
 
@@ -18,71 +21,4 @@ module Spof
   class SpofError < StandardError
   end
 
-  
-  module Search
-
-    def self.album(text, page = 1)
-      url = 'http://ws.spotify.com/search/1/album.json'
-      return get_response(url, text, page)
-    end
-
-    def self.artist(text, page = 1)
-      url = 'http://ws.spotify.com/search/1/artist.json'
-      return get_response(url, text, page)
-    end
-
-    def self.track(text, page = 1)
-      url = 'http://ws.spotify.com/search/1/track.json'
-      return get_response(url, text, page)
-    end
-
-    private
-    def self.get_response(url, text, page = 1)
-      uri = URI(url)
-      uri.query = URI.encode_www_form({
-        :q => text,
-        :page => page
-        })
-      return uri.to_s if Spof.testing?
-      response = Net::HTTP.get(uri)
-      return JSON.parse(response, :symbolize_names => true)
-    end
-
-  end
-
-  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
-      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
-      return get(spotify_uri, *extras)
-    end
-
-    def self.track(spotify_uri)
-      return get(spotify_uri)
-    end
-
-    def self.get(spotify_uri, *extras)
-      uri = URI('http://ws.spotify.com/lookup/1/.json')
-      uri.query = URI.encode_www_form({
-        :uri => spotify_uri,
-        :extras => extras
-        })
-      response = Net::HTTP.get(uri)
-      return uri.to_s if Spof.testing?
-      return JSON.parse(response, :symbolize_names => true)
-    end
-
-  end
-
 end

data/lib/wrapper.rb

@@ -0,0 +1,38 @@
+require "search"
+require "lookup"
+
+module Spof
+
+	class Wrapper
+
+		def initialize(options = {})
+			@type = nil
+			Spof.config(options)
+		end
+
+		def album
+			@type = :album
+			self
+		end
+
+		def artist
+			@type = :artist
+			self
+		end
+
+		def track
+			@type = :track
+			self
+		end
+
+		def search(text)
+			if [:album, :artist, :track].include?(@type)
+				Spof::Search.send(@type, text)
+			else
+				raise Spof::SpofError, "Invalid search type"
+			end
+		end
+
+	end
+
+end

data/test/{basic.rb → test_search_and_lookup.rb}

@@ -1,4 +1,4 @@
-require_relative '../lib/spof'
+require 'spof'
 require 'test/unit'
 
 

data/test/test_wrapper.rb

@@ -0,0 +1,22 @@
+require 'spof'
+require 'test/unit'
+
+
+class TestWrapper < Test::Unit::TestCase
+
+  def setup
+    Spof.config({
+      :testing => true
+      })
+  end
+
+  def test_helper_methods_return_self
+    assert_nothing_thrown do
+      w = Spof::Wrapper.new
+      w.album.artist.track
+      w.artist.track.album
+    end
+  end
+
+
+end

data/test/test_wrapper_basic_search.rb

@@ -0,0 +1,28 @@
+require 'spof'
+require 'test/unit'
+
+class TestBasicWrapper < Test::Unit::TestCase
+
+  def setup
+    @w = Spof::Wrapper.new :testing => true
+  end
+
+  def test_search_album_request
+    expected = Spof::Search.album('space oddity')
+    real = @w.album.search('space oddity')
+    assert_equal expected, real
+  end
+
+  def test_search_artist_request
+    expected = Spof::Search.artist('david bowie')
+    real = @w.artist.search('david bowie')
+    assert_equal expected, real
+  end
+
+  def test_search_track_request
+    expected = Spof::Search.track('life on mars')
+    real = @w.track.search('life on mars')
+    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.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ignacio Contreras
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,10 +51,15 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/lookup.rb
+- lib/search.rb
 - lib/spof.rb
 - lib/spof/version.rb
+- lib/wrapper.rb
 - spof.gemspec
-- test/basic.rb
+- test/test_search_and_lookup.rb
+- test/test_wrapper.rb
+- test/test_wrapper_basic_search.rb
 homepage: http://github.com/ignaciocontreras/spof
 licenses:
 - MIT
@@ -80,4 +85,6 @@ signing_key:
 specification_version: 4
 summary: Spotify Search & Lookup
 test_files:
-- test/basic.rb
+- test/test_search_and_lookup.rb
+- test/test_wrapper.rb
+- test/test_wrapper_basic_search.rb