spotify 8.0.2 → 8.0.5

data/lib/spotify/version.rb

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

data/spec/spotify_spec.rb

@@ -4,26 +4,28 @@ rescue LoadError
   retry if require 'rubygems'
 end
 
+require 'minitest/autorun'
+
 #
 # Hooking FFI for extra introspection
-# 
+#
 require 'ffi'
 
 module Spotify
   extend FFI::Library
   extend self
-  
+
   def attach_function(name, func, arguments, returns = nil, options = nil)
     args = [name, func, arguments, returns, options].compact
     args.unshift name.to_s if func.is_a?(Array)
-    
+
     hargs = [:name, :func, :args, :returns].zip args
     @attached_methods ||= {}
     @attached_methods[name.to_s] = hash = Hash[hargs]
-    
+
     super
   end
-  
+
   attr_reader :attached_methods
 end
 
@@ -31,44 +33,105 @@ Bundler.require(:default, :development)
 
 #
 # Utility
-# 
+#
 API_H_PATH = File.expand_path('../api.h', __FILE__)
 API_H_SRC  = File.read API_H_PATH
 API_H_XML  = RbGCCXML.parse(API_H_PATH)
 
 #
 # General
-# 
+#
 describe Spotify do
   describe "VERSION" do
     it "should be defined" do
       defined?(Spotify::VERSION).must_equal "constant"
     end
-    
+
     it "should be the same version as in api.h" do
       spotify_version = API_H_SRC.match(/#define\s+SPOTIFY_API_VERSION\s+(\d+)/)[1]
       Spotify::API_VERSION.must_equal spotify_version.to_i
     end
   end
+
+  describe Spotify::SessionConfig do
+    it "allows setting boolean values with bools" do
+      subject = Spotify::SessionConfig.new
+
+      subject[:compress_playlists].must_equal false
+      subject[:dont_save_metadata_for_playlists].must_equal false
+      subject[:initially_unload_playlists].must_equal false
+
+      subject[:compress_playlists] = true
+      subject[:dont_save_metadata_for_playlists] = true
+      subject[:initially_unload_playlists] = true
+
+      subject[:compress_playlists].must_equal true
+      subject[:dont_save_metadata_for_playlists].must_equal true
+      subject[:initially_unload_playlists].must_equal true
+    end
+  end
+
+  describe Spotify::OfflineSyncStatus do
+    it "allows setting boolean values with bools" do
+      subject = Spotify::OfflineSyncStatus.new
+
+      subject[:syncing].must_equal false
+      subject[:syncing] = true
+      subject[:syncing].must_equal true
+    end
+  end
 end
 
 describe "functions" do
   API_H_XML.functions.each do |func|
     next unless func["name"] =~ /\Asp_/
     attached_name = func["name"].sub(/\Asp_/, '')
-    
+
+    def type_of(type, return_type = false)
+      return case type.to_cpp
+        when "const char*"
+          :string
+        when /\A(::)?(char|int|size_t|sp_session\*)\*/
+          return_type ? :pointer : :buffer_out
+        when /::(.+_cb)\*/
+          $1.to_sym
+        else :pointer
+      end if type.is_a?(RbGCCXML::PointerType)
+
+      case type["name"]
+      when "unsigned int"
+        :uint
+      else
+        type["name"].sub(/\Asp_/, '').to_sym
+      end
+    end
+
     describe func["name"] do
       it "should be attached" do
         Spotify.must_respond_to attached_name
       end
-      
+
       it "should expect the correct number of arguments" do
         Spotify.attached_methods[attached_name][:args].count.
           must_equal func.arguments.count
       end
-      
-      # it "should expect the correct types of arguments"
-      # it "should return the correct type"
+
+      it "should return the correct type" do
+        current = Spotify.attached_methods[attached_name][:returns]
+        actual  = type_of(func.return_type, true)
+
+        Spotify.find_type(current).must_equal Spotify.find_type(actual)
+      end
+
+      it "should expect the correct types of arguments" do
+        current = Spotify.attached_methods[attached_name][:args]
+        actual  = func.arguments.map { |arg| type_of(arg.cpp_type) }
+
+        current = current.map { |x| Spotify.find_type(x) }
+        actual  = actual.map  { |x| Spotify.find_type(x) }
+
+        current.must_equal actual
+      end
     end
   end
 end
@@ -76,26 +139,26 @@ end
 describe "enums" do
   API_H_XML.enumerations.each do |enum|
     attached_enum = Spotify.enum_type enum["name"].sub(/\Asp_/, '').to_sym
-    original_enum = enum.values.map { |v| [v["name"].downcase, v["init"]] } # TODO: SP_BITRATE_X => X
-    
+    original_enum = enum.values.map { |v| [v["name"].downcase, v["init"]] }
+
     describe enum["name"] do
       it "should exist" do
         attached_enum.wont_be_nil
       end
-      
+
       it "should match the definition" do
         attached_enum_map = attached_enum.symbol_map
         original_enum.each do |(name, value)|
           a_name, a_value = attached_enum_map.find { |(n, v)| name.match n.to_s }
           attached_enum_map.delete(a_name)
-          
+
           unless a_value.to_s == value.to_s
               p enum["name"]
               p [name, value]
               p [a_name, a_value]
               puts
           end
-          
+
           a_value.to_s.must_equal value
         end
       end
@@ -106,13 +169,13 @@ end
 describe "structs" do
   API_H_XML.structs.each do |struct|
     next if struct["incomplete"]
-    
+
     attached_struct = Spotify.constants.find do |const|
       struct["name"].gsub('_', '').match(/#{const}/i)
     end
-    
+
     attached_members = Spotify.const_get(attached_struct).members.map(&:to_s)
-    
+
     describe struct["name"] do
       it "should contain the same attributes" do
         struct.variables.map(&:name).each do |member|
@@ -121,4 +184,4 @@ describe "structs" do
       end
     end
   end
-end
+end

data/spotify.gemspec

@@ -8,20 +8,19 @@ Gem::Specification.new do |gem|
   gem.authors     = ["Kim Burgestrand"]
   gem.email       = ['kim@burgestrand.se']
   gem.license     = 'X11 License'
-  
+
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = []
   gem.require_paths = ["lib"]
-  
+
   gem.version     = Spotify::VERSION
   gem.platform    = Gem::Platform::RUBY
-  
+
   gem.requirements << 'libspotify, v0.0.8'
   gem.add_dependency 'ffi', '~> 1.0.0'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rbgccxml'
-  gem.add_development_dependency 'turn'
   gem.add_development_dependency 'minitest', '~> 2.0.0'
   gem.add_development_dependency 'bundler', '~> 1.0.0'
-end
+end

metadata

@@ -1,135 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spotify
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 8.0.5
   prerelease: 
-  version: 8.0.2
 platform: ruby
-authors: 
+authors:
 - Kim Burgestrand
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-30 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-07-11 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2151880520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !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: *2151880520
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2151879600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        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: *2151879600
+- !ruby/object:Gem::Dependency
+  name: rbgccxml
+  requirement: &2151878420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: turn
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2151878420
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2151877500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2151877500
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2151876460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *2151876460
 description: 
-email: 
+email:
 - kim@burgestrand.se
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
-- .yardopts
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - lib/spotify.rb
 - lib/spotify/version.rb
-- lib/yard-ffi-plugin.rb
 - spec/api.h
 - spec/spotify_spec.rb
 - 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 
-      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 
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - libspotify, v0.0.8
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Bare-bones Ruby bindings for libspotify
-test_files: 
+test_files:
 - spec/api.h
 - spec/spotify_spec.rb

data/.yardopts

@@ -1 +0,0 @@
--e ./lib/yard-ffi-plugin.rb

data/lib/yard-ffi-plugin.rb

@@ -1,44 +0,0 @@
-class FFIHandler < YARD::Handlers::Ruby::Base
-  include YARD::Tags
-  
-  handles method_call(:attach_function)
-  
-  process do
-    # Extract parameters
-    parameters = statement.parameters.children
-    
-    # Extract actual arguments
-    parameters.unshift parameters[0] if parameters[1].type == :array
-    
-    # TODO: Resolve all arguments (if they are variables)
-    
-    # Normalize all arguments to string values
-    literalizer = proc do |node|
-      case node.type
-      when :array # args: [:type, :type]
-        node[0].map(&literalizer)
-      when :fcall # callback([:type, :type], :type)
-        name = node.jump(:ident)[0]
-        args, rett = node.jump(:arg_paren)[0].children.map(&literalizer)
-        "%s(%s):%s" % [name, args.join(', '), rett]
-      else
-        node.jump(:tstring_content, :ident)[0].sub("void", "nil")
-      end
-    end
-    parameters.map!(&literalizer)
-    
-    # Now, we have all we need!
-    name, cfunc, args, returns = parameters
-    
-    # Register the newly created method
-    method = register MethodObject.new(namespace, name, :class)
-    
-    # Construct the final docstring
-    overload = OverloadTag.new(:overload, "#{name}(#{args.join(', ')})")
-    method.docstring.add_tag overload
-    args.each do |type|
-      overload.docstring.add_tag Tag.new(:param, nil, type)
-    end
-    overload.docstring.add_tag Tag.new(:return, nil, returns)
-  end
-end