hallon 0.12.0 → 0.13.0

data/spec/support/audio_driver_mock.rb

@@ -0,0 +1,23 @@
+class AudioDriverMock
+  attr_reader :state
+
+  # Expected implementation:
+  attr_accessor :format
+
+  def stream(&block)
+    @stream = block if block_given?
+    @stream
+  end
+
+  def play
+    @state = :play
+  end
+
+  def pause
+    @state = :pause
+  end
+
+  def stop
+    @state = :stop
+  end
+end

data/spec/support/context_stub_session.rb

@@ -0,0 +1,5 @@
+shared_context "stubbed session", :stub_session do
+  before do
+    subject.stub(:session).and_return(session)
+  end
+end

data/spec/support/shared_for_linkable_objects.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 shared_examples_for "a Linkable object" do
+  subject { described_class.new(spotify_uri) }
+
   describe "instantiation" do
     let(:spotify_pointer) do
       ptr_type    = Hallon::Link.new(spotify_uri).type
@@ -30,10 +32,28 @@ shared_examples_for "a Linkable object" do
   end
 
   describe "#to_link" do
-    subject { described_class.new(spotify_uri) }
-
     it "should return a valid link" do
       subject.to_link.should eq Hallon::Link.new(spotify_uri)
     end
   end
+
+  describe "#to_str" do
+    it "should return the spotify URI for this object" do
+      subject.to_str.should eq spotify_uri
+    end
+
+    it "should return an empty string if #to_link fails" do
+      subject.should_receive(:to_link).and_return(nil)
+      subject.to_str.should eq ""
+    end
+  end
+
+  describe "#===" do
+    it "should compare the objects by their links if both are Linkable" do
+      mock = double
+      mock.stub(:to_link).and_return(subject.to_link)
+
+      (subject === mock).should be_true
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-25 00:00:00.000000000 Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ref
-  requirement: &70217238288320 !ruby/object:Gem::Requirement
+  requirement: &70259239927580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70217238288320
+  version_requirements: *70259239927580
 - !ruby/object:Gem::Dependency
   name: spotify
-  requirement: &70217238287820 !ruby/object:Gem::Requirement
+  requirement: &70259239926980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 10.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70217238287820
+  version_requirements: *70259239926980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70217238287340 !ruby/object:Gem::Requirement
+  requirement: &70259239926460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70217238287340
+  version_requirements: *70259239926460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70217238286700 !ruby/object:Gem::Requirement
+  requirement: &70259239926000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70217238286700
+  version_requirements: *70259239926000
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70217238286240 !ruby/object:Gem::Requirement
+  requirement: &70259239925600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70217238286240
+  version_requirements: *70259239925600
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70217238285560 !ruby/object:Gem::Requirement
+  requirement: &70259239925140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70217238285560
+  version_requirements: *70259239925140
 description: 
 email: kim@burgestrand.se
 executables: []
@@ -97,6 +97,7 @@ files:
 - Rakefile
 - dev/login.rb
 - examples/adding_tracks_to_playlist.rb
+- examples/audio_driver.rb
 - examples/logging_in.rb
 - examples/playing_audio.rb
 - examples/printing_link_information.rb
@@ -107,6 +108,8 @@ files:
 - lib/hallon/album_browse.rb
 - lib/hallon/artist.rb
 - lib/hallon/artist_browse.rb
+- lib/hallon/audio_driver.rb
+- lib/hallon/audio_queue.rb
 - lib/hallon/base.rb
 - lib/hallon/enumerator.rb
 - lib/hallon/error.rb
@@ -129,7 +132,6 @@ files:
 - lib/hallon/player.rb
 - lib/hallon/playlist.rb
 - lib/hallon/playlist_container.rb
-- lib/hallon/queue.rb
 - lib/hallon/search.rb
 - lib/hallon/session.rb
 - lib/hallon/toplist.rb
@@ -142,6 +144,7 @@ files:
 - spec/hallon/album_spec.rb
 - spec/hallon/artist_browse_spec.rb
 - spec/hallon/artist_spec.rb
+- spec/hallon/audio_queue_spec.rb
 - spec/hallon/base_spec.rb
 - spec/hallon/enumerator_spec.rb
 - spec/hallon/error_spec.rb
@@ -163,7 +166,6 @@ files:
 - spec/hallon/player_spec.rb
 - spec/hallon/playlist_container_spec.rb
 - spec/hallon/playlist_spec.rb
-- spec/hallon/queue_spec.rb
 - spec/hallon/search_spec.rb
 - spec/hallon/session_spec.rb
 - spec/hallon/spotify_spec.rb
@@ -176,8 +178,10 @@ files:
 - spec/mockspotify/mockspotify_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitkeep
+- spec/support/audio_driver_mock.rb
 - spec/support/common_objects.rb
 - spec/support/context_logged_in.rb
+- spec/support/context_stub_session.rb
 - spec/support/cover_me.rb
 - spec/support/enumerable_comparison.rb
 - spec/support/shared_for_callbacks.rb
