hallon 0.18.0 → 0.18.1

data/spec/spec_helper.rb

@@ -28,8 +28,8 @@ RSpec.configure do |config|
     Hallon::Session.stub(:instance).and_return(session)
   end
 
-  config.after do
-    Spotify.registry_clean
+  def spotify_api
+    Spotify::API
   end
 
   def fixture_image_path
@@ -60,8 +60,8 @@ RSpec::Core::ExampleGroup.instance_eval do
   let(:options) do
     {
       :user_agent => "Hallon (rspec)",
-      :settings_path => "tmp",
-      :cache_path => ""
+      :settings_location => "tmp",
+      :cache_location => ""
     }
   end
 
@@ -73,30 +73,34 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/fixtures/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
+  config.after do
+    Spotify.mock_registry_clean
+  end
+
   config.before do
-    Spotify.registry_add 'spotify:image:3ad93423add99766e02d563605c6e76ed2b0e400', mock_image
-    Spotify.registry_add 'spotify:user:burgestrand:playlist:megaplaylist', mock_playlist_two
-    Spotify.registry_add 'spotify:search:my+%C3%A5+utf8+%EF%A3%BF+query', mock_search
-    Spotify.registry_add 'spotify:search:', mock_empty_search
+    Spotify.mock_registry_add 'spotify:image:3ad93423add99766e02d563605c6e76ed2b0e400', mock_image
+    Spotify.mock_registry_add 'spotify:user:burgestrand:playlist:megaplaylist', mock_playlist_two
+    Spotify.mock_registry_add 'spotify:search:my+%C3%A5+utf8+%EF%A3%BF+query', mock_search
+    Spotify.mock_registry_add 'spotify:search:', mock_empty_search
 
-    Spotify.registry_add 'spotify:albumbrowse:1xvnWMz2PNFf7mXOSRuLws', mock_albumbrowse
-    Spotify.registry_add 'spotify:album:1xvnWMz2PNFf7mXOSRuLws', mock_album
+    Spotify.mock_registry_add 'spotify:albumbrowse:1xvnWMz2PNFf7mXOSRuLws', mock_albumbrowse
+    Spotify.mock_registry_add 'spotify:album:1xvnWMz2PNFf7mXOSRuLws', mock_album
 
-    Spotify.registry_add 'spotify:albumbrowse:thisisanemptyalbumyoow', mock_empty_albumbrowse
-    Spotify.registry_add 'spotify:album:thisisanemptyalbumyoow', mock_empty_album
+    Spotify.mock_registry_add 'spotify:albumbrowse:thisisanemptyalbumyoow', mock_empty_albumbrowse
+    Spotify.mock_registry_add 'spotify:album:thisisanemptyalbumyoow', mock_empty_album
 
-    Spotify.registry_add 'spotify:artist:3bftcFwl4vqRNNORRsqm1G', mock_artist
-    Spotify.registry_add 'spotify:artistbrowse:3bftcFwl4vqRNNORRsqm1G', mock_artistbrowse
+    Spotify.mock_registry_add 'spotify:artist:3bftcFwl4vqRNNORRsqm1G', mock_artist
+    Spotify.mock_registry_add 'spotify:artistbrowse:3bftcFwl4vqRNNORRsqm1G', mock_artistbrowse
 
-    Spotify.registry_add 'spotify:artist:thisisanemptyartistyow', mock_empty_artist
-    Spotify.registry_add 'spotify:artistbrowse:thisisanemptyartistyow', mock_empty_artistbrowse
+    Spotify.mock_registry_add 'spotify:artist:thisisanemptyartistyow', mock_empty_artist
+    Spotify.mock_registry_add 'spotify:artistbrowse:thisisanemptyartistyow', mock_empty_artistbrowse
 
-    Spotify.registry_add 'spotify:container:burgestrand', mock_container
+    Spotify.mock_registry_add 'spotify:container:burgestrand', mock_container
 
-    Spotify.registry_add 'spotify:track:7N2Vc8u56VGA4KUrGbikC2', mock_track
+    Spotify.mock_registry_add 'spotify:track:7N2Vc8u56VGA4KUrGbikC2', mock_track
 
-    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.mock_registry_add 'spotify:user:burgestrand', mock_user
+    Spotify.mock_registry_add 'spotify:user:burgestrand:playlist:07AX9IY9Hqmj1RqltcG0fi', mock_playlist
+    Spotify.mock_registry_add 'spotify:user:burgestrand:starred', mock_playlist
   end
 end

data/spec/support/album_mocks.rb

@@ -9,11 +9,11 @@ RSpec::Core::ExampleGroup.instance_eval do
   end
 
   let(:mock_album) do
-    Spotify.mock_album!("Finally Woken", mock_artist, 2004, mock_image_id, :single, true, true)
+    Spotify.mock_album_create("Finally Woken", mock_artist, 2004, mock_image_id, :single, true, true)
   end
 
   let(:mock_empty_album) do
-    Spotify.mock_album!(nil, nil, 0, nil, :single, false, false)
+    Spotify.mock_album_create(nil, nil, 0, nil, :single, false, false)
   end
 
   let(:mock_albumbrowse) do
@@ -21,10 +21,10 @@ RSpec::Core::ExampleGroup.instance_eval do
     copyrights = pointer_array_with(*copyrights)
     tracks     = pointer_array_with(mock_track, mock_track_two)
     review     = "This album is AWESOME"
-    Spotify.mock_albumbrowse(:ok, 2751, mock_album, mock_artist, 2, copyrights, 2, tracks, review, nil, nil)
+    Spotify.mock_albumbrowse_create(:ok, 2751, mock_album, mock_artist, 2, copyrights, 2, tracks, review, nil, nil)
   end
 
   let(:mock_empty_albumbrowse) do
-    Spotify.mock_albumbrowse(:ok, -1, nil, nil, 0, nil, 0, nil, nil, nil, nil)
+    Spotify.mock_albumbrowse_create(:ok, -1, nil, nil, 0, nil, 0, nil, nil, nil, nil)
   end
 end

data/spec/support/artist_mocks.rb

@@ -9,15 +9,15 @@ RSpec::Core::ExampleGroup.instance_eval do
   end
 
   let(:mock_artist) do
-    Spotify.mock_artist!("Jem", mock_image_id, true)
+    Spotify.mock_artist_create("Jem", mock_image_id, true)
   end
 
   let(:mock_artist_two) do
-    Spotify.mock_artist!("Maroon 5", mock_image_id, true)
+    Spotify.mock_artist_create("Maroon 5", mock_image_id, true)
   end
 
   let(:mock_empty_artist) do
-    Spotify.mock_artist!(nil, nil, false)
+    Spotify.mock_artist_create(nil, nil, false)
   end
 
   let(:mock_artistbrowse) do
@@ -27,10 +27,10 @@ RSpec::Core::ExampleGroup.instance_eval do
     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, tophits.length, tophits, "grew up in DA BLOCK", :full, nil, nil)
+    Spotify.mock_artistbrowse_create(: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_empty_artistbrowse) do
-    Spotify.mock_artistbrowse(:ok, 0, nil, 0, nil, 0, nil, 0, nil, 0, nil, 0, nil, nil, :full, nil, nil)
+    Spotify.mock_artistbrowse_create(:ok, 0, nil, 0, nil, 0, nil, 0, nil, 0, nil, 0, nil, nil, :full, nil, nil)
   end
 end

data/spec/support/image_mocks.rb

@@ -13,11 +13,11 @@ RSpec::Core::ExampleGroup.instance_eval do
   let(:mock_image_id)  { ":\xD94#\xAD\xD9\x97f\xE0-V6\x05\xC6\xE7n\xD2\xB0\xE4\0".force_encoding("BINARY") }
 
   let(:mock_image) do
-    Spotify.mock_image!(mock_image_id, :jpeg, File.size(fixture_image_path), File.read(fixture_image_path), :ok)
+    Spotify.mock_image_create(mock_image_id, :jpeg, File.size(fixture_image_path), File.read(fixture_image_path), :ok)
   end
 
   let(:mock_empty_image) do
-    Spotify.mock_image!(mock_image_id, :jpeg, 0, nil, :ok)
+    Spotify.mock_image_create(mock_image_id, :jpeg, 0, nil, :ok)
   end
 
   let(:mock_image_id_pointer) do
@@ -25,10 +25,10 @@ RSpec::Core::ExampleGroup.instance_eval do
   end
 
   let(:mock_image_link) do
-    Spotify.link_create_from_string!(mock_image_uri)
+    Spotify.link_create_from_string(mock_image_uri)
   end
 
   let(:mock_image_link_two) do
