spot 0.1.4 → 2.0.0

data/spec/song_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 require "./lib/spot/song"
 
-describe SpotContainer::Song do
+describe Spot::Song do
   before(:each) do
-    @song = SpotContainer::Song.new(JSON.load(File.read("spec/fixtures/track.json"))["tracks"].first)
+    @song = Spot::Song.new(JSON.load(File.read("spec/fixtures/track.json"))["tracks"].first)
   end
     
   context "the available? method" do
@@ -17,11 +17,11 @@ describe SpotContainer::Song do
   end
   
   it "should have an artist" do
-    @song.artist.should be_instance_of(SpotContainer::Artist)
+    @song.artist.should be_instance_of(Spot::Artist)
   end
   
   it "should have an album" do
-    @song.album.should be_instance_of(SpotContainer::Album)
+    @song.album.should be_instance_of(Spot::Album)
   end
   
   it "should have the correct accessors" do
@@ -45,7 +45,7 @@ describe SpotContainer::Song do
   end
   
   it "should inherit from base" do
-    @song.class.ancestors.should include(SpotContainer::Base)
+    @song.class.ancestors.should include(Spot::Base)
   end
   
   it "should have a title method that equals the name method" do
@@ -53,16 +53,6 @@ describe SpotContainer::Song do
   end
   
   it "should have a working to string method" do
-    @song.to_s.should eq("#{@song.title} - #{@song.artist.name}")
-  end
-  
-  context "user requst" do
-    before(:all) do
-      WebMock.allow_net_connect!
-    end
-    
-    it "should match user request" do
-      Spot.territory("SE").prime.strip.find_song("Call My Name - Tove Styrke").result.to_s.should eq("Call My Name - Tove Styrke")
-    end
-  end
+    @song.to_s.should eq("#{@song.artist.name} - #{@song.title}")
+  end  
 end

data/spec/spec_helper.rb

@@ -1,9 +1,20 @@
 require "rspec"
-require "webmock/rspec"
 require "spot"
+require "vcr"
+require "webmock/rspec"
 
 RSpec.configure do |config|
   config.mock_with :rspec
+  config.extend VCR::RSpec::Macros
+end
+
+VCR.configure do |c|
+  c.cassette_library_dir = "spec/fixtures/vcr_cassettes"
+  c.hook_into :webmock
+  c.default_cassette_options = {
+    :record => :new_episodes
+  }
+  c.allow_http_connections_when_no_cassette = false
 end
 
 def mock_media(ret)
@@ -19,17 +30,10 @@ def validate_artists(artists)
   end
 end
 
-def set_up(times = 100, ret = true, klass = SpotContainer::Song)
+def set_up(times = 100, ret = true, klass = Spot::Song)
   klass.should_receive(:new).exactly(times).times.and_return(mock_media(ret))
 end
 
 def generate_url(type, search, page = 1)
   "http://ws.spotify.com/search/1/#{type}.json?q=#{URI.escape(search)}&page=#{page}"
-end
-
-def stubs(type, search, page = 1)
-  url = generate_url(type, search, page)
-  stub_request(:get, url).
-    to_return(:body => File.read("spec/fixtures/#{type}.json"), :status => 200)
-  url
 end

data/spec/spot_spec.rb

