hallon 0.8.0 → 0.9.0

data/spec/support/common_objects.rb

@@ -1,20 +1,22 @@
 # coding: utf-8
+require 'time'
+
 RSpec::Core::ExampleGroup.instance_eval do
-  let(:mock_artist) { Spotify.mock_artist("Jem", true) }
-  let(:mock_artist_two) { Spotify.mock_artist("Maroon 5", true) }
+  let(:mock_artist) { Spotify.mock_artist("Jem", mock_image_id, true) }
+  let(:mock_artist_two) { Spotify.mock_artist("Maroon 5", mock_image_id, true) }
 
-  let(:mock_album)  { Spotify.mock_album("Finally Woken", mock_artist, 2004, "DEADBEEFDEADBEEFDEAD", :single, true, true) }
-  let(:mock_user)   { Spotify.mock_user("burgestrand", "Burgestrand", "Kim Burgestrand", "https://secure.gravatar.com/avatar/b67b73b5b1fd84119ec788b1c3df02ad", :none, true) }
+  let(:mock_album)  { Spotify.mock_album("Finally Woken", mock_artist, 2004, mock_image_id, :single, true, true) }
+  let(:mock_user)   { Spotify.mock_user("burgestrand", "Burgestrand", true) }
   let(:mock_image)  { Spotify.mock_image(mock_image_id, :jpeg, File.size(fixture_image_path), File.read(fixture_image_path), :ok) }
 
   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, true, false, true, true)
+    Spotify.mock_track("They", artists.length, artists, mock_album, 123_456, 42, 2, 7, 0, true, :available, :done, false, true, 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, true, false, true, true)
+    Spotify.mock_track("Amazing", artists.length, artists, mock_album, 123_456, 42, 2, 7, 0, true, :available, :no, false, true, true, true)
   end
 
   let(:mock_albumbrowse) do
@@ -22,26 +24,24 @@ 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, mock_album, mock_artist, 2, copyrights, 2, tracks, review, nil, nil)
+    Spotify.mock_albumbrowse(:ok, 2751, mock_album, mock_artist, 2, copyrights, 2, tracks, review, nil, nil)
   end
 
   let(:mock_artistbrowse) do
-    artistbrowse = nil
-
     mock_image_pointer = FFI::MemoryPointer.from_string(mock_image_id)
     similar_artists    = pointer_array_with(mock_artist, mock_artist_two)
     portraits = pointer_array_with(mock_image_pointer, mock_image_pointer)
     tracks    = pointer_array_with(mock_track, mock_track_two)
     albums    = pointer_array_with(mock_album)
 
-    Spotify.mock_artistbrowse(:ok, mock_artist, portraits.length, portraits, tracks.length, tracks, albums.length, albums, similar_artists.length, similar_artists, "grew up in DA BLOCK", nil, nil)
+    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)
   end
 
   let(:mock_toplistbrowse) 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, artists.length, artists, albums.length, albums, tracks.length, tracks)
+    Spotify.mock_toplistbrowse(:ok, 2751, artists.length, artists, albums.length, albums, tracks.length, tracks)
   end
 
   let(:mock_search) do
@@ -52,6 +52,55 @@ RSpec::Core::ExampleGroup.instance_eval do
     Spotify.mock_search(:ok, "my query", "another thing", 1337, tracks.length, tracks, 42, albums.length, albums, 81104, artists.length, artists, nil, nil)
   end
 
+  let(:mock_subscribers) do
+    people = %w[Kim Elin Ylva]
+    people.map! { |x| FFI::MemoryPointer.from_string(x) }
+
+    subscribers = FFI::MemoryPointer.new(:pointer, people.size)
+    subscribers.write_array_of_pointer people
+
+    Spotify.mock_subscribers(people.count, subscribers)
+  end
+
+  let(:mock_empty_subscribers) do
+    Spotify.mock_subscribers(0, nil)
+  end
+
+  let(:mock_playlist) do
+    num_tracks = 4
+    tracks_ptr = FFI::MemoryPointer.new(Spotify::Mock::PlaylistTrack, num_tracks)
+    tracks = num_tracks.times.map do |i|
+      Spotify::Mock::PlaylistTrack.new(tracks_ptr + Spotify::Mock::PlaylistTrack.size * i)
+    end
+
+    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][: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][: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][:seen] = true
+
+    tracks[3][:track] = mock_track_two
+    tracks[3][:create_time] = Time.parse("2009-11-07").to_i
+    tracks[3][:creator] = mock_user
+    tracks[3][:message] = FFI::MemoryPointer.from_string("message this, YO!")
+    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)
+  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(:null_pointer)   { FFI::Pointer.new(0) }
@@ -80,16 +129,42 @@ RSpec::Core::ExampleGroup.instance_eval do
 
   let(:mock_session_object) do
     session = Hallon::Session.send(:allocate)