-    Spotify.link_create_from_string!("spotify:image:ce9da340323614dc95ae96b68843b1c726dc5c8a")
+    Spotify.link_create_from_string("spotify:image:ce9da340323614dc95ae96b68843b1c726dc5c8a")
   end
 end

data/spec/support/playlist_container_mocks.rb

@@ -16,21 +16,21 @@ RSpec::Core::ExampleGroup.instance_eval do
     items[0][:playlist] = mock_playlist
     items[0][:type]     = :playlist
 
-    items[1][:folder_name] = FFI::MemoryPointer.from_string("Boogie")
+    items[1][:folder_name] = "Boogie"
     items[1][:type]        = :start_folder
     items[1][:folder_id]   = 1337
 
     items[2][:playlist] = mock_playlist_two
     items[2][:type]     = :playlist
 
-    items[3][:folder_name] = FFI::Pointer::NULL
+    items[3][:folder_name] = nil
     items[3][:type]        = :end_folder
     items[3][:folder_id]   = 1337
 
-    Spotify.mock_playlistcontainer!(mock_user, true, num_items, items_ptr, nil, nil)
+    Spotify.mock_playlistcontainer_create(mock_user, true, num_items, items_ptr, nil, nil)
   end
 
   let(:mock_empty_container) do
-    Spotify.mock_playlistcontainer!(nil, false, 0, nil, nil, nil)
+    Spotify.mock_playlistcontainer_create(nil, false, 0, nil, nil, nil)
   end
 end

data/spec/support/playlist_mocks.rb

@@ -32,19 +32,19 @@ RSpec::Core::ExampleGroup.instance_eval do
     tracks[0][:track] = mock_track
     tracks[0][:create_time] = Time.parse("2009-11-04").to_i
     tracks[0][:creator] = mock_user
-    tracks[0][:message] = FFI::MemoryPointer.from_string("message this, YO!")
+    tracks[0][:message] = "message this, YO!"
     tracks[0][:seen] = true
 
     tracks[1][:track] = mock_track_two
     tracks[1][:create_time] = Time.parse("2009-11-05").to_i
     tracks[1][:creator] = mock_user
-    tracks[1][:message] = FFI::MemoryPointer.from_string("message this, YO!")
+    tracks[1][:message] = "message this, YO!"
     tracks[1][:seen] = true
 
     tracks[2][:track] = mock_track
     tracks[2][:create_time] = Time.parse("2009-11-06").to_i
     tracks[2][:creator] = mock_user
-    tracks[2][:message] = FFI::MemoryPointer.from_string("message this, YO!")
+    tracks[2][:message] = "message this, YO!"
     tracks[2][:seen] = true
 
     tracks[3][:track] = mock_track_two
@@ -53,15 +53,15 @@ RSpec::Core::ExampleGroup.instance_eval do
     tracks[3][:message] = nil
     tracks[3][:seen] = true
 
-    Spotify.mock_playlist!("Megaplaylist", true, mock_user, true, "Playlist description...?", mock_image_id, false, 1000, mock_subscribers, true, :no, 67, num_tracks, tracks_ptr)
+    Spotify.mock_playlist_create("Megaplaylist", true, mock_user, true, "Playlist description...?", mock_image_id, false, 1000, mock_subscribers, true, :no, 67, num_tracks, tracks_ptr)
   end
 
   let(:mock_playlist_two) do
-    Spotify.mock_playlist!("Dunderlist", true, mock_user, true, nil, mock_image_id, false, 1000, nil, true, :no, 0, 0, nil)
+    Spotify.mock_playlist_create("Dunderlist", true, mock_user, true, nil, mock_image_id, false, 1000, nil, true, :no, 0, 0, nil)
   end
 
   let(:mock_empty_playlist) do
-    Spotify.mock_playlist!(nil, false, nil, false, nil, nil, false, 0, nil, false, :no, 0, 0, nil)
+    Spotify.mock_playlist_create(nil, false, nil, false, nil, nil, false, 0, nil, false, :no, 0, 0, nil)
   end
 
   let(:mock_playlist_raw) do

data/spec/support/search_mocks.rb

@@ -14,10 +14,10 @@ RSpec::Core::ExampleGroup.instance_eval do
     tracks    = pointer_array_with(mock_track, mock_track_two)
     playlists = pointer_array_with(mock_playlist_two)
 
