itunes-client 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73cbf11e4ffba3ff0928c8a872eb181e7ad6d941
-  data.tar.gz: a7ee4be0ffb87dd6169c8a2c6291cf942d7d71d5
+  metadata.gz: 84cff6353f729ae6ed533ee0ea61f5ef4bc054f0
+  data.tar.gz: 69f8934039019946f497a38aaca502590948261c
 SHA512:
-  metadata.gz: 63183e8d33a3c6237361293e7e0f77f72f52748199d5dd30e8a8598ff47217222a86924be98d426dd9d778adf0dc3fa044e742fa96fce5bcda0b16e97460659d
-  data.tar.gz: 5e17dac860ead5cd8903a4879f2a7bb24cec14ea0760d1b86161e408274ece35e7919980da56259278d8972f2997ea664b15e11ae1611abe7d408b1ccdfa0a6d
+  metadata.gz: b65f4e065e816a8d61d8c04266d11a56e60cd60fd59c967648b1adb2ec335e53ffc4dc5a873a7aa1338b36b5f15489545ec146f8a1ddd5c5f0411805311aef0e
+  data.tar.gz: a4ef2807ecfca46366828afc7e2edf0551a178c9a73d9145ac7ff8ee1aee1f70669813adce4da7c12a12901a6a3eeed1c86c23caa320081a62c6c90a32dfc835

data/lib/itunes/player.rb

@@ -0,0 +1,55 @@
+# coding: utf-8
+require 'singleton'
+
+require 'itunes/track'
+require 'itunes/util'
+
+module Itunes
+  class Player
+    extend Itunes::Util::Executor
+
+    class << self
+      def add(file_path)
+        persistent_id = execute_script("#{script_dir}/add.scpt", file_path)
+        Track.find_by(persistent_id: persistent_id).first
+      end
+
+      def stop
+        execute_script("#{script_dir}/stop.scpt")
+        self
+      end
+
+      def pause
+        execute_script("#{script_dir}/pause.scpt")
+        self
+      end
+
+      def playing?
+        execute_script("#{script_dir}/player_state.scpt") == 'playing'
+      end
+
+      def paused?
+        execute_script("#{script_dir}/player_state.scpt") == 'paused'
+      end
+
+      def stopped?
+        execute_script("#{script_dir}/player_state.scpt") == 'stopped'
+      end
+
+      def next_track
+        persistent_id = execute_script("#{script_dir}/next_track.scpt")
+        Track.find_by(persistent_id: persistent_id).first
+      end
+
+      def prev_track
+        persistent_id = execute_script("#{script_dir}/prev_track.scpt")
+        Track.find_by(persistent_id: persistent_id).first
+      end
+
+      private
+      def script_dir
+        'player'
+      end
+    end
+  end
+end

data/lib/itunes/track.rb

@@ -49,12 +49,12 @@ module Itunes
     end
 
     def pause
-      application.pause
+      Itunes.pause
       self
     end
 
     def stop
-      application.stop
+      Itunes.stop
       self
     end
 
@@ -106,10 +106,6 @@ module Itunes
 
     private
 
-    def application
-      Application.instance
-    end
-
     def update_attribute_records(args)
       records = []
       args.each do |key, val|

data/lib/itunes/version.rb

@@ -1,3 +1,3 @@
 module Itunes
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/lib/itunes-client.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 require 'itunes/version'
-require 'itunes/application'
+require 'itunes/player'
 
 module Itunes
 end

data/scripts/player/next_track.scpt

@@ -0,0 +1,5 @@
+tell application "iTunes"
+  next track
+  play
+  return persistent ID of current track
+end tell

data/scripts/player/player_state.scpt

@@ -0,0 +1,3 @@
+tell application "iTunes"
+  player state
+end tell

data/scripts/player/prev_track.scpt

@@ -0,0 +1,5 @@
+tell application "iTunes"
+  previous track
+  play
+  return persistent ID of current track
+end tell

data/spec/itunes/player_spec.rb

@@ -0,0 +1,115 @@
+# coding: utf-8
+require 'spec_helper'
+require 'itunes-client'
+
+include Itunes
+
+describe Player do
+  let(:player) { Itunes::Player }
+
+  describe '.add' do
+    subject(:add) { player.add(file_name) }
+
+    let(:file_name) { 'foo.wav' }
+    let(:new_persistent_id) { 'foo' }
+
+    before do
+      player.should_receive(:execute_script).
+        with('player/add.scpt', file_name).and_return(new_persistent_id)
+      Track.should_receive(:find_by).
+        with(persistent_id: new_persistent_id).
+        and_return([Track.new(persistent_id: new_persistent_id)])
+    end
+
+    it 'returns an array of track instance' do
+      expect(add).to be_a(Track)
+      expect(add.persistent_id).to eq(new_persistent_id)
+    end
+  end
+
+  describe '.pause' do
+    it 'calls pause.scpt' do
+      player.should_receive(:execute_script).with('player/pause.scpt')
+      player.pause
+    end
+  end
+
+  describe '.stop' do
+    it 'calls stop.scpt' do
+      player.should_receive(:execute_script).with('player/stop.scpt')
+      player.stop
+    end
+  end
+
+  describe '.playing?' do
+    subject { player.playing? }
+    context 'when iTunes plays a track' do
+      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      it { expect(subject).to be_true }
+    end
+
+    context 'when iTunes stops a track' do
+      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('stopped') }
+      it { expect(subject).to be_false }
+    end
+  end
+
+  describe '.paused?' do
+    subject { player.paused? }
+    context 'when iTunes plays a track' do
+      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      it { expect(subject).to be_false }
+    end
+
+    context 'when iTunes pauses' do
+      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('paused') }
+      it { expect(subject).to be_true }
+    end
+  end
+
+  describe '.stopped?' do
+    subject { player.stopped? }
+    context 'when iTunes plays a track' do
+      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      it { expect(subject).to be_false }
+    end
+
+    context 'when iTunes stops a track' do
+      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('stopped') }
+      it { expect(subject).to be_true }
+    end
+  end
+
+  describe '.next_track' do
+    before do
+      player.should_receive(:execute_script).
+        with('player/next_track.scpt').and_return(new_persistent_id)
+      Track.should_receive(:find_by).
+        with(persistent_id: new_persistent_id).
+        and_return([Track.new(persistent_id: new_persistent_id)])
+    end
+    let(:new_persistent_id) { 'foo' }
+
+    it 'plays a next track' do
+      next_track = player.next_track
+      expect(next_track.persistent_id).to eq(new_persistent_id)
+    end
+  end
+
+  describe '.prev_track' do
+    before do
+      player.should_receive(:execute_script).
+        with('player/prev_track.scpt').and_return(new_persistent_id)
+      Track.should_receive(:find_by).
+        with(persistent_id: new_persistent_id).
+        and_return([Track.new(persistent_id: new_persistent_id)])
+    end
+    let(:new_persistent_id) { 'foo' }
+
+    it 'plays a previous track' do
+      next_track = player.prev_track
+      expect(next_track.persistent_id).to eq(new_persistent_id)
+    end
+  end
+
+end

data/spec/itunes/track_spec.rb

@@ -8,7 +8,7 @@ describe Track do
   let(:track) do
     Track.new(persistent_id: base_persistent_id, name: base_name, album: base_album)
   end
-  let(:app) { Application.instance }
+  let(:app) { Itunes }
   let(:base_persistent_id) { 'foo' }
   let(:base_name) { 'base name' }
   let(:base_album) { 'base album' }

data/spec/itunes/util/executor_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 require 'spec_helper'
-require 'itunes-client'
+require 'itunes/util'
 
 describe Itunes::Util::Executor do
   class DummyClass

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itunes-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - ryo katsuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,21 +169,24 @@ files:
 - Rakefile
 - itunes-client.gemspec
 - lib/itunes-client.rb
-- lib/itunes/application.rb
+- lib/itunes/player.rb
 - lib/itunes/track.rb
 - lib/itunes/util.rb
 - lib/itunes/util/executor.rb
 - lib/itunes/version.rb
-- scripts/application/add.scpt
-- scripts/application/pause.scpt
-- scripts/application/stop.scpt
+- scripts/player/add.scpt
+- scripts/player/next_track.scpt
+- scripts/player/pause.scpt
+- scripts/player/player_state.scpt
+- scripts/player/prev_track.scpt
+- scripts/player/stop.scpt
 - scripts/track/convert.scpt
 - scripts/track/current_track.scpt
 - scripts/track/delete.scpt
 - scripts/track/finder.tmpl.scpt
 - scripts/track/play.scpt
 - scripts/track/updater.tmpl.scpt
-- spec/itunes/application_spec.rb
+- spec/itunes/player_spec.rb
 - spec/itunes/track_spec.rb
 - spec/itunes/util/executor_spec.rb
 - spec/spec_helper.rb
@@ -213,7 +216,7 @@ specification_version: 4
 summary: itunes-client provides a high level API like ActiveRecord style to control
   your iTunes.
 test_files:
-- spec/itunes/application_spec.rb
+- spec/itunes/player_spec.rb
 - spec/itunes/track_spec.rb
 - spec/itunes/util/executor_spec.rb
 - spec/spec_helper.rb

data/lib/itunes/application.rb

@@ -1,34 +0,0 @@
-# coding: utf-8
-require 'singleton'
-
-require 'itunes/track'
-require 'itunes/util'
-
-module Itunes
-  class Application
-    include Singleton
-    include Itunes::Util::Executor
-
-    attr_accessor :tracks
-
-    def add(file_path)
-      persistent_id = execute_script("#{script_dir}/add.scpt", file_path)
-      Track.find_by(persistent_id: persistent_id).first
-    end
-
-    def stop
-      execute_script("#{script_dir}/stop.scpt")
-      self
-    end
-
-    def pause
-      execute_script("#{script_dir}/pause.scpt")
-      self
-    end
-
-    private
-    def script_dir
-      'application'
-    end
-  end
-end

data/spec/itunes/application_spec.rb

@@ -1,49 +0,0 @@
-# coding: utf-8
-require 'spec_helper'
-require 'itunes-client'
-
-include Itunes
-
-describe Application do
-  let(:app) { described_class.instance }
-
-  describe '#initialize' do
-    it 'raises an Error' do
-      expect { described_class.new }.to raise_error
-    end
-  end
-
-  describe '#add' do
-    subject(:add) { app.add(file_name) }
-
-    let(:file_name) { 'foo.wav' }
-    let(:new_persistent_id) { 'foo' }
-
-    before do
-      app.should_receive(:execute_script).
-        with('application/add.scpt', file_name).and_return(new_persistent_id)
-      Track.should_receive(:find_by).
-        with(persistent_id: new_persistent_id).
-        and_return([Track.new(persistent_id: new_persistent_id)])
-    end
-
-    it 'returns an array of track instance' do
-      expect(add).to be_a(Track)
-      expect(add.persistent_id).to eq(new_persistent_id)
-    end
-  end
-
-  describe '#pause' do
-    it 'calls pause.scpt' do
-      app.should_receive(:execute_script).with('application/pause.scpt')
-      app.pause
-    end
-  end
-
-  describe '#stop' do
-    it 'calls stop.scpt' do
-      app.should_receive(:execute_script).with('application/stop.scpt')
-      app.stop
-    end
-  end
-end