spotify 9.0.1 → 9.1.0

data/lib/spotify.rb

@@ -497,10 +497,18 @@ module Spotify
   # FFI::Struct for Subscribers of a Playlist.
   #
   # @attr [Fixnum] count
-  # @attr [Pointer<String>] subscribers
+  # @attr [Array<Pointer<String>>] subscribers
   class Subscribers < FFI::Struct
     layout :count, :uint,
-           :subscribers, :array # array of count strings
+           :subscribers, [:pointer, 1] # array of pointers to strings
+
+    # Redefined, as the layout of the Struct can only be determined
+    # at run-time.
+    #
+    # @param [FFI::Pointer] pointer
+    def initialize(pointer)
+      super(pointer, :count, :uint, :subscribers, [:pointer, pointer.read_uint])
+    end
   end
 
   #

data/lib/spotify/version.rb

@@ -1,4 +1,4 @@
 module Spotify
   # See README for versioning policy.
-  VERSION = [9, 0, 1].join('.')
+  VERSION = [9, 1, 0].join('.')
 end

data/spec/spotify_spec.rb

@@ -181,4 +181,26 @@ describe "structs" do
       end
     end
   end
+
+  describe Spotify::Subscribers do
+    it "should create the subscribers array using count" do
+      # Memory looks like this:
+      #
+      # 00 00 00 00 <- count of subscribers
+      # 00 00 00 00 <- pointer to subscriber 1
+      # …… …… …… ……
+      # 00 00 00 00 <- pointer to subscriber n
+      real_struct = FFI::MemoryPointer.new(:char, 24)
+      real_struct.put_uint(0, 2)
+      subscribers = %w[a bb].map { |x| FFI::MemoryPointer.from_string(x) }
+      real_struct.put_array_of_pointer(8, subscribers)
+
+      struct = Spotify::Subscribers.new(real_struct)
+      struct[:count].must_equal 2
+      struct[:subscribers].size.must_equal 2
+      struct[:subscribers][0].read_string.must_equal "a"
+      struct[:subscribers][1].read_string.must_equal "bb"
+      proc { struct[:subscribers][2] }.must_raise IndexError
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spotify
 version: !ruby/object:Gem::Version
-  version: 9.0.1
+  version: 9.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-24 00:00:00.000000000Z
+date: 2011-10-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2156717700 !ruby/object:Gem::Requirement
+  requirement: &2153532820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156717700
+  version_requirements: *2153532820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156717280 !ruby/object:Gem::Requirement
+  requirement: &2153532100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156717280
+  version_requirements: *2153532100
 - !ruby/object:Gem::Dependency
   name: rbgccxml
-  requirement: &2156716800 !ruby/object:Gem::Requirement
+  requirement: &2153531500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156716800
+  version_requirements: *2153531500
 - !ruby/object:Gem::Dependency
   name: gccxml_gem
-  requirement: &2156716300 !ruby/object:Gem::Requirement
+  requirement: &2153530920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '!='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.3
   type: :development
   prerelease: false
-  version_requirements: *2156716300
+  version_requirements: *2153530920
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156715780 !ruby/object:Gem::Requirement
+  requirement: &2153530280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2156715780
+  version_requirements: *2153530280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156715300 !ruby/object:Gem::Requirement
+  requirement: &2153529780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2156715300
+  version_requirements: *2153529780
 description: 
 email:
 - kim@burgestrand.se