-    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)
+    Spotify.mock_search_create(: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_empty_search) do
-    Spotify.mock_search(:ok, "", nil, 0, 0, nil, 0, 0, nil, 0, 0, nil, 0, 0, nil, nil, nil)
+    Spotify.mock_search_create(:ok, "", nil, 0, 0, nil, 0, 0, nil, 0, 0, nil, 0, 0, nil, nil, nil)
   end
 end

data/spec/support/session_mocks.rb

@@ -26,7 +26,7 @@ RSpec::Core::ExampleGroup.instance_eval do
     sstatus = mock_offline_sync_status
     inbox   = mock_playlist
     session.instance_eval do
-      @pointer = Spotify.mock_session(nil, :undefined, 60 * 60 * 24 * 30, sstatus, 7, 3, inbox)
+      @pointer = Spotify.mock_session_create(nil, :undefined, 60 * 60 * 24 * 30, sstatus, 7, 3, inbox)
     end
     session
   end

data/spec/support/shared_for_callbacks.rb

@@ -52,7 +52,7 @@ RSpec.configure do
       # sure the methods have the correct arity
       # (also, we can’t find the struct callback arity in any nice way)
       it "should have the correct arity" do
-        fn = Spotify.find_type(type)
+        fn = Spotify::API.find_type(type)
         subject_callback.arity.should eq fn.param_types.size
       end if method_defined?(:type)
     end

data/spec/support/shared_for_linkable_objects.rb

@@ -6,8 +6,9 @@ shared_examples_for "a Linkable object" do
     let(:spotify_pointer) do
       ptr_type    = Hallon::Link.new(spotify_uri).type
       ptr_type    = :user if ptr_type == :profile
-      ffi_pointer = Spotify.registry_find(spotify_uri[/[^#]+/]) # up to pound sign for track#offset
-      Spotify::Pointer.new(ffi_pointer, ptr_type, false)
+      ptr_class   = Spotify.const_get(ptr_type.to_s.sub(/\A\w/) { |x| x.upcase })
+      ffi_pointer = Spotify.mock_registry_find(spotify_uri[/[^#]+/]) # up to pound sign for track#offset
+      ptr_class.new(ffi_pointer)
     end
 
     it "should work with a string URI" do

data/spec/support/toplist_mocks.rb

@@ -10,10 +10,10 @@ RSpec::Core::ExampleGroup.instance_eval 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)
-    Spotify.mock_toplistbrowse(:ok, 2751, artists.length, artists, albums.length, albums, tracks.length, tracks)
+    Spotify.mock_toplistbrowse_create(:ok, 2751, artists.length, artists, albums.length, albums, tracks.length, tracks)
   end
 
   let(:mock_empty_toplistbrowse) do
-    Spotify.mock_toplistbrowse(:ok, -1, 0, nil, 0, nil, 0, nil)
+    Spotify.mock_toplistbrowse_create(:ok, -1, 0, nil, 0, nil, 0, nil)
   end
 end

data/spec/support/track_mocks.rb

@@ -9,20 +9,20 @@ 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, :ok, true, :available, :done, false, true, nil, true, false)
+    Spotify.mock_track_create("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, :ok, true, :available, :no, false, true, nil, true, true)
+    Spotify.mock_track_create("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)
+    Spotify.mock_track_create("They", artists.length, artists, mock_album, 60, 100, 1, 1, :ok, true, :available, :no, false, true, mock_track, false, false)
   end
 
   let(:mock_empty_track) do
-    Spotify.mock_track!(nil, 0, nil, nil, 0, 0, 0, 0, :ok, false, :unavailable, :no, false, true, nil, false, false)
+    Spotify.mock_track_create(nil, 0, nil, nil, 0, 0, 0, 0, :ok, false, :unavailable, :no, false, true, nil, false, false)
   end
 end

data/spec/support/user_mocks.rb

@@ -7,11 +7,11 @@ RSpec::Core::ExampleGroup.instance_eval do
   end
 
   let(:mock_user) do
-    Spotify.mock_user!("burgestrand", "Burgestrand", true)
+    Spotify.mock_user_create("burgestrand", "Burgestrand", true)
   end
 
   let(:mock_empty_user) do
-    Spotify.mock_user!(nil, nil, false)
+    Spotify.mock_user_create(nil, nil, false)
   end
 
   let(:mock_user_raw) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ref
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 12.2.0
+        version: 12.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 12.2.0
+        version: 12.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -293,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 228682146525853245
+      hash: 1548945263546800899
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24