spotify 7.0.2 → 7.0.3

data/lib/spotify.rb

@@ -46,9 +46,9 @@ module Spotify
   # @attr [Fixnum] sample_rate
   # @attr [Fixnum] channels
   class AudioFormat < FFI::Struct
-    layout :sample_type => :sampletype,
-           :sample_rate => :int,
-           :channels => :int
+    layout :sample_type, :sampletype,
+           :sample_rate, :int,
+           :channels, :int
   end
 
   # FFI::Struct for Audio Buffer Stats.
@@ -56,8 +56,8 @@ module Spotify
   # @attr [Fixnum] samples
   # @attr [Fixnum] stutter
   class AudioBufferStats < FFI::Struct
-    layout :samples => :int,
-           :stutter => :int
+    layout :samples, :int,
+           :stutter, :int
   end
   
   #
@@ -107,21 +107,21 @@ module Spotify
   # @attr [callback(:pointer):void] stop_playback
   # @attr [callback(:pointer, :pointer):void] get_audio_buffer_stats
   class SessionCallbacks < FFI::Struct
-    layout :logged_in => callback([ :pointer, :error ], :void),
-           :logged_out => callback([ :pointer ], :void),
-           :metadata_updated => callback([ :pointer ], :void),
-           :connection_error => callback([ :pointer, :error ], :void),
-           :message_to_user => callback([ :pointer, :string ], :void),
-           :notify_main_thread => callback([ :pointer ], :void),
-           :music_delivery => callback([ :pointer, :pointer, :pointer, :int ], :int),
-           :play_token_lost => callback([ :pointer ], :void),
-           :log_message => callback([ :pointer, :string ], :void),
-           :end_of_track => callback([ :pointer ], :void),
-           :streaming_error => callback([ :pointer, :error ], :void),
-           :userinfo_updated => callback([ :pointer ], :void),
-           :start_playback => callback([ :pointer ], :void),
-           :stop_playback => callback([ :pointer ], :void),
-           :get_audio_buffer_stats => callback([ :pointer, :pointer ], :void)
+    layout :logged_in, callback([ :pointer, :error ], :void),
+           :logged_out, callback([ :pointer ], :void),
+           :metadata_updated, callback([ :pointer ], :void),
+           :connection_error, callback([ :pointer, :error ], :void),
+           :message_to_user, callback([ :pointer, :string ], :void),
+           :notify_main_thread, callback([ :pointer ], :void),
+           :music_delivery, callback([ :pointer, :pointer, :pointer, :int ], :int),
+           :play_token_lost, callback([ :pointer ], :void),
+           :log_message, callback([ :pointer, :string ], :void),
+           :end_of_track, callback([ :pointer ], :void),
+           :streaming_error, callback([ :pointer, :error ], :void),
+           :userinfo_updated, callback([ :pointer ], :void),
+           :start_playback, callback([ :pointer ], :void),
+           :stop_playback, callback([ :pointer ], :void),
+           :get_audio_buffer_stats, callback([ :pointer, :pointer ], :void)
   end
 
   # FFI::Struct for Session configuration.
@@ -136,17 +136,17 @@ module Spotify
   # @attr [Fixnum] dont_save_metadata_for_playlists
   # @attr [Fixnum] initially_unload_playlists
   class SessionConfig < FFI::Struct
-    layout :api_version => :int,
-           :cache_location => :pointer,
-           :settings_location => :pointer,
-           :application_key => :pointer,
-           :application_key_size => :size_t,
-           :user_agent => :pointer,
-           :callbacks => :pointer,
-           :userdata => :pointer,
-           :compress_playlists => :int,
-           :dont_save_metadata_for_playlists => :int,
-           :initially_unload_playlists => :int    
+    layout :api_version, :int,
+           :cache_location, :pointer,
+           :settings_location, :pointer,
+           :application_key, :pointer,
+           :application_key_size, :size_t,
+           :user_agent, :pointer,
+           :callbacks, :pointer,
+           :userdata, :pointer,
+           :compress_playlists, :int,
+           :dont_save_metadata_for_playlists, :int,
+           :initially_unload_playlists, :int    
   end
   
   #
