hallon 0.2.0 → 0.2.1

data/.rspec

@@ -2,6 +2,4 @@
 -fs
 -Ilib
 -Ispec
---fail-fast
---require cover_me
 --require spec_helper

data/CHANGELOG

@@ -1,6 +1,20 @@
 Hallon’s Changelog
 ==================
 
+v0.2.1
+------------------
+- Fix compatibility with v1.8
+
+v0.2.0
+------------------
+- Alias Session#process_events_on to Session#wait_until
+- Have Error.maybe_raise return error code
+- Use mockspotify gem (https://rubygems.org/gems/mockspotify) for testing
+
+v0.1.1
+------------------
+Don’t show the README in the gem description.
+
 v0.1.0
 ------------------
 Initial, first, release! This version is merely made to

data/Gemfile

@@ -1,2 +1,4 @@
 source :rubygems
-gemspec
+gemspec
+
+gem 'cover_me', :platform => :ruby_19

data/Rakefile

@@ -8,7 +8,9 @@ require 'yard'
 YARD::Rake::YardocTask.new
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
+RSpec::Core::RakeTask.new('spec') do |task|
+  task.ruby_opts = '-W2'
+end
 
 desc "Run the full test suite and generate a coverage report"
 task 'spec:cov' => ['clean', 'spec:full'] do

data/hallon.gemspec

@@ -16,15 +16,14 @@ Gem::Specification.new do |gem|
 
   gem.version     = Hallon::VERSION
   gem.platform    = Gem::Platform::RUBY
-  gem.required_ruby_version = '~> 1.9'
+  gem.required_ruby_version = '~> 1.8'
 
   gem.add_dependency 'spotify', '~> 8.0.5'
-  gem.add_development_dependency 'mockspotify', '~> 0.1.2'
+  gem.add_development_dependency 'mockspotify', '~> 0.1.4'
   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 'cover_me'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'rdiscount'
 end

data/lib/hallon.rb

@@ -2,6 +2,7 @@
 require 'spotify'
 require 'hallon/ext/spotify'
 require 'hallon/ext/ffi'
+require 'hallon/ext/object'
 
 require 'hallon/synchronizable'
 require 'hallon/observable'

data/lib/hallon/error.rb

@@ -43,7 +43,7 @@ module Hallon
         return symbol if symbol == :ok
 
         message = []
-        message << "[#{symbol.upcase}]"
+        message << "[#{symbol.to_s.upcase}]"
         message << explain(error)
         message << "(#{error})"
         raise Hallon::Error, message.join(' ')

data/lib/hallon/ext/ffi.rb

@@ -18,9 +18,7 @@ module FFI
       #
       # @param [Integer] count how many to read
       # @return a type of appropriate size
-      define_method(:read_size_t) do |*args|
-        public_send("read_#{type}", *args)
-      end
+      alias_method :read_size_t, "read_#{type}"
     end
   end
 end

data/lib/hallon/ext/object.rb

@@ -0,0 +1,13 @@
+class Object
+  unless defined?(singleton_class)
+    def singleton_class
+      class << self; self; end
+    end
+  end
+
+  unless method_defined?(:define_singleton_method)
+    def define_singleton_method(*args, &b)
+      singleton_class.send(:define_method, *args, &b)
+    end
+  end
+end

data/lib/hallon/link.rb

@@ -76,7 +76,17 @@ module Hallon
     # @param [#to_str] other
     # @return [Integer]
     def <=>(other)
-      to_str <=> String.try_convert(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
     end
 
     # String representation of the given Link.

data/lib/hallon/version.rb

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

data/spec/hallon/ffi_spec.rb

@@ -1,5 +1,5 @@
 describe FFI::Pointer do
   it "should have a #read_size_t" do
-    described_class.instance_methods.should include :read_size_t
+    described_class.method_defined?(:read_size_t).should be_true
   end
 end

data/spec/hallon/image_spec.rb

@@ -2,35 +2,53 @@
 require 'ostruct'
 
 describe Hallon::Image, :session => true do
-  let(:session) { double.stub(:pointer).and_return(nil) }
-  let(:image) do
-    Hallon::Session.should_receive(:instance).and_return double.stub(:pointer => nil)
-
-    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)
-  end
+  let(:session) { OpenStruct.new(:pointer => nil) }
 
-  subject { image }
+  describe "an image instance" do
+    let(:image) do
+      Hallon::Session.should_receive(:instance).and_return session
 
-  its(:status) { should be :ok }
-  its(:format) { should be :jpeg }
-  its(:id) { should eq "3ad93423add99766e02d563605c6e76ed2b0e450" }
+      image = Spotify.mock_image(
+        "3ad93423add99766e02d563605c6e76ed2b0e450".gsub(/../) { |x| x.to_i(16).chr },
+        :jpeg,
+        File.size(fixture_image_path),
+        File.read(fixture_image_path),
+        :ok
+      )
 
-  describe "#data" do
-    it "should correspond to the fixture image" do
-      image.data.should eq File.read(fixture_image_path, :encoding => 'binary')
+      Hallon::Image.new(image)
     end
 
-    it "should have a binary encoding" do
-      image.data.encoding.name.should eq 'ASCII-8BIT'
+    subject { image }
+
+    its(:status) { should be :ok }
+    its(:format) { should be :jpeg }
+    its(:id) { should eq "3ad93423add99766e02d563605c6e76ed2b0e450" }
+
+    describe "#data" do
+      subject { image.data }
+
+      it "should correspond to the fixture image" do
+        should eq File.open(fixture_image_path, 'r:binary', &:read)
+      end
+
+      it "should have a binary encoding" do
+        pending "ruby 1.8 does not support String#encoding" unless subject.respond_to?(:encoding)
+        subject.encoding.name.should eq 'ASCII-8BIT'
+      end
     end
+
+    describe "#to_link" do
+      it "should retrieve the Spotify URI" do
+        image.to_link.should eq Hallon::Link.new("spotify:image:#{image.id}")
+      end
+    end
+  end
+
+  context "created from an uri" do
+    let(:image) { Hallon::Image.new("spotify:image:c78f091482e555bd2ffacfcd9cbdc0714b221663", session) }
+    subject { image }
+    its(:id) { should eq "c78f091482e555bd2ffacfcd9cbdc0714b221663" }
   end
 
   describe "callbacks" do

data/spec/hallon/observable_spec.rb

@@ -4,10 +4,8 @@ describe Hallon::Observable do
   end
 
   describe "instance methods" do
-    subject { described_class.instance_methods }
-
-    it { should include :on }
-    it { should include :trigger }
+    it { should respond_to :on }
+    it { should respond_to :trigger }
   end
 
   describe "#on" do

data/spec/spec_helper.rb

@@ -1,4 +1,11 @@
 # coding: utf-8
+
+begin
+  require 'cover_me'
+rescue LoadError
+  # ignore, only for development, it’s in the Gemfile
+end
+
 require 'mockspotify'
 require 'hallon'
 

data/spec/support/cover_me.rb

@@ -1,5 +1,7 @@
-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"]
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000Z
+date: 2011-07-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spotify
-  requirement: &2153174180 !ruby/object:Gem::Requirement
+  requirement: &2157240440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 8.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2153174180
+  version_requirements: *2157240440
 - !ruby/object:Gem::Dependency
   name: mockspotify
-  requirement: &2153173600 !ruby/object:Gem::Requirement
+  requirement: &2157239880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.4
   type: :development
   prerelease: false
-  version_requirements: *2153173600
+  version_requirements: *2157239880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153172780 !ruby/object:Gem::Requirement
+  requirement: &2157239180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *2153172780
+  version_requirements: *2157239180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153171860 !ruby/object:Gem::Requirement
+  requirement: &2157232320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2153171860
+  version_requirements: *2157232320
 - !ruby/object:Gem::Dependency
   name: autotest-standalone
-  requirement: &2153171320 !ruby/object:Gem::Requirement
+  requirement: &2157231660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153171320
+  version_requirements: *2157231660
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2153170600 !ruby/object:Gem::Requirement
+  requirement: &2157230760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,21 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153170600
-- !ruby/object:Gem::Dependency
-  name: cover_me
-  requirement: &2153169940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2153169940
+  version_requirements: *2157230760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153169300 !ruby/object:Gem::Requirement
+  requirement: &2157230240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153169300
+  version_requirements: *2157230240
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2153168620 !ruby/object:Gem::Requirement
+  requirement: &2157229660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153168620
+  version_requirements: *2157229660
 description: 
 email: kim@burgestrand.se
 executables: []
@@ -134,6 +123,7 @@ files:
 - lib/hallon.rb
 - lib/hallon/error.rb
 - lib/hallon/ext/ffi.rb
+- lib/hallon/ext/object.rb
 - lib/hallon/ext/spotify.rb
 - lib/hallon/image.rb
 - lib/hallon/link.rb
@@ -172,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ~>
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: