hallon 0.14.0 → 0.15.0

data/spec/hallon/session_spec.rb

@@ -130,6 +130,13 @@ describe Hallon::Session do
     end
   end
 
+  describe "#login" do
+    it "should raise an error when given empty credentials" do
+      expect { session.login '', 'pass' }.to raise_error(ArgumentError)
+      expect { session.login 'Kim', '' }.to raise_error(ArgumentError)
+    end
+  end
+
   describe "#logout" do
     it "should check logged in status" do
       session.should_receive(:logged_in?).once.and_return(false)

data/spec/hallon/user_spec.rb

@@ -67,7 +67,7 @@ describe Hallon::User do
       it "should return the playlist container of the user" do
         Spotify.registry_add("spotify:container:%s" % user.name, mock_container)
 
-        session.login('burgestrand', '')
+        session.login('burgestrand', 'pass')
         mock_session { user.published.should eq published }
       end
 

data/spec/mockspotify.rb

@@ -42,7 +42,9 @@ module Spotify
       layout :playlist, :playlist,
              :type, :playlist_type,
              :folder_name, :pointer,
-             :folder_id, :uint64
+             :folder_id, :uint64,
+             :num_seen_tracks, :int,
+             :seen_tracks, :pointer
     end
   end
 
@@ -61,18 +63,18 @@ module Spotify
 
   attach_function :mock_session, :mocksp_session_create, [:pointer, :connectionstate, :int, Spotify::OfflineSyncStatus, :int, :int, :playlist], :session
   attach_mock_function :mock_user, :mocksp_user_create, [:string, :string, :bool], :user
-  attach_mock_function :mock_track, :mocksp_track_create, [:string, :int, :array, :album, :int, :int, :int, :int, :error, :bool, :availability, :track_offline_status, :bool, :bool, :bool, :bool], :track
+  attach_mock_function :mock_track, :mocksp_track_create, [:string, :int, :array, :album, :int, :int, :int, :int, :error, :bool, :availability, :track_offline_status, :bool, :bool, :track, :bool, :bool], :track
   attach_mock_function :mock_image, :mocksp_image_create, [:image_id, :imageformat, :size_t, :buffer_in, :error], :image
   attach_mock_function :mock_artist, :mocksp_artist_create, [:string, :image_id, :bool], :artist
   attach_mock_function :mock_album, :mocksp_album_create, [:string, :artist, :int, :image_id, :albumtype, :bool, :bool], :album
 
   attach_function :mock_albumbrowse, :mocksp_albumbrowse_create, [:error, :int, :album, :artist, :int, :array, :int, :array, :string, :albumbrowse_complete_cb, :pointer], :albumbrowse
-  attach_function :mock_artistbrowse, :mocksp_artistbrowse_create, [:error, :int, :artist, :int, :array, :int, :array, :int, :array, :int, :array, :string, :artistbrowse_type, :artistbrowse_complete_cb, :pointer], :artistbrowse
+  attach_function :mock_artistbrowse, :mocksp_artistbrowse_create, [:error, :int, :artist, :int, :array, :int, :array, :int, :array, :int, :array, :int, :array, :string, :artistbrowse_type, :artistbrowse_complete_cb, :pointer], :artistbrowse
   attach_function :mock_toplistbrowse, :mocksp_toplistbrowse_create, [:error, :int, :int, :array, :int, :array, :int, :array], :toplistbrowse
 
   attach_mock_function :mock_playlist, :mocksp_playlist_create, [:string, :bool, :user, :bool, :string, :image_id, :bool, :uint, Spotify::Subscribers, :bool, :playlist_offline_status, :int, :int, :array], :playlist
   attach_mock_function :mock_playlistcontainer, :mocksp_playlistcontainer_create, [:user, :bool, :int, :array, PlaylistContainerCallbacks, :userdata], :playlistcontainer
-  attach_function :mock_search, :mocksp_search_create, [:error, :string, :string, :int, :int, :array, :int, :int, :array, :int, :int, :array, :search_complete_cb, :pointer], :search
+  attach_function :mock_search, :mocksp_search_create, [:error, :string, :string, :int, :int, :array, :int, :int, :array, :int, :int, :array, :int, :int, :array, :search_complete_cb, :pointer], :search
   attach_function :mock_subscribers, :mocksp_subscribers, [:int, :array], Spotify::Subscribers
 
   # mocked accessors

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
 # coding: utf-8
 
