hallon 0.18.1 → 0.18.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f25eaa19120499087ea81ef9f17c7102e3a62177
+  data.tar.gz: 1b03b1966751bd123ceb89b3d32364da27b569cc
+SHA512:
+  metadata.gz: ed2e9f12f2549234d6cfc6b9a501774b3aac8179bd0f079f6a7da48a5dbcfd353f7d92eb0e760f6ab7e9ca434d77a1e01fec4800ab86f0b629b1d0385446b6a4
+  data.tar.gz: 68dfe742b746431e11165cb3e31f977bd5e3efccd80cbbb46aaa0a48180cb900aceb753403b7151342a55d6f65793d038f3ca0bd774e5d01feffeecdbf44c5d1

data/.gitignore

@@ -28,3 +28,4 @@ pkg
 
 ## Mac OS
 .DS_Store
+examples/common.rb

data/.travis.yml

@@ -1,5 +1,11 @@
 language: ruby
-bundler_args: --path vendor/bundle
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - rbx-19mode
+  - jruby-19mode
+matrix:
+  allow_failures:
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode

data/CHANGELOG.md

@@ -4,6 +4,14 @@ Hallon’s Changelog
 [HEAD][]
 ------------------
 
+[v0.18.2][]
+------------------
+No changes to public API. Mostly some cleanup, and support for the new
+Spotify gem.
+
+- [470bc9786] Use weak_observable gem for weak reference callbacks.
+- [b2feb8095] Require newest FFI and Spotify versions.
+
 [v0.18.1][]
 ------------------
 Hallon now supports spotify ~> 12.3.0. As a result, you no longer need to manually install

data/Gemfile

@@ -3,10 +3,11 @@ gemspec
 
 # Useful for testing out audio.
 unless ENV["TRAVIS"] # does not build on travis
-  gem 'hallon-openal'
+  gem 'hallon-openal', '~> 1.0.1'
 end
 
 gem 'ruby_parser', '>= 3.0.0.a1', '< 4.0'
 gem 'pry'
 gem 'simplecov'
-gem 'rb-readline'
+gem 'yard'
+gem 'maruku'

data/README.markdown

