scissor-echonest 0.0.8 → 0.1.0

data/Rakefile

@@ -21,7 +21,7 @@ DESCRIPTION       = "Scissor extension to use Echo Nest Developers API"
 RUBYFORGE_PROJECT = "scissorechonest"
 HOMEPATH          = "http://github.com/youpy/scissor-echonest"
 BIN_FILES         = %w(  )
-VERS              = "0.0.8"
+VERS              = "0.1.0"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/examples/afromb.rb

@@ -11,18 +11,12 @@
 require 'rubygems'
 require 'scissor/echonest'
 require 'narray'
-
-Scissor.logger.level = Logger::DEBUG
-
+ 
 class AfromB
   def initialize(a, b = nil)
     @a, @b = [a, b || a]
 
-    @segments_of_a = @a.inject([]) do |memo, file|
-      memo += Scissor(file).segments
-      memo
-    end
-
+    @segments_of_a = Scissor(@a).segments
     @segments_of_b = (@a == @b) ? @segments_of_a : Scissor(@b).segments
   end
 
@@ -73,23 +67,21 @@ class AfromB
     Scissor.join(result)
   end
 end
-
+ 
 if __FILE__ == $0
   require 'pit'
-
+ 
   Scissor.echonest_api_key = Pit.get('echonest.com', :require => {
       'api_key' => 'your Echo Nest API key'
     })['api_key']
   Scissor::Chunk.echonest.user_agent.send_timeout = 300
 
-  if ARGV.size == 2
+  if ARGV.size == 3
+    a, b, outfile = ARGV
+  else
     a, outfile = ARGV
     b = a
-  else
-    a = ARGV
-    outfile = a.pop
-    b = a.pop
   end
 
-  AfromB.new(a, b).run > outfile
+  AfromB.new(a, b).run >> outfile
 end

data/lib/scissor/echonest.rb

@@ -16,12 +16,22 @@ module Scissor
       end
     end
 
+    def bars
+      analyze do |analysis|
+        bars = analysis.bars
+        bars.inject([]) do |chunks, bar|
+          chunk = self[bar.start, bar.duration]
+          chunk.set_delegate(bar)
+          chunks << chunk
+          chunks
+        end
+      end
+    end
+
     def beats
-      tempfile_for_echonest do |tmpfile|
+      analyze do |analysis|
         chunks = []
-        scissor = to_file(tmpfile, :bitrate => '64k')
-
-        beats = self.class.echonest.get_beats(tmpfile)
+        beats = analysis.beats
 
         if beats.size != 0
           chunk = self[0, beats.first.start]
@@ -42,10 +52,8 @@ module Scissor
     end
 
     def segments
-      tempfile_for_echonest do |tmpfile|
-        scissor = to_file(tmpfile, :bitrate => '64k')
-
-        segments = self.class.echonest.get_segments(tmpfile)
+      analyze do |analysis|
+        segments = analysis.segments
         segments.inject([]) do |chunks, segment|
           chunk = self[segment.start, segment.duration]
           chunk.set_delegate(segment)
@@ -57,11 +65,13 @@ module Scissor
 
     private
 
-    def tempfile_for_echonest
+    def analyze
       tmpfile = Pathname.new('/tmp/scissor_echonest_temp_' + $$.to_s + '.mp3')
-      yield tmpfile
+      scissor = to_file(tmpfile, :bitrate => '64k')
+
+      yield self.class.echonest.track.analysis(tmpfile)
     ensure
-      tmpfile.unlink
+      tmpfile.unlink if tmpfile.exist?
     end
   end
 end

data/spec/scissor-echonest_spec.rb

@@ -34,6 +34,16 @@ describe Scissor do
       Scissor::Chunk.stub!(:echonest).and_return(api)
     end
 
+    it 'should get bars' do
+      bars = @scissor.bars
+      bar = bars.first
+
+      bars.size.should eql(80)
+      bar.start.should be_close(1.0, 0.1)
+      bar.duration.should be_close(1.48, 0.01)
+      bar.confidence.should be_close(0.18, 0.01)
+    end
+
     it 'should get beats' do
       beats = @scissor.beats
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - youpy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-30 00:00:00 +09:00
+date: 2011-11-01 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency