hallon 0.16.0 → 0.17.0

data/spec/hallon/session_spec.rb

@@ -38,6 +38,20 @@ describe Hallon::Session do
     it "should fail on a huge user agent (> 255 characters)" do
       expect { create_session(true, :user_agent => 'a' * 256) }.to raise_error(ArgumentError)
     end
+
+    it "should extract the proxy username and password" do
+      session = create_session(true, :proxy => "socks5://kim:pass@batm.an")
+      session.options[:proxy].should eq "socks5://batm.an"
+      session.options[:proxy_username].should eq "kim"
+      session.options[:proxy_password].should eq "pass"
+    end
+
+    it "should not override the given username or password" do
+      session = create_session(true, :proxy => "socks5://kim:pass@batm.an", :proxy_username => "batman", :proxy_password => "hidden identity")
+      session.options[:proxy].should eq "socks5://batm.an"
+      session.options[:proxy_username].should eq "batman"
+      session.options[:proxy_password].should eq "hidden identity"
+    end
   end
 
   describe "options" do
@@ -70,7 +84,7 @@ describe Hallon::Session do
 
   describe "#relogin" do
     it "should raise if no credentials have been saved" do
-      expect { session.relogin }.to raise_error(Hallon::Error)
+      expect { session.relogin }.to raise_error(Spotify::Error)
     end
 
     it "should not raise if credentials have been saved" do
@@ -81,6 +95,17 @@ describe Hallon::Session do
     end
   end
 
+  describe "#username" do
+    it "should be nil if no username is stored in libspotify" do
+      session.username.should eq nil
+    end
+
+    it "should retrieve the current user’s name if logged in" do
+      session.login 'Kim', 'pass'
+      session.username.should eq 'Kim'
+    end
+  end
+
   describe "#remembered_user" do
     it "should be nil if no username is stored in libspotify" do
       session.remembered_user.should eq nil
@@ -160,6 +185,15 @@ describe Hallon::Session do
     end
   end
 
+  describe "#private= and #private?" do
+    it "sets session privacy mode" do
+      session.private = false
+      session.should_not be_private
+      session.private = true
+      session.should be_private
+    end
+  end
+
   describe "#cache_size" do
     it "should default to 0" do
       session.cache_size.should eq 0
@@ -247,13 +281,13 @@ describe Hallon::Session do
 
   describe "#offline_bitrate=" do
     it "should not resync unless explicitly told so" do
-      Spotify.should_receive(:session_preferred_offline_bitrate).with(session.pointer, :'96k', false)
+      Spotify.should_receive(:session_preferred_offline_bitrate).with(session.pointer, :'96k', false).and_return(:ok)
       session.offline_bitrate = :'96k'
     end
 
     it "should resync if asked to" do
-      Spotify.should_receive(:session_preferred_offline_bitrate).with(session.pointer, :'96k', true)
-      session.offline_bitrate = :'96k', true
+      Spotify.should_receive(:session_preferred_offline_bitrate).with(session.pointer, :'96k', true).and_return(:ok)
+      session.offline_bitrate = :'96k', :resync
     end
 
     it "should fail given an invalid value" do

data/spec/hallon/spotify_spec.rb

@@ -1,49 +1,4 @@
 describe Spotify do
-  describe "a wrapped function" do
-    let(:null_pointer) { FFI::Pointer.new(0) }
-    subject do
-      Spotify.should_receive(:session_user).and_return(null_pointer)
-      Spotify.session_user!(session)
-    end
-
-    it "should return a Spotify::Pointer" do
-      subject.should be_a Spotify::Pointer
-    end
-
-    it "should not add ref when the result is nil" do
-      Spotify.should_not_receive(:user_add_ref)
-      subject.should be_null
-    end
-  end
-
-  describe Spotify::Pointer do
-    describe ".typechecks?" do
-      it "should return false for non-spotify pointers" do
-        Spotify::Pointer.typechecks?(double(type: :artist), :artist).should be_false
-      end
-
-      it "should be false for pointers of another type if type is given" do
-        Spotify::Pointer.typechecks?(mock_album, :artist).should be_false
-      end
-
-      it "should be true for a pointer of the correct type" do
-        Spotify::Pointer.typechecks?(mock_album, :album).should be_true
-      end
-    end
-
-    describe "garbage collection" do
-      let(:my_pointer) { FFI::Pointer.new(1) }
-
-      it "should work" do
-        # GC tests are a bit funky, but as long as we garbage_release at least once, then
-        # we can assume our GC works properly, but up the stakes just for the sake of it
-        Spotify.should_receive(:garbage_release).with(my_pointer).at_least(3).times
-        5.times { Spotify::Pointer.new(my_pointer, :garbage, false) }
-        5.times { GC.start; sleep 0.01 }
-      end
-    end
-  end
-
   describe Spotify::CallbackStruct do
     subject { Spotify::SessionCallbacks.new }
     it { should be_a Spotify::CallbackStruct }

data/spec/mockspotify.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'ffi'
 require 'rbconfig'
 
@@ -14,9 +15,12 @@ module Spotify
     end
 
     # Overriden to not throw an error on missing functions.
-    def attach_function(*)
+    def attach_function(name, *)
       super
     rescue FFI::NotFoundError => e
+      define_singleton_method(name) do |*args|
+        raise FFI::NotFoundError, "#{name} has not been defined"
+      end
       warn "#{e.message}" if $VERBOSE
     end
   end
@@ -79,6 +83,7 @@ module Spotify
 
   # mocked accessors
   attach_function :mocksp_playlist_get_autolink_tracks, [:playlist], :bool
+  attach_function :mocksp_session_set_is_scrobbling_possible, [:session, :social_provider, :bool], :void
 
   $VERBOSE = old_verbose
 end

data/spec/spec_helper.rb

@@ -3,11 +3,10 @@
 require 'bundler'
 Bundler.setup
 
-begin
-  require 'cover_me'
-rescue LoadError
-  # ignore, only for development, it’s in the Gemfile
-end
+SimpleCov.start do
+  add_filter 'spec/'
+  add_filter 'vendor/'
+end if defined?(SimpleCov)
 
 require 'mockspotify'
 require 'hallon'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ref
-  requirement: &70343012134120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70343012134120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: spotify
-  requirement: &70343012131940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 11.0.2
+        version: 12.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70343012131940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 12.0.2
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70343012130580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70343012130580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70343012128740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70343012128740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70343012127800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343012127800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70343012126280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343012126280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70343012278320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343012278320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: kim@burgestrand.se
 executables: []
@@ -144,6 +179,7 @@ files:
 - lib/hallon/player.rb
 - lib/hallon/playlist.rb
 - lib/hallon/playlist_container.rb
+- lib/hallon/scrobbler.rb
 - lib/hallon/search.rb
 - lib/hallon/session.rb
 - lib/hallon/toplist.rb
@@ -180,6 +216,7 @@ files:
 - spec/hallon/player_spec.rb
 - spec/hallon/playlist_container_spec.rb
 - spec/hallon/playlist_spec.rb
+- spec/hallon/scrobbler_spec.rb
 - spec/hallon/search_spec.rb
 - spec/hallon/session_spec.rb
 - spec/hallon/spotify_spec.rb
@@ -198,7 +235,6 @@ files:
 - spec/support/audio_driver_mock.rb
 - spec/support/common_objects.rb
 - spec/support/context_logged_in.rb
-- spec/support/cover_me.rb
 - spec/support/enumerable_comparison.rb
 - spec/support/image_mocks.rb
 - spec/support/playlist_container_mocks.rb
@@ -254,9 +290,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 995209467900648626
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Hallon allows you to write Ruby applications utilizing the official Spotify
@@ -292,6 +331,7 @@ test_files:
 - spec/hallon/player_spec.rb
 - spec/hallon/playlist_container_spec.rb
 - spec/hallon/playlist_spec.rb
+- spec/hallon/scrobbler_spec.rb
 - spec/hallon/search_spec.rb
 - spec/hallon/session_spec.rb
 - spec/hallon/spotify_spec.rb
@@ -310,7 +350,6 @@ test_files:
 - spec/support/audio_driver_mock.rb
 - spec/support/common_objects.rb
 - spec/support/context_logged_in.rb
-- spec/support/cover_me.rb
 - spec/support/enumerable_comparison.rb
 - spec/support/image_mocks.rb
 - spec/support/playlist_container_mocks.rb

data/spec/support/cover_me.rb

@@ -1,7 +0,0 @@
-if defined?(CoverMe)
-  CoverMe.config do |c|
-    c.project.root = Dir.pwd
-    c.at_exit      = proc {} # default hook opens coverage/ folder, ANNOYING!
-    c.file_pattern = [%r"#{c.project.root}/lib/.+\.rb"]
-  end
-end