@@ -280,26 +280,26 @@ module Spotify
   # Searching
   # 
   # @see http://developer.spotify.com/en/libspotify/docs/group__search.html
-  enum :radio_genre, {
-    :alt_pop_rock => 0x1,
-    :blues        => 0x2,
-    :country      => 0x4,
-    :disco        => 0x8,
-    :funk         => 0x10,
-    :hard_rock    => 0x20,
-    :heavy_metal  => 0x40,
-    :rap          => 0x80,
-    :house        => 0x100,
-    :jazz         => 0x200,
-    :new_wave     => 0x400,
-    :rnb          => 0x800,
-    :pop          => 0x1000,
-    :punk         => 0x2000,
-    :reggae       => 0x4000,
-    :pop_rock     => 0x8000,
-    :soul         => 0x10000,
-    :techno       => 0x20000
-  }.flatten
+  enum :radio_genre, [
+    :alt_pop_rock, 0x1,
+    :blues       , 0x2,
+    :country     , 0x4,
+    :disco       , 0x8,
+    :funk        , 0x10,
+    :hard_rock   , 0x20,
+    :heavy_metal , 0x40,
+    :rap         , 0x80,
+    :house       , 0x100,
+    :jazz        , 0x200,
+    :new_wave    , 0x400,
+    :rnb         , 0x800,
+    :pop         , 0x1000,
+    :punk        , 0x2000,
+    :reggae      , 0x4000,
+    :pop_rock    , 0x8000,
+    :soul        , 0x10000,
+    :techno      , 0x20000
+  ]
 
 
   attach_function :search_create, :sp_search_create, [ :pointer, :string, :int, :int, :int, :int, :int, :int, callback([:pointer, :pointer], :void), :pointer ], :pointer
@@ -374,19 +374,19 @@ module Spotify
   # @attr [callback(:pointer, :int, :string, :pointer):void] track_message_changed
   # @attr [callback(:pointer, :pointer):void] subscribers_changed
   class PlaylistCallbacks < FFI::Struct
-    layout :tracks_added => callback([ :pointer, :pointer, :int, :int, :pointer ], :void),
-           :tracks_removed => callback([ :pointer, :pointer, :int, :pointer ], :void),
-           :tracks_moved => callback([ :pointer, :pointer, :int, :int, :pointer ], :void),
-           :playlist_renamed => callback([ :pointer, :pointer ], :void),
-           :playlist_state_changed => callback([ :pointer, :pointer ], :void),
-           :playlist_update_in_progress => callback([ :pointer, :bool, :pointer ], :void),
-           :playlist_metadata_updated => callback([ :pointer, :pointer ], :void),
-           :track_created_changed => callback([ :pointer, :int, :pointer, :int, :pointer ], :void),
-           :track_seen_changed => callback([ :pointer, :int, :bool, :pointer ], :void),
-           :description_changed => callback([ :pointer, :string, :pointer ], :void),
-           :image_changed => callback([ :pointer, :pointer, :pointer ], :void),
-           :track_message_changed => callback([ :pointer, :int, :string, :pointer ], :void),
-           :subscribers_changed => callback([ :pointer, :pointer ], :void)
+    layout :tracks_added, callback([ :pointer, :pointer, :int, :int, :pointer ], :void),
+           :tracks_removed, callback([ :pointer, :pointer, :int, :pointer ], :void),
+           :tracks_moved, callback([ :pointer, :pointer, :int, :int, :pointer ], :void),
+           :playlist_renamed, callback([ :pointer, :pointer ], :void),
+           :playlist_state_changed, callback([ :pointer, :pointer ], :void),
+           :playlist_update_in_progress, callback([ :pointer, :bool, :pointer ], :void),
+           :playlist_metadata_updated, callback([ :pointer, :pointer ], :void),
+           :track_created_changed, callback([ :pointer, :int, :pointer, :int, :pointer ], :void),
+           :track_seen_changed, callback([ :pointer, :int, :bool, :pointer ], :void),
+           :description_changed, callback([ :pointer, :string, :pointer ], :void),
+           :image_changed, callback([ :pointer, :pointer, :pointer ], :void),
+           :track_message_changed, callback([ :pointer, :int, :string, :pointer ], :void),
+           :subscribers_changed, callback([ :pointer, :pointer ], :void)
   end
 
   # FFI::Struct for Subscribers of a Playlist.