@@ -5,6 +5,14 @@ Hallon (Swedish for “[Raspberry][]”) is _the_ ruby gem for interacting with
 
 Code samples can be found under the `examples/` directory. An explanation on how to run them can be found on the [Hallon wiki on GitHub](https://github.com/Burgestrand/Hallon/wiki).
 
+### Contact details
+
+- __Got questions?__ Ask on the mailing list: <mailto:ruby-hallon@googlegroups.com> (<https://groups.google.com/d/forum/ruby-hallon>)
+- __Found a bug?__ Report an issue: <https://github.com/Burgestrand/Hallon/issues/new>
+- __Have feedback?__ I ❤ feedback! Please send it to the mailing list.
+
+If you for some reason cannot use the mailing list or GitHub issue tracker you may contact me directly. My email is found on [my GitHub profile](https://github.com/Burgestrand).
+
 Prerequisites
 -------------
 
@@ -60,14 +68,6 @@ gem install hallon-openal
 
 For more information about audio support in Hallon, see the section "Audio support" below.
 
-### Contact details
-
-- __Got questions?__ Ask on the mailing list: <mailto:ruby-hallon@googlegroups.com> (<https://groups.google.com/d/forum/ruby-hallon>)
-- __Found a bug?__ Report an issue: <https://github.com/Burgestrand/Hallon/issues/new>
-- __Have feedback?__ I ❤ feedback! Please send it to the mailing list.
-
-If you for some reason cannot use the mailing list or GitHub issue tracker you may contact me directly. My email is found on [my GitHub profile](https://github.com/Burgestrand), and I’m also available as [@burgestrand on twitter](https://twitter.com/Burgestrand).
-
 Hallon and Spotify objects
 --------------------------
 All objects from libspotify have a counterpart in Hallon, and just like in libspotify the objects are populated with information as it becomes available. All objects that behave in this way respond to `#loaded?`, which’ll return true if the object has been populated with data.
@@ -170,6 +170,9 @@ You can only keep one session with Spotify alive at a time within the same proce
 ### When forking, you need to be extra careful
 If you fork, you need to instantiate the session within the process you plan to use Hallon in. You want to use Hallon in the parent? Create the session in the parent. You want to use it in the child? Create the session in the child! This is a limitation of libspotify itself.
 
+### You must not share cache directory between processes
+Hallon uses `tmp/hallon` as both cache and settings directory by default. If you launch Hallon in multiple processes, you must make sure that `cache_location` is not shared between them, by changing it in the call to [Session.initialize][], or libspotify will lock up.
+
 ### Hallon and platforms
 Hallon aims to support the available platforms of the Spotify gem, which in turn depends somewhat on the platforms that libspotify support. As of current, Hallon officially supports Mac OS and Linux distributions that libspotify supports. Windows support is possible, but is yet to have been needed.
 
@@ -185,7 +188,29 @@ Credits
 
 License
 -------
-Hallon is licensed under a 2-clause (Simplified) BSD license. More information can be found in the `LICENSE.txt` file.
+Hallon is licensed under a 2-clause (Simplified) BSD license.
+
+Copyright 2012 Kim Burgestrand. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY KIM BURGESTRAND ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KIM BURGESTRAND OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 [Raspberry]:        http://images.google.com/search?q=raspberry&tbm=isch
 [Spotify for Ruby]: https://github.com/Burgestrand/spotify

data/Rakefile

@@ -4,13 +4,13 @@ require 'rake'
 begin
   require 'bundler'
   Bundler::GemHelper.install_tasks
+
+  require 'yard'
+  YARD::Rake::YardocTask.new
 rescue LoadError
   # not everybody needs these
 end
 
-require 'yard'
-YARD::Rake::YardocTask.new
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec') do |task|
   task.ruby_opts = '-W2'

data/examples/example_support.rb

@@ -42,9 +42,15 @@ end
 
 # Making sure you receive the latest of the latest. Hallon does not wish to
 # be replaced by older versions when showing you the shiny.
-$LOAD_PATH.unshift(File.expand_path('../lib', File.dirname(__FILE__)))
+require 'bundler'
+Bundler.setup
 require 'hallon'
 
+begin
+  require_relative 'common'
+rescue LoadError
+end
+
 # This is a quick sanity check, to make sure we have all the necessities in order.
 appkey_path = File.expand_path('./spotify_appkey.key')
 unless File.exists?(appkey_path)
@@ -52,9 +58,6 @@ unless File.exists?(appkey_path)
     Your Spotify application key could not be found at the path:
       #{appkey_path}
 
-    Please adjust the path in examples/common.rb or put your application key in:
-      #{appkey_path}
-
     You may download your application key from:
       https://developer.spotify.com/en/libspotify/application-key/
   ERROR
@@ -68,8 +71,8 @@ they require actual login credentials before they may run."
 
 # Spotify requires a rite of passage. It’s own variant of “open sesame”, so we will
 # ask you to provide them with your information.
-hallon_username = prompt("Please enter your spotify username")
-hallon_password = prompt("Please enter your spotify password", hide: true)
+hallon_username = ENV.fetch("SPOTIFY_USERNAME") { prompt("Please enter your spotify username") }
+hallon_password = ENV.fetch("SPOTIFY_PASSWORD") { prompt("Please enter your spotify password", hide: true) }
 hallon_appkey   = IO.read(appkey_path)
 
 # Make sure the credentials are there. We don’t want to go without them.

data/hallon.gemspec

@@ -21,11 +21,9 @@ Gem::Specification.new do |gem|
   gem.platform    = Gem::Platform::RUBY
   gem.required_ruby_version = '>= 1.9'
 
-  gem.add_dependency 'ref', '~> 1.0'
-  gem.add_dependency 'spotify', '~> 12.3.0'
-  gem.add_development_dependency 'rake', '~> 0.8'
+  gem.add_dependency 'weak_observable', '~> 1.0'
+  gem.add_dependency 'spotify', '~> 12.5.1'
+  gem.add_dependency 'ffi', '~> 1.8'
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 2'
-  gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rdiscount'
 end

data/lib/hallon.rb

@@ -3,6 +3,7 @@ require 'spotify'
 require 'hallon/ext/spotify'
 require 'hallon/ext/ffi'
 
+require 'weak_observable'
 require 'hallon/observable'
 require 'hallon/linkable'
 require 'hallon/loadable'

data/lib/hallon/observable.rb

@@ -22,31 +22,7 @@ module Hallon
       # @param [Object] object
       # @param [FFI::Pointer] pointer
       def subscribe(object, pointer)
-        key = pointer.address
-        ref = Ref::WeakReference.new(object)
-
-        @lock.synchronize do
-          if @subscribers_rev[ref.referenced_object_id]
-            raise ArgumentError, "already subscribed to callbacks"
-          end
-
-          @subscribers[key] ||= {} # use a hash for fast reverse lookups
-          @subscribers[key][ref.referenced_object_id] = ref
-          @subscribers_rev[ref.referenced_object_id] = key
-        end
-
-        ObjectSpace.define_finalizer(object, @unsubscriber)
-      end
-
-      # Retrieve all subscribers for a given pointer.
-      #
-      # @param [FFI::Pointer] pointer
-      def subscribers_for(pointer)
-        key = pointer.address
-
-        @lock.synchronize do
-          @subscribers.fetch(key, {}).values.map(&:object).compact
-        end
+        @observers.add(pointer.address, object, :trigger)
       end
 
       protected
@@ -57,18 +33,7 @@ module Hallon
       # track of all subscribers properly.
       def initialize_observable
         @callbacks = initialize_callbacks
-
-        @lock = Ref::SafeMonitor.new
-        @subscribers = {}
-        @subscribers_rev = {}
-        @unsubscriber = proc do |object_id|
-          @lock.synchronize do
-            if key = @subscribers_rev.delete(object_id)
-              @subscribers[key].delete(object_id)
-              @subscribers.delete(key) if @subscribers[key].empty?
-            end
-          end
-        end
+        @observers = WeakObservable::Hub.new
       end
 
       # @param [#to_s] name
@@ -86,9 +51,8 @@ module Hallon
       # @param […] arguments
       # @return whatever the (last) handler returned
       def trigger(pointer, event, *arguments)
-        subscribers_for(pointer).inject(nil) do |_, subscriber|
-          # trigger is protected, inconvenient but symbolic
-          subscriber.send(:trigger, event, *arguments)
+        if results = @observers.notify(pointer.address, event, *arguments)
+          results[-1]
         end
       end
     end
@@ -104,11 +68,10 @@ module Hallon
     # @return [Proc] the previous handler
     # @yield (*args) event handler block
     def on(event, &block)
+      event &&= event.to_s
       raise ArgumentError, "no block given" unless block
       raise NameError, "no such callback: #{event}" unless has_callback?(event)
-      handlers[event.to_s].tap do
-        handlers[event.to_s] = block
-      end
+      handlers[event].tap { handlers[event] = block }
     end
 
     # Wait for the given callbacks to fire until the block returns true
@@ -178,6 +141,15 @@ module Hallon
       handlers.replace(old_handlers)
     end
 
+    # @param [#to_s] name
+    # @param [...] arguments
+    # @return whatever the handler returns
+    def trigger(name, *arguments, &block)
+      if handler = handlers[name.to_s]
+        handler.call(*arguments, &block)
+      end
+    end
+
     protected
 
     # Register this object as interested in callbacks.
@@ -191,15 +163,6 @@ module Hallon
       end
     end
 
-    # @param [#to_s] name
-    # @param [...] arguments
-    # @return whatever the handler returns
-    def trigger(name, *arguments, &block)
-      if handler = handlers[name.to_s]
-        handler.call(*arguments, &block)
-      end
-    end
-
     # @return [Hash<String, Proc>]
     def handlers
       @__handlers ||= Hash.new(proc {})

data/lib/hallon/observable/session.rb

@@ -91,13 +91,12 @@ module Hallon::Observable
     # @yield [format, frames]
     # @yieldparam [Hash] format (contains :type, :rate, :channels)
     # @yieldparam [Enumerator<[Integer...]>] frames (each frame is an array containing format[:channels] integers of format[:type])
-    def music_delivery_callback(pointer, format, frames, num_frames)
-      struct = Spotify::AudioFormat.new(format)
-
-      format = {}
-      format[:rate] = struct[:sample_rate]
-      format[:channels] = struct[:channels]
-      format[:type] = struct[:sample_type]
+    def music_delivery_callback(pointer, format_struct, frames, num_frames)
+      format = {
+        rate: format_struct[:sample_rate],
+        channels: format_struct[:channels],
+        type: format_struct[:sample_type]
+      }
 
       # read the frames of the given type
       frames = unless num_frames.zero?
@@ -161,7 +160,6 @@ module Hallon::Observable
     # @yield []
     # @yieldreturn an integer pair, [samples, dropouts]
     def get_audio_buffer_stats_callback(pointer, stats)
-      stats = Spotify::AudioBufferStats.new(stats)
       samples, dropouts = trigger(pointer, :get_audio_buffer_stats)
       stats[:samples]  = samples.to_i
       stats[:stutter] = dropouts.to_i

data/lib/hallon/playlist.rb

@@ -250,20 +250,8 @@ module Hallon
     #       libspotify does not store more than 500 subscriber names
     # @return [Array<String>] list of canonical usernames
     def subscribers
-      ptr = Spotify.playlist_subscribers(pointer)
-
-      if ptr.null?
-        []
-      else
-        struct = Spotify::Subscribers.new(ptr)
-        if struct[:count].zero?
-          []
-        else
-          struct[:subscribers].map(&:read_string)
-        end
-      end
-    ensure
-      Spotify.playlist_subscribers_free(ptr) unless ptr.null?
+      subscribers = Spotify.playlist_subscribers(pointer)
+      subscribers.to_a
     end
 
     # @return [Integer] total number of subscribers.

data/lib/hallon/session.rb

@@ -46,7 +46,7 @@ module Hallon
     # @see (see Session#initialize)
     # @return [Session]
     def Session.initialize(appkey, options = {}, &block)
-      raise "Session has already been initialized" if @__instance__
+      raise "Session has already been initialized" if defined?(@__instance__)
       @__instance__ = new(appkey, options, &block)
     end
 
@@ -375,8 +375,8 @@ module Hallon
     # @see http://developer.spotify.com/en/libspotify/docs/structsp__offline__sync__status.html
     def offline_sync_status
       struct = Spotify::OfflineSyncStatus.new
-      if Spotify.offline_sync_get_status(pointer, struct.pointer)
-        Hash[struct.members.zip(struct.values)]
+      if Spotify.offline_sync_get_status(pointer, struct)
+        struct.to_h
       else
         {}
       end

data/lib/hallon/version.rb

@@ -3,5 +3,5 @@ module Hallon
   # Current release version of Hallon
   #
   # @see http://semver.org/
-  VERSION = [0, 18, 1].join('.')
+  VERSION = [0, 18, 2].join('.')
 end

data/spec/hallon/observable/session_spec.rb

@@ -49,15 +49,15 @@ describe Hallon::Observable::Session do
       frames
     end
 
-    let(:format) do
+    let(:format_struct) do
       struct = Spotify::AudioFormat.new
       struct[:sample_type] = :int16
       struct[:sample_rate] = 44100 # 44.1khz
       struct[:channels]    = 2
-      struct.pointer
+      struct
     end
 
-    let(:input)  { [a_pointer, format, frames, num_frames] }
+    let(:input)  { [a_pointer, format_struct, frames, num_frames] }
     let(:output) { [{rate: 44100, type: :int16, channels: 2}, data.each_slice(2)] }
 
     it "should return the resulting value" do
@@ -70,7 +70,7 @@ describe Hallon::Observable::Session do
     end
 
     it "should not go ballistic when there is no audio data" do
-      subject_callback.call(a_pointer, format, FFI::Pointer::NULL, 0)
+      subject_callback.call(a_pointer, format_struct, FFI::Pointer::NULL, 0)
     end
   end
 
@@ -95,7 +95,8 @@ describe Hallon::Observable::Session do
   end
 
   specification_for_callback "get_audio_buffer_stats" do
-    let(:input)  { [a_pointer, Spotify::AudioBufferStats.new.pointer] }
+    let(:struct) { Spotify::AudioBufferStats.new }
+    let(:input)  { [a_pointer, struct] }
     let(:output) { [] }
 
     it "should return the resulting audio buffer stats" do
@@ -104,7 +105,7 @@ describe Hallon::Observable::Session do
 
       stats[:samples].should eq 0
       stats[:stutter].should eq 0
-      subject_callback.call(a_pointer, stats.pointer)
+      subject_callback.call(a_pointer, stats)
       stats[:samples].should eq 5
       stats[:stutter].should eq 7
     end
@@ -114,7 +115,7 @@ describe Hallon::Observable::Session do
 
       stats[:samples].should eq 0
       stats[:stutter].should eq 0
-      subject_callback.call(a_pointer, stats.pointer)
+      subject_callback.call(a_pointer, stats)
       stats[:samples].should eq 0
       stats[:stutter].should eq 0
     end

data/spec/hallon/observable_spec.rb

@@ -54,27 +54,6 @@ describe Hallon::Observable do
 
   describe "ClassMethods" do
     subject { klass }
-
-    describe ".subscribers_for" do
-      around { |test| Ref::Mock.use(&test) }
-
-      it "should contain a list of weak references to subscribers" do
-        ptr = FFI::Pointer.new(0xDEADBEEF)
-
-        objA = klass.new
-        subject.subscribers_for(ptr).should eq [objA]
-
-        objB = klass.new
-        subject.subscribers_for(ptr).should eq [objA, objB]
-
-        Ref::Mock.gc(objA)
-        subject.subscribers_for(ptr).should eq [objB]
-      end
-
-      it "should return an empty array if there are no subscribers" do
-        subject.subscribers_for(null_pointer).should be_empty
-      end
-    end
   end
 
   subject { klass.new }
@@ -124,8 +103,8 @@ describe Hallon::Observable do
     it "should return the previous callback" do
       previous = proc { puts "hey!" }
       new_one  = proc { puts "ho!" }
-      initial  = subject.on(:testing, &previous)
 
+      subject.on(:testing, &previous)
       subject.on(:testing, &new_one).should eq previous
       subject.on(:testing, &previous).should eq new_one
     end
@@ -144,11 +123,6 @@ describe Hallon::Observable do
       expect { subject.send(:subscribe_for_callbacks) }.to raise_error(LocalJumpError)
     end
 
-    it "should raise an error if the same object tries to subscribe twice" do
-      # we already subscribed for callbacks in initialize
-      expect { subject.send(:subscribe_for_callbacks) {} }.to raise_error(ArgumentError)
-    end
-
     it "should do nothing if the result is a null pointer" do
       klass.should_not_receive(:subscribe)
       klass.any_instance.stub(:pointer).and_return(FFI::Pointer::NULL)

data/spec/mockspotify.rb

@@ -34,17 +34,17 @@ module Spotify
 
   module Mock
     class PlaylistTrack < Spotify::Struct
-      layout :track, Spotify::Track,
+      layout :track, :pointer,
              :create_time, :int,
-             :creator, Spotify::User,
-             :message, Spotify::NULString,
+             :creator, :pointer,
+             :message, Spotify::UTF8StringPointer,
              :seen, :bool
     end
 
     class PlaylistContainerItem < Spotify::Struct
-      layout :playlist, Spotify::Playlist,
+      layout :playlist, :pointer,
              :type, :playlist_type,
-             :folder_name, Spotify::NULString,
+             :folder_name, Spotify::UTF8StringPointer,
              :folder_id, :uint64,
              :num_seen_tracks, :int,
              :seen_tracks, :array
@@ -54,25 +54,35 @@ module Spotify
   class API
     old_verbose, $VERBOSE = $VERBOSE, true
 
+    # Some of these can accept null pointers, but our type protection ensures
+    # that we never pass null values in place of spotify objects, so we work
+    # around it by not using the real types. We still want to document the kind
+    # used, however.
+    typedef :pointer, :track
+    typedef :pointer, :album
+    typedef :pointer, :artist
+    typedef :pointer, :playlist
+    typedef :pointer, :user
+
     attach_function :mock_registry_find, [:string], :pointer
     attach_function :mock_registry_add, [:string, :pointer], :void
     attach_function :mock_registry_clean, [], :void
 
-    attach_function :mock_session_create, [:pointer, :connectionstate, :int, OfflineSyncStatus, :int, :int, Playlist], Session
+    attach_function :mock_session_create, [:pointer, :connectionstate, :int, OfflineSyncStatus, :int, :int, :playlist], Session
     attach_function :mock_user_create, [:string, :string, :bool], User
-    attach_function :mock_track_create, [:string, :int, :array, Album, :int, :int, :int, :int, :error, :bool, :availability, :track_offline_status, :bool, :bool, Track, :bool, :bool], Track
+    attach_function :mock_track_create, [:string, :int, :array, :album, :int, :int, :int, :int, :error, :bool, :availability, :track_offline_status, :bool, :bool, :track, :bool, :bool], Track
     attach_function :mock_image_create, [ImageID, :imageformat, :size_t, :buffer_in, :error], Image
     attach_function :mock_artist_create, [:string, ImageID, :bool], Artist
-    attach_function :mock_album_create, [:string, Artist, :int, ImageID, :albumtype, :bool, :bool], Album
+    attach_function :mock_album_create, [:string, :artist, :int, ImageID, :albumtype, :bool, :bool], Album
 
-    attach_function :mock_albumbrowse_create, [:error, :int, Album, Artist, :int, :array, :int, :array, :string, :albumbrowse_complete_cb, :userdata], AlbumBrowse
-    attach_function :mock_artistbrowse_create, [:error, :int, Artist, :int, :array, :int, :array, :int, :array, :int, :array, :int, :array, :string, :artistbrowse_type, :artistbrowse_complete_cb, :userdata], ArtistBrowse
+    attach_function :mock_albumbrowse_create, [:error, :int, :album, :artist, :int, :array, :int, :array, :string, :albumbrowse_complete_cb, :userdata], AlbumBrowse
+    attach_function :mock_artistbrowse_create, [:error, :int, :artist, :int, :array, :int, :array, :int, :array, :int, :array, :int, :array, :string, :artistbrowse_type, :artistbrowse_complete_cb, :userdata], ArtistBrowse
     attach_function :mock_toplistbrowse_create, [:error, :int, :int, :array, :int, :array, :int, :array], ToplistBrowse
 
-    attach_function :mock_playlist_create, [:string, :bool, User, :bool, :string, ImageID, :bool, :uint, Subscribers, :bool, :playlist_offline_status, :int, :int, :array], Playlist
-    attach_function :mock_playlistcontainer_create, [User, :bool, :int, :array, PlaylistContainerCallbacks, :userdata], PlaylistContainer
+    attach_function :mock_playlist_create, [:string, :bool, :user, :bool, :string, ImageID, :bool, :uint, Subscribers, :bool, :playlist_offline_status, :int, :int, :array], Playlist
+    attach_function :mock_playlistcontainer_create, [:user, :bool, :int, :array, PlaylistContainerCallbacks, :userdata], PlaylistContainer
     attach_function :mock_search_create, [:error, :string, :string, :int, :int, :array, :int, :int, :array, :int, :int, :array, :int, :int, :array, :search_complete_cb, :userdata], Search
-    attach_function :mock_subscribers, [:int, :array], Subscribers
+    attach_function :mock_subscribers, [:int, :array], Subscribers.by_ref
 
     # mocked accessors
     attach_function :mock_playlist_get_autolink_tracks, [Playlist], :bool

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: hallon
 version: !ruby/object:Gem::Version
-  version: 0.18.1
-  prerelease: 
+  version: 0.18.2
 platform: ruby
 authors:
 - Kim Burgestrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2013-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ref
+  name: weak_observable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,99 +27,59 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: spotify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 12.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 12.5.1
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
+        version: '1.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: 
 email: kim@burgestrand.se
 executables: []
@@ -137,7 +94,6 @@ files:
 - .yardopts
 - CHANGELOG.md
 - Gemfile
-- LICENSE.txt
 - QUIRKS
 - README.markdown
 - Rakefile
@@ -275,30 +231,26 @@ files:
 homepage: http://github.com/Burgestrand/Hallon
 licenses:
 - X11 License
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1548945263546800899
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hallon allows you to write Ruby applications utilizing the official Spotify
   C API.
 test_files:

data/LICENSE.txt

@@ -1,21 +0,0 @@
-Copyright 2012 Kim Burgestrand. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, this list of
-      conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright notice, this list
-      of conditions and the following disclaimer in the documentation and/or other materials
-      provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY KIM BURGESTRAND ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KIM BURGESTRAND OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.