-    friends = pointer_array_with(mock_user)
     sstatus = mock_offline_sync_status
+    inbox   = mock_playlist
     session.instance_eval do
-      @pointer = Spotify.mock_session(nil, :undefined, friends.length, friends, 60 * 60 * 24 * 30, sstatus, 7, 3)
+      @pointer = Spotify.mock_session(nil, :undefined, 60 * 60 * 24 * 30, sstatus, 7, 3, inbox)
     end
     session
   end
+
+  let(:mock_image_link) do
+    Spotify.link_create_from_string!(mock_image_uri)
+  end
+
+  let(:mock_image_link_two) do
+    Spotify.link_create_from_string!("spotify:image:ce9da340323614dc95ae96b68843b1c726dc5c8a")
+  end
+
+  let(:mock_container) do
+    owner = Spotify.registry_find("spotify:user:burgestrand")
+    Spotify.mock_playlistcontainer(owner, true)
+  end
 end
 
-RSpec::Core::ExampleGroup.new.instance_eval do
-  Spotify.registry_add 'spotify:track:7N2Vc8u56VGA4KUrGbikC2', mock_track
-  Spotify.registry_add 'spotify:user:burgestrand', mock_user
+RSpec.configure do |config|
+  config.before do
+    Spotify.registry_add mock_image_uri, mock_image
+    Spotify.registry_add 'spotify:albumbrowse:1xvnWMz2PNFf7mXOSRuLws', mock_albumbrowse
+    Spotify.registry_add 'spotify:artistbrowse:3bftcFwl4vqRNNORRsqm1G', mock_artistbrowse
+    Spotify.registry_add 'spotify:artist:3bftcFwl4vqRNNORRsqm1G', mock_artist
+    Spotify.registry_add 'spotify:album:1xvnWMz2PNFf7mXOSRuLws', mock_album
+    Spotify.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
+  end
+
+  config.after do
+    Spotify.registry_clean
+  end
 end

data/spec/support/shared_for_linkable_objects.rb

@@ -0,0 +1,39 @@
+# coding: utf-8
+shared_examples_for "a Linkable object" do
+  describe "instantiation" 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)
+    end
+
+    it "should work with a string URI" do
+      expect { described_class.new(spotify_uri) }.to_not raise_error
+    end
+
+    it "should fail with an invalid spotify pointer" do
+      expect { described_class.new("i_am_invalid_uri") }.to raise_error(ArgumentError, /not a valid spotify \w+ URI or pointer/)
+    end
+
+    it "should work with a Link object" do
+      expect { described_class.new(Hallon::Link.new(spotify_uri)) }.to_not raise_error
+    end
+
+    it "should work with a spotify pointer" do
+      expect { described_class.new(spotify_pointer) }.to_not raise_error
+    end
+
+    it "should work with a custom object" do
+      expect { described_class.new(custom_object) }.to_not raise_error
+    end if defined?(custom_object)
+  end
+
+  describe "#to_link" do
+    subject { described_class.new(spotify_uri) }
+
+    it "should return a valid link" do
+      subject.to_link.should eq Hallon::Link.new(spotify_uri)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000Z
+date: 2011-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spotify
-  requirement: &2156044680 !ruby/object:Gem::Requirement
+  requirement: &70146970531060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 9.0.0
+        version: 10.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156044680
+  version_requirements: *70146970531060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156043420 !ruby/object:Gem::Requirement
+  requirement: &70146970529600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2156043420
+  version_requirements: *70146970529600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156041620 !ruby/object:Gem::Requirement
+  requirement: &70146970527480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *2156041620
+  version_requirements: *70146970527480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156039900 !ruby/object:Gem::Requirement
+  requirement: &70146970524260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2156039900
+  version_requirements: *70146970524260
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156038000 !ruby/object:Gem::Requirement
+  requirement: &70146970523640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156038000
+  version_requirements: *70146970523640
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2156036440 !ruby/object:Gem::Requirement
+  requirement: &70146970522520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156036440
+  version_requirements: *70146970522520
 description: 
 email: kim@burgestrand.se
 executables: []
@@ -96,7 +96,8 @@ files:
 - QUIRKS
 - README.markdown
 - Rakefile
-- Termfile
+- dev/login.rb
+- examples/adding_tracks_to_playlist.rb
 - examples/logging_in.rb
 - examples/printing_link_information.rb
 - examples/show_published_playlists_of_user.rb
@@ -116,9 +117,10 @@ files:
 - lib/hallon/linkable.rb
 - lib/hallon/observable.rb
 - lib/hallon/player.rb