@@ -0,0 +1,221 @@
+# -*- encoding : utf-8 -*-
+
+describe Spot::Search do
+  use_vcr_cassette "spotify"
+
+  before(:each) do
+    @spot = Spot::Search.new
+  end
+  
+  context "tracks if success" do
+    it "should contain the right amounts of songs" do
+      Spot::Search.find_all_songs("kaizers orchestra").should have(100).results
+    end
+    
+    it "should call Spot::Song with the right arguments" do
+      Spot::Song.should_receive(:new) do |args|
+        args["album"]["released"].should match(/^\d{4}$/)
+        args["album"]["href"].should match(/^spotify\:album\:[a-zA-Z0-9]+$/)
+        args["album"]["name"].should_not be_empty
+        args["album"]["availability"]["territories"].should match(/[A-Z]{2}|(worldwide)/)
+        
+        args["name"].should_not be_empty
+        args["popularity"].should match(/[0-9\.]+/)
+        args["length"].should be_instance_of(Float)
+        args["href"].should match(/^spotify\:track\:[a-zA-Z0-9]+$/)
+        
+        validate_artists(args["artists"])
+        
+        mock_media(true)
+      end.exactly(100).times
+      
+      Spot::Search.find_all_songs("kaizers orchestra").results
+    end
+      
+    it "should not have any songs" do
+      Spot::Search.find_all_songs("d41d8cd98f00b204e9800998ecf8427e").results.should be_empty
+    end
+  end
+  
+  context "artists if success" do    
+    after(:each) do
+      a_request(:get, @url).should have_been_made.once
+    end
+    
+    before(:each) do
+      @url = generate_url("artist", "kaizers orchestra")
+    end  
+  
+    it "should contain the right amounts of artists" do
+      Spot::Search.find_all_artists("kaizers orchestra").results.should have(1).results
+    end
+    
+    it "should call Spot::Artist with the right arguments" do
+      Spot::Artist.should_receive(:new) do |args|
+        args["name"].should_not be_empty
+        args["popularity"].should match(/[0-9\.]+/)
+        args["href"].should match(/^spotify\:artist\:[a-zA-Z0-9]+$/)
+        mock_media(true)
+      end.exactly(1).times
+      
+      Spot::Search.find_all_artists("kaizers orchestra").results
+    end
+    
+    it "should be able to cache a request" do
+      set_up(1, true, Spot::Artist)
+      spot = Spot::Search.find_all_artists("kaizers orchestra")
+      10.times { spot.results }
+    end
+    
+    it "should not have any songs if nothing is valid" do
+      set_up(1, false, Spot::Artist)
+      Spot::Search.find_all_artists("kaizers orchestra").results.should be_empty
+    end
+  end
+  
+  context "album if success" do  
+    it "should contain the right amounts of albums" do
+      Spot::Search.find_all_albums("kaizers orchestra").should have(55).results
+    end
+    
+    it "should call Spot::Album with the right arguments" do
+      Spot::Album.should_receive(:new) do |args|
+        validate_artists(args["artists"])
+        
+        args["href"].should match(/^spotify\:album\:[a-zA-Z0-9]+$/)
+        
+        args["availability"]["territories"].should match(/[A-Z]{2}|(worldwide)/)
+        args["name"].should_not be_empty
+        args["popularity"].should match(/[0-9\.]+/)
+        mock_media(true)
+      end.exactly(55).times
+      
+      Spot::Search.find_all_albums("kaizers orchestra").results
+    end
+    
+    it "should be possible to specify a territories" do
+      Spot::Search.territory("RANDOM").find_all_albums("kaizers orchestra").results.should be_empty
+    end
+  end
+  
+  context "find_*" do    
+    it "should only return one element" do
+      Spot::Search.find_song("kaizers orchestra").result.should be_instance_of(Spot::Song)
+    end
+  end
+  
+  it "should be possible to set a page variable" do
+    url = generate_url("track", "kaizers orchestra", 11)
+    Spot::Search.page(11).find_song("kaizers orchestra").result
+    a_request(:get, url).should have_been_made.once
+  end
+  
+  context "the prime method" do
+    it "should return the best match" do
+      Spot::Search.prime.find_song("kaizers orchestra").result.artist.name.should eq("Kaizers Orchestra")  
+    end
+  end
+    
+  context "method does not exist" do
+    it "should raise no method error if the method does't exist (plain value)" do
+      lambda { Spot::Search.find_song("string").random_method }.should raise_error(NoMethodError)
+    end
+    
+    it "should raise an error if the method matches find_*_*" do
+      lambda { Spot::Search.find_song("string").find_by_song }.should raise_error(NoMethodError)
+    end
+    
+    it "should raise an error if the method matches find_all_* " do
+      lambda { Spot::Search.find_song("string").find_all_random }.should raise_error(NoMethodError)
+    end
+  end
+  
+  context "exclude" do    
+    it "should have a working exclude? method" do
+      {
+        "tribute"                          => true,
+        "cover random"                     => true, 
+        "live"                             => true,
+        "club mix random"                  => true,
+        "LIVE"                             => true,
+        "karaoKE"                          => true,
+        "instrumental"                     => true,
+        "Karaoke - Won't Get Fooled Again" => true,
+        "club version"                     => true,
+        "instrumentals"                    => true,
+        "demo"                             => true,
+        "made famous by"                   => true,
+        "remixes"                          => true,
+        "ringtone"                         => true,
+        "ringtones"                        => true,
+        "riingtonerandom"                  => false,
+        "club random mix"                  => false,
+        "random"                           => false,
+        "oliver"                           => false
+      }.each do |comp, outcome|
+        @spot.exclude?(comp).should eq(outcome)
+      end
+    end
+  end
+  
+  context "territory" do
+    it "should not find any songs when using a non valid territory" do
+      @spot.territory("RANDOM").find_all_songs("search").results.should be_empty
+    end
+    
+    it "should find some songs when using a valid territory" do
+      @spot.territory("SE").find_all_songs("search").results.should_not be_empty
+    end
+    
+    it "should be ignored if nil" do
+      @spot.territory(nil).find_all_songs("search").results.count.should eq(@spot.find_all_songs("search").results.count)
+    end
+  end
+    
+  context "the info values" do
+    after(:each) do
+      a_request(:get, @url).should have_been_made.once
+    end
+    
+    it "should have some info" do
+      @url = generate_url("track", "kaizers orchestra")
+      spot = Spot::Search.strip.find_song("kaizers orchestra")
+      spot.num_results.should be > 0
+      spot.limit.should eq(100)
+      spot.offset.should eq(0)
+      spot.query.should eq("kaizers orchestra")
+    end
+  end
+
+  context "bugs" do
+    it "handles 'Jason Derulo - Undefeated'" do
+      Spot::Search.strip.find_song("Jason Derulo - Undefeated").result.to_s.should eq("Jason Derulo - Undefeated")
+    end
+
+    it "handles 'Call My Name - Tove Styrke'" do
+      Spot::Search.territory("SE").prime.strip.find_song("Tove Styrke - Call My Name").result.to_s.should eq("Tove Styrke - Call My Name")
+    end
+
+    it "handles 'D'Banj - Oliver Twist'" do
+      Spot::Search.territory("SE").prime.strip.find_song("D'Banj - Oliver Twist").result.to_s.downcase.should eq("D'Banj - Oliver Twist".downcase)
+    end
+
+    it "should handle 'Iron Maiden - Can I Play With Madness'" do
+      song = Spot::Search.territory("SE").prime.strip.find_song("Iron Maiden - Can I Play With Madness").result
+      song.artist.name.should eq("Iron Maiden")
+      song.title.should match(%r{Can I Play With Madness})
+    end
+
+    it "should handle 'Smooth - Undercover Lover'" do
+      Spot::Search.territory("SE").strip.prime.find_song("Smooth - Undercover Lover").result.to_s.should eq("Smooth - Undercover Lover")
+    end
+
+    it "should handle 'Basto! - Live Tonight (Gregory's Theme) (extended mix)'" do
+      Spot::Search.territory("SE").strip.prime.find_song("Basto! - Live Tonight (Gregory's Theme) (extended mix)").result.to_s.should eq("Basto - Live Tonight (Gregory's Theme) - Radio Edit")
+    end
+
+    it "should handle 'Wtf! - Da Bop'" do
+      Spot::Search.territory("SE").strip.prime.find_song("Wtf! - Da Bop").result.to_s.should eq("WTF! - Da Bop - Video Edit")
+    end
+  end
+end