+require 'bundler'
+Bundler.setup
+
 begin
   require 'cover_me'
 rescue LoadError

data/spec/support/common_objects.rb

@@ -13,12 +13,17 @@ RSpec::Core::ExampleGroup.instance_eval do
 
   let(:mock_track) do
     artists = pointer_array_with(mock_artist, mock_artist_two)
-    Spotify.mock_track!("They", artists.length, artists, mock_album, 123_456, 42, 2, 7, 0, true, :available, :done, false, true, true, false)
+    Spotify.mock_track!("They", artists.length, artists, mock_album, 123_456, 42, 2, 7, :ok, true, :available, :done, false, true, nil, true, false)
   end
 
   let(:mock_track_two) do
     artists = pointer_array_with(mock_artist)
-    Spotify.mock_track!("Amazing", artists.length, artists, mock_album, 123_456, 42, 2, 7, 0, true, :available, :no, false, true, true, true)
+    Spotify.mock_track!("Amazing", artists.length, artists, mock_album, 123_456, 42, 2, 7, :ok, true, :available, :no, false, true, nil, true, true)
+  end
+
+  let(:mock_linked_track) do
+    artists = pointer_array_with(mock_artist_two)
+    Spotify.mock_track!("They", artists.length, artists, mock_album, 60, 100, 1, 1, :ok, true, :available, :no, false, true, mock_track, false, false)
   end
 
   let(:mock_albumbrowse) do
@@ -34,8 +39,9 @@ RSpec::Core::ExampleGroup.instance_eval do
     portraits = pointer_array_with(mock_image_id_pointer, mock_image_id_pointer)
     tracks    = pointer_array_with(mock_track, mock_track_two)
     albums    = pointer_array_with(mock_album)
+    tophits   = pointer_array_with(mock_track)
 
-    Spotify.mock_artistbrowse(:ok, 2751, mock_artist, portraits.length, portraits, tracks.length, tracks, albums.length, albums, similar_artists.length, similar_artists, "grew up in DA BLOCK", :full, nil, nil)
+    Spotify.mock_artistbrowse(:ok, 2751, mock_artist, portraits.length, portraits, tracks.length, tracks, albums.length, albums, similar_artists.length, similar_artists, tophits.length, tophits, "grew up in DA BLOCK", :full, nil, nil)
   end
 
   let(:mock_toplistbrowse) do
@@ -46,11 +52,12 @@ RSpec::Core::ExampleGroup.instance_eval do
   end
 
   let(:mock_search) do
-    artists = pointer_array_with(mock_artist, mock_artist_two)
-    albums  = pointer_array_with(mock_album)
-    tracks  = pointer_array_with(mock_track, mock_track_two)
+    artists   = pointer_array_with(mock_artist, mock_artist_two)
+    albums    = pointer_array_with(mock_album)
+    tracks    = pointer_array_with(mock_track, mock_track_two)
+    playlists = pointer_array_with(mock_playlist, mock_playlist_two)
 
-    Spotify.mock_search(:ok, "my query", "another thing", 1337, tracks.length, tracks, 42, albums.length, albums, 81104, artists.length, artists, nil, nil)
+    Spotify.mock_search(:ok, "my å utf8  query", "another thing", 1337, tracks.length, tracks, 42, albums.length, albums, 81104, artists.length, artists, 0716, playlists.length, playlists, nil, nil)
   end
 
   let(:mock_subscribers) do
@@ -110,8 +117,8 @@ RSpec::Core::ExampleGroup.instance_eval do
   end
 
   let(:mock_image_uri) { "spotify:image:#{mock_image_hex}" }
-  let(:mock_image_hex) { "3ad93423add99766e02d563605c6e76ed2b0e450" }
-  let(:mock_image_id)  { ":\xD94#\xAD\xD9\x97f\xE0-V6\x05\xC6\xE7n\xD2\xB0\xE4P".force_encoding("BINARY") }
+  let(:mock_image_hex) { "3ad93423add99766e02d563605c6e76ed2b0e400" }
+  let(:mock_image_id)  { ":\xD94#\xAD\xD9\x97f\xE0-V6\x05\xC6\xE7n\xD2\xB0\xE4\0".force_encoding("BINARY") }
   let(:null_pointer)   { FFI::Pointer.new(0) }
   let(:a_pointer)      { FFI::Pointer.new(1) }
 