+- lib/hallon/playlist.rb
+- lib/hallon/playlist_container.rb
 - lib/hallon/search.rb
 - lib/hallon/session.rb
-- lib/hallon/synchronizable.rb
 - lib/hallon/toplist.rb
 - lib/hallon/track.rb
 - lib/hallon/user.rb
@@ -138,9 +140,11 @@ files:
 - spec/hallon/linkable_spec.rb
 - spec/hallon/observable_spec.rb
 - spec/hallon/player_spec.rb
+- spec/hallon/playlist_container_spec.rb
+- spec/hallon/playlist_spec.rb
 - spec/hallon/search_spec.rb
 - spec/hallon/session_spec.rb
-- spec/hallon/synchronizable_spec.rb
+- spec/hallon/spotify_spec.rb
 - spec/hallon/toplist_spec.rb
 - spec/hallon/track_spec.rb
 - spec/hallon/user_spec.rb
@@ -153,6 +157,7 @@ files:
 - spec/support/common_objects.rb
 - spec/support/context_logged_in.rb
 - spec/support/cover_me.rb
+- spec/support/shared_for_linkable_objects.rb
 - spec/support/shared_for_loadable_objects.rb
 - spec/mockspotify/libmockspotify/src/Makefile.am
 - spec/mockspotify/libmockspotify/src/album.c
@@ -161,6 +166,7 @@ files:
 - spec/mockspotify/libmockspotify/src/artistbrowse.c
 - spec/mockspotify/libmockspotify/src/error.c
 - spec/mockspotify/libmockspotify/src/image.c
+- spec/mockspotify/libmockspotify/src/inbox.c
 - spec/mockspotify/libmockspotify/src/libmockspotify.c
 - spec/mockspotify/libmockspotify/src/libmockspotify.h
 - spec/mockspotify/libmockspotify/src/libspotify/api.h
@@ -196,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Delicious Ruby bindings to the official Spotify API
@@ -216,9 +222,11 @@ test_files:
 - spec/hallon/linkable_spec.rb
 - spec/hallon/observable_spec.rb
 - spec/hallon/player_spec.rb
+- spec/hallon/playlist_container_spec.rb
+- spec/hallon/playlist_spec.rb
 - spec/hallon/search_spec.rb
 - spec/hallon/session_spec.rb
-- spec/hallon/synchronizable_spec.rb
+- spec/hallon/spotify_spec.rb
 - spec/hallon/toplist_spec.rb
 - spec/hallon/track_spec.rb
 - spec/hallon/user_spec.rb
@@ -231,4 +239,6 @@ test_files:
 - spec/support/common_objects.rb
 - spec/support/context_logged_in.rb
 - spec/support/cover_me.rb
+- spec/support/shared_for_linkable_objects.rb
 - spec/support/shared_for_loadable_objects.rb
+has_rdoc: 

data/Termfile

@@ -1,7 +0,0 @@
-# You wonder what this is?
-# 
-# This is a Termfile, and is used by a gem named “terminitor” that
-# allows me to set up the work environment for Hallon much easier.
-
-run 'bundle exec autotest'
-tab '$EDITOR .'

data/lib/hallon/synchronizable.rb

@@ -1,32 +0,0 @@
-# coding: utf-8
-require 'monitor'
-require 'forwardable'
-
-module Hallon
-  # Adds synchronization primitives to target when included.
-  module Synchronizable
-    # Creates a `Monitor` for the target instance and adds `monitor` class method for access.
-    #
-    # Also adds several other methods:
-    #
-    # - `#synchronize`
-    # - `#new_cond`
-    #
-    # These all delegate to `#monitor`.
-    #
-    # @note This module is part of Hallons private API
-    # @private
-    def self.included(o)
-      o.instance_exec do
-        @monitor = Monitor.new
-        class << self
-          attr_reader :monitor
-        end
-      end
-    end
-
-    extend Forwardable
-    def_delegators :monitor, :synchronize, :new_cond
-    def_delegators 'self.class', :monitor
-  end
-end

data/spec/hallon/synchronizable_spec.rb

@@ -1,19 +0,0 @@
-describe Hallon::Synchronizable do
-  subject do
-    Class.new { include Hallon::Synchronizable }.new
-  end
-
-  describe "#synchronize" do
-    it "should not deadlock when called recursively in itself" do
-      expect do
-        subject.synchronize { subject.synchronize {} }
-      end.to_not raise_error
-    end
-  end
-
-  describe "#new_cond" do
-    it "should give us a new condition variable" do
-      subject.new_cond.should be_a Monitor::ConditionVariable
-    end
-  end
-end