data/spot.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "spot"
-  s.version     = "0.1.4"
+  s.version     = "2.0.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]
@@ -22,8 +22,9 @@ Gem::Specification.new do |s|
   s.add_dependency("rest-client")
   s.add_dependency("abstract")
   s.add_dependency("levenshteinish")
-  s.add_dependency("rchardet19")
+  s.add_dependency("charlock_holmes")
   
   s.add_development_dependency("rspec")
-  s.add_development_dependency("webmock")
+  s.add_development_dependency("vcr")
+  s.add_development_dependency("webmock", "~> 1.8.0")
 end

metadata

@@ -1,105 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spot
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  version: 0.1.4
 platform: ruby
-authors: 
+authors:
 - Linus Oleander
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json_pure
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70199036450180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70199036450180
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70199036449740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: abstract
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70199036449740
+- !ruby/object:Gem::Dependency
+  name: abstract
+  requirement: &70199036449320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: levenshteinish
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70199036449320
+- !ruby/object:Gem::Dependency
+  name: levenshteinish
+  requirement: &70199036448900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rchardet19
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70199036448900
+- !ruby/object:Gem::Dependency
+  name: charlock_holmes
+  requirement: &70199031942860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70199031942860
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: &70199031942440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70199031942440
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70199031942020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70199031942020
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70199031941520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *70199031941520
 description: A Ruby implementation of the Spotify Meta API.
-email: 
+email:
 - linus@oleander.nu
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .DS_Store
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -109,54 +115,57 @@ files:
 - lib/spot/album.rb
 - lib/spot/artist.rb
 - lib/spot/base.rb
+- lib/spot/clean.rb
 - lib/spot/exclude.yml
+- lib/spot/ignore.yml
 - lib/spot/song.rb
 - spec/album_spec.rb
 - spec/artist_spec.rb
 - spec/base_spec.rb
+- spec/clean_spec.rb
 - spec/fixtures/album.json
 - spec/fixtures/artist.json
 - spec/fixtures/exclude.tribute.json
 - spec/fixtures/track.json
+- spec/fixtures/vcr_cassettes/spotify.yml
 - spec/song_spec.rb
 - spec/spec_helper.rb
-- spec/spotify_spec.rb
+- spec/spot_spec.rb
 - spot.gemspec
 homepage: https://github.com/oleander/Spot
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: spot
-rubygems_version: 1.8.8
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A Ruby implementation of the Spotify Meta API
-test_files: 
+test_files:
 - spec/album_spec.rb
 - spec/artist_spec.rb
 - spec/base_spec.rb
+- spec/clean_spec.rb
 - spec/fixtures/album.json
 - spec/fixtures/artist.json
 - spec/fixtures/exclude.tribute.json
 - spec/fixtures/track.json
+- spec/fixtures/vcr_cassettes/spotify.yml
 - spec/song_spec.rb
 - spec/spec_helper.rb
-- spec/spotify_spec.rb
+- spec/spot_spec.rb