itunes-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f1c91e02d16364127d719091b1ed109ae00d905
-  data.tar.gz: f063ff6d206acc2795795c7f30cf768d16c39d94
+  metadata.gz: 7b23fc7101437304af9f40938b9c1ffd1a8c1200
+  data.tar.gz: f87f2609ef6ae98a19c0ff27ccbf58d9930f5f5b
 SHA512:
-  metadata.gz: b614bc34af5c7adca7cd1e7afd6d2d836c85260a825d287bfe410e109ffb70714ba91f68c20947f204b318ab40e1fc7bdb2e0f6b9dd1a0c02dfe0d4d44eeeb89
-  data.tar.gz: 0d255ef6391c425c76e1aa3d168ec677896affffb4e9f7b1261f386a41f05cb03cffc3bcd3ab344bafd23dab639356293802ad06eebeca6a0284651235e89f7f
+  metadata.gz: 5bc6e7a8e429d395d8bd3f1b4a633f0f33d0bc316b268bfe82219d0bd979adfb75542a7c59372e22d328a921b1d59903fc566c57d9e783f1014de0775c021d1b
+  data.tar.gz: e409d720b89d34548c6c24039530357ecd45725aa5fa98902f6c0b1211274509203a473177f86ee63edc6fe58db5a8ec8eb7dccc91182d6bd0b269201c81a0b7

data/lib/itunes/player.rb

@@ -51,6 +51,11 @@ module Itunes
         Track.find_by(persistent_id: persistent_id).first
       end
 
+      def current_track
+        persistent_id = execute_script("#{script_dir}/current_track.scpt")
+        Track.find_by(persistent_id: persistent_id).first
+      end
+
       private
       def script_dir
         'player'

data/lib/itunes/track.rb

@@ -88,11 +88,6 @@ module Itunes
       end
     end
 
-    def self.current_track
-      persistent_id = execute_script('track/current_track.scpt')
-      Track.find_by(persistent_id: persistent_id).first
-    end
-
     def self.find_conditions(args)
       conditions = []
       args.each do |key, val|

data/lib/itunes/version.rb

@@ -1,3 +1,3 @@
 module Itunes
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/itunes/player_spec.rb

@@ -5,16 +5,14 @@ require 'itunes-client'
 include Itunes
 
 describe Player do
-  let(:player) { Itunes::Player }
-
   describe '.add' do
-    subject(:add) { player.add(file_name) }
+    subject(:add) { Player.add(file_name) }
 
     let(:file_name) { 'foo.wav' }
     let(:new_persistent_id) { 'foo' }
 
     before do
-      player.should_receive(:execute_script).
+      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).
@@ -29,67 +27,67 @@ describe Player do
 
   describe '.pause' do
     it 'calls pause.scpt' do
-      player.should_receive(:execute_script).with('player/pause.scpt')
-      player.pause
+      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
+      Player.should_receive(:execute_script).with('player/stop.scpt')
+      Player.stop
     end
   end
 
   describe '.play' do
     it 'calls play.scpt' do
-      player.should_receive(:execute_script).with('player/play.scpt')
-      player.play
+      Player.should_receive(:execute_script).with('player/play.scpt')
+      Player.play
     end
   end
 
   describe '.playing?' do
-    subject { player.playing? }
+    subject { Player.playing? }
     context 'when iTunes plays a track' do
-      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      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') }
+      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? }
+    subject { Player.paused? }
     context 'when iTunes plays a track' do
-      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      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') }
+      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? }
+    subject { Player.stopped? }
     context 'when iTunes plays a track' do
-      before { player.should_receive(:execute_script).with('player/player_state.scpt').and_return('playing') }
+      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') }
+      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).
+      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).
@@ -98,14 +96,14 @@ describe Player do
     let(:new_persistent_id) { 'foo' }
 
     it 'plays a next track' do
-      next_track = player.next_track
+      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).
+      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).
@@ -114,9 +112,26 @@ describe Player do
     let(:new_persistent_id) { 'foo' }
 
     it 'plays a previous track' do
-      next_track = player.prev_track
+      next_track = Player.prev_track
       expect(next_track.persistent_id).to eq(new_persistent_id)
     end
   end
 
+  describe '.current_track' do
+    before do
+      Player.should_receive(:execute_script).
+        with('player/current_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) { 'new_persistent_id' }
+
+    it 'returns a current track' do
+      current_track = Player.current_track
+      expect(current_track.persistent_id).to eq(new_persistent_id)
+    end
+  end
+
 end

data/spec/itunes/track_spec.rb

@@ -155,20 +155,4 @@ describe Track do
       end
     end
   end
-
-  describe '.current_track' do
-    subject(:current_track) { Track.current_track }
-    let(:new_persistent_id) { 'new_persistent_id' }
-    before do
-      Track.should_receive(:execute_script).
-        with('track/current_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
-    it 'returns a current track' do
-      expect(current_track.persistent_id).to eq(new_persistent_id)
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itunes-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ryo katsuma
@@ -175,6 +175,7 @@ files:
 - lib/itunes/util/executor.rb
 - lib/itunes/version.rb
 - scripts/player/add.scpt
+- scripts/player/current_track.scpt
 - scripts/player/next_track.scpt
 - scripts/player/pause.scpt
 - scripts/player/play.scpt
@@ -182,7 +183,6 @@ files:
 - 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