@@ -394,8 +394,8 @@ module Spotify
   # @attr [Fixnum] count
   # @attr [Pointer<String>] subscribers
   class Subscribers < FFI::Struct
-    layout :count => :uint,
-           :subscribers => :pointer # array of count strings
+    layout :count, :uint,
+           :subscribers, :pointer # array of count strings
   end
 
   #
@@ -425,10 +425,10 @@ module Spotify
   # @attr [callback(:pointer, :pointer, :int, :int, :pointer):void] playlist_moved
   # @attr [callback(:pointer, :pointer):void] container_loaded
   class PlaylistContainerCallbacks < FFI::Struct
-    layout :playlist_added => callback([ :pointer, :pointer, :int, :pointer ], :void),
-           :playlist_removed => callback([ :pointer, :pointer, :int, :pointer ], :void),
-           :playlist_moved => callback([ :pointer, :pointer, :int, :int, :pointer ], :void),
-           :container_loaded => callback([ :pointer, :pointer ], :void)
+    layout :playlist_added, callback([ :pointer, :pointer, :int, :pointer ], :void),
+           :playlist_removed, callback([ :pointer, :pointer, :int, :pointer ], :void),
+           :playlist_moved, callback([ :pointer, :pointer, :int, :int, :pointer ], :void),
+           :container_loaded, callback([ :pointer, :pointer ], :void)
   end
   
   #

data/lib/spotify/version.rb

@@ -1,3 +1,3 @@
 module Spotify
-  VERSION = [7, 0, 2].join('.')
+  VERSION = [7, 0, 3].join('.')
 end

data/spec/spotify_spec.rb

@@ -90,7 +90,7 @@ describe "enums" do
       end
       
       it "should match the definition" do
-        attached_enum.symbol_map.sort_by { |k, v| -k.size }.each do |(key, value)|
+        attached_enum.symbol_map.sort_by { |k, v| -k.to_s.size }.each do |(key, value)|
           k, v = original_enum.find { |x, _| x.match key.to_s }
           v.must_equal value.to_s
           original_enum.delete(k)

metadata

@@ -1,103 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spotify
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 7
-  - 0
-  - 2
-  version: 7.0.2
+version: !ruby/object:Gem::Version
+  version: 7.0.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Kim Burgestrand
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-18 00:00:00 +02:00
+date: 2011-04-18 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153189120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153189120
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2153188700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rbgccxml
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153188700
+- !ruby/object:Gem::Dependency
+  name: rbgccxml
+  requirement: &2153188240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153188240
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2153187740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153187740
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2153187240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *2153187240
 description: 
-email: 
+email:
 - kim@burgestrand.se
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - Gemfile
@@ -111,36 +87,31 @@ files:
 - spotify.gemspec
 has_rdoc: true
 homepage: https://github.com/Burgestrand/libspotify-ruby
-licenses: 
+licenses:
 - X11 License
 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 
-      segments: 
-      - 0
-      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 
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - libspotify, v0.0.7
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Bare-bones Ruby bindings for libspotify
-test_files: 
+test_files:
 - spec/api.h
 - spec/spotify_spec.rb