hallon 0.3.0 → 0.4.0

data/CHANGELOG

@@ -1,6 +1,17 @@
 Hallon’s Changelog
 ==================
 
+NEXT
+------------------
+- No longer uses autotest as development dependency
+- Add Hallon::Base class
+- Cleaned up specs to use same mocks everywhere
+- Album subsystem support (except for #cover and #artist)
+- Add optional parameter to have Image#id return raw id
+- Make Hallon::URI match image URIs
+- Allow Image.new to accept an image id
+- Add Album#cover
+
 v0.3.0
 ------------------
 - Don’t use bundler for :spec and :test rake tasks

data/hallon.gemspec

@@ -19,11 +19,9 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '~> 1.8'
 
   gem.add_dependency 'spotify', '~> 8.0.5'
-  gem.add_development_dependency 'mockspotify', '~> 0.1.7'
+  gem.add_development_dependency 'mockspotify', '~> 0.1.8'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2'
-  gem.add_development_dependency 'autotest-standalone'
-  gem.add_development_dependency 'autotest-growl'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rdiscount'
 end

data/lib/hallon.rb

@@ -10,11 +10,13 @@ require 'hallon/linkable'
 
 require 'hallon/version'
 require 'hallon/error'
+require 'hallon/base'
 require 'hallon/session'
 require 'hallon/link'
 require 'hallon/user'
 require 'hallon/image'
 require 'hallon/track'
+require 'hallon/album'
 
 # The Hallon module wraps around all Hallon objects to avoid polluting
 # the global namespace. To start using Hallon, you most likely want to
@@ -28,9 +30,10 @@ module Hallon
   # @example
   #   Hallon::URI === "spotify:user:burgestrand" # => true
   URI = /(spotify:(?:
-    (?:artist|album|track|user:[^:]+:playlist):[a-zA-Z0-9]+
+    (?:artist|album|track|user:[^:]+:playlist):\h+
     |user:[^:]+
-    |search:(?:[-\w$\.+!*'(),]+|%[a-fA-F0-9]{2})+
+    |search:(?:[-\w$\.+!*'(),]+|%\h{2})+
+    |image:\h{40}
     ))
   /x
 end

data/lib/hallon/album.rb

@@ -0,0 +1,77 @@
+module Hallon
+  # Albums are non-detailed metadata about actual music albums.
+  #
+  # To retrieve copyrights, album review and tracks you need to browse
+  # the album, which is not currently supported by Hallon. You can retrieve
+  # the {#pointer} use the raw Spotify API on it, however.
+  #
+  # @note All metadata methods require the album to be {Album#loaded?}
+  #
+  # @see http://developer.spotify.com/en/libspotify/docs/group__album.html
+  class Album < Base
+    def self.types
+      Spotify.enum_type(:albumtype).to_hash
+    end
+
+    extend Linkable
+
+    from_link :as_album
+    to_link   :from_album
+
+    # Construct an Album from a link.
+    #
+    # @param [String, Link, FFI::Pointer] link
+    def initialize(link)
+      @pointer = Spotify::Pointer.new from_link(link), :album, true
+    end
+
+    # Name of album.
+    #
+    # @return [String]
+    def name
+      Spotify.album_name(@pointer)
+    end
+
+    # Release year of album.
+    #
+    # @return [Integer]
+    def year
+      Spotify.album_year(@pointer)
+    end
+
+    # Retrieve album type.
+    #
+    # @return [Symbol] one of {Album.types}
+    def type
+      Spotify.album_type(@pointer)
+    end
+
+    # True if the album is available from the current session.
+    #
+    # @return [Boolean]
+    def available?
+      Spotify.album_is_available(@pointer)
+    end
+
+    # True if album has been loaded.
+    #
+    # @return [Boolean]
+    def loaded?
+      Spotify.album_is_loaded(@pointer)
+    end
+
+    # Retrieve album cover art.
+    #
+    # @return [Image]
+    def cover(session = Session.instance)
+      image_id = Spotify.album_cover(@pointer)
+      Hallon::Image.new(image_id.read_string(20), session) unless image_id.null?
+    end
+
+    # Not yet implemented.
+    def artist
+      return if (ptr = Spotify.album_artist(@pointer)).null?
+      raise NotImplementedError
+    end
+  end
+end

data/lib/hallon/base.rb

@@ -0,0 +1,20 @@
+module Hallon
+  # All objects in Hallon are mere representations of Spotify objects.
+  # Hallon::Base covers basic functionality shared by all of these.
+  class Base
+    # Underlying FFI pointer.
+    #
+    # @return [FFI::Pointer]
+    attr_reader :pointer
+
+    # True if both objects represent the *same* object.
+    #
+    # @param [Object] other
+    # @return [Boolean]
+    def ==(other)
+      pointer == other.pointer
+    rescue NoMethodError
+      super
+    end
+  end
+end

data/lib/hallon/image.rb

@@ -3,25 +3,37 @@ module Hallon
   # Images are JPEG images that can be linked to and saved.
   #
   # @see http://developer.spotify.com/en/libspotify/docs/group__image.html
-  class Image
+  class Image < Base
     extend Linkable
 
-    from_link(:image) do |link, session|
-      Spotify::image_create_from_link(session.pointer, link)
+    from_link :as_image do |link, session|
+      Spotify::image_create_from_link(session, link)
     end
 
-    to_link(:image)
+    to_link :from_image
 
     # Image triggers `:load` when loaded
     include Hallon::Observable
 
     # Create a new instance of an Image.
     #
-    # @param [String, Link, FFI::Pointer] link
+    # @param [String, Link, FFI::Pointer] link link or image id
     # @param [Hallon::Session] session
     def initialize(link, session = Session.instance)
+      if link.is_a?(String)
+        link = to_id($1) if link =~ %r|image[:/](\h{40})|
+
+        FFI::MemoryPointer.new(:char, 20) do |ptr|
+          ptr.write_bytes link
+          link = Spotify.image_create(session.pointer, ptr)
+        end
+      else
+        link = from_link(link, session.pointer)
+      end
+
+      @pointer = Spotify::Pointer.new link, :image
+
       @callback = proc { trigger(:load) }
-      @pointer  = Spotify::Pointer.new from_link(link, session), :image
       Spotify::image_add_load_callback(@pointer, @callback, nil)
 
       # TODO: remove load_callback when @pointer is released
@@ -50,11 +62,13 @@ module Hallon
       Spotify::image_format(@pointer)
     end
 
-    # Retrieve image ID as a hexadecimal string.
+    # Retrieve image ID as a string.
     #
+    # @param [Boolean] raw true if you want the image id as a hexadecimal string
     # @return [String]
-    def id
-      Spotify::image_image_id(@pointer).read_string(20).unpack('H*')[0]
+    def id(raw = false)
+      id = Spotify::image_image_id(@pointer).read_string(20)
+      raw ? id : to_hex(id)
     end
 
     # Raw image data as a binary encoded string.
@@ -66,5 +80,18 @@ module Hallon
         return data.read_bytes(size.read_size_t)
       end
     end
+
+    protected
+      # @param [String]
+      # @return [String]
+      def to_hex(id)
+        id.unpack('H40')[0]
+      end
+
+      # @param [String]
+      # @return [String]
+      def to_id(hex)
+        [hex].pack('H40')
+      end
   end
 end

data/lib/hallon/link.rb

@@ -3,9 +3,7 @@ module Hallon
   # Wraps Spotify URIs in a class, giving access to methods performable on them.
   #
   # @see http://developer.spotify.com/en/libspotify/docs/group__link.html
-  class Link
-    include Comparable
-
+  class Link < Base
     # True if the given Spotify URI is valid (parsable by libspotify).
     #
     # @param (see Hallon::Link#initialize)
@@ -71,22 +69,13 @@ module Hallon
       "http://open.spotify.com/%s" % to_str[8..-1].gsub(':', '/')
     end
 
-    # Compare this Link to another object
-    #
-    # @param [#to_str] other
-    # @return [Integer]
-    def <=>(other)
-      if other.respond_to?(:to_str)
-        to_str <=> other.to_str
-      end
-    end
-
     # True if this link equals `other.to_str`
     #
     # @param [#to_str] other
     # @return [Boolean]
     def ==(other)
-      (self <=> other) == 0
+      return super unless other.respond_to?(:to_str)
+      to_str == other.to_str
     end
 
     # String representation of the given Link.
@@ -96,7 +85,7 @@ module Hallon
       "<#{self.class.name} #{to_str}>"
     end
 
-    # Retrieve the underlying pointer.
+    # Retrieve the underlying pointer. Used by {Linkable}.
     #
     # @param [Symbol] expected_type if given, makes sure the link is of this type
     # @return [FFI::Pointer]
@@ -105,7 +94,7 @@ module Hallon
       unless type == expected_type
         raise ArgumentError, "expected #{expected_type} link, but it is of type #{type}"
       end if expected_type
-      @pointer
+      super()
     end
   end
 end

data/lib/hallon/linkable.rb

@@ -6,47 +6,53 @@ module Hallon
   # @note Linkable is not part of Hallons’ public API.
   # @private
   module Linkable
-    # These are extended onto a class when {Linkable} is included.
-    include Forwardable
-
-    # Creates `from_link` class & instance method which’ll convert a link to a pointer
+    # Defines `#from_link`, used in converting a link to a pointer.
     #
-    # @example
-    #   # Creates instance method `from_link(link)`
-    #   from_link(:playlist) { |link| Spotify::link_as_playlist(link) }
+    # @overload from_link(type)
+    #   Convert from a link using said method.
+    #
+    #   @example
+    #     from_link :as_album # => Spotify.link_as_album(pointer, *args)
+    #
+    #   @param [Symbol] as_object link conversion method, formatted `as_type`
+    #
+    # @overload from_link(type) { |*args| … }
+    #   Use the given block to convert the link.
+    #
+    #   @example
+    #     from_link :profile do |pointer|
+    #       Spotify.link_as_user(pointer)
+    #     end
+    #
+    #   @param [#to_s] type link type
+    #   @yield [link, *args] called when conversion is needed from Link pointer
+    #   @yieldparam [Hallon::Link] link
+    #   @yieldparam *args any extra arguments given to `#from_link`
     #
-    # @param [Symbol] type expected link type
-    # @yield [link, *args] called when conversion is needed from Link pointer
-    # @yieldparam [Hallon::Link] link
-    # @yieldparam *args any extra arguments given to `#from_link`
     # @see Link#pointer
-    def from_link(type)
-      define_singleton_method(:from_link) do |link, *args|
+    def from_link(as_object, &block)
+      block ||= Spotify.method(:"link_#{as_object}")
+      type    = as_object.to_s[/^(as_)?([^_]+)/, 2].to_sym
+
+      define_method(:from_link) do |link, *args|
         if link.is_a? FFI::Pointer then link else
-          yield Link.new(link).pointer(type), *args
+          block.call Link.new(link).pointer(type), *args
         end
       end
-
-      def_delegators 'self.class', :from_link
     end
 
-    # Defines `to_link` class & instance method.
+    # Defines `#to_link` method, which converts the the current object to a {Link}
     #
     # @example
-    #   to_link(:artist)
+    #   to_link :from_artist # => Spotify.link_create_from_artist
     #
-    # @note Calls down to `Spotify::link_create_from_#{type}(@pointer)`
-    # @param [Symbol] type object kind
+    # @param [Symbol] cmethod object kind
     # @return [Link]
-    def to_link(type)
-      define_singleton_method(:to_link) do |ptr, *args|
-        link = Spotify.__send__(:"link_create_from_#{type}", ptr, *args)
+    def to_link(cmethod)
+      define_method(:to_link) do |*args|
+        link = Spotify.__send__(:"link_create_#{cmethod}", @pointer, *args)
         Hallon::Link.new(link)
       end
-
-      define_method(:to_link) do |*args, &block|
-        self.class.to_link(@pointer, *args, &block)
-      end
     end
   end
 end

data/lib/hallon/session.rb

@@ -9,17 +9,12 @@ module Hallon
   # with Spotify before using them.
   #
   # @see https://developer.spotify.com/en/libspotify/docs/group__session.html
-  class Session
+  class Session < Base
     # The options Hallon used at {Session#initialize}.
     #
     # @return [Hash]
     attr_reader :options
 
-    # Underlying Spotify pointer.
-    #
-    # @return [FFI::Pointer]
-    attr_reader :pointer
-
     # libspotify only allows one session per process.
     include Singleton
     class << self

data/lib/hallon/track.rb

@@ -4,18 +4,21 @@ module Hallon
   # are browsable entities that can also be played by streaming.
   #
   # @see http://developer.spotify.com/en/libspotify/docs/group__track.html
-  class Track
+  class Track < Base
     extend Linkable
 
-    from_link(:track) { |link, ptr| Spotify.link_as_track_and_offset(link, ptr) }
-    to_link(:track)
+    from_link :as_track_and_offset
+    to_link   :from_track
 
+    # Overriden to use default parameter.
+    # @see #to_link
+    alias_method :_to_link, :to_link
     # Create a Link to the current track and offset in seconds.
     #
     # @param [Float] offset offset into track in seconds
     # @return [Hallon::Link]
     def to_link(offset = offset)
-      self.class.to_link(@pointer, (offset * 1000).to_i)
+      _to_link (offset * 1000).to_i
     end
 
     # Offset into track in seconds this track was created with.
@@ -23,12 +26,6 @@ module Hallon
     # @return [Rational]
     attr_reader :offset
 
-    # Underlying Spotify pointer.
-    #
-    # @private
-    # @return [FFI::Pointer]
-    attr_reader :pointer
-
     # Construct a new Track instance.
     #
     # @param [String, Link, FFI::Pointer] link

data/lib/hallon/user.rb

@@ -6,17 +6,19 @@ module Hallon
   # status between users.
   #
   # @see http://developer.spotify.com/en/libspotify/docs/group__user.html
-  class User
+  class User < Base
     extend Linkable
 
     # @macro [attach] from_link
     #   Given a Link, get its’ underlying pointer.
     #
     #   @method to_link
-    #   @scope  class
+    #   @scope  instance
     #   @param  [String, Hallon::Link, FFI::Pointer] link
     #   @return [FFI::Pointer]
-    from_link(:profile) { |link| Spotify::link_as_user(link) }
+    from_link :profile do |link|
+      Spotify::link_as_user(link)
+    end
 
     # @macro [attach] to_link
     #   Create a Link to the current object.
@@ -24,10 +26,7 @@ module Hallon
     #   @method to_link
     #   @scope  instance
     #   @return [Hallon::Link]
-    to_link(:user)
-
-    # Used by {Session#relation_type?}
-    attr_reader :pointer
+    to_link :from_user
 
     # Construct a new instance of User.
     #

data/lib/hallon/version.rb

@@ -3,5 +3,5 @@ module Hallon
   # Current release version of Hallon
   #
   # @see http://semver.org/
-  VERSION = [0, 3, 0].join('.')
+  VERSION = [0, 4, 0].join('.')
 end

data/spec/fixtures/example_uris.rb

@@ -1,12 +1,13 @@
 def example_uris
   {
     "spotify:search:omg%2bwtf%2b%ef%a3%bf%c3%9f%e2%88%82%2bbbq" => :search,
-    "spotify:track:3oN2Kq1h07LSSBSLYQp0Ns" => :track,
     "spotify:album:6I58XCEkOnfUVsfpDehzlQ" => :album,
     "spotify:artist:6MF9fzBmfXghAz953czmBC" => :artist,
     "spotify:user:burgestrand:playlist:4nQnbGi4kALbME9csEqdW2" => :playlist,
     "spotify:user:burgestrand" => :profile,
     "spotify:user:burgestrand:starred" => :starred,
-    "spotify:track:7N2Vc8u56VGA4KUrGbikC2#1:40" => :track
+    "spotify:image:c78f091482e555bd2ffacfcd9cbdc0714b221663" => :image,
+    "spotify:track:3oN2Kq1h07LSSBSLYQp0Ns" => :track,
+    "spotify:track:7N2Vc8u56VGA4KUrGbikC2#1:40" => :track,
   }
 end

data/spec/hallon/album_spec.rb

@@ -0,0 +1,44 @@
+# coding: utf-8
+describe Hallon::Album do
+  subject { Hallon::Album.new(mock_album) }
+
+  its(:name) { should eq "Finally Woken" }
+  its(:year) { should be 2004 }
+  its(:type) { should be :single }
+
+  it { should be_available }
+  it { should be_loaded }
+
+  describe "artist" do
+    it "should be nil if there is no artist" do
+      Spotify.should_receive(:album_artist).and_return(null_pointer)
+      subject.artist.should be_nil
+    end
+
+    it "should be an artist if it exists"
+  end
+
+  describe "cover" do
+    before { Hallon::Session.should_receive(:instance).and_return(session) }
+
+    it "should be nil if there is no image" do
+      Spotify.should_receive(:album_cover).and_return(null_pointer)
+      subject.cover.should be_nil
+    end
+
+    it "should be an image if it exists" do
+      FFI::MemoryPointer.new(:string, 20) do |ptr|
+        ptr.write_string(mock_image_id)
+
+        Spotify.should_receive(:album_cover).and_return(ptr)
+        subject.cover.id.should eq mock_image_hex
+      end
+    end
+  end
+
+  describe ".types" do
+    it "should not be an empty hash" do
+      Hallon::Album.types.should_not be_empty
+    end
+  end
+end

data/spec/hallon/image_spec.rb

@@ -1,29 +1,20 @@
 # coding: utf-8
-require 'ostruct'
-
 describe Hallon::Image, :session => true do
-  let(:session) { OpenStruct.new(:pointer => nil) }
-
   describe "an image instance" do
     let(:image) do
       Hallon::Session.should_receive(:instance).and_return session
-
-      image = Spotify.mock_image(
-        "3ad93423add99766e02d563605c6e76ed2b0e450".gsub(/../) { |x| x.to_i(16).chr },
-        :jpeg,
-        File.size(fixture_image_path),
-        File.read(fixture_image_path),
-        :ok
-      )
-
-      Hallon::Image.new(image)
+      Hallon::Image.new(mock_image)
     end
 
     subject { image }
 
     its(:status) { should be :ok }
     its(:format) { should be :jpeg }
-    its(:id) { should eq "3ad93423add99766e02d563605c6e76ed2b0e450" }
+
+    describe "id" do
+      specify("in hex") { subject.id.should eq mock_image_hex }
+      specify("raw") { subject.id(true).should eq mock_image_id }
+    end
 
     describe "#data" do
       subject { image.data }
@@ -45,9 +36,23 @@ describe Hallon::Image, :session => true do
     end
   end
 
+  context "created from an url" do
+    subject { Hallon::Image.new("http://open.spotify.com/image/c78f091482e555bd2ffacfcd9cbdc0714b221663", session) }
+    its(:id) { should eq "c78f091482e555bd2ffacfcd9cbdc0714b221663" }
+  end
+
   context "created from an uri" do
-    let(:image) { Hallon::Image.new("spotify:image:c78f091482e555bd2ffacfcd9cbdc0714b221663", session) }
-    subject { image }
+    subject { Hallon::Image.new("spotify:image:c78f091482e555bd2ffacfcd9cbdc0714b221663", session) }
+    its(:id) { should eq "c78f091482e555bd2ffacfcd9cbdc0714b221663" }
+  end
+
+  context "created from an id" do
+    subject { Hallon::Image.new(mock_image_id, session) }
+    its(:id) { should eq mock_image_hex }
+  end
+
+  context "created from a link" do
+    subject { Hallon::Image.new(Hallon::Link.new("spotify:image:c78f091482e555bd2ffacfcd9cbdc0714b221663"), session) }
     its(:id) { should eq "c78f091482e555bd2ffacfcd9cbdc0714b221663" }
   end
 

data/spec/hallon/link_spec.rb

@@ -78,7 +78,20 @@ describe Hallon::Link do
     end
 
     it "should not fail when #to_str is unavailable" do
-      subject.should_not eq Object.new
+      object = Object.new
+      object.should_not respond_to :to_str
+      subject.should_not eq object
+    end
+
+    it "should compare underlying pointers if #to_str is unavailable" do
+      object = Hallon::Link.new(FFI::Pointer.new(subject.pointer))
+
+      def object.respond_to?(o)
+        return false if o == :to_str
+        super
+      end
+
+      subject.should eq object
     end
   end
 end

data/spec/hallon/linkable_spec.rb

@@ -1,43 +1,41 @@
 describe Hallon::Linkable do
-  it "should define the #from_link method" do
+  let(:klass) do
     klass = Class.new
-    klass.should_not respond_to :from_link
-
-    klass.instance_exec do
+    klass.instance_eval do
       extend Hallon::Linkable
-      from_link :foobar
     end
+    klass
+  end
+
+  let(:object) { klass.new }
 
-    klass.should respond_to :from_link
+  before(:each) { Spotify.stub(:link_as_search) }
+
+  it "should define the #from_link method" do
+    object.should_not respond_to :from_link
+    klass.from_link(:as_search)
+    object.should respond_to :from_link
   end
 
   describe "#from_link" do
-    it "should call the given block if necessary" do
-      called = false
-      klass = Class.new
+    it "should call the appropriate Spotify function" do
+      Spotify.should_receive(:link_as_search)
 
-      klass.instance_exec do
-        extend Hallon::Linkable
-        from_link(nil) { called = true }
-      end
-
-      klass.from_link("spotify:search:whatever")
-      called.should eq true
+      klass.from_link(:as_search)
+      object.from_link 'spotify:search:moo'
     end
 
-    it "should pass extra parameters to the defining block" do
-      klass = Class.new
-
-      link = mock
-      link.stub(:pointer)
-      Hallon::Link.stub(:new => link)
+    it "should call the given block if necessary" do
+      Spotify.should_not_receive(:link_as_search)
 
-      klass.instance_exec do
-        extend Hallon::Linkable
-        from_link(nil) { |link, *args| args }
-      end
+      called = false
+      klass.from_link(:as_search) { called = true }
+      expect { object.from_link 'spotify:search:whatever' }.to change { called }
+    end
 
-      klass.from_link("spotify:user:burgestrand", :cool, 5).should eq [:cool, 5]
+    it "should pass extra parameters to the defining block" do
+      klass.from_link(:search) { |link, *args| args }
+      object.from_link("spotify:search:burgestrand", :cool, 5).should eq [:cool, 5]
     end
   end
 end

data/spec/hallon/track_spec.rb

@@ -1,28 +1,8 @@
 # coding: utf-8
 describe Hallon::Track, :session => true do
-  let(:artist) { Spotify.mock_artist("Artist", true) }
-  let(:album)  { Spotify.mock_album("Album", artist, 2011, nil, :unknown, true, true) }
-
-  subject do
-    artists = FFI::MemoryPointer.new(:pointer)
-    artists.write_pointer artist
-
-    track = Spotify.mock_track(
-      "Elucteene", # name
-      1, artists, # num_artists, artists
-      album, # album
-      123_456, # duration
-      42,  # popularity
-      2, 7, # disc, index
-      0, true  # error, loaded
-    )
-
-    artists.free
-
-    Hallon::Track.new(track)
-  end
+  subject { Hallon::Track.new(mock_track) }
 
-  its(:name)   { should eq "Elucteene" }
+  its(:name)   { should eq "They" }
   its(:disc)   { should be 2 }
   its(:index)  { should be 7 }
   its(:status) { should be :ok }
@@ -30,34 +10,35 @@ describe Hallon::Track, :session => true do
   its(:duration) { should eq 123.456 }
   its(:popularity) { should eq 0.42 }
 
-  xit("artist.name") { should eq "Artist" }
-  xit("album.name")  { should eq "Album"  }
+  its("album.name")  { should eq "Finally Woken"  }
+  pending("artist.name") { should eq "Jem" }
 
   it { should be_loaded }
 
   describe "album" do
     it "should be an album when there is one" do
-
+      subject.album.should eq Hallon::Album.new(mock_album)
     end
 
     it "should be nil when there isn’t one" do
       Spotify.should_receive(:track_album).and_return(FFI::Pointer.new(0))
-
       subject.album.should be_nil
     end
   end
 
   describe "to_link" do
+    before(:each) { Hallon::Link.stub(:new) }
+
     it "should pass the current offset by default" do
+      Spotify.should_receive(:link_create_from_track).with(subject.pointer, 10_000)
       subject.should_receive(:offset).and_return(10)
-      described_class.should_receive(:to_link).with(subject.pointer, 10_000)
 
       subject.to_link
     end
 
     it "should accept offset as parameter" do
+      Spotify.should_receive(:link_create_from_track).with(subject.pointer, 1_337_000)
       subject.should_not_receive(:offset)
-      described_class.should_receive(:to_link).with(subject.pointer, 1_337_000)
 
       subject.to_link(1337)
     end
@@ -78,12 +59,12 @@ describe Hallon::Track, :session => true do
 
   describe "a local track" do
     subject do
-      Hallon::Track.local "Title", "Artist", "Coolio", 100
+      Hallon::Track.local "Nissy", "Emmy", "Coolio", 100
     end
 
-    its(:name) { should eq "Title" }
-    pending("artist.name") { should eq "Artist" }
-    pending("album.name") { should eq "Album" }
+    its(:name) { should eq "Nissy" }
+    its("album.name") { should eq "Coolio" }
+    pending("artist.name") { should eq "Emmy" }
     its(:duration) { should eq 0.1 }
   end
 end

data/spec/hallon/user_spec.rb

@@ -28,16 +28,7 @@ describe Hallon::User do
   end
 
   describe "an instance", :logged_in => true do
-    let(:user) do
-      user = Spotify.mock_user(
-        "burgestrand", "Burgestrand", "Kim Burgestrand",
-        "https://secure.gravatar.com/avatar/b67b73b5b1fd84119ec788b1c3df02ad",
-        :none, true
-      )
-      Hallon::User.new(user)
-    end
-
-    subject { user }
+    let(:user) { Hallon::User.new(mock_user) }
 
     describe "#to_link" do
       it "should return a Link for this user" do

data/spec/support/common_objects.rb

@@ -0,0 +1,18 @@
+RSpec::Core::ExampleGroup.instance_eval do
+  let(:mock_artist) { Spotify.mock_artist("Jem", true) }
+  let(:mock_album)  { Spotify.mock_album("Finally Woken", mock_artist, 2004, "DEADBEEFDEADBEEFDEAD", :single, true, true) }
+  let(:mock_user)   { Spotify.mock_user("burgestrand", "Burgestrand", "Kim Burgestrand", "https://secure.gravatar.com/avatar/b67b73b5b1fd84119ec788b1c3df02ad", :none, true) }
+  let(:mock_image)  { Spotify.mock_image(mock_image_id, :jpeg, File.size(fixture_image_path), File.read(fixture_image_path), :ok) }
+  let(:mock_track) do
+    track = nil
+    FFI::MemoryPointer.new(:pointer) do |ary|
+      ary.write_pointer mock_artist
+      track = Spotify.mock_track("They", 1, ary, mock_album, 123_456, 42, 2, 7, 0, true)
+    end
+    track
+  end
+
+  let(:mock_image_hex) { "3ad93423add99766e02d563605c6e76ed2b0e450" }
+  let(:mock_image_id)  { ":\xD94#\xAD\xD9\x97f\xE0-V6\x05\xC6\xE7n\xD2\xB0\xE4P" }
+  let(:null_pointer)   { FFI::Pointer.new(0) }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-25 00:00:00.000000000Z
+date: 2011-07-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spotify
-  requirement: &2161051120 !ruby/object:Gem::Requirement
+  requirement: &2156138200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 8.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2161051120
+  version_requirements: *2156138200
 - !ruby/object:Gem::Dependency
   name: mockspotify
-  requirement: &2161050620 !ruby/object:Gem::Requirement
+  requirement: &2156137500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.8
   type: :development
   prerelease: false
-  version_requirements: *2161050620
+  version_requirements: *2156137500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161050020 !ruby/object:Gem::Requirement
+  requirement: &2156136740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *2161050020
+  version_requirements: *2156136740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161049380 !ruby/object:Gem::Requirement
+  requirement: &2156136060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,32 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2161049380
-- !ruby/object:Gem::Dependency
-  name: autotest-standalone
-  requirement: &2161048660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2161048660
-- !ruby/object:Gem::Dependency
-  name: autotest-growl
-  requirement: &2161047680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2161047680
+  version_requirements: *2156136060
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2161046920 !ruby/object:Gem::Requirement
+  requirement: &2156135380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161046920
+  version_requirements: *2156135380
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2161044780 !ruby/object:Gem::Requirement
+  requirement: &2156134600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161044780
+  version_requirements: *2156134600
 description: 
 email: kim@burgestrand.se
 executables: []
@@ -121,6 +99,8 @@ files:
 - examples/printing_link_information.rb
 - hallon.gemspec
 - lib/hallon.rb
+- lib/hallon/album.rb
+- lib/hallon/base.rb
 - lib/hallon/error.rb
 - lib/hallon/ext/ffi.rb
 - lib/hallon/ext/object.rb
@@ -136,6 +116,7 @@ files:
 - lib/hallon/version.rb
 - spec/fixtures/example_uris.rb
 - spec/fixtures/pink_cover.jpg
+- spec/hallon/album_spec.rb
 - spec/hallon/error_spec.rb
 - spec/hallon/ffi_spec.rb
 - spec/hallon/hallon_spec.rb
@@ -149,6 +130,7 @@ files:
 - spec/hallon/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitkeep
+- spec/support/common_objects.rb
 - spec/support/context_logged_in.rb
 - spec/support/cover_me.rb
 - spec/support/shared_for_loadable_objects.rb
@@ -180,6 +162,7 @@ summary: Delicious Ruby bindings to the official Spotify API
 test_files:
 - spec/fixtures/example_uris.rb
 - spec/fixtures/pink_cover.jpg
+- spec/hallon/album_spec.rb
 - spec/hallon/error_spec.rb
 - spec/hallon/ffi_spec.rb
 - spec/hallon/hallon_spec.rb
@@ -193,6 +176,7 @@ test_files:
 - spec/hallon/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/.gitkeep
+- spec/support/common_objects.rb
 - spec/support/context_logged_in.rb
 - spec/support/cover_me.rb
 - spec/support/shared_for_loadable_objects.rb