@@ -215,9 +219,9 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ~>
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.8'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -226,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Hallon allows you to write Ruby applications utilizing the official Spotify
@@ -238,6 +242,7 @@ test_files:
 - spec/hallon/album_spec.rb
 - spec/hallon/artist_browse_spec.rb
 - spec/hallon/artist_spec.rb
+- spec/hallon/audio_queue_spec.rb
 - spec/hallon/base_spec.rb
 - spec/hallon/enumerator_spec.rb
 - spec/hallon/error_spec.rb
@@ -259,7 +264,6 @@ test_files:
 - spec/hallon/player_spec.rb
 - spec/hallon/playlist_container_spec.rb
 - spec/hallon/playlist_spec.rb
-- spec/hallon/queue_spec.rb
 - spec/hallon/search_spec.rb
 - spec/hallon/session_spec.rb
 - spec/hallon/spotify_spec.rb
@@ -272,8 +276,10 @@ test_files:
 - spec/mockspotify/mockspotify_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitkeep
+- spec/support/audio_driver_mock.rb
 - spec/support/common_objects.rb
 - spec/support/context_logged_in.rb
+- spec/support/context_stub_session.rb
 - spec/support/cover_me.rb
 - spec/support/enumerable_comparison.rb
 - spec/support/shared_for_callbacks.rb

data/lib/hallon/queue.rb

@@ -1,71 +0,0 @@
-# coding: utf-8
-require 'thread'
-
-module Hallon
-  # Hallon::Queue is a non-blocking (well, not entirely) sized FIFO queue.
-  #
-  # You initialize the queue with a `max_size`, and then push data to it.
-  # For every push operation, the Queue will tell you how much of your data
-  # it could consume. If the queue becomes full, it won’t accept any more
-  # data (and will return 0 on the #push operation) until you pull some data
-  # out of it with #pop.
-  #
-  # Hallon::Queue is useful for handling {Hallon::Observable::Session#music_delivery_callback}.
-  #
-  # @example
-  #   queue = Hallon::Queue.new(4)
-  #   queue.push([1, 2]) # => 2
-  #   queue.push([3]) # => 1
-  #   queue.push([4, 5, 6]) # => 1
-  #   queue.push([5, 6]) # => 0
-  #   queue.pop(1) # => [1]
-  #   queue.push([5, 6]) # => 1
-  #   queue.pop # => [2, 3, 4, 5]
-  class Queue
-    attr_reader :max_size
-
-    # @param [Integer] max_size
-    def initialize(max_size)
-      @mutex    = Mutex.new
-      @condv    = ConditionVariable.new
-
-      @max_size = max_size
-      @samples  = []
-    end
-
-    # @param [#take] data
-    # @return [Integer] how much of the data that was added to the queue
-    def push(samples)
-      synchronize do
-        can_accept  = max_size - size
-        new_samples = samples.take(can_accept)
-
-        @samples.concat(new_samples)
-        @condv.signal
-
-        new_samples.size
-      end
-    end
-
-    # @note If the queue is empty, this operation will block until data is available.
-    # @param [Integer] num_samples max number of samples to pop off the queue
-    # @return [Array] data, where data.size might be less than num_samples but never more
-    def pop(num_samples = max_size)
-      synchronize do
-        @condv.wait(@mutex) while @samples.empty?
-        @samples.shift(num_samples)
-      end
-    end
-
-    # @return [Integer] number of samples in buffer
-    def size
-      @samples.size
-    end
-
-    private
-      # @yield (merely a wrapper over @mutex.synchronize)
-      def synchronize
-        @mutex.synchronize { return yield }
-      end
-  end
-end

data/spec/hallon/queue_spec.rb

@@ -1,35 +0,0 @@
-# coding: utf-8
-describe Hallon::Queue do
-  let(:queue) { Hallon::Queue.new(4) }
-  subject { queue }
-
-  it "should conform to the example specification of its’ documentation" do
-    queue.push([1, 2]).should eq 2
-    queue.push([3]).should eq 1
-    queue.push([4, 5, 6]).should eq 1
-    queue.push([5, 6]).should eq 0
-    queue.pop(1).should eq [1]
-    queue.push([5, 6]).should eq 1
-    queue.pop.should eq [2, 3, 4, 5]
-  end
-
-  describe "#pop" do
-    it "should not block if the queue is not empty" do
-      queue.push([1, 2])
-
-      start = Time.now
-      queue.pop.should eq [1, 2]
-      (Time.now - start).should be_within(0.001).of(0)
-    end
-
-    it "should block if the queue is empty" do
-      queue.size.should be_zero
-
-      # I could mock out ConditionVariable and Mutex, but where’s the fun in that?
-      start = Time.now
-      Thread.start { sleep 0.2; queue.push([1]) }
-      queue.pop.should eq [1]
-      (Time.now - start).should be_within(0.08).of(0.2)
-    end
-  end
-end