itunes-client 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acf0f6362da0cee6e1acd568af19372073f9ff1b
-  data.tar.gz: 819befcd3e4f4df0c3937d77d053e30350a88d4e
+  metadata.gz: 5645b5129783ab41989f48719cc052f25a5f835b
+  data.tar.gz: 7253a509ac6e66791d49dc71dca6acad9a7f4dd3
 SHA512:
-  metadata.gz: 71055a9bf65eef0718b2656e29ea2661f0505909750bb12494d993407f0cccfb4eaf22d0e5a96c4d2306d8c96cc09d2adf3224c75ef5011fb199b25d14636434
-  data.tar.gz: 55ca841cd771536984bb3750b9d1c1a57906540be6ff0842ebe49b89823f9d9dfa5dae479886a7c6de68a06042816040540413b8b0913a4052fce0c7bc70666a
+  metadata.gz: 9a57212b58a551bbc99ca4d70027ad5ffa308cbae0f121932c3e8e0e2b04a672fab0ed95f0a54762192b6d06df31301a2c4144cfee2fbcdfa067ed89695d463c
+  data.tar.gz: a89c43842d98e6f0a22d06348907c1ea9ae78be9c7579b6a3272489863c870d1d0f57da57ea60c8f211d9fde9b8e104c10a13b183b49cdd09cd58e6a6fa51054

data/README.md

@@ -44,9 +44,11 @@ track = application.add(path_to_your_sound_file)
 # Convert by default encoder
 encoded_track = track.convert
 
-# Find a track
-track = Track.find_by(name: "Hello, Goodbye")
-# => #<Itunes::Track:0x007fdd38a1d430 @persistent_id="571B6412CDADBC93", @name="Hello, Goodbye", @album="1", @artist="The Beatles", @track_count="27", @track_number="19">
+# Find all tracks
+tracks = Track.find_by(name: "Hello, Goodbye")
+# => [#<Itunes::Track:0x007fdd38a1d430 @persistent_id="571B6412CDADBC93", @name="Hello, Goodbye", @album="1", @artist="The Beatles", @track_count="27", @track_number="19">]
+
+track = tracks.first
 
 # Play track
 track.play

data/lib/itunes/track.rb

@@ -58,9 +58,8 @@ module Itunes
       self
     end
 
-    def assign_attributes_by(itunes_response)
-      track_data = ::JSON.parse(itunes_response)
-      ATTRIBUTES.each { |attr| send("#{attr}=", track_data[attr.to_s]) }
+    def assign_attributes_by(track_attributes)
+      ATTRIBUTES.each { |attr| send("#{attr}=", track_attributes[attr.to_s]) }
     end
 
     def self.find_by(arg)
@@ -70,8 +69,11 @@ module Itunes
       script_name = generate_script_from_template('track/finder.tmpl.scpt', conditions: conditions)
       track_response = execute_template_based_script(script_name)
 
-      Track.new.tap do |track|
-        track.assign_attributes_by(track_response)
+      tracks_attributes = ::JSON.parse(track_response)
+      tracks_attributes.compact.map do |track_attributes|
+        Track.new.tap do |track|
+          track.assign_attributes_by(track_attributes)
+        end
       end
     end
 

data/lib/itunes/version.rb

@@ -1,3 +1,3 @@
 module Itunes
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/scripts/track/finder.tmpl.scpt

@@ -1,15 +1,23 @@
 tell application "iTunes"
-  set specified_track to (some track whose #{conditions})
-
-  set props to {}
-  set end of props to "{"
-  set end of props to ("\"persistent_id\":\"" & persistent ID of specified_track & "\",")
-  set end of props to ("\"name\":\"" & name of specified_track & "\",")
-  set end of props to ("\"album\":\"" & album of specified_track & "\",")
-  set end of props to ("\"artist\":\"" & artist of specified_track & "\",")
-  set end of props to ("\"track_count\":\"" & track count of specified_track & "\",")
-  set end of props to ("\"track_number\":\"" & track number of specified_track & "\"")
-  set end of props to "}"
-
-  return props as string
+  set specified_tracks to (every track whose #{conditions})
+
+	set json to "["
+
+	repeat with specified_track in specified_tracks
+    set props to {}
+    set end of props to "{"
+    set end of props to ("\"persistent_id\":\"" & persistent ID of specified_track & "\",")
+    set end of props to ("\"name\":\"" & name of specified_track & "\",")
+    set end of props to ("\"album\":\"" & album of specified_track & "\",")
+    set end of props to ("\"artist\":\"" & artist of specified_track & "\",")
+    set end of props to ("\"track_count\":\"" & track count of specified_track & "\",")
+    set end of props to ("\"track_number\":\"" & track number of specified_track & "\"")
+    set end of props to "}"
+
+    set json to json & props as string & ","
+  end repeat
+
+  set json to json & "null]"
+  return json
+
 end tell

data/spec/itunes/application_spec.rb

@@ -24,14 +24,15 @@ describe Application do
         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))
+        and_return([Track.new(persistent_id: new_persistent_id)])
     end
 
-    it 'returns a track instance' do
-      track = add
+    it 'returns an array of track instance' do
+      tracks = add
 
-      expect(track).to be_a(Track)
-      expect(track.persistent_id).to eq(new_persistent_id)
+      expect(tracks).to be_an(Array)
+      expect(tracks.size).to eq(1)
+      expect(tracks.first.persistent_id).to eq(new_persistent_id)
     end
   end
 

data/spec/itunes/track_spec.rb

@@ -33,13 +33,14 @@ describe Track do
         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))
+        and_return([Track.new(persistent_id: new_persistent_id)])
     end
 
-    it 'returns a new Track' do
-      converted_track = convert
-      expect(converted_track).to be_a(Track)
-      expect(converted_track.persistent_id).to eq(new_persistent_id)
+    it 'returns an array of new Track' do
+      converted_tracks = convert
+      expect(converted_tracks).to be_an(Array)
+      expect(converted_tracks.size).to eq(1)
+      expect(converted_tracks.first.persistent_id).to eq(new_persistent_id)
     end
   end
 
@@ -94,7 +95,7 @@ describe Track do
       end
     end
 
-    context 'when hash argument which has 1 key is given' do
+    context 'when hash argument is given' do
       let(:arg) { { name: name } }
       let(:new_scpt) { 'new.scpt' }
       let(:new_persistent_id) { 'bar' }
@@ -105,15 +106,14 @@ describe Track do
           and_return(new_scpt)
 
         Track.stub(:execute_template_based_script).
-          and_return({ persistent_id: new_persistent_id, name: name }.to_json)
+          and_return([{ persistent_id: new_persistent_id, name: name }].to_json)
       end
 
-      it 'returns a track with specified name' do
-        track = find
-        expect(track).to be_a(Track)
-        expect(track.name).to eq(name)
+      it 'returns an array of track with specified name' do
+        tracks = find
+        expect(tracks.size).to eq(1)
+        expect(tracks.first.name).to eq(name)
       end
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itunes-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ryo katsuma