@@ -157,7 +164,7 @@ RSpec::Core::ExampleGroup.instance_eval do
 
   let(:mock_container) do
     num_items = 4
-    items_ptr = FFI::MemoryPointer.new(Spotify::Mock::PlaylistTrack, num_items)
+    items_ptr = FFI::MemoryPointer.new(Spotify::Mock::PlaylistContainerItem, num_items)
     items = num_items.times.map do |i|
       Spotify::Mock::PlaylistContainerItem.new(items_ptr + Spotify::Mock::PlaylistContainerItem.size * i)
     end
@@ -192,6 +199,7 @@ RSpec.configure do |config|
     Spotify.registry_add 'spotify:user:burgestrand', mock_user
     Spotify.registry_add 'spotify:user:burgestrand:playlist:07AX9IY9Hqmj1RqltcG0fi', mock_playlist
     Spotify.registry_add 'spotify:user:burgestrand:starred', mock_playlist
+    Spotify.registry_add 'spotify:search:my+%C3%A5+utf8+%EF%A3%BF+query', mock_search
   end
 
   config.after do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ref
-  requirement: &70180063490240 !ruby/object:Gem::Requirement
+  requirement: &70257549939320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70180063490240
+  version_requirements: *70257549939320
 - !ruby/object:Gem::Dependency
   name: spotify
-  requirement: &70180063489400 !ruby/object:Gem::Requirement
+  requirement: &70257549938820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: 11.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70180063489400
+  version_requirements: *70257549938820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70180063487500 !ruby/object:Gem::Requirement
+  requirement: &70257549938160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70180063487500
+  version_requirements: *70257549938160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70180063485340 !ruby/object:Gem::Requirement
+  requirement: &70257549937260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70180063485340
+  version_requirements: *70257549937260
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70180063484620 !ruby/object:Gem::Requirement
+  requirement: &70257549936520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180063484620
+  version_requirements: *70257549936520
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70257549935960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70257549935960
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70180063483960 !ruby/object:Gem::Requirement
+  requirement: &70257549935520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70180063483960
+  version_requirements: *70257549935520
 description: 
 email: kim@burgestrand.se
 executables: []
@@ -97,9 +108,8 @@ files:
 - Rakefile
 - dev/login.rb
 - examples/adding_tracks_to_playlist.rb
-- examples/logging_in.rb
+- examples/example_support.rb
 - examples/playing_audio.rb
-- examples/printing_link_information.rb
 - examples/show_published_playlists_of_user.rb
 - hallon.gemspec
 - lib/hallon.rb
@@ -208,6 +218,8 @@ files:
 - spec/mockspotify/libmockspotify/src/session.c
 - spec/mockspotify/libmockspotify/src/toplistbrowse.c
 - spec/mockspotify/libmockspotify/src/track.c
+- spec/mockspotify/libmockspotify/src/urlcode.c
+- spec/mockspotify/libmockspotify/src/urlcode.h
 - spec/mockspotify/libmockspotify/src/user.c
 - spec/mockspotify/libmockspotify/src/util.c
 - spec/mockspotify/libmockspotify/src/util.h

data/examples/logging_in.rb

@@ -1,16 +0,0 @@
-# coding: utf-8
-
-$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
-
-require 'hallon'
-require './spec/support/config'
-
-session = Hallon::Session.initialize IO.read(ENV['HALLON_APPKEY']) do
-  on(:log_message) do |message|
-    puts "[LOG] #{message}"
-  end
-end
-
-session.login!(ENV['HALLON_USERNAME'], ENV['HALLON_PASSWORD'])
-
-puts "Successfully logged in!"

data/examples/printing_link_information.rb

@@ -1,30 +0,0 @@
-# coding: utf-8
-
-$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
-
-require 'hallon'
-require './spec/support/config'
-
-# Utility
-def prompt(str)
-  print str
-  gets.chomp
-end
-
-# Hallon
-session = Hallon::Session.initialize IO.read(ENV['HALLON_APPKEY']) do
-  on(:log_message) do |message|
-    $stderr.puts "[LOG] #{message}"
-  end
-end
-
-while url = prompt("Enter a Spotify URI: ")
-  begin
-    p (link = Hallon::Link.new(url))
-    puts "\tHTTP URL: #{link.to_url}"
-    puts "\tSpotify URI: #{link.to_str}"
-    puts "\tLink type: #{link.type}"
-  rescue ArgumentError => e
-    puts e
-  end
-end